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

fix domain-formfields

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-12 18:16:54 +01:00
parent cc96aef50f
commit b8ab1edc56
2 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,61 +12,53 @@
* @author Froxlor team <team@froxlor.org> (2010-) * @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields * @package Formfields
* @version $Id: formfield.domains_add.php 112 2010-12-14 12:11:20Z d00p $ * @version $Id: formfield.domains_edit.php 130 2010-12-22 00:54:11Z d00p $
*/ */
return array( return array(
'domain_add' => array( 'domain_add' => array(
'title' => $lng['domains']['subdomain_add'], 'title' => $lng['domains']['subdomain_add'],
'image' => 'icons/add_domain.png', 'image' => 'icons/domain_add.png',
'sections' => array( 'sections' => array(
'section_a' => array( 'section_a' => array(
'title' => $lng['domains']['subdomain_add'], 'title' => $lng['domains']['subdomain_add'],
'image' => 'icons/add_domain.png', 'image' => 'icons/domain_add.png',
'fields' => array( 'fields' => array(
'domain' => array( 'domain' => array(
'label' => $lng['domains']['domainname'], 'label' => $lng['domains']['domainname'],
'type' => 'text' 'type' => 'text'
), ),
'aliasdomain' => array( 'alias' => array(
'label' => $lng['domains']['aliasdomain'], 'label' => $lng['domains']['aliasdomain'],
'type' => 'select', 'type' => 'select',
'select_var' => $aliasdomains 'select_var' => $aliasdomains
), ),
'pathedit' => array( 'path' => array(
'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
'label' => $lng['panel']['pathorurl'],
'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
'type' => 'text',
'value' => $pathSelect
),
'pathedit_dropdown' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'type' => 'text', 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
'value' => $pathSelect 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'),
'select_var' => $pathSelect
), ),
'pathedit_dropdown2' => array( 'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'], 'label' => $lng['panel']['urloverridespath'],
'type' => 'text', 'type' => 'text',
'value' => $urlvalue, 'value' => $urlvalue
'size' => 30
), ),
'apache2_customerRedirect' => array( 'redirectcode' => array(
'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false), 'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['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' => $redirectcode 'select_var' => $redirectcode
), ),
'ssl' => array( 'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
'label' => 'SSL Redirect', 'label' => 'SSL Redirect',
'type' => 'yesno', 'type' => 'yesno',
'yesno_var' => $ssl_redirect 'yesno_var' => $ssl_redirect
), ),
'openbasedir' => array( 'openbasedir_path' => array(
'label' => $lng['domain']['openbasedirpath'], 'label' => $lng['domain']['openbasedirpath'],
'type' => 'select', 'type' => 'select',
'select_var' => $openbasedir 'select_var' => $openbasedir

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

@@ -34,58 +34,50 @@ return array(
'type' => 'label', 'type' => 'label',
'value' => $domainip 'value' => $domainip
), ),
'alias_check' => array( 'alias' => array(
'visible' => ($alias_check == '0' ? true : false), 'visible' => ($alias_check == '0' ? true : false),
'label' => $lng['domains']['aliasdomain'], 'label' => $lng['domains']['aliasdomain'],
'type' => 'select', 'type' => 'select',
'select_var' => $domains 'select_var' => $domains
), ),
'pathedit' => array( 'path' => array(
'visible' => ($settings['panel']['pathedit'] != 'Dropdown' ? true : false),
'label' => $lng['panel']['pathorurl'],
'desc' => $lng['panel']['pathDescription'], // TODO was ist mit: $lng['panel']['pathDescriptionEx'] ?
'type' => 'text',
'value' => $pathSelect
),
'pathedit_dropdown' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'label' => $lng['panel']['path'], 'label' => $lng['panel']['path'],
'type' => 'text', 'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
'value' => $pathSelect 'type' => ($settings['panel']['pathedit'] != 'Dropdown' ? 'text' : 'select'),
'select_var' => $pathSelect
), ),
'pathedit_dropdown2' => array( 'url' => array(
'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false), 'visible' => ($settings['panel']['pathedit'] == 'Dropdown' ? true : false),
'label' => $lng['panel']['urloverridespath'], 'label' => $lng['panel']['urloverridespath'],
'type' => 'text', 'type' => 'text',
'value' => $urlvalue, 'value' => $urlvalue
'size' => 30
), ),
'apache2_customerRedirect' => array( 'redirectcode' => array(
'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1') ? true : false), 'visible' => (($settings['system']['webserver'] == 'apache2' && $settings['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' => $redirectcode 'select_var' => $redirectcode
), ),
'parentdomain' => array( 'iswildcarddomain' => array(
'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false), 'visible' => (($result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0') ? true : false),
'label' => $lng['domains']['wildcarddomain'], 'label' => $lng['domains']['wildcarddomain'],
'type' => 'label', 'type' => 'yesno',
'value' => $iswildcarddomain 'yesno_var' => $iswildcarddomain
), ),
'emaildomain' => array( 'isemaildomain' => array(
'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false), 'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false),
'label' => 'Emaildomain', 'label' => 'Emaildomain',
'type' => 'label', 'type' => 'yesno',
'value' => $isemaildomain 'yesno_var' => $isemaildomain
), ),
'ssl' => array( 'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? true : false), 'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
'label' => 'SSL Redirect', 'label' => 'SSL Redirect',
'type' => 'label', 'type' => 'yesno',
'value' => $ssl_redirect 'yesno_var' => $ssl_redirect
), ),
'openbasedir' => array( 'openbasedir_path' => array(
'label' => $lng['domain']['openbasedirpath'], 'label' => $lng['domain']['openbasedirpath'],
'type' => 'select', 'type' => 'select',
'select_var' => $openbasedir 'select_var' => $openbasedir