From: Reini U. <ru...@us...> - 2004-02-27 13:30:00
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12600/lib/plugin Modified Files: UserPreferences.php Log Message: several performance improvements, esp. with peardb simplified loops storepass seperated from prefs if defined so stacked and strict still not working Index: UserPreferences.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserPreferences.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -2 -b -p -d -r1.18 -r1.19 --- UserPreferences.php 24 Feb 2004 15:20:06 -0000 1.18 +++ UserPreferences.php 27 Feb 2004 13:21:17 -0000 1.19 @@ -74,4 +74,5 @@ extends WikiPlugin if ($request->isPost()) { + $errmsg = ''; if ($rp = $request->getArg('pref')) { // replace only changed prefs in $pref with those from request @@ -81,11 +82,20 @@ extends WikiPlugin //trigger_error("DEBUG: reading prefs from request".print_r($rp)); //trigger_error("DEBUG: writing prefs with setPreferences".print_r($pref)); + if (empty($rp['passwd'])) + unset($rp['passwd']); $num = $user->setPreferences($rp); - if (!$num) { - $errmsg = _("No changes."); + if (!empty($rp['passwd'])) { + if ($user->mayChangePass()) { + $user->storePass($rp['passwd']); + $errmsg = _("Password updated."); + } else { + $errmsg = _("Password cannot be changed."); } - else { + } + if (!$num) { + $errmsg .= " " ._("No changes."); + } else { $pref = $user->_prefs; - $errmsg = fmt("%d UserPreferences fields successfully updated.", $num); + $errmsg .= sprintf(_("%d UserPreferences fields successfully updated."), $num); } } @@ -138,4 +148,10 @@ extends WikiPlugin // $Log$ +// Revision 1.19 2004/02/27 13:21:17 rurban +// several performance improvements, esp. with peardb +// simplified loops +// storepass seperated from prefs if defined so +// stacked and strict still not working +// // Revision 1.18 2004/02/24 15:20:06 rurban // fixed minor warnings: unchecked args, POST => Get urls for sortby e.g. |