Merge branch '6580-interface_base_url' into 'develop'

Allow overriding the interface_base_url for password reset mails, #6580

Closes #6580

See merge request ispconfig/ispconfig3!1807

Author: Till Brehm

install/tpl/config.inc.php.master

@@ -158,6 +158,7 @@ $conf['timezone'] = '{timezone}';
 
 //** Misc.
 $conf['interface_logout_url'] = ''; // example: http://www.domain.tld/
+$conf['interface_base_url'] = ''; // example: http://www.domain.tld (no trailing slash)
 
 
 //** Auto Load Modules

interface/web/login/password_reset.php

@@ -84,6 +84,9 @@
 			else $server_domain = 'https://' . $server_domain;
 
 			if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '443') $server_domain .= ':' . $_SERVER['SERVER_PORT'];
+			if (!empty($conf['interface_base_url'])) {
+				$server_domain = $conf['interface_base_url'];
+			}
 
 			$app->uses('getconf,ispcmail');
 			$server_config_array = $app->getconf->get_global_config();