Changeset 9267 for extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php

Timestamp:

Feb 17, 2011, 6:20:31 PM (13 years ago)

Author:

Eric

Message:

r9266 merged from trunk to branch 2.20

File:

• extensions/NBC_UserAdvManager/branches/2.20/admin/UAM_admin.php (modified) (4 diffs)

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

@@ -74 +74 @@
 $height = '300px';
 $areas = array();
-array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2','UAM_GTAutoDelText');
+array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2','UAM_GTAutoDelText','UAM_USRAutoDelText');
 
 if (function_exists('set_fckeditor_instance'))
@@ -122 +122 @@
 
     $_POST['UAM_CustomPasswRetr_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomPasswRetr_Text'])));
+
+    $_POST['UAM_USRAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
 
     // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
@@ -171 +173 @@
       $_POST['UAM_AdminValidationMail_Text'],
       $_POST['UAM_CustomPasswRetr'],
-      $_POST['UAM_CustomPasswRetr_Text']
+      $_POST['UAM_CustomPasswRetr_Text'],
+      $_POST['UAM_USRAuto'],
+      $_POST['UAM_USRAutoDelText'],
+      $_POST['UAM_USRAutoMail']
       );
 
@@ -412 +417 @@
     'UAM_CUSTOMPASSWRETR_FALSE'      => $conf_UAM[29]=='false' ?  'checked="checked"' : '' ,
     'UAM_CUSTOMPASSWRETR_TEXT'       => $conf_UAM[30],
+    'UAM_USRAUTO_TRUE'               => $conf_UAM[31]=='true' ?  'checked="checked"' : '' ,
+    'UAM_USRAUTO_FALSE'              => $conf_UAM[31]=='false' ?  'checked="checked"' : '' ,
+    'UAM_USRAUTODEL_TEXT'            => $conf_UAM[32],
+    'UAM_USRAUTOMAIL_TRUE'           => $conf_UAM[33]=='true' ?  'checked="checked"' : '' ,
+    'UAM_USRAUTOMAIL_FALSE'          => $conf_UAM[33]=='false' ?  'checked="checked"' : '' ,
                 'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
     'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,