[phpwiki-checkins] SF.net SVN: phpwiki:[9391] trunk/lib/WikiUser.php

[<var...@us...>]

Revision: 9391
          http://sourceforge.net/p/phpwiki/code/9391
Author:   vargenau
Date:     2014-12-01 09:23:39 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
global $request;

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-28 16:16:21 UTC (rev 9390)
+++ trunk/lib/WikiUser.php	2014-12-01 09:23:39 UTC (rev 9391)
@@ -549,12 +549,19 @@
 
     function isAdmin()
     {
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         static $group;
+
         if ($this->_level == WIKIAUTH_ADMIN) return true;
         if (!$this->isSignedIn()) return false;
         if (!$this->isAuthenticated()) return false;
 
-        if (!$group) $group = &$request->getGroup();
+        if (!$group)
+            $group = &$request->getGroup();
         return ($this->_level > WIKIAUTH_BOGO and $group->isMember(GROUP_ADMIN));
     }
 
@@ -616,7 +623,11 @@
 
         if ($logout) { // Log out
             if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+                /**
+                 * @var WikiRequest $request
+                 */
                 global $request;
+
                 $zone_offset = Request_AccessLogEntry::_zone_offset();
                 $ncsa_time = date("d/M/Y:H:i:s", time());
                 $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
@@ -654,7 +665,11 @@
         $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
 
         if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+            /**
+             * @var WikiRequest $request
+             */
             global $request;
+
             $zone_offset = Request_AccessLogEntry::_zone_offset();
             $ncsa_time = date("d/M/Y:H:i:s", time());
             $manglepasswd = $passwd;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.