From: <var...@us...> - 2012-12-27 11:05:55
|
Revision: 8691 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8691&view=rev Author: vargenau Date: 2012-12-27 11:05:49 +0000 (Thu, 27 Dec 2012) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/WikiUserNew.php Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2012-12-27 11:04:56 UTC (rev 8690) +++ trunk/lib/WikiUserNew.php 2012-12-27 11:05:49 UTC (rev 8691) @@ -750,8 +750,7 @@ * 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 @@ 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 @@ $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 @@ 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 @@ } } -/** 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |