Changeset 8095 for extensions/NBC_UserAdvManager/branches/2.16/admin/UAM_admin.php

Timestamp:

Dec 12, 2010, 7:09:27 PM (14 years ago)

Author:

Eric

Message:

merge from trunk to branch 2.16

File:

• extensions/NBC_UserAdvManager/branches/2.16/admin/UAM_admin.php (modified) (6 diffs)

extensions/NBC_UserAdvManager/branches/2.16/admin/UAM_admin.php

@@ -118 +118 @@
 
     $_POST['UAM_GTAutoMailText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMailText'])));
+    
+    $_POST['UAM_AdminValidationMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Text'])));
 
     //Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
@@ -160 +162 @@
       $_POST['UAM_RedirToProfile'],
       $_POST['UAM_GTAuto'],
-      $_POST['UAM_GTAutoDel'],
       $_POST['UAM_GTAutoMail'],
       $_POST['UAM_GTAutoDelText'],
       $_POST['UAM_GTAutoMailText'],
       (isset($_POST['UAM_Downgrade_Group'])?$_POST['UAM_Downgrade_Group']:''),
-      (isset($_POST['UAM_Downgrade_Status'])?$_POST['UAM_Downgrade_Status']:''));
+      (isset($_POST['UAM_Downgrade_Status'])?$_POST['UAM_Downgrade_Status']:''),
+      $_POST['UAM_AdminValidationMail_Text']
+      );
 
     $conf['UserAdvManager'] = serialize($newconf_UAM);
@@ -252 +255 @@
                 }
     //configuration value for downgrade users
-    if (isset($conf_UAM[27]) and $conf_UAM[27] == $row['id'])
+    if (isset($conf_UAM[26]) and $conf_UAM[26] == $row['id'])
                 {
                 $Downgrade = $row['id'];
@@ -331 +334 @@
   {
           $status_options[$status] = l10n('user_status_'.$status);
-          if (isset($conf_UAM[28]) and $conf_UAM[28] == $status)
+          if (isset($conf_UAM[27]) and $conf_UAM[27] == $status)
                 {
                   $Downgrade_Status = $status;
@@ -395 +398 @@
     'UAM_GTAUTO_TRUE'                => $conf_UAM[22]=='true' ?  'checked="checked"' : '' ,
     'UAM_GTAUTO_FALSE'               => $conf_UAM[22]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTODEL_TRUE'             => $conf_UAM[23]=='true' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTODEL_FALSE'            => $conf_UAM[23]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTOMAIL_TRUE'            => $conf_UAM[24]=='true' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTOMAIL_FALSE'           => $conf_UAM[24]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTODEL_TEXT'             => $conf_UAM[25],
-    'UAM_GTAUTOMAILTEXT'             => $conf_UAM[26],
-                'UAM_Downgrade_Group'            => $conf_UAM[27],
-                'UAM_Downgrade_Status'           => $conf_UAM[28],
+    'UAM_GTAUTOMAIL_TRUE'            => $conf_UAM[23]=='true' ?  'checked="checked"' : '' ,
+    'UAM_GTAUTOMAIL_FALSE'           => $conf_UAM[23]=='false' ?  'checked="checked"' : '' ,
+    'UAM_GTAUTODEL_TEXT'             => $conf_UAM[24],
+    'UAM_GTAUTOMAILTEXT'             => $conf_UAM[25],
+                'UAM_Downgrade_Group'            => $conf_UAM[26],
+                'UAM_Downgrade_Status'           => $conf_UAM[27],
+    'UAM_ADMINVALIDATIONMAIL_TEXT'   => $conf_UAM[28],
                 'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
     'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,
@@ -966 +968 @@
         {
           ForceValidation($user_id);
+          validation_mail($user_id);
         }
         array_push(