add new template-variables (SERVER_HOSTNAME, SERVER_IP, SERVER_IP and DOMAINNAME) to create-customer-email-template, fixes #432

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

admin_customers.php

@@ -917,6 +917,8 @@ if ($page == 'customers'
 					Database::pexecute($ins_stmt, array('name' => $loginname));
 					$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added ftp-account for user '" . $loginname . "'");
 
+					$_stdsubdomain = '';
+
 					if ($createstdsubdomain == '1') {
 
 						if (isset($settings['system']['stdsubdomain'])
@@ -968,13 +970,28 @@ if ($page == 'customers'
 
 					if ($sendpassword == '1') {
 
+						$srv_hostname = $settings['system']['hostname'];
+						if ($settings['system']['froxlordirectlyviahostname'] == '0') {
+							$srv_hostname .= '/froxlor';
+						}
+
+						$srv_ip_stmt = Database::prepare("
+							SELECT ip, port FROM `".TABLE_PANEL_IPSANDPORTS."`
+							WHERE `id` = :defaultip
+						");
+						$srv_ip = Database::pexecute_first($srv_ip_stmt, array('defaultip' => $settings['system']['defaultip']));
+
 						$replace_arr = array(
 							'FIRSTNAME' => $firstname,
 							'NAME' => $name,
 							'COMPANY' => $company,
 							'SALUTATION' => getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)),
 							'USERNAME' => $loginname,
-							'PASSWORD' => $password
+							'PASSWORD' => $password,
+							'SERVER_HOSTNAME' => $srv_hostname,
+							'SERVER_IP' => isset($srv_ip['ip']) ? $srv_ip['ip'] : '',
+							'SERVER_PORT' => isset($srv_ip['port']) ? $srv_ip['port'] : '',
+							'DOMAINNAME' => $_stdsubdomain
 						);
 
 						// Get mail templates from database; the ones from 'admin' are fetched for fallback

lng/english.lng.php

@@ -1996,3 +1996,7 @@ $lng['serversettings']['allow_error_report_customer']['description'] = 'Please n
 $lng['admin']['phpsettings']['enable_slowlog'] = 'Enable slowlog (per domain)';
 $lng['admin']['phpsettings']['request_terminate_timeout'] = 'Request terminate-timeout';
 $lng['admin']['phpsettings']['request_slowlog_timeout'] = 'Request slowlog-timeout';
+$lng['admin']['templates']['SERVER_HOSTNAME'] = 'Replaces the system-hostname (URL to froxlor)';
+$lng['admin']['templates']['SERVER_IP'] = 'Replaces the default server ip-address';
+$lng['admin']['templates']['SERVER_PORT'] = 'Replaces the default server port';
+$lng['admin']['templates']['DOMAINNAME'] = 'Replaces the customers standard-subdomain (can be empty if none is generated)';

lng/german.lng.php

@@ -1722,3 +1722,7 @@ $lng['serversettings']['allow_error_report_customer']['description'] = 'Bitte be
 $lng['admin']['phpsettings']['enable_slowlog'] = 'FPM slowlog pro Domain aktivieren';
 $lng['admin']['phpsettings']['request_terminate_timeout'] = 'Request terminate-timeout';
 $lng['admin']['phpsettings']['request_slowlog_timeout'] = 'Request slowlog-timeout';
+$lng['admin']['templates']['SERVER_HOSTNAME'] = 'Wird mit dem System-Hostname (URL zu froxlor) ersetzt';
+$lng['admin']['templates']['SERVER_IP'] = 'Wird mit der standard System IP-Adresse ersetzt';
+$lng['admin']['templates']['SERVER_PORT'] = 'Wird mit dem standard Port ersetzt';
+$lng['admin']['templates']['DOMAINNAME'] = 'Wird mit der Standardsubdomain des Kunden ersetzt (kann leer sein, wenn keine erstellt werden soll)';

templates/Froxlor/admin/templates/templates_add_2.tpl

@@ -77,6 +77,22 @@ $header
 					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
+				<tr>
+					<td><em>{SERVER_HOSTNAME}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_HOSTNAME']}</td>
+				</tr>
+				<tr>
+					<td><em>{SERVER_IP}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_IP']}</td>
+				</tr>
+				<tr>
+					<td><em>{SERVER_PORT}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_PORT']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAINNAME}</em></td>
+					<td>{$lng['admin']['templates']['DOMAINNAME']}</td>
+				</tr>
 				<tr>
 					<td colspan="2">
 						<strong>{$lng['admin']['templates']['pop_success']}</strong>

templates/Froxlor/admin/templates/templates_edit.tpl

@@ -78,6 +78,22 @@ $header
 					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
+				<tr>
+					<td><em>{SERVER_HOSTNAME}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_HOSTNAME']}</td>
+				</tr>
+				<tr>
+					<td><em>{SERVER_IP}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_IP']}</td>
+				</tr>
+				<tr>
+					<td><em>{SERVER_PORT}</em></td>
+					<td>{$lng['admin']['templates']['SERVER_PORT']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAINNAME}</em></td>
+					<td>{$lng['admin']['templates']['DOMAINNAME']}</td>
+				</tr>
 				<tr>
 					<td colspan="2">
 						<strong>{$lng['admin']['templates']['pop_success']}</strong>