Ignore:
Timestamp:
03/08/10 23:11:51 (10 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager] Pre-2.14.0 merged from trunk to branch 2.14

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.14/admin/UAM_admin.php

    r5065 r5087  
    2727 
    2828$UAM_Password_Test_Score = 0; 
    29 $UAM_MailInfo_Error_Txt = false; 
    30 $UAM_ConfirmMail_Error_Txt = false; 
    31 $UAM_Reminder_Error_Txt = false; 
    32 $UAM_ConfirmMail_Error_Txt1 = false; 
    33 $UAM_ConfirmMail_Error_Txt2 = false; 
    3429$UAM_Exclusionlist_Error = false; 
    3530 
     
    7166// +----------------------------------------------------------+ 
    7267 
    73 /* Standby because this may cause too many problems with (;) in text fields */ 
    74 //$toolbar = 'Basic'; 
    75 //$width = '750px'; 
    76 //$height = '300px'; 
    77 //$areas = array(); 
    78 //array_push( $areas,'UAM_MailInfo_Text','UAM_ConfirmMail_Text','UAM_GhostTracker_ReminderText','UAM_ConfirmMail_ReMail_Txt1','UAM_ConfirmMail_ReMail_Txt2'); 
    79   
    80 //if (function_exists('set_fckeditor_instance')) 
    81 //  set_fckeditor_instance($areas, $toolbar, $width, $height); 
     68/* Pending because this may cause problems with special characters in emails */ 
     69/*$toolbar = 'Basic'; 
     70$width = '750px'; 
     71$height = '300px'; 
     72$areas = array(); 
     73array_push( $areas,'UAM_MailInfo_Text','UAM_ConfirmMail_Text','UAM_GhostTracker_ReminderText','UAM_ConfirmMail_ReMail_Txt1','UAM_ConfirmMail_ReMail_Txt2'); 
     74 
     75if (function_exists('set_fckeditor_instance')) 
     76{ 
     77  $fcke_config = unserialize($conf['FCKEditor']); 
     78  foreach($areas as $area) 
     79  { 
     80    if (!isset($fcke_config[$area])) 
     81    { 
     82      $fcke_config[$area] = false; 
     83    } 
     84  } 
     85  $conf['FCKEditor'] = serialize($fcke_config); 
     86 
     87  set_fckeditor_instance($areas, $toolbar, $width, $height); 
     88}*/ 
    8289 
    8390 
     
    106113 
    107114 
    108 /* Control of semicolons - Replaced by dots - Warning message is displayed */     
    109     if ((preg_match($pattern, $_POST['UAM_MailInfo_Text'])) or (preg_match($pattern, $_POST['UAM_GhostTracker_ReminderText'])) or (preg_match($pattern, $_POST['UAM_ConfirmMail_Text']))) 
    110     { 
    111       if (preg_match($pattern, $_POST['UAM_MailInfo_Text'])) 
    112       { 
    113         $_POST['UAM_MailInfo_Text'] = preg_replace($pattern, $replacement, $_POST['UAM_MailInfo_Text']); 
    114         $UAM_MailInfo_Error_Txt = true; 
    115       } 
    116        
    117       if (preg_match($pattern, $_POST['UAM_ConfirmMail_Text'])) 
    118       { 
    119         $_POST['UAM_ConfirmMail_Text'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_Text']); 
    120         $UAM_ConfirmMail_Error_Txt = true; 
    121       } 
    122        
    123       if (preg_match($pattern, $_POST['UAM_GhostTracker_ReminderText'])) 
    124       { 
    125         $_POST['UAM_GhostTracker_ReminderText'] = preg_replace($pattern, $replacement, $_POST['UAM_GhostTracker_ReminderText']); 
    126         $UAM_Reminder_Error_Txt = true; 
    127       } 
    128        
    129       array_push($page['errors'], l10n('mail_text_error')); 
    130     } 
    131  
    132     /* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */ 
     115/* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */ 
    133116    if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List'])) 
    134117    { 
     
    178161    $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2'])); 
    179162 
    180 /* Control of semicolons - Replaced by dots - Warning message displayed */ 
    181     if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt1'])) or (preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt2']))) 
    182     { 
    183       if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt1']))) 
    184       { 
    185         $_POST['UAM_ConfirmMail_ReMail_Txt1'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_ReMail_Txt1']); 
    186         $UAM_ConfirmMail_Error_Txt1 = true; 
    187       } 
    188        
    189       if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt2']))) 
    190       { 
    191         $_POST['UAM_ConfirmMail_ReMail_Txt2'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_ReMail_Txt2']); 
    192          
    193         $UAM_ConfirmMail_Error_Txt2 = true; 
    194       } 
    195        
    196       array_push($page['errors'], l10n('mail_text_error')); 
    197     } 
    198163 
    199164          $newconf_UAM_ConfirmMail = array ( 
     
    366331    'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[21]=='false' ?  'checked="checked"' : '' , 
    367332                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score, 
    368     'UAM_ERROR_REPORTS1'             => $UAM_MailInfo_Error_Txt, 
    369     'UAM_ERROR_REPORTS2'             => $UAM_ConfirmMail_Error_Txt, 
    370     'UAM_ERROR_REPORTS3'             => $UAM_Reminder_Error_Txt, 
    371333    'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error, 
    372334                'UAM_CONFIRMMAIL_TIMEOUT_TRUE'   => $conf_UAM_ConfirmMail[0]=='true' ?  'checked="checked"' : '' , 
     
    377339    'UAM_CONFIRMMAIL_REMAIL_TXT1'                => $conf_UAM_ConfirmMail[2], 
    378340    'UAM_CONFIRMMAIL_REMAIL_TXT2'                => $conf_UAM_ConfirmMail[4], 
    379     'UAM_ERROR_REPORTS1'             => $UAM_ConfirmMail_Error_Txt1, 
    380     'UAM_ERROR_REPORTS2'             => $UAM_ConfirmMail_Error_Txt2, 
    381341    ) 
    382342  ); 
Note: See TracChangeset for help on using the changeset viewer.