Changeset 12239 for extensions/UserAdvManager/trunk/include

Timestamp:

Sep 26, 2011, 10:26:09 PM (13 years ago)

Author:

Eric

Message:

• Bug 2437 fixed - New feature : Request password renewal for selected users in Piwigo's users management panel.
• Language files updates.
• obsolete.list file creation to clean old help directories in languages.
• Perform database upgrade.

Location:

extensions/UserAdvManager/trunk/include

Files:

• functions.inc.php (modified) (9 diffs)
• upgradedb.inc.php (modified) (1 diff)

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -223 +223 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
-    
+
+  // Update first redirection parameter
   if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
   {
@@ -240 +241 @@
   }
 
+  // Special message display for password reset
+  if ((isset($conf_UAM[38]) and $conf_UAM[38] == 'true'))
+  {
+    if (UAM_check_pwgreset($user['id']))
+    {
+      $template->append('errors', l10n('UAM_Password_Reset_Msg'));
+    }
+  }
+
+  // Controls on profile page submission
   if (isset($_POST['validate']) and !is_admin())
   {
@@ -249 +260 @@
         $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[11]."'");
         unset($_POST['validate']);
+      }
+    }
+
+    // Password reset control
+    if (isset($conf_UAM[38]) and $conf_UAM[38] == 'true' and UAM_check_pwgreset($user['id']))
+    {
+      // if password not changed then pwdreset filed = true else pwdreset field = false
+      if (!empty($_POST['use_new_pwd']))
+      {
+        $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_pwdreset = "false"
+WHERE id = '.$user['id'].'
+LIMIT 1
+;';
+        pwg_query($query);
       }
     }
@@ -341 +368 @@
   }
 
+  // Performing redirection to profile page on first login
   if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
-  {
-    // Performing redirection  
+  {  
     $query ='
 SELECT user_id, status
@@ -351 +378 @@
     $data = pwg_db_fetch_assoc(pwg_query($query));
 
-    if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic")
+    if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
     {
       $user_idsOK = array();
       if (!UAM_check_profile($user['id'], $user_idsOK))
         redirect(PHPWG_ROOT_PATH.'profile.php');
+    }
+  }
+
+  // Performing redirection to profile page for password reset
+  if ((isset($conf_UAM[38]) and $conf_UAM[38] == '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'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
+    {
+      if (UAM_check_pwgreset($user['id']))
+      {
+        redirect(PHPWG_ROOT_PATH.'profile.php');
+      }
     }
   }
@@ -2465 +2511 @@
         @unlink($path);
       }
+      elseif (is_dir($path))
+      {
+        @rmdir($path);
+      }
     }
   }
@@ -2489 +2539 @@
   $v = false;
   
-  $query = "
+  $query = '
 SELECT value
-FROM ".CONFIG_TABLE."
-WHERE param = 'UserAdvManager_Redir'
-;";
+FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_Redir"
+;';
   
   if ($v = (($t = pwg_db_fetch_row(pwg_query($query))) !== false))
@@ -2505 +2555 @@
 
 /**
+ * UAM_check_pwdreset
+ * checks if a user id is registered as having already
+ * changed their password.
+ * 
+ * @uid        : the user id
+ * 
+ * @returns    : true or false whether the users has already changed his password
+ * 
+ */
+function UAM_check_pwgreset($uid)
+{
+  $query = '
+SELECT UAM_pwdreset
+FROM '.USERS_TABLE.'
+WHERE id='.$uid.'
+;';
+
+  $result = pwg_db_fetch_assoc(pwg_query($query));
+  
+  if($result['UAM_pwdreset'] == 'true')
+  {
+    return true;
+  }
+  else return false; 
+}
+
+/**
+ * UAM_Set_PwdReset
+ * Action in user_list to set a password reset for a user
+ */
+function UAM_Set_PwdReset($uid)
+{
+  $query ='
+UPDATE '.USERS_TABLE.'
+SET UAM_pwdreset = "true"
+WHERE id = '.$uid.'
+LIMIT 1
+;';
+
+  pwg_query($query);
+}
+
+
+/**
+ * UAM_loc_visible_user_list
+ * Adds a new feature in user_list to allow password reset for selected users by admin
+ * 
+ */
+function UAM_loc_visible_user_list($visible_user_list)
+{
+  global $template;
+  
+  $template->append('plugin_user_list_column_titles', l10n('UAM_PwdReset'));
+  
+  $user_ids = array();
+  
+  foreach ($visible_user_list as $i => $user)
+  {
+    $user_ids[$i] = $user['id'];
+  }
+  
+  $user_nums = array_flip($user_ids);
+
+  // Query to get informations in database
+  if (!empty($user_ids))
+  {
+    $query = '
+SELECT DISTINCT id, UAM_pwdreset
+  FROM '.USERS_TABLE.'
+  WHERE id IN ('.implode(',', $user_ids).')
+;';
+    $result = pwg_query($query);
+    
+    while ($row = mysql_fetch_array($result))
+    {
+      if ($row['UAM_pwdreset'] == 'false')
+      {
+        $pwdreset = l10n('UAM_PwdReset_Done');
+      }
+      else if ($row['UAM_pwdreset'] == 'true')
+      {
+        $pwdreset = l10n('UAM_PwdReset_Todo');
+      }
+      else $pwdreset = l10n('UAM_PwdReset_NA');
+      
+                  $visible_user_list[$user_nums[$row['id']]]['plugin_columns'][] = $pwdreset; // Shows users password state in user_list
+    }
+  }
+  return $visible_user_list;
+}
+
+
+/**
  * UAM specific database dump (only for MySql !)
  * Creates an SQL dump of UAM specific tables and configuration settings
@@ -2511 +2654 @@
  * 
  */
-function uam_dump($download)
+function UAM_dump($download)
 {
   global $conf;

extensions/UserAdvManager/trunk/include/upgradedb.inc.php

@@ -515 +515 @@
   $Newconf_UAM[36] = '-1';
   $Newconf_UAM[37] = '-1';
-
-  $update_conf = serialize($Newconf_UAM);
-
-  conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
+  $Newconf_UAM[38] = 'false';
+
+  $update_conf = serialize($Newconf_UAM);
+
+  conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
+
+  // Piwigo's native tables modifications for password reset function - Add pwdreset column
+  $q = '
+ALTER TABLE '.USERS_TABLE.'
+ADD UAM_pwdreset enum("true","false") 
+;';
+  pwg_query($q);
 }
 ?>