clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-22 10:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p) 2013-12-05 12:00:54 +01:00
commit 93d1e1f24d
5 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
admin_customers.php
View File

@ -836,6 +836,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'])
@ -887,13 +889,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

4
lng/english.lng.php
View File

@ -1773,3 +1773,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)';

4
lng/german.lng.php
View File

@ -1499,3 +1499,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)';

16
templates/Froxlor/admin/templates/templates_add_2.tpl
View File

@ -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>

16
templates/Froxlor/admin/templates/templates_edit.tpl
View File

@ -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>