Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 29dbbc618e60c30a103fc4812034d163083f4007..bab8a6dbccdb00c9a6c3a3895855c24d59ed8f44 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -95,9 +95,22 @@ class Action extends HTMLOutputter // lawsuit
         return $this->msg;
     }
 
+    public function handleError($e)
+    {
+        if ($e instanceof ClientException) {
+            $this->clientError($e->getMessage(), $e->getCode());
+        } elseif ($e instanceof ServerException) {
+            $this->serverError($e->getMessage(), $e->getCode());
+        } else {
+            // If it wasn't specified more closely which kind of exception it was
+            $this->serverError($e->getMessage(), 500);
+        }
+    }
+
     static public function run(array $args=array(), $output='php://output', $indent=null) {
         $class = get_called_class();
         $action = new $class($output, $indent);
+        set_exception_handler(array($action, 'handleError'));
         $action->execute($args);
         return $action;
     }
@@ -381,8 +394,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $theme = new Theme($mainTheme);
 
-        // Some themes may have external stylesheets, such as using the
-        // Google Font APIs to load webfonts.
+        // Some themes may have external stylesheets
         foreach ($theme->getExternals() as $url) {
             $this->cssLink($url, $mainTheme, $media);
         }
@@ -416,14 +428,12 @@ class Action extends HTMLOutputter // lawsuit
                 $this->script('extlib/jquery.form.js');
                 $this->script('extlib/jquery-ui/jquery-ui.js');
                 $this->script('extlib/jquery.cookie.js');
-                $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/extlib/json2.js', GNUsocial::isHTTPS()).'"); }');
 
                 Event::handle('EndShowJQueryScripts', array($this));
             }
             if (Event::handle('StartShowStatusNetScripts', array($this))) {
                 $this->script('util.js');
                 $this->script('xbImportNode.js');
-                $this->script('geometa.js');
 
                 // This route isn't available in single-user mode.
                 // Not sure why, but it causes errors here.
@@ -480,10 +490,12 @@ class Action extends HTMLOutputter // lawsuit
 
         if (Event::handle('StartScriptVariables', array($this, &$vars))) {
             $vars['urlNewNotice'] = common_local_url('newnotice');
+            $vars['xhrTimeout'] = ini_get('max_execution_time')*1000;   // milliseconds
+            Event::handle('EndScriptVariables', array($this, &$vars));
         }
-        if (!empty($vars)) {
-            $this->inlineScript('SN.V = ' . json_encode($vars));
-        }
+
+        $this->inlineScript('SN.V = ' . json_encode($vars) . ';');
+
         return $vars;
     }
 
@@ -649,10 +661,14 @@ class Action extends HTMLOutputter // lawsuit
                     // if logo is an uploaded file, try to fall back to HTTPS file URL
                     $httpUrl = common_config('site', 'logo');
                     if (!empty($httpUrl)) {
-                        $f = File::getKV('url', $httpUrl);
-                        if (!empty($f) && !empty($f->filename)) {
-                            // this will handle the HTTPS case
-                            $logoUrl = File::url($f->filename);
+                        try {
+                            $f = File::getByUrl($httpUrl);
+                            if (!empty($f->filename)) {
+                                // this will handle the HTTPS case
+                                $logoUrl = File::url($f->filename);
+                            }
+                        } catch (NoResultException $e) {
+                            // no match
                         }
                     }
                 }
@@ -1443,7 +1459,9 @@ class Action extends HTMLOutputter // lawsuit
             $this->endDocument('json');
             break;
         default:
-            throw new ServerException($msg, $code);
+            common_log(LOG_ERR, 'Handled serverError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg));
+            $action = new ServerErrorAction($msg, $code);
+            $action->execute();
         }
 
         exit((int)$code);
@@ -1471,7 +1489,7 @@ class Action extends HTMLOutputter // lawsuit
         if (!array_key_exists($code, ClientErrorAction::$status)) {
             $code = 400;
         }
-        
+
         $status_string = ClientErrorAction::$status[$code];
 
         switch ($format) {
@@ -1499,7 +1517,9 @@ class Action extends HTMLOutputter // lawsuit
             echo $msg;
             break;
         default:
-            throw new ClientException($msg, $code);
+            common_log(LOG_ERR, 'Handled clientError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg));
+            $action = new ClientErrorAction($msg, $code);
+            $action->execute();
         }
         exit((int)$code);
     }