From b974f84e757888aab13c357aeb0dbe3b6ed0baf0 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Wed, 30 Sep 2020 08:29:15 +0200 Subject: [PATCH] - fixed server id and type limit on interface (from !1230) --- interface/web/admin/directive_snippets_del.php | 8 ++++---- interface/web/admin/directive_snippets_edit.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/web/admin/directive_snippets_del.php b/interface/web/admin/directive_snippets_del.php index fd56b39eb7..91dae44155 100644 --- a/interface/web/admin/directive_snippets_del.php +++ b/interface/web/admin/directive_snippets_del.php @@ -49,19 +49,19 @@ $app->load("tform_actions"); class page_action extends tform_actions { function onBeforeDelete() { - global $app, $conf; + global $app; if($this->dataRecord['type'] === 'php') { $rlike = $this->dataRecord['directive_snippets_id'].'|,'.$this->dataRecord['directive_snippets_id'].'|'.$this->dataRecord['directive_snippets_id'].','; - $affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ? AND type = ?', $rlike, 'apache'); + $affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ?', $rlike); if(is_array($affected_snippets) && !empty($affected_snippets)) { foreach($affected_snippets as $snippet) { $sql_in[] = $snippet['directive_snippets_id']; } - $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id IN ?', $conf['server_id'], $sql_in); + $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id IN ?', $sql_in); } } elseif($this->dataRecord['type'] === 'apache' || $this->dataRecord['type'] === 'nginx') { - $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id = ?', $conf['server_id'], $this->dataRecord['directive_snippets_id']); + $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id = ?', $this->dataRecord['directive_snippets_id']); } if(!empty($affected_sites)) { diff --git a/interface/web/admin/directive_snippets_edit.php b/interface/web/admin/directive_snippets_edit.php index 0ea7141273..14a2807f49 100644 --- a/interface/web/admin/directive_snippets_edit.php +++ b/interface/web/admin/directive_snippets_edit.php @@ -50,19 +50,19 @@ $app->uses('tpl,tform,tform_actions'); class page_action extends tform_actions { private function getAffectedSites() { - global $app, $conf; + global $app; if($this->dataRecord['type'] === 'php') { $rlike = $this->dataRecord['id'].'|,'.$this->dataRecord['id'].'|'.$this->dataRecord['id'].','; - $affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ? AND type = ?', $rlike, 'apache'); + $affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ?', $rlike); if(is_array($affected_snippets) && !empty($affected_snippets)) { foreach($affected_snippets as $snippet) { $sql_in[] = $snippet['directive_snippets_id']; } - $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id IN ?', $conf['server_id'], $sql_in); + $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id IN ?', $sql_in); } } elseif($this->dataRecord['type'] === 'apache' || $this->dataRecord['type'] === 'nginx') { - $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id = ?', $conf['server_id'], $this->dataRecord['id']); + $affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id = ?', $this->dataRecord['id']); } return $affected_sites; -- GitLab