diff --git a/data.php b/data.php index ebfeeed7..1082a254 100644 --- a/data.php +++ b/data.php @@ -1,11 +1,11 @@ -format('Y-m-d\TH:i:s'), @@ -148,10 +148,10 @@ $domain, hasHostName($client), $status, - )); + )); } - - + + } return $allQueries; } @@ -164,11 +164,11 @@ $NGC4889 = fopen($gravity, "r"); while ($stars = fread($NGC4889, 1024000)) { $swallowed += substr_count($stars, "\n"); - } + } fclose($NGC4889); - + return $swallowed; - + } function readInLog() { global $log; @@ -226,7 +226,7 @@ function alignTimeArrays(&$times1, &$times2) { $max = max(array(max(array_keys($times1)), max(array_keys($times2)))); $min = min(array(min(array_keys($times1)), min(array_keys($times2)))); - + for ($i = $min; $i <= $max; $i++) { if (!isset($times2[$i])) { $times2[$i] = 0; @@ -258,7 +258,7 @@ function findQueriesAll($var) { return strpos($var, ": query[") || strpos($var, "gravity.list") || strpos($var, ": forwarded") !== false; } - + function findQueries($var) { return strpos($var, ": query[") !== false; } @@ -274,15 +274,15 @@ function findForwards($var) { return strpos($var, ": forwarded") !== false; } - + function hasHostName($var){ global $hosts; foreach ($hosts as $host){ - $x = explode("\t", $host); + $x = preg_split('/\s+/', $host); if ( $var == $x[0] ){ $var = $x[1] . "($var)"; } } return $var; } -?> \ No newline at end of file +?>