Index: stattraq/wp-stattraq/reporter/options.php =================================================================== --- stattraq/wp-stattraq/reporter/options.php (revision 603) +++ stattraq/wp-stattraq/reporter/options.php (working copy) @@ -1,5 +1,10 @@ -\n"; $i = 1; foreach ($rows as $key => $row) { -$str = $row[2]; +$str = $row->dd; $year = $row->year; $month = $row->month; $day = $row->day; Index: stattraq/wp-stattraq/access_detail.php =================================================================== --- stattraq/wp-stattraq/access_detail.php (revision 603) +++ stattraq/wp-stattraq/access_detail.php (working copy) @@ -1,6 +1,16 @@ Access Detail
Access Time:
-
access_time;?>
+
access_time;?>
IP Address:
-
ip_address;?> - whois
+
ip_address;?> + whois
URL:
-
url;?>
+
url;?>
Article ID:
-
article_id;?>
+
article_id;?>
User Agent:
-
user_agent;?>
+
user_agent;?>
Browser:
-
browser;?>
+
browser;?>
Referrer:
-
referrer;?>
+
referrer;?>
Close Index: stattraq/wp-stattraq/index.php =================================================================== --- stattraq/wp-stattraq/index.php (revision 603) +++ stattraq/wp-stattraq/index.php (working copy) @@ -3,11 +3,15 @@ timer_start(); require_once('utils.php'); $options = loadOptions(); -if($options['options_defaults_disable_login'] != false) +if($options['disable_login'] == false) { - require_once('../wp-admin/auth.php'); + if(file_exists('../wp-admin/auth.php')) { + require_once('../wp-admin/auth.php'); + } else { + require_once(ABSPATH . '/wp-admin/admin-functions.php'); + auth_redirect(); + } } - $year = (int)getVar('year',date("Y")); $month = (int)getVar('month',date("m")); $day = (int)getVar('day',date("d")); Index: stattraq/wp-content/plugins/stattraq.php =================================================================== --- stattraq/wp-content/plugins/stattraq.php (revision 603) +++ stattraq/wp-content/plugins/stattraq.php (working copy) @@ -17,32 +17,45 @@ $tablestattraq = $table_prefix . 'stattraq'; $table_stattraq_options = $table_prefix . 'stattraq_options'; function stat_traq_event($passed_param){ -global $doing_rss, $p, $tablestattraq, $wpdb, $browser_type; -$wpdb->hide_errors(); -$s_id = session_id(); -// need to get the real article_id or type of server request (RSS, RDF, ATOM, Ping, etc) -if(!isset($article_id)){ -if (($p != '')){ - $p = intval($p); - $article_id = $p; -}else if(isset($doing_rss) && $doing_rss == 1){ - $article_id = "Feed"; -}else{ - $article_id = 0; // default/mixed page - not just for one article -} -} -if(!isset($s_id)){$s_id = session_id();} + global $wp_query, $doing_rss, $p, $tablestattraq, $wpdb, $browser_type,$posts; -$ipAddress = statTraqGetIPAddress(); -$urlRequested = $_SERVER['PHP_SELF'] . (isset($_SERVER['QUERY_STRING']) ? "?".$_SERVER['QUERY_STRING'] : '' ); -$browser = statTraqGetBrowser(); -$referrer = (isset($_SERVER['HTTP_REFERER']) ? "'" . $_SERVER['HTTP_REFERER'] . "'" :"NULL"); -$userAgent = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "NULL"); -$search_phrase = statTraqGetSearchPhrase($referrer); -if (!strstr($_SERVER['PHP_SELF'], 'wp-admin') && !strstr($_SERVER['PHP_SELF'], 'wp-stattraq')) - $wpdb->query("INSERT INTO $tablestattraq (session_id, access_time, ip_address, url, article_id, referrer, user_agent, browser, user_agent_type, search_phrase) values ('".$s_id."', NOW(), '$ipAddress','$urlRequested', '$article_id', $referrer,'$userAgent','$browser', $browser_type, " . ($search_phrase==null?"NULL" : "'$search_phrase'") . ")"); -$wpdb->show_errors(); -return $passed_param; + $wpdb->hide_errors(); + $s_id = session_id(); + // need to get the real article_id or type of server request (RSS, RDF, ATOM, Ping, etc) + if(!isset($article_id)) { + if (($p != '')){ + $p = intval($p); + $article_id = $p; + } else if(isset($doing_rss) && $doing_rss == 1) { + $article_id = "Feed"; +/* } elseif (isset($wp_query) == true) { + $article_id = $wp_query->get_queried_object_id(); + } else { +*/ + } elseif (isset($wp_query) == true) { + if($wp_query->is_page == true || $wp_query->is_single == true ) + $article_id = $wp_query->get_queried_object_id(); + else + $article_id = 0; + } else { + $article_id = 0; // default/mixed page - not just for one article + } + } + if(!isset($s_id)){ + $s_id = session_id(); + } + + $ipAddress = statTraqGetIPAddress(); + $urlRequested = $_SERVER['PHP_SELF'] . (isset($_SERVER['QUERY_STRING']) ? "?".$_SERVER['QUERY_STRING'] : '' ); + $browser = statTraqGetBrowser(); + $referrer = (isset($_SERVER['HTTP_REFERER']) ? "'" . $_SERVER['HTTP_REFERER'] . "'" :"NULL"); + $userAgent = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "NULL"); + $search_phrase = statTraqGetSearchPhrase($referrer); + if (!strstr($urlRequested, 'wp-admin') && !strstr($urlRequested, 'wp-stattraq') && !strstr($urlRequested, 'favicon.ico')) { + $wpdb->query("INSERT INTO $tablestattraq (session_id, access_time, ip_address, url, article_id, referrer, user_agent, browser, user_agent_type, search_phrase) values ('".$s_id."', NOW(), '$ipAddress','$urlRequested', '$article_id', $referrer,'$userAgent','$browser', $browser_type, " . ($search_phrase==null?"NULL" : "'$search_phrase'") . ")"); + } + $wpdb->show_errors(); + return $passed_param; } function statTraqGetBrowser() @@ -349,4 +362,4 @@ } // add the call to the API request add_action('shutdown', 'stat_traq_event'); -?> \ No newline at end of file +?>