Changeset 17945 for extensions/ContactForm/include

Timestamp:

Sep 16, 2012, 5:20:39 PM (12 years ago)

Author:

mistic100

Message:

• stores emails in database (/!\ update only from published version, not from trunk)
• allow emails to be categorized

Location:

extensions/ContactForm/include

Files:

• contact_form.inc.php (modified) (4 diffs)
• functions.inc.php (modified) (6 diffs)
• install.inc.php (modified) (3 diffs)

extensions/ContactForm/include/contact_form.inc.php

@@ -15 +15 @@
 {
   $contact = array(
-    'author' => trim($_POST['author']),
-    'email' => trim($_POST['email']),
-    'subject' =>   trim($_POST['subject']),
-    'content' =>   $_POST['content'],
+    'author' =>  trim($_POST['author']),
+    'email' =>   trim($_POST['email']),
+    'group' =>   @$_POST['group'],
+    'subject' => trim($_POST['subject']),
+    'content' => $_POST['content'],
    );
   
@@ -47 +48 @@
       'author' => $user['username'],
       'email' => $user['email'],
+      'group' => null,
       'subject' => l10n($conf['ContactForm']['cf_default_subject']),
       'content' => null,
@@ -67 +69 @@
 }
 
+$query = '
+SELECT DISTINCT group_name
+  FROM '. CONTACT_FORM_TABLE .'
+  ORDER BY group_name
+;';
+$result = pwg_query($query);
+
+$groups = array();
+while ($data = pwg_db_fetch_assoc($result))
+{
+  $groups[ $data['group_name'] ] = !empty($data['group_name']) ? l10n($data['group_name']) : l10n('Default');
+}
+
+if (count($groups) > 1)
+{
+  $template->assign('GROUPS', $groups);
+}
+
 $template->assign(array(
   'contact' => $contact,
@@ -77 +97 @@
   ));
 
-$template->set_filename('index', dirname(__FILE__).'/../template/contact_form.tpl');
+$template->set_filename('index', realpath(CONTACT_FORM_PATH . 'template/contact_form.tpl'));
 
 ?>

extensions/ContactForm/include/functions.inc.php

@@ -86 +86 @@
       'name' => $row['username'],
       'email' => $row['email'],
-      'active' => true,
+      'active' => 'true',
       ));
   }
   
-  $conf['ContactForm']['cf_admin_mails'] = $emails;
+  mass_inserts(
+    CONTACT_FORM_TABLE,
+    array('name','email','active'),
+    $email
+    );
+  
   $conf['ContactForm']['cf_must_initialize'] = false;
   conf_update_param('ContactForm', serialize($conf['ContactForm']));
@@ -107 +112 @@
     $conf_mail = get_mail_configuration();
   }
+  
+  $query = '
+SELECT DISTINCT group_name
+  FROM '. CONTACT_FORM_TABLE .'
+  ORDER BY group_name
+;';
+  $groups = array_from_query($query, 'group_name');
   
   $comm = array_merge($comm,
@@ -159 +171 @@
   }
   
+  // check group
+  if ( count($groups) > 1 and $comm['group'] == -1 )
+  {
+    $comm['group'] = true;
+    array_push($page['errors'], l10n('Please choose a category'));
+    $comment_action='reject';
+  }
+  
   // check content
   if (empty($comm['content']))
@@ -186 +206 @@
   
   // get admin emails
-  $emails = get_contact_emails();
+  $emails = get_contact_emails($comm['group']);
   if (!count($emails))
   {
@@ -281 +301 @@
 /**
  * get contact emails
- */
-function get_contact_emails()
+ * @param mixed group:
+ *    - bool true:    all emails
+ *    - empty string: emails without group
+ *    - string:       emails with the specified group
+ */
+function get_contact_emails($group=true)
 {
   global $conf;
@@ -288 +312 @@
   include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
   
+  $where = '1=1';
+  if ($group!==true)
+  {
+    if (empty($group))
+    {
+      $where = 'group_name IS NULL';
+    }
+    else
+    {
+      $where = 'group_name="'.$group.'"';
+    }
+  }
+  
+  $query = '
+SELECT *
+  FROM '. CONTACT_FORM_TABLE .'
+  WHERE 
+    '.$where.'
+    AND active = "true"
+  ORDER BY name ASC
+';
+  $result = pwg_query($query);
+  
   $emails = array();
-  foreach ($conf['ContactForm']['cf_admin_mails'] as $data)
-  {
-    if ($data['active'])
-    {
-      array_push($emails, format_email($data['name'], $data['email']));
-    }
+  while ($data = pwg_db_fetch_assoc($result))
+  {
+    array_push($emails, format_email($data['name'], $data['email']));
   }
   

extensions/ContactForm/include/install.inc.php

@@ -4 +4 @@
 function contact_form_install()
 {
-  global $conf;
+  global $conf, $prefixeTable;
+  
+  // email table
+  $query = '
+CREATE TABLE IF NOT EXISTS `'. $prefixeTable .'contact_form` (
+  `id` smallint(5) NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL,
+  `email` varchar(128) NOT NULL,
+  `active` enum("true","false") NOT NULL DEFAULT "true",
+  `group_name` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `UNIQUE` (`email`,`group_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;';
+  pwg_query($query);
 
   // configuration
@@ -19 +32 @@
       'cf_redirect_delay' => 5,
       'cf_mail_type' => 'text/html',
-      'cf_admin_mails' => array(),
       ));
     
@@ -37 +49 @@
     if (!isset($new_conf['cf_must_initialize']))
     {
+      // new params
       $new_conf['cf_must_initialize'] = false;
       $new_conf['cf_default_subject'] = 'A comment on your site';
       $new_conf['cf_mail_type'] = 'text/html';
-      unset($new_conf['comment'], $new_conf['cf_redirect_delay'], $new_conf['cf_separator'], $new_conf['cf_separator_length']);
       
+      // move emails to database
+      $email = array();
       foreach ($new_conf['cf_admin_mails'] as $email => $data)
       {
-        $new_conf['cf_admin_mails'][] = array(
+        array_push($emails, array(
           'email' => $email,
           'name' => $data['NAME'],
-          'active' => $data['ACTIVE'],
-          );
-        unset($new_conf['cf_admin_mails'][ $email ]);
+          'active' => boolean_to_string($data['ACTIVE']),
+          ));
       }
       
+      mass_inserts(
+        $prefixeTable .'contact_form',
+        array('name','email','active'),
+        $emails
+        );
+      
+      // old params
+      unset(
+        $new_conf['comment'], $new_conf['cf_redirect_delay'], 
+        $new_conf['cf_separator'], $new_conf['cf_separator_length'], 
+        $new_conf['cf_admin_mails']
+        );
+      
+      // save config
       $conf['ContactForm'] = serialize($new_conf);
       $conf['ContactForm_before'] = stripslashes($conf['persoformtop']);