merge 0.9.x into 1.0.x

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

diff --git a/lib/action.php b/lib/action.php
index d8efad07408ac70324033b8f8d4e152d2681ff52..3492873c5981574b7d29e71a08641759f901cca6 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -118,7 +118,7 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
-    function timingComment()
+    function endHTML()
     {
         global $_startTime;
 
@@ -127,15 +127,10 @@ class Action extends HTMLOutputter // lawsuit
             $diff = round(($endTime - $_startTime) * 1000);
             $this->raw("<!-- ${diff}ms -->");
         }
-    }
 
-    function endHTML()
-    {
-        $this->timingComment();
         return parent::endHTML();
     }
 
-    
     /**
      * Show head, a template method.
      *
@@ -144,7 +139,6 @@ class Action extends HTMLOutputter // lawsuit
     function showHead()
     {
         // XXX: attributes (profile?)
-        $this->timingComment();
         $this->elementStart('head');
         if (Event::handle('StartShowHeadElements', array($this))) {
             if (Event::handle('StartShowHeadTitle', array($this))) {
@@ -160,7 +154,6 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowHeadElements', array($this));
         }
         $this->elementEnd('head');
-        $this->timingComment();
     }
 
     /**
@@ -316,6 +309,7 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.cookie.min.js');
                     $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
                     $this->script('jquery.joverlay.min.js');
+                    $this->script('jquery.infieldlabel.min.js');
                 } else {
                     $this->script('jquery.js');
                     $this->script('jquery.form.js');
@@ -323,7 +317,9 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.cookie.js');
                     $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
                     $this->script('jquery.joverlay.js');
+                    $this->script('jquery.infieldlabel.js');
                 }
+
                 Event::handle('EndShowJQueryScripts', array($this));
             }
             if (Event::handle('StartShowStatusNetScripts', array($this)) &&
@@ -335,9 +331,13 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('xbImportNode.js');
                     $this->script('geometa.js');
                 }
+                $this->inlineScript('var _peopletagAC = "' .
+                    common_local_url('peopletagautocomplete') . '";');
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
-                $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                if (common_config('javascript', 'bustframes')) {
+                    $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                }
                 Event::handle('EndShowStatusNetScripts', array($this));
                 Event::handle('EndShowLaconicaScripts', array($this));
             }
@@ -352,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
      * events and appending to the array. Try to avoid adding strings that won't be used, as
      * they'll be added to HTML output.
      */
-
     function showScriptMessages()
     {
         $messages = array();
@@ -474,31 +473,25 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showBody()
     {
-        $this->timingComment();
         $this->elementStart('body', (common_current_user()) ? array('id' => strtolower($this->trimmed('action')),
                                                                     'class' => 'user_in')
                             : array('id' => strtolower($this->trimmed('action'))));
         $this->elementStart('div', array('id' => 'wrap'));
         if (Event::handle('StartShowHeader', array($this))) {
-            $this->timingComment();
             $this->showHeader();
             $this->flush();
-            $this->timingComment();
             Event::handle('EndShowHeader', array($this));
         }
         $this->showCore();
         $this->flush();
         if (Event::handle('StartShowFooter', array($this))) {
-            $this->timingComment();
             $this->showFooter();
             $this->flush();
-            $this->timingComment();
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
         $this->showScripts();
         $this->elementEnd('body');
-        $this->timingComment();
     }
 
     /**
@@ -716,24 +709,18 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content_wrapper'));
         $this->elementStart('div', array('id' => 'site_nav_local_views_wrapper'));
         if (Event::handle('StartShowLocalNavBlock', array($this))) {
-            $this->timingComment();
             $this->showLocalNavBlock();
             $this->flush();
-            $this->timingComment();
             Event::handle('EndShowLocalNavBlock', array($this));
         }
         if (Event::handle('StartShowContentBlock', array($this))) {
-            $this->timingComment();
             $this->showContentBlock();
             $this->flush();
-            $this->timingComment();
             Event::handle('EndShowContentBlock', array($this));
         }
         if (Event::handle('StartShowAside', array($this))) {
-            $this->timingComment();
             $this->showAside();
             $this->flush();
-            $this->timingComment();
             Event::handle('EndShowAside', array($this));
         }
         $this->elementEnd('div');
@@ -762,7 +749,6 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
-
     function showProfileBlock()
     {
         if (common_logged_in()) {
@@ -1372,13 +1358,16 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
-    function menuItem($url, $text, $title=null, $is_selected=false, $id=null)
+    function menuItem($url, $text, $title=null, $is_selected=false, $id=null, $class=null)
     {
         // Added @id to li for some control.
         // XXX: We might want to move this to htmloutputter.php
         $lattrs = array();
-        if ($is_selected) {
-            $lattrs['class'] = 'current';
+        if ($class !== null) {
+            $lattrs['class'] = $class;
+            if ($is_selected) {
+                $lattrs['class'] = trim('current ' . $lattrs['class']);
+            }
         }
 
         (is_null($id)) ? $lattrs : $lattrs['id'] = $id;