Changeset 28458 for extensions/ContactForm/include/functions.inc.php

Timestamp:

May 13, 2014, 7:46:37 PM (10 years ago)

Author:

mistic100

Message:

fix unused content type, send copy as Bcc

File:

• extensions/ContactForm/include/functions.inc.php (modified) (6 diffs)

extensions/ContactForm/include/functions.inc.php

@@ -17 +17 @@
     $page['is_homepage'] = false;
 
-    $page['section_title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.CONTACT_FORM_PUBLIC.'">'.l10n('Contact').'</a>';
+    $page['section_title'] = 
+      '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'
+      .$conf['level_separator']
+      .'<a href="'.CONTACT_FORM_PUBLIC.'">'.l10n('Contact').'</a>';
   }
 }
@@ -233 +236 @@
 
   // get admin emails
-  $emails = get_contact_emails($comm['group']);
-  if (!count($emails))
+  $to = get_contact_emails($comm['group']);
+  if (!count($to))
   {
     $page['errors'][] = l10n('Error while sending e-mail');
@@ -246 +249 @@
     $prefix = str_replace('%gallery_title%', $conf['gallery_title'], $conf['ContactForm']['cf_subject_prefix']);
 
-    $from = $Cc = null;
+    $from = $Cc = $Bcc = null;
     if (!empty($comm['email']))
     {
@@ -255 +258 @@
       if ($comm['send_copy'])
       {
+        $Bcc = $to;
+        $to = null;
         $Cc = $from;
       }
@@ -263 +268 @@
 
     $result = pwg_mail(
-      $emails,
+      $to,
       array(
         'subject' => '['.$prefix.'] '.$comm['subject'],
+        'content' => $comm['content'],
         'mail_title' => $prefix,
         'mail_subtitle' => $comm['subject'],
         'content_format' => 'text/html',
+        'email_format' => $conf['ContactForm']['cf_mail_type'],
         'from' => $from,
         'Cc' => $Cc,
+        'Bcc' => $Bcc,
         ),
       array(
@@ -328 +336 @@
   ORDER BY name ASC
 ';
-  $emails = array_from_query($query);
+  $emails = query2array($query);
 
   return $emails;