X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=26ebd20932247cb870d1c6f37326406c29a26812;hb=f500d4ea5be3583e7c2e9ad21d0c300bceda83f2;hp=0e5d7ae361c0539569e8052c37bc5e73f31da952;hpb=749367e12f9742d7fd5ee028230fefa627599125;p=quix0rs-gnu-social.git diff --git a/lib/action.php b/lib/action.php index 0e5d7ae361..26ebd20932 100644 --- a/lib/action.php +++ b/lib/action.php @@ -111,6 +111,19 @@ class Action extends HTMLOutputter // lawsuit } } + function endHTML() + { + global $_startTime; + + if (isset($_startTime)) { + $endTime = microtime(true); + $diff = round(($endTime - $_startTime) * 1000); + $this->raw(""); + } + + return parent::endHTML(); + } + /** * Show head, a template method. * @@ -300,11 +313,11 @@ 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(); - + if (Event::handle('StartScriptMessages', array($this, &$messages))) { // Common messages needed for timeline views etc... @@ -312,14 +325,14 @@ class Action extends HTMLOutputter // lawsuit $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more'); $messages = array_merge($messages, $this->getScriptMessages()); - + Event::handle('EndScriptMessages', array($this, &$messages)); } - + if (!empty($messages)) { $this->inlineScript('SN.messages=' . json_encode($messages)); } - + return $messages; } @@ -533,33 +546,33 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('ul', array('class' => 'nav')); if (Event::handle('StartPrimaryNav', array($this))) { if ($user) { - // TRANS: Tooltip for main menu option "Personal" + // TRANS: Tooltip for main menu option "Personal". $tooltip = _m('TOOLTIP', 'Personal profile and friends timeline'); $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), - // TRANS: Main menu option when logged in for access to personal profile and friends timeline + // TRANS: Main menu option when logged in for access to personal profile and friends timeline. _m('MENU', 'Personal'), $tooltip, false, 'nav_home'); - // TRANS: Tooltip for main menu option "Account" + // TRANS: Tooltip for main menu option "Account". $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile'); $this->menuItem(common_local_url('profilesettings'), - // TRANS: Main menu option when logged in for access to user settings + // TRANS: Main menu option when logged in for access to user settings. _('Account'), $tooltip, false, 'nav_account'); - // TRANS: Tooltip for main menu option "Services" + // TRANS: Tooltip for main menu option "Services". $tooltip = _m('TOOLTIP', 'Connect to services'); $this->menuItem(common_local_url('oauthconnectionssettings'), - // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services + // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services. _('Connect'), $tooltip, false, 'nav_connect'); if ($user->hasRight(Right::CONFIGURESITE)) { - // TRANS: Tooltip for menu option "Admin" + // TRANS: Tooltip for menu option "Admin". $tooltip = _m('TOOLTIP', 'Change site configuration'); $this->menuItem(common_local_url('siteadminpanel'), - // TRANS: Main menu option when logged in and site admin for access to site configuration + // TRANS: Main menu option when logged in and site admin for access to site configuration. _m('MENU', 'Admin'), $tooltip, false, 'nav_admin'); } if (common_config('invite', 'enabled')) { - // TRANS: Tooltip for main menu option "Invite" + // TRANS: Tooltip for main menu option "Invite". $tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s'); $this->menuItem(common_local_url('invite'), - // TRANS: Main menu option when logged in and invitations are allowed for inviting new users + // TRANS: Main menu option when logged in and invitations are allowed for inviting new users. _m('MENU', 'Invite'), sprintf($tooltip, common_config('site', 'name')), @@ -568,33 +581,33 @@ class Action extends HTMLOutputter // lawsuit // TRANS: Tooltip for main menu option "Logout" $tooltip = _m('TOOLTIP', 'Logout from the site'); $this->menuItem(common_local_url('logout'), - // TRANS: Main menu option when logged in to log out the current user + // TRANS: Main menu option when logged in to log out the current user. _m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); } else { if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { - // TRANS: Tooltip for main menu option "Register" + // TRANS: Tooltip for main menu option "Register". $tooltip = _m('TOOLTIP', 'Create an account'); $this->menuItem(common_local_url('register'), - // TRANS: Main menu option when not logged in to register a new account + // TRANS: Main menu option when not logged in to register a new account. _m('MENU', 'Register'), $tooltip, false, 'nav_register'); } - // TRANS: Tooltip for main menu option "Login" + // TRANS: Tooltip for main menu option "Login". $tooltip = _m('TOOLTIP', 'Login to the site'); $this->menuItem(common_local_url('login'), - // TRANS: Main menu option when not logged in to log in + // TRANS: Main menu option when not logged in to log in. _m('MENU', 'Login'), $tooltip, false, 'nav_login'); } - // TRANS: Tooltip for main menu option "Help" + // TRANS: Tooltip for main menu option "Help". $tooltip = _m('TOOLTIP', 'Help me!'); $this->menuItem(common_local_url('doc', array('title' => 'help')), - // TRANS: Main menu option for help on the StatusNet site + // TRANS: Main menu option for help on the StatusNet site. _m('MENU', 'Help'), $tooltip, false, 'nav_help'); if ($user || !common_config('site', 'private')) { - // TRANS: Tooltip for main menu option "Search" + // TRANS: Tooltip for main menu option "Search". $tooltip = _m('TOOLTIP', 'Search for people or text'); $this->menuItem(common_local_url('peoplesearch'), - // TRANS: Main menu option when logged in or when the StatusNet instance is not private + // TRANS: Main menu option when logged in or when the StatusNet instance is not private. _m('MENU', 'Search'), $tooltip, false, 'nav_search'); } Event::handle('EndPrimaryNav', array($this));