From 1730088ab1423afee0216a7e030e7823b6a88f39 Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Sat, 26 Mar 2011 23:09:29 +0100 Subject: [PATCH] Replaced yes/no selection with checkboxes, refs #645 @2h0m Finished all for admin pages. admin_
.php files need to be cleaned. --- .../admin/admin/formfield.admin_add.php | 35 ++++++--- .../admin/admin/formfield.admin_edit.php | 42 +++++++--- .../cronjobs/formfield.cronjobs_edit.php | 7 +- .../admin/customer/formfield.customer_add.php | 48 ++++++++---- .../customer/formfield.customer_edit.php | 42 +++++++--- .../admin/domains/formfield.domains_add.php | 77 +++++++++++++------ .../admin/domains/formfield.domains_edit.php | 77 +++++++++++++------ .../ipsandports/formfield.ipsandports_add.php | 35 ++++++--- .../formfield.ipsandports_edit.php | 35 ++++++--- 9 files changed, 284 insertions(+), 114 deletions(-) diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php index e486c1f9..465fcb69 100644 --- a/lib/formfields/admin/admin/formfield.admin_add.php +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -68,8 +68,11 @@ return array( ), 'change_serversettings' => array( 'label' => $lng['admin']['change_serversettings'], - 'type' => 'yesno', - 'yesno_var' => $change_serversettings, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'customers' => array( 'label' => $lng['admin']['customers'], @@ -81,8 +84,11 @@ return array( ), 'customers_see_all' => array( 'label' => $lng['admin']['customers_see_all'], - 'type' => 'yesno', - 'yesno_var' => $customers_see_all, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'domains' => array( 'label' => $lng['admin']['domains'], @@ -94,13 +100,19 @@ return array( ), 'domains_see_all' => array( 'label' => $lng['admin']['domains_see_all'], - 'type' => 'yesno', - 'yesno_var' => $domains_see_all, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'caneditphpsettings' => array( 'label' => $lng['admin']['caneditphpsettings'], - 'type' => 'yesno', - 'yesno_var' => $caneditphpsettings, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'diskspace' => array( 'label' => $lng['customer']['diskspace'], @@ -192,8 +204,11 @@ return array( ), 'can_manage_aps_packages' => array( 'label' => $lng['aps']['canmanagepackages'], - 'type' => 'yesno', - 'yesno_var' => $can_manage_aps_packages, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array(), 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false) ), 'number_of_aps_packages' => array( diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php index c68d7b60..68e706d1 100644 --- a/lib/formfields/admin/admin/formfield.admin_edit.php +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -31,8 +31,11 @@ return array( ), 'deactivated' => array( 'label' => $lng['admin']['deactivated_user'], - 'type' => 'yesno', - 'yesno_var' => $deactivated, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']), 'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true) ), 'admin_password' => array( @@ -78,8 +81,11 @@ return array( ), 'change_serversettings' => array( 'label' => $lng['admin']['change_serversettings'], - 'type' => 'yesno', - 'yesno_var' => $change_serversettings, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['change_serversettings']) ), 'customers' => array( 'label' => $lng['admin']['customers'], @@ -91,8 +97,11 @@ return array( ), 'customers_see_all' => array( 'label' => $lng['admin']['customers_see_all'], - 'type' => 'yesno', - 'yesno_var' => $customers_see_all, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['customers_see_all']) ), 'domains' => array( 'label' => $lng['admin']['domains'], @@ -104,13 +113,19 @@ return array( ), 'domains_see_all' => array( 'label' => $lng['admin']['domains_see_all'], - 'type' => 'yesno', - 'yesno_var' => $domains_see_all, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['domains_see_all']) ), 'caneditphpsettings' => array( 'label' => $lng['admin']['caneditphpsettings'], - 'type' => 'yesno', - 'yesno_var' => $caneditphpsettings, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['caneditphpsettings']) ), 'diskspace' => array( 'label' => $lng['customer']['diskspace'], @@ -202,8 +217,11 @@ return array( ), 'can_manage_aps_packages' => array( 'label' => $lng['aps']['canmanagepackages'], - 'type' => 'yesno', - 'yesno_var' => $can_manage_aps_packages, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['can_manage_aps_packages']), 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false) ), 'number_of_aps_packages' => array( diff --git a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php index c121e55a..2137ec07 100644 --- a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php +++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php @@ -31,8 +31,11 @@ return array( ), 'isactive' => array( 'label' => $lng['admin']['activated'], - 'type' => 'yesno', - 'yesno_var' => $isactive + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['isactive']) ), 'interval_value' => array( 'label' => $lng['cronjob']['cronjobintervalv'], diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php index f0e680ae..1b15f760 100644 --- a/lib/formfields/admin/customer/formfield.customer_add.php +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -30,13 +30,19 @@ return array( ), 'createstdsubdomain' => array( 'label' => $lng['admin']['stdsubdomain_add'].'?', - 'type' => 'yesno', - 'yesno_var' => $createstdsubdomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'store_defaultindex' => array( 'label' => $lng['admin']['store_defaultindex'].'?', - 'type' => 'yesno', - 'yesno_var' => $store_defaultindex + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'new_customer_password' => array( 'label' => $lng['login']['password'], @@ -44,8 +50,11 @@ return array( ), 'sendpassword' => array( 'label' => $lng['admin']['sendpassword'], - 'type' => 'yesno', - 'yesno_var' => $sendpassword + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'def_language' => array( 'label' => $lng['login']['language'], @@ -175,14 +184,20 @@ return array( ), 'email_imap' => array( 'label' => $lng['customer']['email_imap'], - 'type' => 'yesno', - 'yesno_var' => $email_imap, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), 'mandatory' => true ), 'email_pop3' => array( 'label' => $lng['customer']['email_pop3'], - 'type' => 'yesno', - 'yesno_var' => $email_pop3, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1'), 'mandatory' => true ), 'ftps' => array( @@ -210,13 +225,18 @@ return array( ), 'phpenabled' => array( 'label' => $lng['admin']['phpenabled'].'?', - 'type' => 'yesno', - 'yesno_var' => $phpenabled + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'perlenabled' => array( 'label' => $lng['admin']['perlenabled'].'?', - 'type' => 'yesno', - 'yesno_var' => $perlenabled + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ) ), 'number_of_aps_packages' => array( 'label' => $lng['aps']['numberofapspackages'], diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php index 78afc4f6..6edd0bfb 100644 --- a/lib/formfields/admin/customer/formfield.customer_edit.php +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -36,13 +36,19 @@ return array( ), 'createstdsubdomain' => array( 'label' => $lng['admin']['stdsubdomain_add'].'?', - 'type' => 'yesno', - 'yesno_var' => $createstdsubdomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array(($result['standardsubdomain'] != '0') ? '1' : '0') ), 'deactivated' => array( 'label' => $lng['admin']['deactivated_user'], - 'type' => 'yesno', - 'yesno_var' => $deactivated + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['deactivated']) ), 'new_customer_password' => array( 'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')', @@ -186,14 +192,20 @@ return array( ), 'email_imap' => array( 'label' => $lng['customer']['email_imap'], - 'type' => 'yesno', - 'yesno_var' => $email_imap, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['imap']), 'mandatory' => true ), 'email_pop3' => array( 'label' => $lng['customer']['email_pop3'], - 'type' => 'yesno', - 'yesno_var' => $email_pop3, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['pop3']), 'mandatory' => true ), 'ftps' => array( @@ -221,13 +233,19 @@ return array( ), 'phpenabled' => array( 'label' => $lng['admin']['phpenabled'].'?', - 'type' => 'yesno', - 'yesno_var' => $phpenabled + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['phpenabled']) ), 'perlenabled' => array( 'label' => $lng['admin']['perlenabled'].'?', - 'type' => 'yesno', - 'yesno_var' => $perlenabled + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['perlenabled']) ), 'number_of_aps_packages' => array( 'label' => $lng['aps']['numberofapspackages'], diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index 0aed7855..401f28e3 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -55,8 +55,11 @@ return array( ), 'caneditdomain' => array( 'label' => $lng['admin']['domain_edit'], - 'type' => 'yesno', - 'yesno_var' => $caneditdomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'add_date' => array( 'label' => $lng['domains']['add_date'], @@ -91,14 +94,20 @@ return array( 'ssl' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL', - 'type' => 'yesno', - 'yesno_var' => $ssl + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'ssl_redirect' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL Redirect', - 'type' => 'yesno', - 'yesno_var' => $ssl_redirect + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'ssl_ipandport' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), @@ -114,13 +123,19 @@ return array( ), 'wwwserveralias' => array( 'label' => $lng['admin']['wwwserveralias'], - 'type' => 'yesno', - 'yesno_var' => $wwwserveralias + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'speciallogfile' => array( 'label' => 'Speciallogfile', - 'type' => 'yesno', - 'yesno_var' => $speciallogfile + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'specialsettings' => array( 'visible' => ($userinfo['change_serversettings'] == '1' ? true : false), @@ -140,13 +155,19 @@ return array( 'fields' => array( 'openbasedir' => array( 'label' => 'OpenBasedir', - 'type' => 'yesno', - 'yesno_var' => $openbasedir + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'safemode' => array( 'label' => 'Safemode', - 'type' => 'yesno', - 'yesno_var' => $safemode + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'phpsettingid' => array( 'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), @@ -173,8 +194,11 @@ return array( 'fields' => array( 'isbinddomain' => array( 'label' => 'Nameserver', - 'type' => 'yesno', - 'yesno_var' => $isbinddomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'zonefile' => array( 'label' => 'Zonefile', @@ -189,13 +213,19 @@ return array( 'fields' => array( 'isemaildomain' => array( 'label' => $lng['admin']['emaildomain'], - 'type' => 'yesno', - 'yesno_var' => $isemaildomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'email_only' => array( 'label' => $lng['admin']['email_only'], - 'type' => 'yesno', - 'yesno_var' => $email_only + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'subcanemaildomain' => array( 'label' => $lng['admin']['subdomainforemail'], @@ -205,8 +235,11 @@ return array( 'dkim' => array( 'visible' => ($settings['dkim']['use_dkim'] == '1' ? true : false), 'label' => 'DomainKeys', - 'type' => 'yesno', - 'yesno_var' => $dkim + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ) ) ) diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 4af4e27b..6d2ddc20 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -64,8 +64,11 @@ return array( ), 'caneditdomain' => array( 'label' => $lng['admin']['domain_edit'], - 'type' => 'yesno', - 'yesno_var' => $caneditdomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['caneditdomain']) ), 'add_date' => array( 'label' => $lng['domains']['add_date'], @@ -102,14 +105,20 @@ return array( 'ssl' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL', - 'type' => 'yesno', - 'yesno_var' => $ssl + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['ssl']) ), 'ssl_redirect' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'label' => 'SSL Redirect', - 'type' => 'yesno', - 'yesno_var' => $ssl_redirect + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['ssl_redirect']) ), 'ssl_ipandport' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), @@ -125,8 +134,11 @@ return array( ), 'wwwserveralias' => array( 'label' => $lng['admin']['wwwserveralias'], - 'type' => 'yesno', - 'yesno_var' => $wwwserveralias + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['wwwserveralias']) ), 'speciallogfile' => array( 'label' => 'Speciallogfile', @@ -147,8 +159,11 @@ return array( 'visible' => ($userinfo['change_serversettings'] == '1' ? true : false), 'label' => $lng['admin']['specialsettingsforsubdomains'], 'desc' => $lng['serversettings']['specialsettingsforsubdomains']['description'], - 'type' => 'yesno', - 'yesno_var' => $specialsettingsforsubdomains + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ) ) ), @@ -159,13 +174,19 @@ return array( 'fields' => array( 'openbasedir' => array( 'label' => 'OpenBasedir', - 'type' => 'yesno', - 'yesno_var' => $openbasedir + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['openbasedir']) ), 'safemode' => array( 'label' => 'Safemode', - 'type' => 'yesno', - 'yesno_var' => $safemode + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['safemode']) ), 'phpsettingid' => array( 'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false), @@ -194,8 +215,11 @@ return array( 'fields' => array( 'isbinddomain' => array( 'label' => 'Nameserver', - 'type' => 'yesno', - 'yesno_var' => $isbinddomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['isbinddomain']) ), 'zonefile' => array( 'label' => 'Zonefile', @@ -211,13 +235,19 @@ return array( 'fields' => array( 'isemaildomain' => array( 'label' => $lng['admin']['emaildomain'], - 'type' => 'yesno', - 'yesno_var' => $isemaildomain + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['isemaildomain']) ), 'email_only' => array( 'label' => $lng['admin']['email_only'], - 'type' => 'yesno', - 'yesno_var' => $email_only + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['email_only']) ), 'subcanemaildomain' => array( 'label' => $lng['admin']['subdomainforemail'], @@ -227,8 +257,11 @@ return array( 'dkim' => array( 'visible' => ($settings['dkim']['use_dkim'] == '1' ? true : false), 'label' => 'DomainKeys', - 'type' => 'yesno', - 'yesno_var' => $dkim + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['dkim']) ) ) ) diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php index 1af03726..580f383c 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -41,18 +41,27 @@ return array( 'fields' => array( 'listen_statement' => array( 'label' => $lng['admin']['ipsandports']['create_listen_statement'], - 'type' => 'yesno', - 'yesno_var' => $listen_statement + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'namevirtualhost_statement' => array( 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], - 'type' => 'yesno', - 'yesno_var' => $namevirtualhost_statement, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'vhostcontainer' => array( 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], - 'type' => 'yesno', - 'yesno_var' => $vhostcontainer + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ), 'docroot' => array( 'label' => $lng['admin']['ipsandports']['docroot']['title'], @@ -69,8 +78,11 @@ return array( ), 'vhostcontainer_servername_statement' => array( 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], - 'type' => 'yesno', - 'yesno_var' => $vhostcontainer_servername_statement + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array('1') ) ) ), @@ -95,8 +107,11 @@ return array( 'fields' => array( 'ssl' => array( 'label' => $lng['admin']['ipsandports']['enable_ssl'], - 'type' => 'yesno', - 'yesno_var' => $enable_ssl + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array() ), 'ssl_cert_file' => array( 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php index 05b54339..0f9a2ff6 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -43,18 +43,27 @@ return array( 'fields' => array( 'listen_statement' => array( 'label' => $lng['admin']['ipsandports']['create_listen_statement'], - 'type' => 'yesno', - 'yesno_var' => $listen_statement + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['listen_statement']) ), 'namevirtualhost_statement' => array( 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], - 'type' => 'yesno', - 'yesno_var' => $namevirtualhost_statement, + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['namevirtualhost_statement']) ), 'vhostcontainer' => array( 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], - 'type' => 'yesno', - 'yesno_var' => $vhostcontainer + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer']) ), 'docroot' => array( 'label' => $lng['admin']['ipsandports']['docroot']['title'], @@ -73,8 +82,11 @@ return array( ), 'vhostcontainer_servername_statement' => array( 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], - 'type' => 'yesno', - 'yesno_var' => $vhostcontainer_servername_statement + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['vhostcontainer_servername_statement']) ) ) ), @@ -100,8 +112,11 @@ return array( 'fields' => array( 'ssl' => array( 'label' => $lng['admin']['ipsandports']['enable_ssl'], - 'type' => 'yesno', - 'yesno_var' => $enable_ssl + 'type' => 'checkbox', + 'values' => array( + array ('label' => $lng['panel']['yes'], 'value' => '1') + ), + 'value' => array($result['ssl']) ), 'ssl_cert_file' => array( 'label' => $lng['admin']['ipsandports']['ssl_cert_file'],