Bugfix and minor improvements

Author: beranek1

analyser.php

@@ -58,7 +58,7 @@ function country_to_continent($country) {
         $country_to_continent = array ("AD"=>"EU","AE"=>"AS","AF"=>"AS","AG"=>"NA","AI"=>"NA","AL"=>"EU","AM"=>"AS","AN"=>"NA","AO"=>"AF","AP"=>"AS","AR"=>"SA","AS"=>"OC","AT"=>"EU","AU"=>"OC","AW"=>"NA","AX"=>"EU","AZ"=>"AS","BA"=>"EU","BB"=>"NA","BD"=>"AS","BE"=>"EU","BF"=>"AF","BG"=>"EU","BH"=>"AS","BI"=>"AF","BJ"=>"AF","BL"=>"NA","BM"=>"NA","BN"=>"AS","BO"=>"SA","BR"=>"SA","BS"=>"NA","BT"=>"AS","BV"=>"AN","BW"=>"AF","BY"=>"EU","BZ"=>"NA","CA"=>"NA","CC"=>"AS","CD"=>"AF","CF"=>"AF","CG"=>"AF","CH"=>"EU","CI"=>"AF","CK"=>"OC","CL"=>"SA","CM"=>"AF","CN"=>"AS","CO"=>"SA","CR" => "NA","CU"=>"NA","CV"=>"AF","CX"=>"AS","CY"=>"AS","CZ"=>"EU","DE"=>"EU","DJ"=>"AF","DK"=>"EU","DM"=>"NA","DO"=>"NA","DZ"=>"AF","EC"=>"SA","EE"=>"EU","EG"=>"AF","EH"=>"AF","ER"=>"AF","ES"=>"EU","ET"=>"AF","EU"=>"EU","FI"=>"EU","FJ"=>"OC","FK"=>"SA","FM"=>"OC","FO"=>"EU","FR"=>"EU","FX"=>"EU","GA"=>"AF","GB"=>"EU","GD"=>"NA","GE"=>"AS","GF"=>"SA","GG"=>"EU","GH"=>"AF","GI"=>"EU","GL"=>"NA","GM"=>"AF","GN"=>"AF","GP"=>"NA","GQ"=>"AF","GR"=>"EU","GS"=>"AN","GT"=>"NA","GU"=>"OC","GW"=>"AF","GY"=>"SA","HK"=>"AS","HM"=>"AN","HN"=>"NA","HR"=>"EU","HT"=>"NA","HU"=>"EU","ID"=>"AS","IE"=>"EU","IL"=>"AS","IM"=>"EU","IN"=>"AS","IO"=>"AS","IQ"=>"AS","IR"=>"AS","IS"=>"EU","IT"=>"EU","JE"=>"EU","JM"=>"NA","JO"=>"AS","JP"=>"AS","KE"=>"AF","KG"=>"AS","KH"=>"AS","KI"=>"OC","KM"=>"AF","KN"=>"NA","KP"=>"AS","KR"=>"AS","KW"=>"AS","KY"=>"NA","KZ"=>"AS","LA"=>"AS","LB"=>"AS","LC"=>"NA","LI"=>"EU","LK"=>"AS","LR"=>"AF","LS"=>"AF","LT"=>"EU","LU"=>"EU","LV"=>"EU","LY"=>"AF","MA"=>"AF","MC"=>"EU","MD"=>"EU","ME"=>"EU","MF"=>"NA","MG"=>"AF","MH"=>"OC","MK"=>"EU","ML"=>"AF","MM"=>"AS","MN"=>"AS","MO"=>"AS","MP"=>"OC","MQ"=>"NA","MR"=>"AF","MS"=>"NA","MT"=>"EU","MU"=>"AF","MV"=>"AS","MW"=>"AF","MX"=>"NA","MY"=>"AS","MZ"=>"AF","NA"=>"AF","NC"=>"OC","NE"=>"AF","NF"=>"OC","NG"=>"AF","NI"=>"NA","NL"=>"EU","NO"=>"EU","NP"=>"AS","NR"=>"OC","NU"=>"OC","NZ"=>"OC","OM"=>"AS","PA"=>"NA","PE"=>"SA","PF"=>"OC","PG"=>"OC","PH"=>"AS","PK"=>"AS","PL"=>"EU","PM"=>"NA","PN"=>"OC","PR"=>"NA","PS"=>"AS","PT"=>"EU","PW"=>"OC","PY"=>"SA","QA"=>"AS","RE"=>"AF","RO"=>"EU","RS"=>"EU","RU"=>"EU","RW"=>"AF","SA"=>"AS","SB"=>"OC","SC"=>"AF","SD"=>"AF","SE"=>"EU","SG"=>"AS","SH"=>"AF","SI"=>"EU","SJ"=>"EU","SK"=>"EU","SL"=>"AF","SM"=>"EU","SN"=>"AF","SO"=>"AF","SR"=>"SA","ST"=>"AF","SV"=>"NA","SY"=>"AS","SZ"=>"AF","TC"=>"NA","TD"=>"AF","TF"=>"AN","TG"=>"AF","TH"=>"AS","TJ"=>"AS","TK"=>"OC","TL"=>"AS","TM"=>"AS","TN"=>"AF","TO"=>"OC","TR"=>"EU","TT"=>"NA","TV"=>"OC","TW"=>"AS","TZ"=>"AF","UA"=>"EU","UG"=>"AF","UM"=>"OC","US"=>"NA","UY"=>"SA","UZ"=>"AS","VA"=>"EU","VC"=>"NA","VE"=>"SA","VG"=>"NA","VI"=>"NA","VN"=>"AS","VU"=>"OC","WF"=>"OC","WS"=>"OC","YE"=>"AS","YT"=>"AF","ZA"=>"AF","ZM"=>"AF","ZW"=>"AF");
         return $country_to_continent[strtoupper($country)];
     }
