Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-01-31 13:24:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #213 from Mibew/stats

Browse Source 
Make statistics compatible with the default MySQL 5.7 settings
This commit is contained in:
Fedor A. Fetisov 2017-10-27 23:23:26 +03:00 committed by GitHub
commit f9c5d4dbaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mibew/libs/statistics.php
View File

@ -52,7 +52,6 @@ function get_by_date_statistics($start, $end)
. "FROM {threadstatistics} s " . "FROM {threadstatistics} s "
. "WHERE s.date >= :start " . "WHERE s.date >= :start "
. "AND s.date < :end " . "AND s.date < :end "
. "GROUP BY DATE(FROM_UNIXTIME(date)) "
. "ORDER BY s.date DESC"), . "ORDER BY s.date DESC"),
array( array(
':start' => $start, ':start' => $start,
@ -63,8 +62,7 @@ function get_by_date_statistics($start, $end)
// Get statistics aggregated for all accessed interval // Get statistics aggregated for all accessed interval
$total = $db->query( $total = $db->query(
("SELECT DATE(FROM_UNIXTIME(date)) AS date, " ("SELECT SUM(threads) AS threads, "
. "SUM(threads) AS threads, "
. "SUM(missedthreads) AS missedthreads, " . "SUM(missedthreads) AS missedthreads, "
. "SUM(sentinvitations) AS sentinvitations, " . "SUM(sentinvitations) AS sentinvitations, "
. "SUM(acceptedinvitations) AS acceptedinvitations, " . "SUM(acceptedinvitations) AS acceptedinvitations, "
@ -116,7 +114,7 @@ function get_by_operator_statistics($start, $end)
. "WHERE s.operatorid = o.operatorid " . "WHERE s.operatorid = o.operatorid "
. "AND s.date >= :start " . "AND s.date >= :start "
. "AND s.date < :end " . "AND s.date < :end "
. "GROUP BY s.operatorid"), . "GROUP BY s.operatorid, o.vclocalename"),
array( array(
':start' => $start, ':start' => $start,
':end' => $end, ':end' => $end,