diff --git a/dragon_fire.code-workspace b/dragon_fire.code-workspace index 265fc75..f870583 100644 --- a/dragon_fire.code-workspace +++ b/dragon_fire.code-workspace @@ -12,8 +12,7 @@ "search", "templates", "css", - "database", - "analytics" + "database" ] } } \ No newline at end of file diff --git a/www/src/db_handler/analytics_interface.php b/www/src/db_handler/analytics_interface.php index 473c1e6..6ec9f67 100644 --- a/www/src/db_handler/analytics_interface.php +++ b/www/src/db_handler/analytics_interface.php @@ -8,7 +8,7 @@ interface AnalyticsInterface { public function log_path_access( $path, $agent, - $referrer, $runtime, $status = 200); + $referrer, $runtime); public function log_path_errcode( $path, diff --git a/www/src/db_handler/mysql_analytics_handler.php b/www/src/db_handler/mysql_analytics_handler.php index 2906e59..d6b1eb1 100644 --- a/www/src/db_handler/mysql_analytics_handler.php +++ b/www/src/db_handler/mysql_analytics_handler.php @@ -72,7 +72,7 @@ class MySQLAnalyticsHandler $path, $agent, $referrer, - $time, $status = 200) { + $time) { if(strlen($path) == 0) { $path = '/'; @@ -83,7 +83,6 @@ class MySQLAnalyticsHandler 'path' => $path, 'agent' => $agent, 'referrer' => $referrer, - 'status' => $status ], 'access_sum'); $this->increment_counter([ diff --git a/www/src/serve/post.php b/www/src/serve/post.php index 84c10a5..46ef71c 100644 --- a/www/src/serve/post.php +++ b/www/src/serve/post.php @@ -107,8 +107,6 @@ if($REQUEST_PATH == '/search/') { $post = $adapter->get_post($REQUEST_PATH); if(!isset($post)) { - $analytics_return_status = 404; - $error_page = $SITE_CONFIG['site_defaults']; $error_page['path'] = '/404'; $error_page['title'] = '404 oh no'; diff --git a/www/src/setup/analytics.php b/www/src/setup/analytics.php index edeb50e..e045c68 100644 --- a/www/src/setup/analytics.php +++ b/www/src/setup/analytics.php @@ -5,25 +5,6 @@ $data_time_start = microtime(true); $analytics_enable_tail = false; $analytics_post = null; -$analytics_return_status = 200; - -$analytics_known_bogus_requests = [ - '/\.(git|env|aws|xmlrpc|well-known|svn)/', - '/^\/wp-/', - '/^\/ID3/', - '/^\/config/', - '/^\/web\.config/', - '/^\/storage/', - '/^\/web\/config\.php/', - '/^\/phpinfo\.php/', - '/^\/swagger\.json/', - '/^\/package\.json/', - '/^\/info\.php/', - '/^\/db\.ini/', - '/^\/administrator/' -]; -$analytics_request_is_bogus = null; - function deduce_user_agent() { $real_agent=$_SERVER['HTTP_USER_AGENT']; @@ -38,27 +19,6 @@ function deduce_user_agent() { } } -function analytics_is_bogus_request() { - global $analytics_request_is_bogus; - global $analytics_known_bogus_requests; - - global $REQUEST_PATH; - - if(isset($analytics_request_is_bogus)) { - return $analytics_request_is_bogus; - } - - foreach($analytics_known_bogus_requests AS $bogus_check) { - if(preg_match($bogus_check, $REQUEST_PATH)) { - $analytics_request_is_bogus = true; - return true; - } - } - - $analytics_request_is_bogus = false; - return false; -} - function analytics_is_user() { return preg_match('/^user/', deduce_user_agent()); } @@ -74,8 +34,6 @@ register_shutdown_function(function() { global $analytics_enable_tail; - global $analytics_return_status; - $data_time_end = microtime(true); $http_referer = 'magic'; @@ -87,14 +45,10 @@ register_shutdown_function(function() { $compute_time = $data_time_end - $data_time_start; - if(analytics_is_bogus_request()) { - $analytics_return_status = 'bogus'; - } - $analytics_adapter->log_path_access($REQUEST_PATH, deduce_user_agent(), $referrer, - $compute_time, $analytics_return_status); + $compute_time); if($analytics_enable_tail) { echo "";