Changeset 25104 for extensions/Password_Policy

Timestamp:

Oct 24, 2013, 12:01:51 AM (10 years ago)

Author:

Eric

Message:

Next version is 2.5.1 :

• Improve workflow when account is locked and a password renewal is set
• Add missing translation keys
• Update it_IT, thanks to : Ericnet

Location:

extensions/Password_Policy

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (5 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)

extensions/Password_Policy/changelog.txt.php

@@ -5 +5 @@
 
 -- 2.5.0 : Initial release for Piwigo 2.5
+
+-- 2.5.1 : Improve workflow when account is locked and a password renewal is set
+           Missing translation keys
+           Update it_IT, thanks to : Ericnet
 */
 ?>

extensions/Password_Policy/include/functions.inc.php

@@ -30 +30 @@
  * Triggered on loc_begin_index
  * 
- * Initiating GhostTracker - Perform user logout after registration if account locked
+ * Perform user logout after registration if account locked and redirection to profile page is password renewal is set
  */
 function PP_Init()
@@ -40 +40 @@
   $conf_PP = unserialize($conf['PasswordPolicy']);
 
-  // Admins, Guests and Adult_Content users are excluded
-  // ---------------------------------------------------
-  if (!is_admin() and !is_a_guest() and $user['username'] != "16" and $user['username'] != "18")
+  // Perfoming redirection for locked accounts
+  // -----------------------------------------
+  if (!is_a_guest() and $user['username'] != "16" and $user['username'] != "18")
   {
     // Perform user logout if user account is locked
     if (
-        (isset($conf_PP['LOGFAILBLOCK']) and $conf_PP['LOGFAILBLOCK'] == 'true')
-        and PP_UsrBlock_Verif($user['username'])
-        and !is_admin()
-        and !is_webmaster()
-        )
+          (isset($conf_PP['LOGFAILBLOCK']) and $conf_PP['LOGFAILBLOCK'] == 'true')
+          and PP_UsrBlock_Verif($user['username'])
+          //and (isset($userlocked) and $userlocked == 'true')
+          and !is_admin()
+          and !is_webmaster())
     {
       invalidate_user_cache();
@@ -64 +64 @@
     }
   }
+
+  // Performing redirection to profile page for password reset
+  // ---------------------------------------------------------
+  if ((isset($conf_PP['PWDRESET']) and $conf_PP['PWDRESET'] == 'true'))
+  {
+    $query ='
+SELECT user_id, status
+FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$user['id'].'
+;';
+    $data = pwg_db_fetch_assoc(pwg_query($query));
+
+    if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
+    {
+      if (PP_check_pwdreset($user['id']))
+      {
+        redirect(PHPWG_ROOT_PATH.'profile.php');
+      }
+    }
+  }
+
+
 }
 
@@ -219 +241 @@
 /**
  * PP_user_list_locked
- * Adds a new feature in user_list to allow password reset for selected users by admin
+ * Adds a new feature in user_list to allow user unlocking by admin
  * 
  */
@@ -266 +288 @@
   }
   return $visible_user_list;
-}
-
-
-/**
- * Triggered on login_success
- * 
- * Redirects a visitor (except for admins, webmasters and generic statuses) to his profile.php page if password reset is needed
- * 
- */
-function PP_LoginTasks()
-{
-  global $conf, $user;
-
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-
-  $conf_PP = unserialize($conf['PasswordPolicy']);
-
-  // Perfoming redirection for locked accounts
-  // -----------------------------------------
-  if (!is_admin() and !is_a_guest() and $user['username'] != "16" and $user['username'] != "18")
-  {
-    // Perform user logout if user account is locked
-    if ((isset($conf_PP['LOGFAILBLOCK']) and $conf_PP['LOGFAILBLOCK'] == 'true')
-          and PP_UsrBlock_Verif($user['username'])
-          and !is_admin()
-          and !is_webmaster())
-    {
-      invalidate_user_cache();
-      logout_user();
-      if ($conf['guest_access'])
-      {
-        redirect(make_index_url().'?PP_msg=locked', 0);
-      }
-      else
-      {
-        redirect(get_root_url().'identification.php?PP_msg=locked' , 0);
-      }
-    }
-  }
-
-  // Performing redirection to profile page for password reset
-  // ---------------------------------------------------------
-  if ((isset($conf_PP['PWDRESET']) and $conf_PP['PWDRESET'] == 'true'))
-  {
-    $query ='
-SELECT user_id, status
-FROM '.USER_INFOS_TABLE.'
-WHERE user_id = '.$user['id'].'
-;';
-    $data = pwg_db_fetch_assoc(pwg_query($query));
-
-    if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
-    {
-      if (PP_check_pwdreset($user['id']))
-      {
-        redirect(PHPWG_ROOT_PATH.'profile.php');
-      }
-    }
-  }
 }
 

extensions/Password_Policy/language/en_UK/plugin.lang.php

@@ -69 +69 @@
 $lang['PP_User Locked'] = 'User locked';
 $lang['PP_You need to confirm unlock'] = 'You must confirm unlocking (check box)!';
+$lang['PP %d user unlocked'] = '%d user unlocked';
+$lang['PP %d users unlocked'] = '%d users unlocked';
 ?>

extensions/Password_Policy/language/fr_FR/plugin.lang.php

@@ -57 +57 @@
 $lang['PP_UserLocked_Custom_Txt'] = 'Personnalisation du message d\'information à l\'utilisateur verrouillé';
 $lang['PP_UserLocked_Custom_Txt_d'] = 'Vous pouvez modifier ici le texte du message affiché à l\'utilisateur dont le compte est verrouillé. Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.';
-$lang['PP_LockedUsers'] = 'Verrouillages';
+$lang['PP_LockedUsers'] = 'Verrous';
 $lang['PP_Unlock'] = 'Déverrouillage';
 $lang['PP_Unlock selected users'] = 'Déverrouiller les utilisateurs sélectionnés';
@@ -69 +69 @@
 $lang['PP_User Locked'] = 'Utilisateur verrouillé';
 $lang['PP_You need to confirm unlock'] = 'Vous devez confirmer le déverrouillage (case à cocher) !';
+$lang['PP %d user unlocked'] = '%d utilisateur déverrouillé';
+$lang['PP %d users unlocked'] = '%d utilisateurs déverrouillés';
 ?>

extensions/Password_Policy/main.inc.php

@@ -27 +27 @@
 add_event_handler('get_admin_plugin_menu_links', 'PP_admin_menu');
 
+// Display messages on index page
+// ------------------------------
+add_event_handler('init', 'PP_InitPage');
+
 // Features and controls on user connexion
 // ---------------------------------------
 add_event_handler('loc_begin_index', 'PP_Init');
-
-// Display messages on index page
-// ------------------------------
-add_event_handler('init', 'PP_InitPage');
 
 // Check users registration
@@ -43 +43 @@
   add_event_handler('loc_begin_profile', 'PP_Profile_Init');
 }
-
-// Redirection to profile page
-// ---------------------------
-add_event_handler('login_success', 'PP_LoginTasks',EVENT_HANDLER_PRIORITY_NEUTRAL+10, 1);
 
 // Security option : Count of login failure and lock account after x attempt