Changeset 19235 for extensions/UserAdvManager/branches/2.41/admin/UAM_admin.php

Timestamp:

Nov 30, 2012, 10:09:53 PM (11 years ago)

Author:

Eric

Message:

Merge r19234 from trunk to branch 2.41 :
Bug 2765 fixed - Code cleanup
Bug 2788 fixed : Warning message on email exclusion no more remains if misconfiguration is fixed. But it's still necessary to refresh the current page once for the warning message to disappear.
Bug 2796 fixed - Use of php date() function instead od MySql NOW() - Usefull if MySql server is not set at the same date-time as Apache/Php server
Update da_DK, thanks to : Kaare
Update it_IT, thanks to : virgigiole
Update lv_LV, thanks to : agrisans

File:

• extensions/UserAdvManager/branches/2.41/admin/UAM_admin.php (modified) (3 diffs)

extensions/UserAdvManager/branches/2.41/admin/UAM_admin.php

@@ -152 +152 @@
                                 if ($conf['obligatory_user_mail_address'])
                                 {
-                                                        // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
-                // --------------------------------------------------------------------------------------
-                if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
-                {
-                array_push($page['errors'], l10n('UAM_mail_exclusionlist_error'));
-                $UAM_Exclusionlist_Error = true;
-                }
-                }
-                elseif (!$conf['obligatory_user_mail_address'])
-                {
-                $_POST['UAM_MailExclusion_List'] = '';
-                }
+          // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
+          // --------------------------------------------------------------------------------------
+                  if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
+                  {
+                  array_push($page['errors'], l10n('UAM_mail_exclusionlist_error'));
+                  $UAM_Exclusionlist_Error = true;
+                  }
+                  }
+                  elseif (!$conf['obligatory_user_mail_address'])
+                  {
+                  $_POST['UAM_MailExclusion_List'] = '';
+                  }
 
     // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled
@@ -1617 +1617 @@
         while ($row = pwg_db_fetch_assoc($result))
         {
-          list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+          $dbnow = date("Y-m-d H:i:s");
             
           $query = '
@@ -1645 +1645 @@
         while($row = pwg_db_fetch_assoc($result))
         {
-          list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+          $dbnow = date("Y-m-d H:i:s");
             
           $query = '