From fa5f1900f04ea28dcb0cb68ca77901e5bb743a07 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 8 Nov 2013 08:54:44 +0100 Subject: [PATCH] add trace to database error-log-message (it just helps a lot finding the error); fixed queries in fpm und fcgid class; minor cosmetic changes Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/database/class.Database.php | 1 + lib/classes/phpinterface/class.phpinterface_fcgid.php | 2 +- lib/classes/phpinterface/class.phpinterface_fpm.php | 2 +- scripts/jobs/cron_tasks.inc.http.10.apache.php | 3 +-- scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 2 +- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php index 8af62a3b..7adc2094 100644 --- a/lib/classes/database/class.Database.php +++ b/lib/classes/database/class.Database.php @@ -251,6 +251,7 @@ class Database { $sl_file = makeCorrectFile($sl_dir."/sql-error.log"); $sqllog = @fopen($sl_file, 'a'); @fwrite($sqllog, date('d.m.Y H:i', time())." --- ".str_replace("\n", " ", $error->getMessage())."\n"); + @fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error->getTraceAsString()."\n"); @fclose($sqllog); if ($showerror) { diff --git a/lib/classes/phpinterface/class.phpinterface_fcgid.php b/lib/classes/phpinterface/class.phpinterface_fcgid.php index aedd20b1..8b998561 100644 --- a/lib/classes/phpinterface/class.phpinterface_fcgid.php +++ b/lib/classes/phpinterface/class.phpinterface_fcgid.php @@ -254,7 +254,7 @@ class phpinterface_fcgid { $adminid = intval($adminid); if (!isset($this->_admin_cache[$adminid])) { - $stmt = Database::prepare("TABLE_PANEL_ADMINS + $stmt = Database::prepare(" SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :id" ); $this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid)); diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php index a458a03a..5f22fe0d 100644 --- a/lib/classes/phpinterface/class.phpinterface_fpm.php +++ b/lib/classes/phpinterface/class.phpinterface_fpm.php @@ -348,7 +348,7 @@ class phpinterface_fpm { $adminid = intval($adminid); if (!isset($this->_admin_cache[$adminid])) { - $stmt = Database::prepare("TABLE_PANEL_ADMINS + $stmt = Database::prepare(" SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :id" ); $this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid)); diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index f4afc5fe..1cc75e08 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -787,7 +787,6 @@ class apache */ public function createVirtualHosts() { - //$result_domains = $this->db->query("SELECT `d`.*, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `d`.`phpsettingid`, `c`.`adminid`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot`, `c`.`deactivated`, `c`.`phpenabled` AS `phpenabled`, `d`.`mod_fcgid_starter`, `d`.`mod_fcgid_maxrequests` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) " . "LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) " . "WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` <> 1 ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC"); $query = "SELECT `d`.*, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `d`.`phpsettingid`, `c`.`adminid`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot`, `c`.`deactivated`, @@ -809,7 +808,7 @@ class apache GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` <> '1' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $result_domains = $this->db->query($query); diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index a5c9dc9a..27c0af10 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -324,7 +324,7 @@ class lighttpd GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` <> '1' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $included_vhosts = array(); diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 10187b1b..c6e0467b 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -284,7 +284,7 @@ class nginx GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` <> '1' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $result_domains = $this->db->query($query);