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

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

Revision: 9600
          http://sourceforge.net/p/phpwiki/code/9600
Author:   vargenau
Date:     2015-03-04 16:07:32 +0000 (Wed, 04 Mar 2015)
Log Message:
-----------
Extend scope of global $request

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2015-03-04 16:01:30 UTC (rev 9599)
+++ trunk/lib/WikiUser.php	2015-03-04 16:07:32 UTC (rev 9600)
@@ -587,13 +587,13 @@
         extract($args);
         $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level));
 
+        /**
+         * @var WikiRequest $request
+         */
+        global $request;
+
         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"',
@@ -631,11 +631,6 @@
         $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;
@@ -697,7 +692,6 @@
         $this->_level = $authlevel;
         return $this;
     }
-
 }
 
 /**
@@ -826,8 +820,6 @@
                 // prefs should be stored besides the session in the homepagehandle or in a db.
                 $request->setCookieVar(getCookieName(), $this->_userid,
                     COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
-                //$request->setCookieVar(WIKI_NAME, array('userid' => $prefs->get('userid')),
-                //                       COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
             }
         }
         if (is_object($prefs)) {

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