SF.net SVN: postfixadmin:[1832] trunk

[<gin...@us...>]

Revision: 1832
          http://sourceforge.net/p/postfixadmin/code/1832
Author:   gingerdog
Date:     2016-03-28 18:28:40 +0000 (Mon, 28 Mar 2016)
Log Message:
-----------
merge github pull request into svn manually - https://github.com/postfixadmin/postfixadmin/commit/3e62d3975ab78eee565b484b1f0fa3c29e0909fb - adding configurable smtp helo (CONF["smtp_client"])

Modified Paths:
--------------
    trunk/config.inc.php
    trunk/functions.inc.php

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2016-03-27 20:12:49 UTC (rev 1831)
+++ trunk/config.inc.php	2016-03-28 18:28:40 UTC (rev 1832)
@@ -125,6 +125,11 @@
 $CONF['smtp_server'] = 'localhost';
 $CONF['smtp_port'] = '25';
 
+// SMTP Client
+// Hostname (FQDN) of the server hosting Postfix Admin
+// Used in the HELO when sending emails from Postfix Admin
+$CONF['smtp_client'] = '';
+
 // Encrypt
 // In what way do you want the passwords to be crypted?
 // md5crypt = internal postfix admin md5

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2016-03-27 20:12:49 UTC (rev 1831)
+++ trunk/functions.inc.php	2016-03-28 18:28:40 UTC (rev 1832)
@@ -1136,7 +1136,10 @@
     $smtpd_server = $CONF['smtp_server'];
     $smtpd_port = $CONF['smtp_port'];
     //$smtp_server = $_SERVER["SERVER_NAME"];
-    $smtp_server = php_uname("n");
+    $smtp_server = php_uname('n');
+    if(!empty($CONF['smtp_client'])) {
+        $smtp_server = $CONF['smtp_client'];
+    }
     $errno = "0";
     $errstr = "0";
     $timeout = "30";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.