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

fix group by clause to be be compliant with mysql 5.7

Browse Source
This commit is contained in:
FliegenKLATSCH
2016-04-30 17:24:11 +02:00
committed by FliegenKLATSCH
parent 9799e05ce4
commit 97d035eee9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customer_domains.php
View File

@@ -730,7 +730,7 @@ if ($page == 'overview') {
AND `dip`.`id_ipandports` AND `dip`.`id_ipandports`
IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."` IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."`
WHERE `id_domain` = :id) WHERE `id_domain` = :id)
GROUP BY `d`.`domain` GROUP BY `d`.`id`, `d`.`domain`
ORDER BY `d`.`domain` ASC" ORDER BY `d`.`domain` ASC"
); );
Database::pexecute($domains_stmt, array("id" => $result['id'], "customerid" => $userinfo['customerid'])); Database::pexecute($domains_stmt, array("id" => $result['id'], "customerid" => $userinfo['customerid']));

3
customer_traffic.php
View File

@@ -115,8 +115,7 @@ if (!is_null($month) && !is_null($year)) {
$result_stmt = Database::prepare("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail $result_stmt = Database::prepare("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
FROM `" . TABLE_PANEL_TRAFFIC . "` FROM `" . TABLE_PANEL_TRAFFIC . "`
WHERE `customerid` = :customerid WHERE `customerid` = :customerid
GROUP BY CONCAT(`year`,`month`) GROUP BY `year` DESC, `month` DESC
ORDER BY CONCAT(`year`,`month`) DESC
LIMIT 12" LIMIT 12"
); );
Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'])); Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));