Changeset 2106 for trunk

Timestamp:

Sep 25, 2007, 11:52:00 PM (17 years ago)

Author:

rub

Message:

Resolved 0000580: Send mail by define smtp configuration

Merge branch-1_7 2104:2105 into BSF

Location:

trunk/include

Files:

• class_smtp_mail.inc.php (copied) (copied from branches/branch-1_7/include/class_smtp_mail.inc.php)
• config_default.inc.php (modified) (1 diff)
• functions_mail.inc.php (modified) (6 diffs)

trunk/include/config_default.inc.php

@@ -285 +285 @@
 //  Value could be text/plain  or text/html
 $conf['default_email_format'] = 'text/html';
+
+// smtp configuration
+// (work if fsockopen function is allowed for smtp port)
+// smtp_host: smtp server host
+//  if null, regular mail function is used
+//   format: hoststring[:port]
+//   exemple: smtp.pwg.net:21
+// smtp_user/smtp_password: user & password for smtp identication
+$conf['smtp_host'] = '';
+$conf['smtp_user'] = '';
+$conf['smtp_password'] = '';
+
 
 // check_upgrade_feed: check if there are database upgrade required. Set to

trunk/include/functions_mail.inc.php

@@ -47 +47 @@
     'mail_options' => $conf['mail_options'],
     'send_bcc_mail_webmaster' => $conf['send_bcc_mail_webmaster'],
-    'default_email_format' => $conf['default_email_format']
+    'default_email_format' => $conf['default_email_format'],
+    'use_smtp' => !empty($conf['smtp_host']),
+    'smtp_host' => $conf['smtp_host'],
+    'smtp_user' => $conf['smtp_user'],
+    'smtp_password' => $conf['smtp_password']
     );
 
@@ -74 +78 @@
   if ($conf['enabled_format_email'])
   {
-    $cvt7b_name = '"'.addslashes(str_translate_to_ascii7bits($name)).'"';
-
-    if (strpos($email, '<') === false)
-    {
-      return $cvt7b_name.' <'.$email.'>';
+    // Spring cleaning
+    $cvt_name = trim(preg_replace('#[\n\r]+#s', '', $name));
+    $cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
+    // Ascii convertion
+    $cvt_name = '"'.addslashes(str_translate_to_ascii7bits($cvt_name)).'"';
+
+    if (strpos($cvt_email, '<') === false)
+    {
+      return $cvt_name.' <'.$cvt_email.'>';
     }
     else
     {
-      return $cvt7b_name.$email;
+      return $cvt_name.$cvt_email;
     }
   }
   else
   {
-    return $email;
+    return $cvt_email;
   }
 }
@@ -437 +445 @@
 }
 
-
 /*
  * sends an email, using PhpWebGallery specific informations
@@ -499 +506 @@
     $args['subject'] = 'PhpWebGallery';
   }
-  $cvt7b_subject = str_translate_to_ascii7bits($args['subject']);
+  // Spring cleaning
+  $cvt_subject = trim(preg_replace('#[\n\r]+#s', '', $args['subject']));
+  // Ascii convertion
+  $cvt_subject = str_translate_to_ascii7bits($cvt_subject);
 
   if (!isset($args['content']))
@@ -545 +555 @@
   $headers.= '  reply-type=original'."\n";
   $headers.= 'MIME-Version: 1.0'."\n";
+  $headers.= 'X-Mailer: Piwigo Mailer'."\n";
 
   $content = '';
@@ -674 +685 @@
   }*/
 
-  if ($conf_mail['mail_options'])
-  {
-    $options = '-f '.$conf_mail['email_webmaster'];
-    
-    return mail($to, $cvt7b_subject, $content, $headers, $options);
+  if ($conf_mail['use_smtp'])
+  {
+    include_once( PHPWG_ROOT_PATH.'include/class_smtp_mail.inc.php' );
+    $smtp_mail = new smtp_mail(
+      $conf_mail['smtp_host'], $conf_mail['smtp_user'], $conf_mail['smtp_password'],
+      $conf_mail['email_webmaster']);
+    return $smtp_mail->mail($to, $cvt_subject, $content, $headers);
   }
   else
   {
-    return mail($to, $cvt7b_subject, $content, $headers);
+    if ($conf_mail['mail_options'])
+    {
+      $options = '-f '.$conf_mail['email_webmaster'];
+      return mail($to, $cvt_subject, $content, $headers, $options);
+    }
+    else
+    {
+      return mail($to, $cvt_subject, $content, $headers);
+    }
   }
 }