From ede64848ce0fb70488d742f169fc953689784d52 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 27 Dec 2012 11:00:27 +0000
Subject: [PATCH] Remove unused variable

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8687 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiUser/AdoDb.php     | 6 ++----
 lib/WikiUser/BogoLogin.php | 2 +-
 lib/WikiUser/OpenID.php    | 1 -
 lib/WikiUser/POP3.php      | 2 +-
 lib/WikiUser/PdoDb.php     | 7 ++-----
 lib/WikiUser/PearDb.php    | 6 ++----
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/WikiUser/AdoDb.php b/lib/WikiUser/AdoDb.php
index 06c4b19ed..2f1bdcb5c 100644
--- a/lib/WikiUser/AdoDb.php
+++ b/lib/WikiUser/AdoDb.php
@@ -70,8 +70,7 @@ class _AdoDbPassUser
                 $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 @@ class _AdoDbPassUser
             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;
             }
         }
diff --git a/lib/WikiUser/BogoLogin.php b/lib/WikiUser/BogoLogin.php
index 6332e674d..f075c48dc 100644
--- a/lib/WikiUser/BogoLogin.php
+++ b/lib/WikiUser/BogoLogin.php
@@ -48,7 +48,7 @@ class _BogoLoginPassUser extends _PassUser
             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 {
diff --git a/lib/WikiUser/OpenID.php b/lib/WikiUser/OpenID.php
index bec996b62..0b4324796 100644
--- a/lib/WikiUser/OpenID.php
+++ b/lib/WikiUser/OpenID.php
@@ -208,7 +208,6 @@ class _OpenIDPassUser
 
     function checkPass($password)
     {
-        $userid = $this->_userid;
         if (!loadPhpExtension('openssl')) {
             trigger_error(
                 sprintf(_("The PECL %s extension cannot be loaded."), "openssl")
diff --git a/lib/WikiUser/POP3.php b/lib/WikiUser/POP3.php
index 20f06c87d..c9263a4b9 100644
--- a/lib/WikiUser/POP3.php
+++ b/lib/WikiUser/POP3.php
@@ -73,7 +73,7 @@ class _POP3PassUser
             // 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),
diff --git a/lib/WikiUser/PdoDb.php b/lib/WikiUser/PdoDb.php
index 67d53a66c..72063b82a 100644
--- a/lib/WikiUser/PdoDb.php
+++ b/lib/WikiUser/PdoDb.php
@@ -67,8 +67,7 @@ class _PdoDbPassUser
             $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 @@ class _PdoDbPassUser
             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 @@ class _PdoDbPassUser
                 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);
diff --git a/lib/WikiUser/PearDb.php b/lib/WikiUser/PearDb.php
index 13c538827..f7c74bd6b 100644
--- a/lib/WikiUser/PearDb.php
+++ b/lib/WikiUser/PearDb.php
@@ -65,8 +65,7 @@ class _PearDbPassUser
             $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 @@ class _PearDbPassUser
             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;
             }
         }
-- 
2.45.0