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

still implementing the new Settings-class, refs #1325

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2013-12-15 14:35:07 +01:00
parent 528082b49f
commit bcf187761c
23 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/formfields/customer/domains/formfield.domains_add.php
View File

@@ -43,25 +43,25 @@ return array(
),
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? $pathSelect['note'].'<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? $pathSelect['note'].'<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'visible' => (Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'],
'type' => 'text'
),
'redirectcode' => array(
'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
'visible' => ((Settings::Get('system.webserver') == 'apache2' && Settings::Get('customredirect.enabled') == '1') ? true : false),
'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select',
'select_var' => isset($redirectcode) ? $redirectcode : null
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'visible' => (Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox',

8
lib/formfields/customer/domains/formfield.domains_edit.php
View File

@@ -42,19 +42,19 @@ return array(
),
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'visible' => (Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'],
'type' => 'text',
'value' => $urlvalue
),
'redirectcode' => array(
'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false),
'visible' => ((Settings::Get('system.webserver') == 'apache2' && Settings::Get('customredirect.enabled') == '1') ? true : false),
'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select',
@@ -77,7 +77,7 @@ return array(
'value' => array($result['isemaildomain'])
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? (domainHasSslIpPort($result['id']) ? true : false) : false) : false),
'visible' => (Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? (domainHasSslIpPort($result['id']) ? true : false) : false) : false),
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox',

4
lib/formfields/customer/email/formfield.emails_addaccount.php
View File

@@ -40,14 +40,14 @@ return array(
'value' => generatePassword(),
),
'email_quota' => array(
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false),
'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'label' => $lng['emails']['quota'],
'desc' => $lng['panel']['megabyte'],
'type' => 'text',
'value' => $quota
),
'alternative_email' => array(
'visible' => ($settings['panel']['sendalternativemail'] == '1' ? true : false),
'visible' => (Settings::Get('panel.sendalternativemail') == '1' ? true : false),
'label' => $lng['emails']['alternative_emailaddress'],
'type' => 'text'
)

2
lib/formfields/customer/email/formfield.emails_edit.php
View File

@@ -43,7 +43,7 @@ return array(
'value' => $lng['panel']['no'].'&nbsp;[<a href="'.$filename.'?page=accounts&amp;action=add&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['account_add'].'</a>]'
),
'mail_quota' => array(
'visible' => ($result['popaccountid'] != 0 && $settings['system']['mail_quota_enabled']),
'visible' => ($result['popaccountid'] != 0 && Settings::Get('system.mail_quota_enabled')),
'label' => $lng['customer']['email_quota'],
'type' => 'label',
'value' => $result['quota'].' '.$lng['panel']['megabyte'].' [<a href="'.$filename.'?page=accounts&amp;action=changequota&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['emails']['quota_edit'].'</a>]'

6
lib/formfields/customer/extras/formfield.htaccess_add.php
View File

@@ -26,7 +26,7 @@ return array(
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
@@ -45,13 +45,13 @@ return array(
'type' => 'text'
),
'error403path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'),
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument403path'],
'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text'
),
'error500path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'),
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument500path'],
'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text'

4
lib/formfields/customer/extras/formfield.htaccess_edit.php
View File

@@ -44,14 +44,14 @@ return array(
'value' => $result['error404path']
),
'error403path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'),
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument403path'],
'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text',
'value' => $result['error403path']
),
'error500path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'),
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument500path'],
'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text',

2
lib/formfields/customer/extras/formfield.htpasswd_add.php
View File

@@ -26,7 +26,7 @@ return array(
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']

6
lib/formfields/customer/ftp/formfield.ftp_add.php
View File

@@ -24,19 +24,19 @@ return array(
'image' => 'icons/user_add.png',
'fields' => array(
'ftp_username' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false),
'visible' => (Settings::Get('customer.ftpatdomain') == '1' ? true : false),
'label' => $lng['login']['username'],
'type' => 'text'
),
'ftp_domain' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false),
'visible' => (Settings::Get('customer.ftpatdomain') == '1' ? true : false),
'label' => $lng['domains']['domainname'],
'type' => 'select',
'select_var' => (isset($domains) ? $domains : ""),
),
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']

2
lib/formfields/customer/ftp/formfield.ftp_edit.php
View File

@@ -30,7 +30,7 @@ return array(
),
'path' => array(
'label' => $lng['panel']['path'],
'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']