Changeset 25872 for extensions/ContactForm/admin/emails.php

Timestamp:

Dec 9, 2013, 5:34:37 PM (10 years ago)

Author:

mistic100

Message:

update for 2.6

File:

• extensions/ContactForm/admin/emails.php (modified) (4 diffs)

extensions/ContactForm/admin/emails.php

@@ -9 +9 @@
   {
     if (isset($entry['delete'])) continue;
-    
-    if ( empty($entry['email']) or !check_email_validity($entry['email']) )
+
+    if ( empty($entry['email']) or !email_check_format($entry['email']) )
     {
-      array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+      $page['errors'][] = l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
     }
     else
     {
+      if (empty($entry['name'])) $entry['name'] = $entry['email'];
       if ($entry['group_name'] == -1) $entry['group_name'] = null;
-      
-      array_push($emails, array(
+
+      $emails[] = array(
         'name' => $entry['name'],
         'email' => $entry['email'],
         'group_name' => $entry['group_name'],
         'active' => boolean_to_string(isset($entry['active'])),
-        ));
+        );
     }
   }
-  
+
   pwg_query('TRUNCATE TABLE `'. CONTACT_FORM_TABLE. '`;');
-  
+
   mass_inserts(
     CONTACT_FORM_TABLE,
@@ -34 +35 @@
     $emails
     );
-    
-  $conf['ContactForm']['cf_ready'] = count($emails);
-  
-  array_push($page['infos'], l10n('Information data registered in database'));
+
+  $conf['ContactForm_ready'] = count($emails);
+
+  $page['infos'][] = l10n('Information data registered in database');
 }
 
@@ -55 +56 @@
 {
   $data['active'] = get_boolean($data['active']);
-  array_push($emails, $data);
+  $emails[] = $data;
   if (!empty($data['group_name']))
   {
-    array_push($groups, $data['group_name']);
+    $groups[] = $data['group_name'];
   }
 }
@@ -68 +69 @@
 
 $template->set_filename('contact_form', realpath(CONTACT_FORM_PATH . 'admin/template/emails.tpl'));
-
-?>