[Fmsystem-commits] [12231] Add configurable smtp timeout

[Sigurd Nes]

Revision: 12231
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12231
Author:   sigurdne
Date:     2014-10-24 14:19:33 +0000 (Fri, 24 Oct 2014)
Log Message:
-----------
Add configurable smtp timeout

Modified Paths:
--------------
    trunk/admin/templates/base/config.tpl
    trunk/phpgwapi/inc/class.mailer_smtp.inc.php

Modified: trunk/admin/templates/base/config.tpl
===================================================================
--- trunk/admin/templates/base/config.tpl       2014-10-24 10:37:40 UTC (rev 
12230)
+++ trunk/admin/templates/base/config.tpl       2014-10-24 14:19:33 UTC (rev 
12231)
@@ -88,9 +88,14 @@
        
        <tr class="row_off">
                <td>{lang_SMTP_server_port_number}:</td>
-       <td><input name="newsettings[smtp_port]" value="{value_smtp_port}" 
/></td>
+               <td><input name="newsettings[smtp_port]" 
value="{value_smtp_port}" /></td>
        </tr>
-       
+
+       <tr class="row_off">
+               <td>{lang_SMTP_server_timeout}:</td>
+               <td><input name="newsettings[smtp_timeout]" 
value="{value_smtp_timeout}" /></td>
+       </tr>
+
        <tr class="row_on">
                <td>{lang_Use_SMTP_auth}:</td>
                <td>

Modified: trunk/phpgwapi/inc/class.mailer_smtp.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.mailer_smtp.inc.php        2014-10-24 10:37:40 UTC 
(rev 12230)
+++ trunk/phpgwapi/inc/class.mailer_smtp.inc.php        2014-10-24 14:19:33 UTC 
(rev 12231)
@@ -36,6 +36,7 @@
                        $this->SMTPSecure = 
isset($GLOBALS['phpgw_info']['server']['smtpSecure']) ? 
$GLOBALS['phpgw_info']['server']['smtpSecure'] : '';
                        $this->Version = 'custom - phpGroupWare 5.2.7';
                        $this->CharSet = 'utf-8';
+                       $this->Timeout = 
isset($GLOBALS['phpgw_info']['server']['smtp_timeout']) && 
$GLOBALS['phpgw_info']['server']['smtp_timeout'] ? 
(int)$GLOBALS['phpgw_info']['server']['smtp_timeout'] : 10;
  
                        if ( 
isset($GLOBALS['phpgw_info']['server']['smtpAuth']) && 
$GLOBALS['phpgw_info']['server']['smtpAuth'] == 'yes' )
                        {
@@ -62,7 +63,7 @@
                 * @see SMTP::$Debugoutput
                 */
 
-                       if ( 
isset($GLOBALS['phpgw_info']['server']['Debugoutput']) && 
$GLOBALS['phpgw_info']['server']['smtpAuth'] != 'echo' )
+                       if ( 
isset($GLOBALS['phpgw_info']['server']['Debugoutput']) && 
$GLOBALS['phpgw_info']['server']['Debugoutput'] != 'echo' )
                        {
                                switch 
($GLOBALS['phpgw_info']['server']['Debugoutput'])
                                {