Ticket #1484767: roundcubemail-identity-smtp.svn1039.diff

SQL/mysql.update-svn1037.sql

@@ +1 @@
+-- RoundCube Webmail update script for MySQL databases
+-- Updates from revision 1037 to current
+
+ALTER TABLE `identities`
+  ADD `smtp_server` varchar(128) NOT NULL default '',
+  ADD `smtp_port` int(5) unsigned NOT NULL default '0',
+  ADD `smtp_user` varchar(128) NOT NULL default '',
+  ADD `smtp_pass` varchar(128) NOT NULL default '',
+  ADD `smtp_auth_type` varchar(128) NOT NULL default '',
+  ADD `smtp_helo_host` varchar(128) NOT NULL default '';
+

SQL/mysql.initial.sql

@@ -59 +59 @@
   `bcc` varchar(128) NOT NULL default '',
   `signature` text NOT NULL,
   `html_signature` tinyint(1) NOT NULL default '0',
+  `smtp_server` varchar(128) NOT NULL default '',
+  `smtp_port` int(5) unsigned NOT NULL default '0',
+  `smtp_user` varchar(128) NOT NULL default '',
+  `smtp_pass` varchar(128) NOT NULL default '',
+  `smtp_auth_type` varchar(128) NOT NULL default '',
+  `smtp_helo_host` varchar(128) NOT NULL default '',
   PRIMARY KEY  (`identity_id`),
   KEY `user_id` (`user_id`)
 );

program/include/rcube_smtp.inc

@@ -53 +53 @@
  *
  * @return bool  Returns TRUE on success, or FALSE on error
  */
