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

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

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-08 08:54:44 +01:00
parent fb8b233560
commit fa5f1900f0
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/classes/database/class.Database.php
View File

@@ -251,6 +251,7 @@ class Database {
$sl_file = makeCorrectFile($sl_dir."/sql-error.log"); $sl_file = makeCorrectFile($sl_dir."/sql-error.log");
$sqllog = @fopen($sl_file, 'a'); $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())." --- ".str_replace("\n", " ", $error->getMessage())."\n");
@fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error->getTraceAsString()."\n");
@fclose($sqllog); @fclose($sqllog);
if ($showerror) { if ($showerror) {

2
lib/classes/phpinterface/class.phpinterface_fcgid.php
View File

@@ -254,7 +254,7 @@ class phpinterface_fcgid {
$adminid = intval($adminid); $adminid = intval($adminid);
if (!isset($this->_admin_cache[$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" SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :id"
); );
$this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid)); $this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid));

2
lib/classes/phpinterface/class.phpinterface_fpm.php
View File

@@ -348,7 +348,7 @@ class phpinterface_fpm {
$adminid = intval($adminid); $adminid = intval($adminid);
if (!isset($this->_admin_cache[$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" SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :id"
); );
$this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid)); $this->_admin_cache[$adminid] = Database::pexecute_first($stmt, array('id' => $adminid));

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

@@ -787,7 +787,6 @@ class apache
*/ */
public function createVirtualHosts() 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`, $query = "SELECT `d`.*, `pd`.`domain` AS `parentdomain`, `c`.`loginname`,
`d`.`phpsettingid`, `c`.`adminid`, `c`.`guid`, `c`.`email`, `d`.`phpsettingid`, `c`.`adminid`, `c`.`guid`, `c`.`email`,
`c`.`documentroot` AS `customerroot`, `c`.`deactivated`, `c`.`documentroot` AS `customerroot`, `c`.`deactivated`,
@@ -809,7 +808,7 @@ class apache
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$result_domains = $this->db->query($query); $result_domains = $this->db->query($query);

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

@@ -324,7 +324,7 @@ class lighttpd
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$included_vhosts = array(); $included_vhosts = array();

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

@@ -284,7 +284,7 @@ class nginx
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$result_domains = $this->db->query($query); $result_domains = $this->db->query($query);