From 4fc02e6c9311b0a637fbb1752df43b952b57e235 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 6 Mar 2011 16:49:22 +0100 Subject: [PATCH] fix inline-if-statements to show specific fields only if necessary, refs #633 Signed-off-by: Michael Kaufmann (d00p) --- lib/formfields/admin/admin/formfield.admin_add.php | 10 +++++----- lib/formfields/admin/admin/formfield.admin_edit.php | 10 +++++----- .../admin/customer/formfield.customer_add.php | 8 ++++---- .../admin/customer/formfield.customer_edit.php | 8 ++++---- .../customer/email/formfield.emails_addaccount.php | 4 ++-- .../customer/ticket/formfield.ticket_add.php | 12 ++++++------ 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php index a35b25c4..e486c1f9 100644 --- a/lib/formfields/admin/admin/formfield.admin_add.php +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -155,7 +155,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['system']['mail_quota_enabled'], + 'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'mandatory' => true, 'ul_field' => $email_quota_ul ), @@ -164,7 +164,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['autoresponder']['autoresponder_active'], + 'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false), 'ul_field' => $email_autoresponder_ul ), 'ftps' => array( @@ -179,7 +179,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['ticket']['enabled'], + 'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'ul_field' => $tickets_ul ), 'mysqls' => array( @@ -194,14 +194,14 @@ return array( 'label' => $lng['aps']['canmanagepackages'], 'type' => 'yesno', 'yesno_var' => $can_manage_aps_packages, - 'visible' => $settings['aps']['aps_active'] + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false) ), 'number_of_aps_packages' => array( 'label' => $lng['aps']['numberofapspackages'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['aps']['aps_active'], + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false), 'ul_field' => $number_of_aps_packages_ul ) ) diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php index e23598b7..c68d7b60 100644 --- a/lib/formfields/admin/admin/formfield.admin_edit.php +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -165,7 +165,7 @@ return array( 'type' => 'textul', 'value' => $result['email_quota'], 'maxlength' => 9, - 'visible' => $settings['system']['mail_quota_enabled'], + 'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'mandatory' => true, 'ul_field' => $email_quota_ul ), @@ -174,7 +174,7 @@ return array( 'type' => 'textul', 'value' => $result['email_autoresponder'], 'maxlength' => 9, - 'visible' => $settings['autoresponder']['autoresponder_active'], + 'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false), 'ul_field' => $email_autoresponder_ul ), 'ftps' => array( @@ -189,7 +189,7 @@ return array( 'type' => 'textul', 'value' => $result['tickets'], 'maxlength' => 9, - 'visible' => $settings['ticket']['enabled'], + 'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'ul_field' => $tickets_ul ), 'mysqls' => array( @@ -204,14 +204,14 @@ return array( 'label' => $lng['aps']['canmanagepackages'], 'type' => 'yesno', 'yesno_var' => $can_manage_aps_packages, - 'visible' => $settings['aps']['aps_active'] + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false) ), 'number_of_aps_packages' => array( 'label' => $lng['aps']['numberofapspackages'], 'type' => 'textul', 'value' => $result['aps_packages'], 'maxlength' => 9, - 'visible' => $settings['aps']['aps_active'], + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false), 'ul_field' => $number_of_aps_packages_ul ) ) diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php index 6c7e30bc..f0e680ae 100644 --- a/lib/formfields/admin/customer/formfield.customer_add.php +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -161,7 +161,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['system']['mail_quota_enabled'], + 'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'mandatory' => true, 'ul_field' => $email_quota_ul ), @@ -170,7 +170,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['autoresponder']['autoresponder_active'], + 'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false), 'ul_field' => $email_autoresponder_ul ), 'email_imap' => array( @@ -197,7 +197,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['ticket']['enabled'], + 'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'ul_field' => $tickets_ul ), 'mysqls' => array( @@ -223,7 +223,7 @@ return array( 'type' => 'textul', 'value' => 0, 'maxlength' => 9, - 'visible' => $settings['aps']['aps_active'], + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false), 'ul_field' => $number_of_aps_packages_ul ) ) diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php index 9d23da52..78afc4f6 100644 --- a/lib/formfields/admin/customer/formfield.customer_edit.php +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -172,7 +172,7 @@ return array( 'type' => 'textul', 'value' => $result['email_quota'], 'maxlength' => 9, - 'visible' => $settings['system']['mail_quota_enabled'], + 'visible' => ($settings['system']['mail_quota_enabled'] == '1' ? true : false), 'mandatory' => true, 'ul_field' => $email_quota_ul ), @@ -181,7 +181,7 @@ return array( 'type' => 'textul', 'value' => $result['email_autoresponder'], 'maxlength' => 9, - 'visible' => $settings['autoresponder']['autoresponder_active'], + 'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false), 'ul_field' => $email_autoresponder_ul ), 'email_imap' => array( @@ -208,7 +208,7 @@ return array( 'type' => 'textul', 'value' => $result['tickets'], 'maxlength' => 9, - 'visible' => $settings['ticket']['enabled'], + 'visible' => ($settings['ticket']['enabled'] == '1' ? true : false), 'ul_field' => $tickets_ul ), 'mysqls' => array( @@ -234,7 +234,7 @@ return array( 'type' => 'textul', 'value' => $result['aps_packages'], 'maxlength' => 9, - 'visible' => $settings['aps']['aps_active'], + 'visible' => ($settings['aps']['aps_active'] == '1' ? true : false), 'ul_field' => $number_of_aps_packages_ul ) ) diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php index 895b682e..48b1ea1c 100644 --- a/lib/formfields/customer/email/formfield.emails_addaccount.php +++ b/lib/formfields/customer/email/formfield.emails_addaccount.php @@ -34,14 +34,14 @@ return array( 'type' => 'password' ), 'email_quota' => array( - 'visible' => $settings['system']['mail_quota_enabled'], + 'visible' => ($settings['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'], + 'visible' => ($settings['panel']['sendalternativemail'] == '1' ? true : false), 'label' => $lng['emails']['alternative_emailaddress'], 'type' => 'text' ) diff --git a/lib/formfields/customer/ticket/formfield.ticket_add.php b/lib/formfields/customer/ticket/formfield.ticket_add.php index be86b2da..fb12b60b 100644 --- a/lib/formfields/customer/ticket/formfield.ticket_add.php +++ b/lib/formfields/customer/ticket/formfield.ticket_add.php @@ -17,12 +17,12 @@ return array( 'ticket_add' => array( 'title' => $lng['ticket']['ticket_new'], - 'image' => 'icons/ticket_add.png', - 'sections' => array( - 'section_a' => array( - 'title' => $lng['ticket']['ticket_new'], - 'image' => 'icons/ticket_add.png', - 'fields' => array( + 'image' => 'icons/ticket_add.png', + 'sections' => array( + 'section_a' => array( + 'title' => $lng['ticket']['ticket_new'], + 'image' => 'icons/ticket_add.png', + 'fields' => array( 'subject' => array( 'label' => $lng['ticket']['subject'], 'type' => 'text',