-function smtp_mail($from, $recipients, &$headers, &$body, &$response)
+function smtp_mail($from, $recipients, &$headers, &$body, &$response, $identity_arr)
   {
   global $SMTP_CONN, $CONFIG;
   $smtp_timeout = null;
-  $smtp_host = $CONFIG['smtp_server'];
-  $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
-  $smtp_host_url = parse_url($CONFIG['smtp_server']);
   
+  if ($identity_arr['smtp_server']) {
+    $smtp_host = $identity_arr['smtp_server'];
+    $smtp_port = is_numeric($identity_arr['smtp_port']) ? $identity_arr['smtp_port'] : 25;
+    $smtp_host_url = parse_url($identity_arr['smtp_server']);
+    $smtp_user = $identity_arr['smtp_user'];
+    $smtp_pass = $identity_arr['smtp_pass'];
+    $smtp_auth_type = $identity_arr['smtp_auth_type'];
+    $smtp_helo_host = $identity_arr['smtp_helo_host'];
+  }
+  else {
+    $smtp_host = $CONFIG['smtp_server'];
+    $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
+    $smtp_host_url = parse_url($CONFIG['smtp_server']);
+    $smtp_user = $CONFIG['smtp_user'];
+    $smtp_pass = $CONFIG['smtp_pass'];
+    $smtp_auth_type = $CONFIG['smtp_auth_type'];
+    $smtp_helo_host = $CONFIG['smtp_helo_host'];
+  }
+  
   // overwrite port
   if ($smtp_host_url['host'] && $smtp_host_url['port'])
     {
@@ -76 +92 @@
   // create Net_SMTP object and connect to server
   if (!is_object($smtp_conn))
     {
-    $helo_host = empty($CONFIG['smtp_helo_host']) ? (empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME']) : $CONFIG['smtp_helo_host'];
+    $helo_host = empty($smtp_helo_host) ? (empty($_SERVER['SERVER_NAME']) ? 'localhost' : $_SERVER['SERVER_NAME']) : $smtp_helo_host;
     $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
 
     // set debugging
@@ -94 +110 @@
       }
       
     // attempt to authenticate to the SMTP server
-    if ($CONFIG['smtp_user'] && $CONFIG['smtp_pass'])
+    if ($smtp_user && $smtp_pass)
       {
       if (strstr($CONFIG['smtp_user'], '%u'))
-        $smtp_user = str_replace('%u', $_SESSION['username'], $CONFIG['smtp_user']);
-      else
-        $smtp_user = $CONFIG['smtp_user'];
+        $smtp_user = str_replace('%u', $_SESSION['username'], $smtp_user);
 
-      if (strstr($CONFIG['smtp_pass'], '%p'))
-        $smtp_pass = str_replace('%p', decrypt_passwd($_SESSION['password']), $CONFIG['smtp_pass']);
-      else
-        $smtp_pass = $CONFIG['smtp_pass'];
+      if (strstr($smtp_pass, '%p'))
+        $smtp_pass = str_replace('%p', decrypt_passwd($_SESSION['password']), $smtp_pass);
 
-      $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
+      $smtp_auth_type = empty($smtp_auth_type) ? NULL : $smtp_auth_type;
       $result = $SMTP_CONN->auth($smtp_user, $smtp_pass, $smtp_auth_type);
     
       if (PEAR::isError($result))

program/localization/en_US/labels.inc

@@ -218 +218 @@
 $labels['dstactive']  = 'Daylight savings';
 $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['smtp_server'] = 'SMTP server';
+$labels['smtp_port'] = 'SMTP port';
+$labels['smtp_user'] = 'SMTP username';
+$labels['smtp_pass'] = 'SMTP password';
+$labels['smtp_auth_type'] = 'SMTP auth type';
+$labels['smtp_helo_host'] = 'SMTP HELO host';
 $labels['previewpane'] = 'Show preview pane';
 
 $labels['autosavedraft']  = 'Automatically save draft';

program/steps/settings/save_identity.inc

@@ -19 +19 @@
 
 */
 
-$a_save_cols = array('name', 'email', 'organization', 'reply-to', 'bcc', 'standard', 'signature', 'html_signature');
+$a_save_cols = array('name', 'email', 'organization', 'reply-to', 'bcc', 'standard', 'signature', 'html_signature', 'smtp_server', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_auth_type', 'smtp_helo_host');
 $a_html_cols = array('signature');
 $a_boolean_cols = array('standard', 'html_signature');
 $updated = $default_id = false;

program/steps/settings/edit_identity.inc

@@ -70 +70 @@
                        'bcc'          => array('type' => 'text'),
                        'signature'        => array('type' => 'textarea', 'size' => "40", 'rows' => "6"),
                        'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'_signature\');'),
+                       'smtp_server'  => array('type' => 'text'), 
+                       'smtp_port'    => array('type' => 'text'), 
+                       'smtp_user'    => array('type' => 'text'), 
+                       'smtp_pass'    => array('type' => 'text'), 
+                       'smtp_auth_type'=> array('type' => 'text'), 
+                       'smtp_helo_host'=> array('type' => 'text'), 
                        'standard'     => array('type' => 'checkbox', 'label' => 'setdefault'));
 
 

program/steps/mail/func.inc

@@ -1264 +1264 @@
 /**
  * Send the given message compose object using the configured method
  */
-function rcmail_deliver_message(&$message, $from, $mailto)
+function rcmail_deliver_message(&$message, $from, $mailto, $identity_arr)
 {
   global $CONFIG;
 
@@ -1272 +1272 @@
   $msg_body = $message->get();
   
   // send thru SMTP server using custom SMTP library
-  if ($CONFIG['smtp_server'])
+  if ($identity_arr['smtp_server'] || $CONFIG['smtp_server'])
     {
     // generate list of recipients
     $a_recipients = array($mailto);
@@ -1288 +1288 @@
 
     // send message
     $smtp_response = array();
-    $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers)), $msg_body, $smtp_response);
+    $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers)), $msg_body, $smtp_response, $identity_arr);
 
     // log error
     if (!$sent)

program/steps/mail/sendmail.inc

@@ -304 +304 @@
 // Begin SMTP Delivery Block 
 if (!$savedraft)
 {
-  $sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto);
+  $sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto, $identity_arr);
   
   // return to compose page if sending failed
   if (!$sent)