-    function get_tops($mysql, $table, $field, $start = null, $end = null, $timefield = "created") {
+    function get_tops($mysql, $table, $field, $start = null, $end = null, $timefield = "time") {
         $tops = array();
         $rows = null;
         if($start == null && $end == null) {
@@ -73,7 +73,7 @@ function get_tops($mysql, $table, $field, $start = null, $end = null, $timefield
         }
         return $tops;
     }
-    function get_total_count($mysql, $table, $start = null, $end = null, $timefield = "created") {
+    function get_total_count($mysql, $table, $start = null, $end = null, $timefield = "time") {
         $row = null;
         if($start == null && $end == null) {
             $row = $this->get_one_row("SELECT COUNT(*) FROM ".$table.";", $mysql);
@@ -84,7 +84,7 @@ function get_total_count($mysql, $table, $start = null, $end = null, $timefield
         }
         return $row[0];
     }
-    function analyse_countries($mysql, $table, $field, $start = null, $end = null, $timefield = "created") {
+    function analyse_countries($mysql, $table, $field, $start = null, $end = null, $timefield = "time") {
         $total_countries = 0;
         $rows = null;
         if($start == null && $end == null) {
@@ -129,12 +129,12 @@ function analyse_time($mysql, $time = null) {
             }
         }
         $total_requests = $this->get_total_count($mysql, "requests", $start, $end);
-        $total_visitors = $this->get_total_count($mysql, "visitors", $start, $end);
+        $total_visitors = $this->get_total_count($mysql, "browsers", $start, $end);
         $total_isps = $this->get_total_count($mysql, "isps", $start, $end);
         $total_networks = $this->get_total_count($mysql, "networks", $start, $end);
-        $total_useragents = $this->get_total_count($mysql, "useragents", $start, $end);
+        $total_useragents = $this->get_total_count($mysql, "agents", $start, $end);
         $top_requests = $this->analyse_countries($mysql, "requests", "visitor_country", $start, $end);
-        $top_visitors = $this->analyse_countries($mysql, "uniquebrowsers", "country", $start, $end);
+        $top_visitors = $this->analyse_countries($mysql, "browsers", "country", $start, $end);
         $top_requests["uris"] = $this->get_tops($mysql, "requests", "uri", $start, $end);
         $timespan = array("total_requests" => $total_requests, "total_visitors" => $total_visitors, "total_isps" => $total_isps, "total_networks" => $total_networks, "total_useragents" => $total_useragents, "top_requests" => $top_requests, "top_visitors" => $top_visitors);
         return $timespan;