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

Marked a few fields in admin->domain as mandatory, refs #645

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-03-26 21:24:12 +01:00
parent 3775892bc2
commit f25d1cbb9e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,18 +26,21 @@ return array(
'fields' => array( 'fields' => array(
'domain' => array( 'domain' => array(
'label' => 'Domain', 'label' => 'Domain',
'type' => 'text' 'type' => 'text',
'mandatory' => true,
), ),
'customerid' => array( 'customerid' => array(
'label' => $lng['admin']['customer'], 'label' => $lng['admin']['customer'],
'type' => 'select', 'type' => 'select',
'select_var' => $customers 'select_var' => $customers,
'mandatory' => true,
), ),
'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' => 'select', 'type' => 'select',
'select_var' => $admins 'select_var' => $admins,
'mandatory' => true,
), ),
'alias' => array( 'alias' => array(
'label' => $lng['domains']['aliasdomain'], 'label' => $lng['domains']['aliasdomain'],
@@ -83,6 +86,7 @@ return array(
'label' => 'IP/Port', 'label' => 'IP/Port',
'type' => 'select', 'type' => 'select',
'select_var' => $ipsandports, 'select_var' => $ipsandports,
'mandatory' => true,
), ),
'ssl' => array( 'ssl' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),

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

@@ -27,20 +27,23 @@ return array(
'domain' => array( 'domain' => array(
'label' => 'Domain', 'label' => 'Domain',
'type' => 'label', 'type' => 'label',
'value' => $result['domain'] 'value' => $result['domain'],
'mandatory' => true,
), ),
'customerid' => array( 'customerid' => array(
'label' => $lng['admin']['customer'], 'label' => $lng['admin']['customer'],
'type' => ($settings['panel']['allow_domain_change_customer'] == '1' ? 'select' : 'label'), 'type' => ($settings['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,
), ),
'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['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,
), ),
'alias' => array( 'alias' => array(
'visible' => ($alias_check == '0' ? true : false), 'visible' => ($alias_check == '0' ? true : false),
@@ -94,6 +97,7 @@ return array(
'label' => 'IP/Port', 'label' => 'IP/Port',
'type' => 'select', 'type' => 'select',
'select_var' => $ipsandports, 'select_var' => $ipsandports,
'mandatory' => true,
), ),
'ssl' => array( 'ssl' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),