Changeset 1531 for trunk/include/functions_mail.inc.php

Timestamp:

Aug 10, 2006, 12:10:12 AM (18 years ago)

Author:

rub

Message:

Resolved Issue ID 0000507:

o format of email
o max_execution_time equal to 0
o -f with only adress mail
o use of standard function get_webmaster_mail_address

2 news $conf parameters.

Merge branch-1_6 r1529:1530 into BSF

File:

• trunk/include/functions_mail.inc.php (modified) (2 diffs)

trunk/include/functions_mail.inc.php

@@ -79 +79 @@
 function format_email($name, $email)
 {
-  $cvt7b_name = str_translate_to_ascii7bits($name);
+  global $conf;
 
-  if (strpos($email, '<') === false)
+  if ($conf['enabled_format_email'])
   {
-    return $cvt7b_name.' <'.$email.'>';
+    $cvt7b_name = str_translate_to_ascii7bits($name);
+
+    if (strpos($email, '<') === false)
+    {
+      return $cvt7b_name.' <'.$email.'>';
+    }
+    else
+    {
+      return $cvt7b_name.$email;
+    }
   }
   else
   {
-    return $cvt7b_name.$email;
+    return $email;
   }
 }
@@ -129 +138 @@
   if ($conf_mail['mail_options'])
   {
-    $options = '-f '.$from;
+    $options = '-f '.$conf_mail['email_webmaster'];
     
     return mail($to, $cvt7b_subject, $content, $headers, $options);