Changeset 10391 for extensions/UserAdvManager/trunk/include

Timestamp:

Apr 15, 2011, 9:41:42 PM (13 years ago)

Author:

Eric

Message:

bug 2265 fixed : Add of a new option to display or not user's password in information email
Improving UAM version check for db upgrade
Version 2.20.4 hard coded

Location:

extensions/UserAdvManager/trunk/include

Files:

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

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

@@ -858 +858 @@
   if (isset($conf_UAM[0]) and $conf_UAM[0] == 'true')
   {
-    $infos1 = array(
-      get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
-      get_l10n_args('UAM_User: %s', stripslashes($username)),
-      get_l10n_args('UAM_Password: %s', $password),
-      get_l10n_args('Email: %s', $email),
-      get_l10n_args('', ''),
-    );
-  }
-
+    if (isset($conf_UAM[35]) and $conf_UAM[35] == 'false') // Allow display of clear password in email
+    {
+      $infos1 = array(
+        get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
+        get_l10n_args('UAM_User: %s', stripslashes($username)),
+        get_l10n_args('UAM_Password: %s', $password),
+        get_l10n_args('Email: %s', $email),
+        get_l10n_args('', ''),
+      );
+    }
+    else // Do not allow display of clear password in email
+    {
+      $infos1 = array(
+        get_l10n_args('UAM_infos_mail %s', stripslashes($username)),
+        get_l10n_args('UAM_User: %s', stripslashes($username)),
+        get_l10n_args('Email: %s', $email),
+        get_l10n_args('', ''),
+      );
+    }
+  }
 
   if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' and $confirm)

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

@@ -398 +398 @@
   }
 }
+
+/* upgrade from 2.20.3 to 2.20.4 */
+/* ***************************** */
+function upgrade_2203_2204()
+{
+  global $conf;
+
+  // Upgrading options
+  $query = '
+SELECT value
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager"
+;';
+
+  $result = pwg_query($query);
+  $conf_UAM = pwg_db_fetch_assoc($result);
+    
+  $Newconf_UAM = unserialize($conf_UAM['value']);
+  
+  $Newconf_UAM[35] = 'false';
+  
+  $update_conf = serialize($Newconf_UAM);
+    
+  $query = '
+UPDATE '.CONFIG_TABLE.'
+SET value="'.addslashes($update_conf).'"
+WHERE param="UserAdvManager"
+LIMIT 1
+;';
+
+        pwg_query($query);
+}
 ?>