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

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8691 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiUserNew.php | 79 +++------------------------------------------
 1 file changed, 4 insertions(+), 75 deletions(-)

diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php
index aead8cfb8..2f2de1c39 100644
--- a/lib/WikiUserNew.php
+++ b/lib/WikiUserNew.php
@@ -750,8 +750,7 @@ class _AnonUser
              * function too!).
              */
             if (!$UserName || $UserName == @$unboxedcookie['userid']) {
-                $updated = $this->_prefs->updatePrefs($unboxedcookie);
-                //$this->_prefs = new UserPreferences($unboxedcookie);
+                $this->_prefs->updatePrefs($unboxedcookie);
                 $UserName = @$unboxedcookie['userid'];
                 if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
                     $this->_userid = $UserName;
@@ -766,8 +765,7 @@ class _AnonUser
         if (!$UserName and ($cookie = $request->cookies->get_old("WIKI_PREF2"))) {
             if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) {
                 if (!$UserName || $UserName == $unboxedcookie['userid']) {
-                    $updated = $this->_prefs->updatePrefs($unboxedcookie);
-                    //$this->_prefs = new UserPreferences($unboxedcookie);
+                    $this->_prefs->updatePrefs($unboxedcookie);
                     $UserName = $unboxedcookie['userid'];
                     if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
                         $this->_userid = $UserName;
@@ -816,7 +814,7 @@ class _AnonUser
                 $updated = $this->_prefs->updatePrefs($prefs);
                 $prefs =& $this->_prefs;
             } else {
-                // update the prefs values from scratch. This could leed to unnecessary
+                // update the prefs values from scratch. This could lead to unnecessary
                 // side-effects: duplicate emailVerified, ...
                 $this->_prefs = new UserPreferences($prefs);
                 $updated = true;
@@ -1183,8 +1181,7 @@ class _PassUser
             if ($restored_from_page = $this->_prefs->retrieve
             ($this->_HomePagehandle->get('pref'))
             ) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page, 'init');
-                //$this->_prefs = new UserPreferences($restored_from_page);
+                $this->_prefs->updatePrefs($restored_from_page, 'init');
                 return $this->_prefs;
             }
         }
@@ -2285,74 +2282,6 @@ class UserPreferences
     }
 }
 
-/** TODO: new pref storage classes
- *  These are currently user specific and should be rewritten to be pref specific.
- *  i.e. $this == $user->_prefs
- */
-/*
-class CookieUserPreferences
-extends UserPreferences
-{
-    function CookieUserPreferences ($saved_prefs = false) {
-        //_AnonUser::_AnonUser('',$saved_prefs);
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class PageUserPreferences
-extends UserPreferences
-{
-    function PageUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class PearDbUserPreferences
-extends UserPreferences
-{
-    function PearDbUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class AdoDbUserPreferences
-extends UserPreferences
-{
-    function AdoDbUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-    function getPreferences() {
-        // override the generic slow method here for efficiency
-        _AnonUser::getPreferences();
-        $this->getAuthDbh();
-        if (isset($this->_select)) {
-            $dbh = & $this->_auth_dbi;
-            $rs = $dbh->Execute(sprintf($this->_select,$dbh->qstr($this->_userid)));
-            if ($rs->EOF) {
-                $rs->Close();
-            } else {
-                $prefs_blob = $rs->fields['pref_blob'];
-                $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);
-                    return $this->_prefs;
-                }
-            }
-        }
-        if (empty($this->_prefs->_prefs) and $this->_HomePagehandle) {
-            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);
-                return $this->_prefs;
-            }
-        }
-        return $this->_prefs;
-    }
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8
-- 
2.45.0