maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

improve ip-address description in admin_domains, thx to datenfalke and Sephi

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-28 12:55:43 +02:00
parent 93ba24374b
commit eca2df275c
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/formfields/admin/domains/formfield.domains_add.php
View File

@@ -87,7 +87,8 @@ return array(
'type' => 'text' 'type' => 'text'
), ),
'ipandport' => array( 'ipandport' => array(
'label' => 'IP/Port', 'label' => $lng['domains']['ipandport_multi']['title'],
'desc' => $lng['domains']['ipandport_multi']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ipsandports, 'values' => $ipsandports,
'value' => array($settings['system']['defaultip']), 'value' => array($settings['system']['defaultip']),
@@ -95,7 +96,8 @@ return array(
'mandatory' => true 'mandatory' => true
), ),
'ssl_ipandport' => array( 'ssl_ipandport' => array(
'label' => 'IP/Port (SSL)', 'label' => $lng['domains']['ipandport_ssl_multi']['title'],
'desc' => $lng['domains']['ipandport_ssl_multi']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ssl_ipsandports, 'values' => $ssl_ipsandports,
'value' => '', 'value' => '',
@@ -103,7 +105,8 @@ return array(
), ),
'ssl_redirect' => array( 'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL Redirect', 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1') array ('label' => $lng['panel']['yes'], 'value' => '1')

9
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@@ -98,7 +98,8 @@ return array(
'value' => $result['documentroot'] 'value' => $result['documentroot']
), ),
'ipandport' => array( 'ipandport' => array(
'label' => 'IP/Port', 'label' => $lng['domains']['ipandport_multi']['title'],
'desc' => $lng['domains']['ipandport_multi']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ipsandports, 'values' => $ipsandports,
'value' => $usedips, 'value' => $usedips,
@@ -106,7 +107,8 @@ return array(
'mandatory' => true 'mandatory' => true
), ),
'ssl_ipandport' => array( 'ssl_ipandport' => array(
'label' => 'IP/Port (SSL)', 'label' => $lng['domains']['ipandport_ssl_multi']['title'],
'desc' => $lng['domains']['ipandport_ssl_multi']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ssl_ipsandports, 'values' => $ssl_ipsandports,
'value' => $usedips, 'value' => $usedips,
@@ -114,7 +116,8 @@ return array(
), ),
'ssl_redirect' => array( 'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL Redirect', 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1') array ('label' => $lng['panel']['yes'], 'value' => '1')

4
lib/init.php
View File

@@ -352,8 +352,8 @@ if($language != 'English')
} }
} }
// last but not least include language error_references file // last but not least include language references file
include_once makeSecurePath('lng/error_references.php'); include_once makeSecurePath('lng/lng_references.php');
// Initialize our new link - class // Initialize our new link - class

5
lng/english.lng.php
View File

@@ -1963,3 +1963,8 @@ $lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be
// Added in Froxlor 0.9.29.1-dev // Added in Froxlor 0.9.29.1-dev
$lng['crondesc']['cron_mailboxsize'] = 'Calculating of mailbox-sizes'; $lng['crondesc']['cron_mailboxsize'] = 'Calculating of mailbox-sizes';
$lng['domains']['ipandport_multi']['title'] = 'IP address(es)';
$lng['domains']['ipandport_multi']['description'] = 'Specify one or more IP address for the domain.<br /><br /><div style="color:red">NOTE: IP addresses cannot be changed when the domain is configured as <strong>alias-domain</strong> of another domain.</div>';
$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL IP address(es)';
$lng['domains']['ssl_redirect']['title'] = 'SSL redirect';
$lng['domains']['ssl_redirect']['description'] = 'This option creates redirects for non-ssl vhosts so that all requests are redirected to the SSL-vhost.<br /><br />e.g. a request to <strong>http</strong>://domain.tld/ will redirect you to <strong>https</strong>://domain.tld/';

5
lng/german.lng.php
View File

@@ -1684,3 +1684,8 @@ $lng['admin']['phpfpm.ininote'] = 'Nicht alle gewünschten Werte können in der
// Added in Froxlor 0.9.29.1-dev // Added in Froxlor 0.9.29.1-dev
$lng['crondesc']['cron_mailboxsize'] = 'Berechnung der Mailbox-Größen'; $lng['crondesc']['cron_mailboxsize'] = 'Berechnung der Mailbox-Größen';
$lng['domains']['ipandport_multi']['title'] = 'IP Adresse(n)';
$lng['domains']['ipandport_multi']['description'] = 'Definiere eine oder mehrere IP Adresse(n) für diese Domain.<br /><br /><div style="color:red">Hinweis: Die IP Adressen können nicht geändert werden, sollte die Domain als <strong>Alias-Domain</strong> für eine andere Domain konfiguriert worden sein.</div>';
$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL IP Adresse(n)';
$lng['domains']['ssl_redirect']['title'] = 'SSL Weiterleitung';
$lng['domains']['ssl_redirect']['description'] = 'Diese Option erstellt für alle nicht-ssl vhosts eine Weiterleitung (Redirect), so dass alle Anfragen an den SSL-vhost übermittelt werden.<br /><br />z.B. eine Anfrage an <strong>http</strong>://domain.tld/ würde weiterleiten zu <strong>https</strong>://domain.tld/';

7
lng/error_references.php → lng/lng_references.php
View File

@@ -32,4 +32,9 @@ $lng['error']['domainname'] = $lng['domains']['domainname'];
$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; $lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; $lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
/**
* other language-strings which need no translation
*/
$lng['domains']['ipandport_ssl_multi']['description'] = $lng['domains']['ipandport_multi']['description'];