Changeset 4340 for extensions/NBC_UserAdvManager/trunk/admin

Timestamp:

Nov 22, 2009, 5:11:24 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1259 fixed - PHP notice on user addition by admin in user_list page
• Bug 1257 fixed - If email exclusion list begins with a CR-LF, an informative warning message is displayed (I was unable to delete automatically this CR-LF).

Location:

extensions/NBC_UserAdvManager/trunk/admin

Files:

• UserAdvManager_admin.php (modified) (4 diffs)
• global.tpl (modified) (1 diff)

extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php

@@ -53 +53 @@
 $UserAdvManager_ConfirmMail_Error_Txt1 = false;
 $UserAdvManager_ConfirmMail_Error_Txt2 = false;
+$UserAdvManager_Exclusionlist_Error = false;
 
 // +-----------------------------------------------------------------------+
@@ -98 +99 @@
       
       array_push($page['errors'], l10n('mail_text_error'));
+    }
+
+    /* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */
+    if (preg_match('/^[\s]+/', $_POST['UserAdvManager_MailExclusion_List']))
+    {
+      array_push($page['errors'], l10n('mail_exclusionlist_error'));
+      $UserAdvManager_Exclusionlist_Error = true;
     }
                 
@@ -251 +259 @@
     'UserAdvManager_ERROR_REPORTS2'           => $UserAdvManager_ConfirmMail_Error_Txt,
     'UserAdvManager_ERROR_REPORTS3'           => $UserAdvManager_Reminder_Error_Txt,
+    'UserAdvManager_ERROR_REPORTS4'           => $UserAdvManager_Exclusionlist_Error,
     )
   );
@@ -314 +323 @@
                   while($row = mysql_fetch_assoc($result))
                   {
-                                $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
-                          $conf_nbc_MailExclusion = preg_split('/,/',$conf_nbc_UserAdvManager[13]);
+                          $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_nbc_UserAdvManager[13]);
                           for ($i = 0 ; $i < count($conf_nbc_MailExclusion) ; $i++)
                           {

extensions/NBC_UserAdvManager/trunk/admin/global.tpl

@@ -45 +45 @@
         </li>
 
-{if $UserAdvManager_MAILEXCLUSION_TRUE}     
+{if $UserAdvManager_MAILEXCLUSION_TRUE}
+  {if $UserAdvManager_ERROR_REPORTS4}     
+        <li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>
+        <textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea><br><br>
+        </li>
+  {else}
         <li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>
         <textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea><br><br>
         </li>
+  {/if}
 {else}
         <li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>