[phpwiki-checkins] CVS: phpwiki/lib/plugin UserPreferences.php,1.19,1.20

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14552/plugin

Modified Files:
	UserPreferences.php 
Log Message:
pref fixes (base64)


Index: UserPreferences.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UserPreferences.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -2 -b -p -d -r1.19 -r1.20
--- UserPreferences.php	27 Feb 2004 13:21:17 -0000	1.19
+++ UserPreferences.php	12 Mar 2004 23:20:58 -0000	1.20
@@ -86,10 +86,20 @@ extends WikiPlugin
                         $num = $user->setPreferences($rp);
                         if (!empty($rp['passwd'])) {
+                            $passchanged = false;
                             if ($user->mayChangePass()) {
-                                $user->storePass($rp['passwd']);
+                                if (method_exists($user, 'storePass')) {
+                                    $passchanged = $user->storePass($rp['passwd']);
+                                }
+                                if (method_exists($user, 'changePass')) {
+                                    $passchanged = $user->changePass($rp['passwd']);
+                                }
+                                if ($passchanged) {
                                 $errmsg = _("Password updated.");
                             } else {
                                 $errmsg = _("Password cannot be changed.");
                             }
+                            } else {
+                                $errmsg = _("Password cannot be changed.");
+                            }
                         }
                         if (!$num) {
@@ -148,4 +158,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.20  2004/03/12 23:20:58  rurban
+// pref fixes (base64)
+//
 // Revision 1.19  2004/02/27 13:21:17  rurban
 // several performance improvements, esp. with peardb