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

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

Revision: 9327
          http://sourceforge.net/p/phpwiki/code/9327
Author:   vargenau
Date:     2014-11-17 16:33:00 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
Add class variables

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-17 16:25:16 UTC (rev 9326)
+++ trunk/lib/WikiUser.php	2014-11-17 16:33:00 UTC (rev 9327)
@@ -370,6 +370,9 @@
     public $_level = WIKIAUTH_ANON;
     public $_prefs = false;
     public $_HomePagehandle = false;
+    public $_auth_methods;
+    public $_current_method;
+    public $_current_index;
 
     // constructor
     function _WikiUser($UserName = '', $prefs = false)
@@ -937,8 +940,6 @@
     {
         //global $DBAuthParams, $DBParams;
         if ($UserName) {
-            /*if (!$this->isValidName($UserName))
-                return false;*/
             $this->_userid = $UserName;
             if ($this->hasHomePage())
                 $this->_HomePagehandle = $GLOBALS['request']->getPage($this->_userid);
@@ -1030,6 +1031,7 @@
                     return $this;
             }
         }
+        return null;
     }
 
     function getAuthDbh()
@@ -1739,7 +1741,7 @@
             $user = session_get_user();
             return $user->getEmail();
         } else {
-            parent::get($name);
+            return parent::get($name);
         }
     }
 
@@ -1917,6 +1919,7 @@
 class UserPreferences
 {
     public $notifyPagesAll;
+    public $_init;
 
     function __construct($saved_prefs = false)
     {
@@ -2067,7 +2070,8 @@
     function updatePrefs($prefs, $init = false)
     {
         $count = 0;
-        if ($init) $this->_init = $init;
+        if ($init)
+            $this->_init = $init;
         if (is_object($prefs)) {
             $type = 'emailVerified';
             $obj =& $this->_prefs['email'];

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