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

Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a"

Browse Source 
This reverts commit 4f2ee129fd, reversing
changes made to f284d67843.
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-03 23:38:02 +01:00
parent 130d3e7b16
commit f9d949f90c
19 changed files with 35 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,22 +150,6 @@ return array(
),
'value' => array()
),
'vhost_usedefaultlocation' => array(
'visible' => (Settings::Get('system.webserver') == 'nginx' ? true : false),
'label' => $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'],
'desc' => $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array('1')
),
'vhostsettingid' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
'label' => $lng['admin']['vhostsettings']['vhostsettings'],
'type' => 'select',
'select_var' => $vhostconfigs
),
'specialsettings' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
'style' => 'align-top',

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

@@ -84,7 +84,7 @@ return array(
'value' => $result['registration_date'],
'size' => 10
),
'termination_date' => array(
'termination_date' => array(
'label' => $lng['domains']['termination_date'],
'desc' => $lng['panel']['dateformat'],
'type' => 'text',
@@ -162,22 +162,6 @@ return array(
),
'value' => array($result['speciallogfile'])
),
'vhost_usedefaultlocation' => array(
'visible' => (Settings::Get('system.webserver') == 'nginx' ? true : false),
'label' => $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'],
'desc' => $lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array($result['vhost_usedefaultlocation'])
),
'vhostsettingid' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
'label' => $lng['admin']['vhostsettings']['vhostsettings'],
'type' => 'select',
'select_var' => $vhostconfigs
),
'specialsettings' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
'style' => 'align-top',

43
lib/formfields/admin/vhostconfig/formfield.vhostconfig_add.php
View File

@@ -1,43 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2016 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
*
*/
return array(
'vhostconfig_add' => array(
'title' => $lng['admin']['vhostsettings']['addsettings'],
'image' => 'icons/vhostsettings_add.png',
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['vhostsettings']['addnew'],
'image' => 'icons/vhostsettings_add.png',
'fields' => array(
'description' => array(
'label' => $lng['admin']['phpsettings']['description'],
'type' => 'text',
'maxlength' => 50
),
'vhostsettings' => array(
'style' => 'align-top',
'label' => $lng['admin']['vhostsettings']['vhostsettings'],
'type' => 'textarea',
'cols' => 100,
'rows' => 30
)
)
)
)
)
);

45
lib/formfields/admin/vhostconfig/formfield.vhostconfig_edit.php
View File

@@ -1,45 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2016 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
*
*/
return array(
'vhostconfig_edit' => array(
'title' => $lng['admin']['vhostsettings']['editsettings'],
'image' => 'icons/vhostsettings_edit.png',
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['vhostsettings']['editsettings'],
'image' => 'icons/vhostsettings_edit.png',
'fields' => array(
'description' => array(
'label' => $lng['admin']['phpsettings']['description'],
'type' => 'text',
'maxlength' => 50,
'value' => $result['description']
),
'vhostsettings' => array(
'style' => 'align-top',
'label' => $lng['admin']['vhostsettings']['vhostsettings'],
'type' => 'textarea',
'cols' => 100,
'rows' => 30,
'value' => $result['vhostsettings']
)
)
)
)
)
);