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);

111
admin_vhostsettings.php
View File

@@ -28,14 +28,14 @@ if (isset($_POST['id'])) {
}
if ($page == 'overview') {
$supported_webservers = [ 'apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx' ];
if ($action == '') {
$tablecontent = '';
$count = 0;
$result = Database::query("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` ORDER BY description ASC");
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$domainresult = false;
$query_params = array('id' => $row['id']);
$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
@@ -76,36 +76,47 @@ if ($page == 'overview') {
$domains = $lng['admin']['phpsettings']['notused'];
}
$webserver = str_replace(array_keys($supported_webservers), array_values($supported_webservers), $row['webserver']);
// check whether this is our default config
if ((Settings::Get('system.mod_fcgid') == '1'
&& Settings::Get('system.mod_fcgid_defaultini') == $row['id'])
|| (Settings::Get('phpfpm.enabled') == '1'
&& Settings::Get('phpfpm.defaultini') == $row['id'])
) {
$row['description'] = '<b>'.$row['description'].'</b>';
}
$count++;
eval("\$tablecontent.=\"" . getTemplate("vhostconfig/overview_overview") . "\";");
}
eval("echo \"" . getTemplate("vhostconfig/overview") . "\";");
} else if ($action == 'add') {
if ((int)$userinfo['change_serversettings'] != 1) {
standard_error('nopermissionsorinvalidid');
}
if (isset($_POST['send']) && $_POST['send'] == 'send') {
if ($action == 'add') {
if ((int)$userinfo['change_serversettings'] == 1) {
if (isset($_POST['send'])
&& $_POST['send'] == 'send'
) {
$description = validate($_POST['description'], 'description');
$vhostsettings = validate(trim(str_replace("\r\n", "\n", $_POST['vhostsettings'])), 'vhostsettings', '/^[^\0]*$/');
$webserver = validate($_POST['webserver'], 'webserver', '/^(' . implode("|", array_keys($supported_webservers)) . ')$/');
if (strlen($description) == 0 || strlen($description) > 50) {
if (strlen($description) == 0
|| strlen($description) > 50
) {
standard_error('descriptioninvalid');
}
$ins_stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_VHOSTCONFIGS . "` SET
`description` = :description,
`vhostsettings` = :vhostsettings,
`webserver` = :webserver
");
$ins_data = array('description' => $description, 'vhostsettings' => $vhostsettings, 'webserver' => $webserver);
`description` = :desc,
`vhostsettings` = :vhostsettings"
);
$ins_data = array(
'desc' => $description,
'vhostsettings' => $vhostsettings
);
Database::pexecute($ins_stmt, $ins_data);
inserttask('1');
@@ -113,10 +124,9 @@ if ($page == 'overview') {
redirectTo($filename, array('page' => $page, 's' => $s));
} else {
$webserver_options = '';
while (list($webserver, $webserver_friendlyName) = each($supported_webservers)) {
$webserver_options .= makeoption($webserver_friendlyName, $webserver, Settings::Get('system.webserver'), true);
}
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `id` = 1");
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
$vhostconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/vhostconfig/formfield.vhostconfig_add.php';
$vhostconfig_add_form = htmlform::genHTMLForm($vhostconfig_add_data);
@@ -126,22 +136,30 @@ if ($page == 'overview') {
eval("echo \"" . getTemplate("vhostconfig/overview_add") . "\";");
}
} else if ($action == 'delete') {
} else {
standard_error('nopermissionsorinvalidid');
}
}
if ($action == 'delete') {
$result_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `id` = :id"
);
$result = Database::pexecute_first($result_stmt, array('id' => $id));
if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1) {
if (isset($_POST['send']) && $_POST['send'] == 'send') {
// Remove a reference to this template from all domains using it
$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
`vhostsettingid` = 0 WHERE `vhostsettingid` = :id"
);
Database::pexecute($upd_stmt, array('id' => $id));
if ($result['id'] != 0
&& $result['id'] == $id
&& (int)$userinfo['change_serversettings'] == 1
) {
$del_stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `id` = :id");
if (isset($_POST['send'])
&& $_POST['send'] == 'send'
) {
$del_stmt = Database::prepare("
DELETE FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `id` = :id"
);
Database::pexecute($del_stmt, array('id' => $id));
inserttask('1');
@@ -154,31 +172,43 @@ if ($page == 'overview') {
} else {
standard_error('nopermissionsorinvalidid');
}
} else if ($action == 'edit') {
}
if ($action == 'edit') {
$result_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_VHOSTCONFIGS . "` WHERE `id` = :id"
);
$result = Database::pexecute_first($result_stmt, array('id' => $id));
if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1) {
if (isset($_POST['send']) && $_POST['send'] == 'send') {
if ($result['id'] != 0
&& $result['id'] == $id
&& (int)$userinfo['change_serversettings'] == 1
) {
if (isset($_POST['send'])
&& $_POST['send'] == 'send'
) {
$description = validate($_POST['description'], 'description');
$vhostsettings = validate(trim(str_replace("\r\n", "\n", $_POST['vhostsettings'])), 'vhostsettings', '/^[^\0]*$/');
$webserver = validate($_POST['webserver'], 'webserver', '/^(' . implode("|", array_keys($supported_webservers)) . ')$/');
if (strlen($description) == 0 || strlen($description) > 50) {
if (strlen($description) == 0
|| strlen($description) > 50
) {
standard_error('descriptioninvalid');
}
$upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_VHOSTCONFIGS . "` SET
`description` = :description,
`vhostsettings` = :vhostsettings,
`webserver` = :webserver
`description` = :desc,
`vhostsettings` = :vhostsettings
WHERE `id` = :id"
);
$upd_data = array('description' => $description, 'vhostsettings' => $vhostsettings, 'webserver' => $webserver, 'id' => $id);
$upd_data = array(
'desc' => $description,
'vhostsettings' => $vhostsettings,
'id' => $id
);
Database::pexecute($upd_stmt, $upd_data);
inserttask('1');
@@ -186,10 +216,6 @@ if ($page == 'overview') {
redirectTo($filename, array('page' => $page, 's' => $s));
} else {
$webserver_options = '';
while (list($webserver, $webserver_friendlyName) = each($supported_webservers)) {
$webserver_options .= makeoption($webserver_friendlyName, $webserver, $result['webserver'], true);
}
$vhostconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/vhostconfig/formfield.vhostconfig_edit.php';
$vhostconfig_edit_form = htmlform::genHTMLForm($vhostconfig_edit_data);
@@ -199,6 +225,7 @@ if ($page == 'overview') {
eval("echo \"" . getTemplate("vhostconfig/overview_edit") . "\";");
}
} else {
standard_error('nopermissionsorinvalidid');
}

1
install/froxlor.sql
View File

@@ -858,6 +858,5 @@ CREATE TABLE IF NOT EXISTS `panel_vhostconfigs` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`description` varchar(50) NOT NULL,
`vhostsettings` text NOT NULL,
`webserver` varchar(255) NOT NULL default '',
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

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'],

5
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -868,11 +868,9 @@ class apache extends HttpConfigBase {
// check if vhost config template is set and if so, merge it
if ($domain['vhostsettingid'] != 0) {
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . "
WHERE `webserver` = 'apache2' AND `id` = :id LIMIT 1;");
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . " WHERE `id` = :id LIMIT 1;");
$vhostconfig = Database::pexecute_first($vhostsettings_stmt, array('id' => $domain['vhostsettingid']));
if (is_array($vhostconfig)) {
$vhost_content .= $this->processSpecialConfigTemplate(
$vhostconfig['vhostsettings'],
$domain,
@@ -880,7 +878,6 @@ class apache extends HttpConfigBase {
$domain['port'],
$ssl_vhost) . "\n";
}
}
if ($domain['specialsettings'] != '') {
$vhost_content .= $this->processSpecialConfigTemplate(

5
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -457,11 +457,9 @@ class lighttpd extends HttpConfigBase {
// check if vhost config template is set and if so, merge it
if ($domain['vhostsettingid'] != 0) {
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . "
WHERE `webserver` = 'lighttpd' AND `id` = :id LIMIT 1;");
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . " WHERE `id` = :id LIMIT 1;");
$vhostconfig = Database::pexecute_first($vhostsettings_stmt, array('id' => $domain['vhostsettingid']));
if (is_array($vhostconfig)) {
$vhost_content .= $this->processSpecialConfigTemplate(
$vhostconfig['vhostsettings'],
$domain,
@@ -469,7 +467,6 @@ class lighttpd extends HttpConfigBase {
$domain['port'],
$ssl_vhost) . "\n";
}
}
if ($domain['specialsettings'] != "") {
$vhost_content.= $this->processSpecialConfigTemplate(

5
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -446,11 +446,9 @@ class nginx extends HttpConfigBase {
// check if vhost config template is set and if so, merge it
if ($domain['vhostsettingid'] != 0) {
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . "
WHERE `webserver` = 'nginx' AND `id` = :id LIMIT 1;");
$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . " WHERE `id` = :id LIMIT 1;");
$vhostconfig = Database::pexecute_first($vhostsettings_stmt, array('id' => $domain['vhostsettingid']));
if (is_array($vhostconfig)) {
// replace {SOCKET} var with unix socket
$php = new phpinterface($domain);
$vhostconfig['vhostsettings'] = str_replace("{SOCKET}", $php->getInterface()->getSocketFile(), $vhostconfig['vhostsettings']);
@@ -463,7 +461,6 @@ class nginx extends HttpConfigBase {
$ssl_vhost
));
}
}
if ($domain['specialsettings'] != "") {
$vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate(

1
templates/Sparkle/admin/vhostconfig/overview.tpl vendored
View File

@@ -19,7 +19,6 @@ $header
<tr>
<th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activedomains']}</th>
<th>{$lng['admin']['webserver']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>

1
templates/Sparkle/admin/vhostconfig/overview_overview.tpl vendored
View File

@@ -1,7 +1,6 @@
<tr class="top">
<td><strong>{$row['description']}</strong></td>
<td>{$domains}</td>
<td>{$webserver}</td>
<td>
<a href="{$linker->getLink(array('section' => 'vhostsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />