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

Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates"

Browse Source 
This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-03 23:31:19 +01:00
parent ca807583df
commit f6e519d779
10 changed files with 128 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,11 +29,6 @@ return array(
'type' => 'text',
'maxlength' => 50
),
'webserver' => array(
'label' => $lng['admin']['webserver'],
'type' => 'select',
'select_var' => $webserver_options
),
'vhostsettings' => array(
'style' => 'align-top',
'label' => $lng['admin']['vhostsettings']['vhostsettings'],

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

@@ -30,11 +30,6 @@ return array(
'maxlength' => 50,
'value' => $result['description']
),
'webserver' => array(
'label' => $lng['admin']['webserver'],
'type' => 'select',
'select_var' => $webserver_options
),
'vhostsettings' => array(
'style' => 'align-top',
'label' => $lng['admin']['vhostsettings']['vhostsettings'],