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

1 files changed, 7 insertions, 9 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 7b538c49..63f33c12 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -110,19 +110,17 @@ class gallery_event_Core {
       graphics::choose_default_toolkit();
       module::clear_var("gallery", "choose_default_tookit");
     }
-    auth::clear_failed_auth_attempts($user);
+    Session::instance()->set("active_auth_timestamp", time());
+    auth::clear_failed_attempts($user);
   }
 
-  static function user_login_failed($name) {
-    auth::record_failed_auth_attempts($name);
+  static function user_auth_failed($name) {
+    auth::record_failed_attempt($name);
   }
 
-  static function user_password_changed($user) {
-    auth::clear_failed_auth_attempts($user);
-  }
-
-  static function user_password_change_failed($name) {
-    auth::record_failed_auth_attempts($name);
+  static function user_auth($user) {
+    auth::clear_failed_attempts($user);
+    Session::instance()->set("active_auth_timestamp", time());
   }
 
   static function item_index_data($item, $data) {