X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpasswordsettings.php;h=9e79501e2df5a6546a6f3d73fb57da637b2b74c1;hb=935410e8dc4c2d4d286a942cc27bbf8bc452fbdd;hp=cd4beac3f2120a9c83a81f4ddc8a4e98c8573777;hpb=94f9ce26e78bb9a299f4a41686c9a503f3747aaf;p=quix0rs-gnu-social.git

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index cd4beac3f2..9e79501e2d 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -86,6 +86,7 @@ class PasswordsettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
+
         $this->elementStart('form', array('method' => 'POST',
                                           'id' => 'form_password',
                                           'class' => 'form_settings',
@@ -164,21 +165,28 @@ class PasswordsettingsAction extends AccountSettingsAction
                 $this->showForm(_('Incorrect old password'));
                 return;
             }
+        }else{
+            $oldpassword = null;
         }
 
-        $original = clone($user);
+        $success = false;
+        if(! Event::handle('StartChangePassword', array($user->nickname, $oldpassword, $newpassword))){
+            //no handler changed the password, so change the password internally
+            $original = clone($user);
 
-        $user->password = common_munge_password($newpassword, $user->id);
+            $user->password = common_munge_password($newpassword, $user->id);
 
-        $val = $user->validate();
-        if ($val !== true) {
-            $this->showForm(_('Error saving user; invalid.'));
-            return;
-        }
+            $val = $user->validate();
+            if ($val !== true) {
+                $this->showForm(_('Error saving user; invalid.'));
+                return;
+            }
 
-        if (!$user->update($original)) {
-            $this->serverError(_('Can\'t save new password.'));
-            return;
+            if (!$user->update($original)) {
+                $this->serverError(_('Can\'t save new password.'));
+                return;
+            }
+            Event::handle('EndChangePassword', array($nickname));
         }
 
         $this->showForm(_('Password saved.'), true);