Changeset 17662

Timestamp:

Aug 29, 2012, 6:49:12 PM (12 years ago)

Author:

mistic100

Message:

correct multi-recipient syntax,
remove user agent display,
advanced param 'contact_form_show_ip' to remove IP display

Location:

extensions/ContactForm

Files:

• include/functions.inc.php (modified) (2 diffs)
• template/mail/content_html.tpl (modified) (1 diff)
• template/mail/content_plain.tpl (modified) (1 diff)

extensions/ContactForm/include/functions.inc.php

@@ -240 +240 @@
     }
     
+    $comm['show_ip'] = isset($conf['contact_form_show_ip']) ? $conf['contact_form_show_ip'] : true;
+    
     $template->assign(array(
       'cf_prefix' => $prefix,
@@ -256 +258 @@
       trigger_event('send_mail',
         false, /* Result */
-        trigger_event('send_mail_to', implode(';', $emails)),
+        trigger_event('send_mail_to', implode(',', $emails)),
         trigger_event('send_mail_subject', $subject),
         trigger_event('send_mail_content', $content),

extensions/ContactForm/template/mail/content_html.tpl

@@ -19 +19 @@
 <div id="the_content">
   <p>
-    {'Name'|@translate} : {$contact.author}<br>
-    {'Email address'|@translate} : {$contact.email}
+    {'Name'|@translate}: {$contact.author}<br>
+    {'Email address'|@translate}: {$contact.email}
+    {if $contact.show_ip}<br>{'IP: %s'|@translate|@sprintf:$contact.ip}{/if}
   </p>
 
   <blockquote>{$contact.content}</blockquote>
-
-  <p>
-    {'IP: %s'|@translate|@sprintf:$contact.ip}<br>
-    {'Browser: %s'|@translate|@sprintf:$contact.agent}
-  </p>
 </div>
 

extensions/ContactForm/template/mail/content_plain.tpl

@@ -1 +1 @@
 {$cf_prefix}
+
 --------------------
+{'Name'|@translate}: {$contact.author}
+{'Email address'|@translate}: {$contact.email}
+{if $contact.show_ip}{'IP: %s'|@translate|@sprintf:$contact.ip}{/if}
 
-{'Name'|@translate} : {$contact.author}
-{'Email address'|@translate} : {$contact.email}
+--------------------
+{$contact.content}
 
-====================
-{$contact.content}
-====================
-
-{'IP: %s'|@translate|@sprintf:$contact.ip}
-{'Browser: %s'|@translate|@sprintf:$contact.agent}
 
 --------------------