From 54e6f422ceb9b621b8cd405265e7ce3743c5fa15 Mon Sep 17 00:00:00 2001 From: msquare Date: Mon, 22 Aug 2016 19:11:09 +0200 Subject: [PATCH] cleanup guest stats --- includes/pages/guest_stats.php | 37 +++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/includes/pages/guest_stats.php b/includes/pages/guest_stats.php index da5a6301..aec2d7d4 100644 --- a/includes/pages/guest_stats.php +++ b/includes/pages/guest_stats.php @@ -2,29 +2,34 @@ function guest_stats() { global $api_key; - - if(isset($_REQUEST['api_key'])) { - if($_REQUEST['api_key'] == $api_key) { + + if (isset($_REQUEST['api_key'])) { + if ($_REQUEST['api_key'] == $api_key) { $stats = array(); - + list($user_count) = sql_select("SELECT count(*) as `user_count` FROM `User`"); $stats['user_count'] = $user_count['user_count']; - + list($arrived_user_count) = sql_select("SELECT count(*) as `user_count` FROM `User` WHERE `Gekommen`=1"); $stats['arrived_user_count'] = $arrived_user_count['user_count']; - + $done_shifts_seconds = sql_select_single_cell("SELECT SUM(`Shifts`.`end` - `Shifts`.`start`) FROM `ShiftEntry` JOIN `Shifts` USING (`SID`) WHERE `Shifts`.`end` < UNIX_TIMESTAMP()"); - $stats['done_work_hours'] = round($done_shifts_seconds / (60*60), 0); - - $users_in_action_source = sql_select("SELECT `Shifts`.`start`, `Shifts`.`end` FROM `ShiftEntry` JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID` WHERE UNIX_TIMESTAMP() BETWEEN `Shifts`.`start` AND `Shifts`.`end`"); - $stats['users_in_action'] = count($users_in_action_source); - + $stats['done_work_hours'] = round($done_shifts_seconds / (60 * 60), 0); + + $users_in_action = sql_select("SELECT `Shifts`.`start`, `Shifts`.`end` FROM `ShiftEntry` JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID` WHERE UNIX_TIMESTAMP() BETWEEN `Shifts`.`start` AND `Shifts`.`end`"); + $stats['users_in_action'] = count($users_in_action); + header("Content-Type: application/json"); - die(json_encode($stats)); - } else die(json_encode(array('error' => "Wrong api_key."))); - } else die(json_encode(array('error' => "Missing parameter api_key."))); - + raw_output(json_encode($stats)); + return; + } + raw_output(json_encode([ + 'error' => "Wrong api_key." + ])); + } + raw_output(json_encode([ + 'error' => "Missing parameter api_key." + ])); } - ?>