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

7
admin_domains.php
View File

@@ -1017,8 +1017,7 @@ if ($page == 'domains'
// vhost configs
$vhostconfigs = '';
$configsvhost = Database::prepare("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `webserver` = :webserver ORDER BY description ASC");
Database::pexecute($configsvhost, array('webserver' => Settings::Get('system.webserver')));
$configsvhost = Database::query("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` ORDER BY description ASC");
$vhostconfigs.= makeoption($lng['admin']['vhostsettings']['novhostsettings'], 0);
while ($row = $configsvhost->fetch(PDO::FETCH_ASSOC)) {
@@ -2011,9 +2010,7 @@ if ($page == 'domains'
// vhost configs
$vhostconfigs = '';
$vhostconfigs_result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `webserver` = :webserver ORDER BY description ASC");
Database::pexecute($vhostconfigs_result_stmt, array('webserver' => Settings::Get('system.webserver')));
$vhostconfigs_result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` ORDER BY description ASC");
$vhostconfigs .= makeoption($lng['admin']['vhostsettings']['novhostsettings'], 0);
while ($vhostconfig_row = $vhostconfigs_result_stmt->fetch(PDO::FETCH_ASSOC)) {
$vhostconfigs .= makeoption($vhostconfig_row['description'], $vhostconfig_row['id'], $result['vhostsettingid'], true, true);