- Timestamp:
- Jun 11, 2011, 5:00:58 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/branches/2.20/admin/UAM_admin.php
r11019 r11319 33 33 $UAM_Password_Test_Score = 0; 34 34 $UAM_Exclusionlist_Error = false; 35 $UAM_Illegal_Flag_Error1 = false; 36 $UAM_Illegal_Flag_Error2 = false; 37 $UAM_Illegal_Flag_Error3 = false; 35 38 36 39 $dump_download = ''; … … 111 114 //General configuration settings 112 115 $_POST['UAM_MailInfo_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text']))); 113 116 114 117 $_POST['UAM_ConfirmMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Text']))); 115 118 … … 135 138 // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled 136 139 $conf_UAM = unserialize($conf['UserAdvManager']); 140 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 137 141 138 142 if (((isset($conf_UAM['1']) and ($conf_UAM['1'] == 'false' or $conf_UAM['1'] == 'local')) or ($_POST['UAM_Confirm_Mail'] == 'false' or $_POST['UAM_Confirm_Mail'] == 'local')) and $_POST['UAM_GTAutoMail'] == 'true') … … 141 145 $_POST['UAM_GTAutoMail'] = $newvalue; 142 146 array_push($page['errors'], l10n('UAM_Error_GTAutoMail_cannot_be_set_without_ConfirmMail')); 147 } 148 149 // Check if [Kdays] flag is used in a legal way (ConfirmMail Time out have to be set) 150 if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_Text']) != 0) 151 { 152 $UAM_Illegal_Flag_Error1 = true; 153 array_push($page['errors'], l10n('UAM_Error_Using_illegal_Kdays')); 143 154 } 144 155 … … 193 204 194 205 $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2']))); 206 207 // Check if [Kdays] flag is used in a legal way (ConfirmMail Time out have to be set) 208 if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt1']) == 1) 209 { 210 $UAM_Illegal_Flag_Error2 = true; 211 array_push($page['errors'], l10n('UAM_Error_Using_illegal_flag')); 212 } 213 elseif (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt2']) == 1) 214 { 215 $UAM_Illegal_Flag_Error3 = true; 216 array_push($page['errors'], l10n('UAM_Error_Using_illegal_flag')); 217 } 195 218 196 219 $newconf_UAM_ConfirmMail = array ( … … 433 456 'UAM_HIDEPASSW_FALSE' => $conf_UAM[34]=='false' ? 'checked="checked"' : '' , 434 457 'UAM_PASSWORD_TEST_SCORE' => $UAM_Password_Test_Score, 435 'UAM_ERROR_REPORTS4' => $UAM_Exclusionlist_Error, 458 'UAM_ERROR_REPORTS1' => $UAM_Exclusionlist_Error, 459 'UAM_ERROR_REPORTS2' => $UAM_Illegal_Flag_Error1, 460 'UAM_ERROR_REPORTS3' => $UAM_Illegal_Flag_Error2, 461 'UAM_ERROR_REPORTS4' => $UAM_Illegal_Flag_Error3, 436 462 'UAM_CONFIRMMAIL_TIMEOUT_TRUE' => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' , 437 463 'UAM_CONFIRMMAIL_TIMEOUT_FALSE' => $conf_UAM_ConfirmMail[0]=='false' ? 'checked="checked"' : '' ,
Note: See TracChangeset
for help on using the changeset viewer.