Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 83adc354..1130852b 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -84,6 +84,7 @@ class Users_Controller extends Controller {
       $user->save();
       module::event("user_change_password_form_completed", $user, $form);
       message::success(t("Password changed"));
+      module::event("user_auth", $user);
       module::event("user_password_change", $user);
       print json_encode(
         array("result" => "success",
@@ -91,7 +92,7 @@ class Users_Controller extends Controller {
     } else {
       log::warning("user", t("Failed password change for %name", array("name" => $user->name)));
       $name = $user->name;
-      module::event("user_password_change_failed", $name);
+      module::event("user_auth_failed", $name);
       print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }
@@ -119,14 +120,14 @@ class Users_Controller extends Controller {
       $user->save();
       module::event("user_change_email_form_completed", $user, $form);
       message::success(t("Email address changed"));
-      module::event("user_login", $user);  // since there's no user_authenticated event
+      module::event("user_auth", $user);
       print json_encode(
         array("result" => "success",
               "resource" => url::site("users/{$user->id}")));
     } else {
       log::warning("user", t("Failed email change for %name", array("name" => $user->name)));
       $name = $user->name;
-      module::event("user_login_failed", $name);
+      module::event("user_auth_failed", $name);
       print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }