Changeset 10392 for extensions/UserAdvManager/branches/2.20/include/functions.inc.php

Timestamp:

Apr 15, 2011, 9:43:29 PM (13 years ago)

Author:

Eric

Message:

r10391 merged from trunk to branch 2.20

File:

• extensions/UserAdvManager/branches/2.20/include/functions.inc.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.20/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)