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

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

Revision: 8687
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8687&view=rev
Author:   vargenau
Date:     2012-12-27 11:00:27 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove unused variable

Modified Paths:
--------------
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/BogoLogin.php
    trunk/lib/WikiUser/OpenID.php
    trunk/lib/WikiUser/POP3.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/AdoDb.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -70,8 +70,7 @@
                 $prefs_blob = @$rs->fields['prefs'];
                 $rs->Close();
                 if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                    $updated = $this->_prefs->updatePrefs($restored_from_db);
-                    //$this->_prefs = new UserPreferences($restored_from_db);
+                    $this->_prefs->updatePrefs($restored_from_db);
                     return $this->_prefs;
                 }
             }
@@ -80,8 +79,7 @@
             if ($restored_from_page = $this->_prefs->retrieve
             ($this->_HomePagehandle->get('pref'))
             ) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page);
-                //$this->_prefs = new UserPreferences($restored_from_page);
+                $this->_prefs->updatePrefs($restored_from_page);
                 return $this->_prefs;
             }
         }

Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/BogoLogin.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -48,7 +48,7 @@
             if (isset($this->_prefs->_method) and $this->_prefs->_method == 'HomePage') {
                 $user = new _PersonalPagePassUser($this->_userid, $this->_prefs);
                 if ($user->checkPass($submitted_password)) {
-                    $user = UpgradeUser($this, $user);
+                    UpgradeUser($this, $user);
                     $this->_level = WIKIAUTH_USER;
                     return $this->_level;
                 } else {

Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/OpenID.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -208,7 +208,6 @@
 
     function checkPass($password)
     {
-        $userid = $this->_userid;
         if (!loadPhpExtension('openssl')) {
             trigger_error(
                 sprintf(_("The PECL %s extension cannot be loaded."), "openssl")

Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/POP3.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -73,7 +73,7 @@
             // quit the connection
             fputs($fp, "quit\n");
             // Get the sayonara message
-            $line = fgets($fp, 1024);
+            fgets($fp, 1024);
             fclose($fp);
         } else {
             trigger_error(_("Couldn't connect to %s", "POP3_AUTH_HOST " . $host . ':' . $port),

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/PdoDb.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -67,8 +67,7 @@
             $prefs = $db_result->fetch(PDO_FETCH_BOTH);
             $prefs_blob = @$prefs["prefs"];
             if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                $updated = $this->_prefs->updatePrefs($restored_from_db);
-                //$this->_prefs = new UserPreferences($restored_from_db);
+                $this->_prefs->updatePrefs($restored_from_db);
                 return $this->_prefs;
             }
         }
@@ -76,8 +75,7 @@
             if ($restored_from_page = $this->_prefs->retrieve
             ($this->_HomePagehandle->get('pref'))
             ) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page);
-                //$this->_prefs = new UserPreferences($restored_from_page);
+                $this->_prefs->updatePrefs($restored_from_page);
                 return $this->_prefs;
             }
         }
@@ -210,7 +208,6 @@
                 E_USER_WARNING);
 
         //NOTE: for auth_crypt_method='crypt'  defined('ENCRYPTED_PASSWD',true) must be set
-        $dbh = &$this->_auth_dbi;
         if ($this->_auth_crypt_method == 'crypt') {
             try {
                 $this->_authselect->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2012-12-27 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/PearDb.php	2012-12-27 11:00:27 UTC (rev 8687)
@@ -65,8 +65,7 @@
             $prefs = $db_result->fetchRow();
             $prefs_blob = @$prefs["prefs"];
             if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                $updated = $this->_prefs->updatePrefs($restored_from_db);
-                //$this->_prefs = new UserPreferences($restored_from_db);
+                $this->_prefs->updatePrefs($restored_from_db);
                 return $this->_prefs;
             }
         }
@@ -74,8 +73,7 @@
             if ($restored_from_page = $this->_prefs->retrieve
             ($this->_HomePagehandle->get('pref'))
             ) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page);
-                //$this->_prefs = new UserPreferences($restored_from_page);
+                $this->_prefs->updatePrefs($restored_from_page);
                 return $this->_prefs;
             }
         }

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