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

4
lib/formfields/admin/admin/formfield.admin_add.php
View File

@@ -173,7 +173,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true, 'mandatory' => true,
'ul_field' => $email_quota_ul 'ul_field' => $email_quota_ul
), ),
@@ -189,7 +189,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul 'ul_field' => $tickets_ul
), ),
'tickets_see_all' => array( 'tickets_see_all' => array(

4
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@@ -187,7 +187,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => $result['email_quota'], 'value' => $result['email_quota'],
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true, 'mandatory' => true,
'ul_field' => $email_quota_ul 'ul_field' => $email_quota_ul
), ),
@@ -203,7 +203,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => $result['tickets'], 'value' => $result['tickets'],
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul 'ul_field' => $tickets_ul
), ),
'tickets_see_all' => array( 'tickets_see_all' => array(

4
lib/formfields/admin/customer/formfield.customer_add.php
View File

@@ -181,7 +181,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true, 'mandatory' => true,
'ul_field' => $email_quota_ul 'ul_field' => $email_quota_ul
), ),
@@ -215,7 +215,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul 'ul_field' => $tickets_ul
), ),
'mysqls' => array( 'mysqls' => array(

4
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -189,7 +189,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => $result['email_quota'], 'value' => $result['email_quota'],
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true, 'mandatory' => true,
'ul_field' => $email_quota_ul 'ul_field' => $email_quota_ul
), ),
@@ -223,7 +223,7 @@ return array(
'type' => 'textul', 'type' => 'textul',
'value' => $result['tickets'], 'value' => $result['tickets'],
'maxlength' => 9, 'maxlength' => 9,
'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul 'ul_field' => $tickets_ul
), ),
'mysqls' => array( 'mysqls' => array(

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

@@ -91,7 +91,7 @@ return array(
'desc' => $lng['domains']['ipandport_multi']['description'], 'desc' => $lng['domains']['ipandport_multi']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => $ipsandports, 'values' => $ipsandports,
'value' => array($settings['system']['defaultip']), 'value' => array(Settings::Get('system.defaultip')),
'is_array' => 1, 'is_array' => 1,
'mandatory' => true 'mandatory' => true
), ),
@@ -104,7 +104,7 @@ return array(
'is_array' => 1 'is_array' => 1
), ),
'ssl_redirect' => array( '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'], 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'], 'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
@@ -114,7 +114,7 @@ return array(
'value' => array() 'value' => array()
), ),
'no_ssl_available_info' => array( 'no_ssl_available_info' => 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' => 'SSL', 'label' => 'SSL',
'type' => 'label', 'type' => 'label',
'value' => $lng['panel']['nosslipsavailable'] 'value' => $lng['panel']['nosslipsavailable']
@@ -159,18 +159,18 @@ return array(
'value' => array('1') 'value' => array('1')
), ),
'phpsettingid' => array( 'phpsettingid' => array(
'visible' => (((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1) ? true : false), 'visible' => (((int)Settings::Get('system.mod_fcgid') == 1 || (int)Settings::Get('phpfpm.enabled') == 1) ? true : false),
'label' => $lng['admin']['phpsettings']['title'], 'label' => $lng['admin']['phpsettings']['title'],
'type' => 'select', 'type' => 'select',
'select_var' => $phpconfigs 'select_var' => $phpconfigs
), ),
'mod_fcgid_starter' => array( 'mod_fcgid_starter' => array(
'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => ((int)Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_starter']['title'], 'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'text' 'type' => 'text'
), ),
'mod_fcgid_maxrequests' => array( 'mod_fcgid_maxrequests' => array(
'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => ((int)Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'text' 'type' => 'text'
) )
@@ -179,7 +179,7 @@ return array(
'section_d' => array( 'section_d' => array(
'title' => $lng['admin']['nameserversettings'], 'title' => $lng['admin']['nameserversettings'],
'image' => 'icons/domain_add.png', 'image' => 'icons/domain_add.png',
'visible' => ($settings['system']['bind_enable'] == '1' && $userinfo['change_serversettings'] == '1' ? true : false), 'visible' => (Settings::Get('system.bind_enable') == '1' && $userinfo['change_serversettings'] == '1' ? true : false),
'fields' => array( 'fields' => array(
'isbinddomain' => array( 'isbinddomain' => array(
'label' => 'Nameserver', 'label' => 'Nameserver',
@@ -222,7 +222,7 @@ return array(
'select_var' => $subcanemaildomain 'select_var' => $subcanemaildomain
), ),
'dkim' => array( 'dkim' => array(
'visible' => ($settings['dkim']['use_dkim'] == '1' ? true : false), 'visible' => (Settings::Get('dkim.use_dkim') == '1' ? true : false),
'label' => 'DomainKeys', 'label' => 'DomainKeys',
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(

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

@@ -32,7 +32,7 @@ return array(
), ),
'customerid' => array( 'customerid' => array(
'label' => $lng['admin']['customer'], 'label' => $lng['admin']['customer'],
'type' => ($settings['panel']['allow_domain_change_customer'] == '1' ? 'select' : 'label'), 'type' => (Settings::Get('panel.allow_domain_change_customer') == '1' ? 'select' : 'label'),
'select_var' => (isset($customers) ? $customers : null), 'select_var' => (isset($customers) ? $customers : null),
'value' => (isset($result['customername']) ? $result['customername'] : null), 'value' => (isset($result['customername']) ? $result['customername'] : null),
'mandatory' => true, 'mandatory' => true,
@@ -40,7 +40,7 @@ return array(
'adminid' => array( 'adminid' => array(
'visible' => ($userinfo['customers_see_all'] == '1' ? true : false), 'visible' => ($userinfo['customers_see_all'] == '1' ? true : false),
'label' => $lng['admin']['admin'], 'label' => $lng['admin']['admin'],
'type' => ($settings['panel']['allow_domain_change_admin'] == '1' ? 'select' : 'label'), 'type' => (Settings::Get('panel.allow_domain_change_admin') == '1' ? 'select' : 'label'),
'select_var' => (isset($admins) ? $admins : null), 'select_var' => (isset($admins) ? $admins : null),
'value' => (isset($result['adminname']) ? $result['adminname'] : null), 'value' => (isset($result['adminname']) ? $result['adminname'] : null),
'mandatory' => true, 'mandatory' => true,
@@ -115,7 +115,7 @@ return array(
'is_array' => 1 'is_array' => 1
), ),
'ssl_redirect' => array( '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'], 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'], 'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',
@@ -125,7 +125,7 @@ return array(
'value' => array($result['ssl_redirect']) 'value' => array($result['ssl_redirect'])
), ),
'no_ssl_available_info' => array( 'no_ssl_available_info' => 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' => 'SSL', 'label' => 'SSL',
'type' => 'label', 'type' => 'label',
'value' => $lng['panel']['nosslipsavailable'] 'value' => $lng['panel']['nosslipsavailable']
@@ -181,19 +181,19 @@ return array(
'value' => array($result['openbasedir']) 'value' => array($result['openbasedir'])
), ),
'phpsettingid' => array( 'phpsettingid' => array(
'visible' => (((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1) ? true : false), 'visible' => (((int)Settings::Get('system.mod_fcgid') == 1 || (int)Settings::Get('phpfpm.enabled') == 1) ? true : false),
'label' => $lng['admin']['phpsettings']['title'], 'label' => $lng['admin']['phpsettings']['title'],
'type' => 'select', 'type' => 'select',
'select_var' => $phpconfigs 'select_var' => $phpconfigs
), ),
'mod_fcgid_starter' => array( 'mod_fcgid_starter' => array(
'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => ((int)Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_starter']['title'], 'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'text', 'type' => 'text',
'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '') 'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
), ),
'mod_fcgid_maxrequests' => array( 'mod_fcgid_maxrequests' => array(
'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => ((int)Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'text', 'type' => 'text',
'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') 'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
@@ -203,7 +203,7 @@ return array(
'section_d' => array( 'section_d' => array(
'title' => $lng['admin']['nameserversettings'], 'title' => $lng['admin']['nameserversettings'],
'image' => 'icons/domain_edit.png', 'image' => 'icons/domain_edit.png',
'visible' => ($settings['system']['bind_enable'] == '1' && $userinfo['change_serversettings'] == '1' ? true : false), 'visible' => (Settings::Get('system.bind_enable') == '1' && $userinfo['change_serversettings'] == '1' ? true : false),
'fields' => array( 'fields' => array(
'isbinddomain' => array( 'isbinddomain' => array(
'label' => 'Nameserver', 'label' => 'Nameserver',
@@ -247,7 +247,7 @@ return array(
'select_var' => $subcanemaildomain 'select_var' => $subcanemaildomain
), ),
'dkim' => array( 'dkim' => array(
'visible' => ($settings['dkim']['use_dkim'] == '1' ? true : false), 'visible' => (Settings::Get('dkim.use_dkim') == '1' ? true : false),
'label' => 'DomainKeys', 'label' => 'DomainKeys',
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(

2
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -103,7 +103,7 @@ return array(
'section_d' => array( 'section_d' => array(
'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'],
'image' => 'icons/ipsports_add.png', 'image' => 'icons/ipsports_add.png',
'visible' => ($settings['system']['use_ssl'] == 1 ? true : false), 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false),
'fields' => array( 'fields' => array(
'ssl' => array( 'ssl' => array(
'label' => $lng['admin']['ipsandports']['enable_ssl'], 'label' => $lng['admin']['ipsandports']['enable_ssl'],

2
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@@ -108,7 +108,7 @@ return array(
'section_d' => array( 'section_d' => array(
'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'],
'image' => 'icons/ipsports_edit.png', 'image' => 'icons/ipsports_edit.png',
'visible' => ($settings['system']['use_ssl'] == 1 ? true : false), 'visible' => (Settings::Get('system.use_ssl') == 1 ? true : false),
'fields' => array( 'fields' => array(
'ssl' => array( 'ssl' => array(
'label' => $lng['admin']['ipsandports']['enable_ssl'], 'label' => $lng['admin']['ipsandports']['enable_ssl'],

14
lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
View File

@@ -30,14 +30,14 @@ return array(
'maxlength' => 50 'maxlength' => 50
), ),
'binary' => array( 'binary' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['binary'], 'label' => $lng['admin']['phpsettings']['binary'],
'type' => 'text', 'type' => 'text',
'maxlength' => 255, 'maxlength' => 255,
'value' => '/usr/bin/php-cgi' 'value' => '/usr/bin/php-cgi'
), ),
'file_extensions' => array( 'file_extensions' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['file_extensions'], 'label' => $lng['admin']['phpsettings']['file_extensions'],
'desc' => $lng['admin']['phpsettings']['file_extensions_note'], 'desc' => $lng['admin']['phpsettings']['file_extensions_note'],
'type' => 'text', 'type' => 'text',
@@ -45,17 +45,17 @@ return array(
'value' => 'php' 'value' => 'php'
), ),
'mod_fcgid_starter' => array( 'mod_fcgid_starter' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_starter']['title'], 'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'text' 'type' => 'text'
), ),
'mod_fcgid_maxrequests' => array( 'mod_fcgid_maxrequests' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'text' 'type' => 'text'
), ),
'phpfpm_enable_slowlog' => array( 'phpfpm_enable_slowlog' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['enable_slowlog'], 'label' => $lng['admin']['phpsettings']['enable_slowlog'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(
@@ -64,14 +64,14 @@ return array(
'value' => array() 'value' => array()
), ),
'phpfpm_reqtermtimeout' => array( 'phpfpm_reqtermtimeout' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'],
'type' => 'text', 'type' => 'text',
'maxlength' => 10, 'maxlength' => 10,
'value' => '60s' 'value' => '60s'
), ),
'phpfpm_reqslowtimeout' => array( 'phpfpm_reqslowtimeout' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'],
'type' => 'text', 'type' => 'text',
'maxlength' => 10, 'maxlength' => 10,

14
lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
View File

@@ -31,14 +31,14 @@ return array(
'value' => $result['description'] 'value' => $result['description']
), ),
'binary' => array( 'binary' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['binary'], 'label' => $lng['admin']['phpsettings']['binary'],
'type' => 'text', 'type' => 'text',
'maxlength' => 255, 'maxlength' => 255,
'value' => $result['binary'] 'value' => $result['binary']
), ),
'file_extensions' => array( 'file_extensions' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['file_extensions'], 'label' => $lng['admin']['phpsettings']['file_extensions'],
'desc' => $lng['admin']['phpsettings']['file_extensions_note'], 'desc' => $lng['admin']['phpsettings']['file_extensions_note'],
'type' => 'text', 'type' => 'text',
@@ -46,19 +46,19 @@ return array(
'value' => $result['file_extensions'] 'value' => $result['file_extensions']
), ),
'mod_fcgid_starter' => array( 'mod_fcgid_starter' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_starter']['title'], 'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'text', 'type' => 'text',
'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '') 'value' => ((int)$result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
), ),
'mod_fcgid_maxrequests' => array( 'mod_fcgid_maxrequests' => array(
'visible' => ($settings['system']['mod_fcgid'] == 1 ? true : false), 'visible' => (Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'text', 'type' => 'text',
'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') 'value' => ((int)$result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
), ),
'phpfpm_enable_slowlog' => array( 'phpfpm_enable_slowlog' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['enable_slowlog'], 'label' => $lng['admin']['phpsettings']['enable_slowlog'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(
@@ -67,14 +67,14 @@ return array(
'value' => array($result['fpm_slowlog']) 'value' => array($result['fpm_slowlog'])
), ),
'phpfpm_reqtermtimeout' => array( 'phpfpm_reqtermtimeout' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'],
'type' => 'text', 'type' => 'text',
'maxlength' => 10, 'maxlength' => 10,
'value' => $result['fpm_reqterm'] 'value' => $result['fpm_reqterm']
), ),
'phpfpm_reqslowtimeout' => array( 'phpfpm_reqslowtimeout' => array(
'visible' => ($settings['phpfpm']['enabled'] == 1 ? true : false), 'visible' => (Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'],
'type' => 'text', 'type' => 'text',
'maxlength' => 10, 'maxlength' => 10,

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

@@ -43,25 +43,25 @@ return array(
), ),
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value'] 'value' => $pathSelect['value']
), ),
'url' => array( 'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), 'visible' => (Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'], 'label' => $lng['panel']['urloverridespath'],
'type' => 'text' 'type' => 'text'
), ),
'redirectcode' => array( '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'], 'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'], 'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select', 'type' => 'select',
'select_var' => isset($redirectcode) ? $redirectcode : null 'select_var' => isset($redirectcode) ? $redirectcode : null
), ),
'ssl_redirect' => array( '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'], 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'], 'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',

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

@@ -42,19 +42,19 @@ return array(
), ),
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value'] 'value' => $pathSelect['value']
), ),
'url' => array( 'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), 'visible' => (Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'], 'label' => $lng['panel']['urloverridespath'],
'type' => 'text', 'type' => 'text',
'value' => $urlvalue 'value' => $urlvalue
), ),
'redirectcode' => array( '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'], 'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'], 'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select', 'type' => 'select',
@@ -77,7 +77,7 @@ return array(
'value' => array($result['isemaildomain']) 'value' => array($result['isemaildomain'])
), ),
'ssl_redirect' => array( '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'], 'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'], 'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox', 'type' => 'checkbox',

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

@@ -40,14 +40,14 @@ return array(
'value' => generatePassword(), 'value' => generatePassword(),
), ),
'email_quota' => array( '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'], 'label' => $lng['emails']['quota'],
'desc' => $lng['panel']['megabyte'], 'desc' => $lng['panel']['megabyte'],
'type' => 'text', 'type' => 'text',
'value' => $quota 'value' => $quota
), ),
'alternative_email' => array( 'alternative_email' => array(
'visible' => ($settings['panel']['sendalternativemail'] == '1' ? true : false), 'visible' => (Settings::Get('panel.sendalternativemail') == '1' ? true : false),
'label' => $lng['emails']['alternative_emailaddress'], 'label' => $lng['emails']['alternative_emailaddress'],
'type' => 'text' '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>]' '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( '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'], 'label' => $lng['customer']['email_quota'],
'type' => 'label', '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>]' '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( 'fields' => array(
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value'] 'value' => $pathSelect['value']
@@ -45,13 +45,13 @@ return array(
'type' => 'text' 'type' => 'text'
), ),
'error403path' => array( 'error403path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'), 'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument403path'], 'label' => $lng['extras']['errordocument403path'],
'desc' => $lng['panel']['descriptionerrordocument'], 'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text' 'type' => 'text'
), ),
'error500path' => array( 'error500path' => array(
'visible' => ($settings['system']['webserver'] == 'apache2'), 'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument500path'], 'label' => $lng['extras']['errordocument500path'],
'desc' => $lng['panel']['descriptionerrordocument'], 'desc' => $lng['panel']['descriptionerrordocument'],
'type' => 'text' 'type' => 'text'

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

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

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

@@ -26,7 +26,7 @@ return array(
'fields' => array( 'fields' => array(
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $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', 'image' => 'icons/user_add.png',
'fields' => array( 'fields' => array(
'ftp_username' => array( 'ftp_username' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), 'visible' => (Settings::Get('customer.ftpatdomain') == '1' ? true : false),
'label' => $lng['login']['username'], 'label' => $lng['login']['username'],
'type' => 'text' 'type' => 'text'
), ),
'ftp_domain' => array( 'ftp_domain' => array(
'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false), 'visible' => (Settings::Get('customer.ftpatdomain') == '1' ? true : false),
'label' => $lng['domains']['domainname'], 'label' => $lng['domains']['domainname'],
'type' => 'select', 'type' => 'select',
'select_var' => (isset($domains) ? $domains : ""), 'select_var' => (isset($domains) ? $domains : ""),
), ),
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value'] 'value' => $pathSelect['value']

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

@@ -30,7 +30,7 @@ return array(
), ),
'path' => array( 'path' => array(
'label' => $lng['panel']['path'], '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'], 'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'], 'select_var' => $pathSelect['value'],
'value' => $pathSelect['value'] 'value' => $pathSelect['value']