Changeset 141

Timestamp:

06/12/08 09:04:03 (5 months ago)

Author:

root

Message:

testing major release 1.6

Location:

trunk

Files:

• lib/main.php (modified) (6 diffs)
• readme.txt (modified) (1 diff)
• wassup.php (modified) (35 diffs)

trunk/lib/main.php

@@ -286 +286 @@
         function check_os($useragent) {
 
-                        $os = "N/A"; $version = "N/A";
+                        $os = "N/A"; $version = "";
 
                         if (preg_match("/Windows NT 5.1/",$useragent,$match)) {
-                                $os = "Windows"; $version = "XP";
+                                $os = "WinXP"; $version = "";
                         } elseif (preg_match("/Windows NT 5.2/",$useragent,$match)) {
-                                $os = "Windows"; $version = "Server 2003";
+                                $os = "Win2003"; $version = "";
                         } elseif (preg_match("/Windows NT 6.0/",$useragent,$match)) {
-                                $os = "Windows"; $version = "Vista";
+                                $os = "WinVista"; $version = "";
                         } elseif (preg_match("/(?:Windows NT 5.0|Windows 2000)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "2000";
+                                $os = "Win2000"; $version = "";
                         } elseif (preg_match("/Windows ME/",$useragent,$match)) {
-                                $os = "Windows"; $version = "ME";
+                                $os = "WinME"; $version = "";
                         } elseif (preg_match("/(?:WinNT|Windows\s?NT)\s?([0-9\.]+)?/",$useragent,$match)) {
-                                $os = "Windows"; $version = "NT ".$match[1];
+                                $os = "WinNT"; $version = $match[1];
                         } elseif (preg_match("/Mac OS X/",$useragent,$match)) {
-                                $os = "Mac OS"; $version = "X";
+                                $os = "MacOSX"; $version = "";
                         } elseif (preg_match("/(Mac_PowerPC|Macintosh)/",$useragent,$match)) {
-                                $os = "Mac OS"; $version = "";
+                                $os = "MacPPC"; $version = "";
                         } elseif (preg_match("/(?:Windows95|Windows 95|Win95|Win 95)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "95";
+                                $os = "Win95"; $version = "";
                         } elseif (preg_match("/(?:Windows98|Windows 98|Win98|Win 98|Win 9x)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "98";
+                                $os = "Win98"; $version = "";
                         } elseif (preg_match("/(?:WindowsCE|Windows CE|WinCE|Win CE)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "CE";
+                                $os = "WinCE"; $version = "";
                         } elseif (preg_match("/PalmOS/",$useragent,$match)) {
                                 $os = "PalmOS";
@@ -342 +342 @@
                 function check_browser($useragent) {
 
-                        $browser = "N/A";
+                        $browser = "";
 
                         if (preg_match("/^Mozilla(?:.*)compatible;\sMSIE\s(?:.*)Opera\s([0-9\.]+)/",$useragent,$match)) {
@@ -353 +353 @@
                                 $browser = "iCab";
                         } elseif (preg_match("/^Mozilla(?:.*)compatible;\sMSIE\s([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "MSIE";
+                                $browser = "IE";
                         } elseif (preg_match("/^(?:.*)compatible;\sMSIE\s([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "MSIE";
+                                $browser = "IE";
                         } elseif (preg_match("/^Mozilla(?:.*)(?:.*)Safari/",$useragent,$match)) {
                                 $browser = "Safari";
@@ -366 +366 @@
                         } elseif (preg_match("/^Mozilla(?:.*)\(compatible;\sOmniWeb\/([0-9\.v-]+)/",$useragent,$match)) {
                                 $browser = "Omniweb";
+                        } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Camino|Chimera)\/([0-9\.]+)/",$useragent,$match)) {
+                                $browser = "Camino";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)Netscape\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "Netscape";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Fire(?:fox|bird)|Phoenix)\/([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "Mozilla Firefox";
+                                $browser = "Firefox";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)Minefield\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "Minefield";
@@ -378 +380 @@
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)K-Meleon\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "K-Meleon";
-                        } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Camino|Chimera)\/([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "Camino";
                         } elseif (preg_match("/^Mozilla(?:.*)rv:([0-9\.]+)\)\sGecko/",$useragent,$match)) {
                                 $browser = "Mozilla";
@@ -422 +422 @@
                         }
 
-                        $version = $match[1];
+                        //$version = $match[1];
+                        //restrict version to major and minor version #'s
+                        preg_match("/^\d+(\.\d+)?/",$match[1],$majorvers);
+                        $version = $majorvers[0];
 
                         $this->browser = $browser;

trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.2
 Tested up to: 2.5 - 2.3.2 - 2.3.1 - 2.3 - 2.2
-Stable tag: 1.5.2
+Stable tag: 1.6
 
 Wordpress plugin to analyze your visitors traffic with real time stats, chart and a lot of chronological informations. It has sidebar Widget support to show current online visitors and other statistics.

trunk/wassup.php

@@ -4 +4 @@
 Plugin URI: http://www.wpwp.org
 Description: Wordpress plugin to analyze your visitors traffic with real time stats, chart and a lot of chronological informations. It has sidebar Widget support to show current online visitors and other statistics.
-Version: 1.5.2
+Version: 1.6
 Author: Michele Marcucci
 Author URI: http://www.michelem.org/
@@ -17 +17 @@
         die('Permission Denied! You are not allowed to call this page directly.');
 }
-$version = "1.5.2";
+$version = "1.6";
 define('WASSUPFOLDER', dirname(plugin_basename(__FILE__)), TRUE);
 require_once(dirname(__FILE__).'/lib/wassup.class.php');
@@ -165 +165 @@
 //#   -Load jquery AJAX library and dependent javascripts for admin menus
 //#   -Load language/localization files for admin menus and widget
-//#   -Set 'wassup' ## General hooks
+//#   -Set 'wassup' cookie for new visitor hits
 function wassup_init() {
         global $wpurl;
@@ -550 +550 @@
                 $to_date = wassup_get_time();
                 $from_date = strtotime('-3 minutes', $to_date);
-                $currenttot = $wpdb->get_var("SELECT COUNT(DISTINCT wassup_id) as currenttot FROM $table_tmp_name WHERE timestamp BETWEEN $from_date AND $to_date");
+                $currenttot = $wpdb->get_var("SELECT COUNT(DISTINCT wassup_id) as currenttot FROM $table_tmp_name WHERE `timestamp` BETWEEN $from_date AND $to_date");
                 $currenttot = $currenttot+0;    //set to integer
                 print "<p class='legend'>".__("Visitors online", "wassup").": <strong>".$currenttot."</strong></p><br />";
                 if ($currenttot > 0) {
-                        $qryC = $wpdb->get_results("SELECT id, wassup_id, max(timestamp) as max_timestamp, ip, hostname, searchengine, urlrequested, agent, referrer, spider, username, comment_author FROM $table_tmp_name WHERE timestamp BETWEEN $from_date AND $to_date GROUP BY ip ORDER BY max_timestamp DESC");
+                        $qryC = $wpdb->get_results("SELECT id, wassup_id, max(timestamp) as max_timestamp, ip, hostname, searchengine, urlrequested, agent, referrer, spider, username, comment_author FROM $table_tmp_name WHERE `timestamp` BETWEEN $from_date AND $to_date GROUP BY ip ORDER BY max_timestamp DESC");
                 foreach ($qryC as $cv) {
                 //$timestamp = $cv->max_timestamp;      //redundant
                 $timed = gmdate("H:i:s", $cv->max_timestamp);
-                $ip = @explode(",", $cv->ip);
+                $ip_proxy = strpos($cv->ip,",");
+                //if proxy, get 2nd ip...
+                if ($ip_proxy !== false) {
+                        $ip = substr($cv->ip,(int)$ip_proxy+1);
+                } else { 
+                        $ip = $cv->ip;
+                }
                 if ($cv->referrer != '') {
                         if (!eregi($wpurl, $cv->referrer) OR $cv->searchengine != "") { 
@@ -575 +581 @@
         ?>
                         <div class="sum">
-                        <span class="sum-box"><?php if ($numurl >= 2) { ?><a  href="#" class="showhide" id="<?php echo $cv->id ?>"><?php print $ip[0]; ?></a><?php } else { ?><?php print $ip[0]; ?><?php } ?></span>
+                        <span class="sum-box"><?php if ($numurl >= 2) { ?><a  href="#" class="showhide" id="<?php echo $cv->id ?>"><?php print $ip; ?></a><?php } else { ?><?php print $ip; ?><?php } ?></span>
                         <div class="sum-det"><span class="det1">
                         <?php
@@ -604 +610 @@
                         <ul class="url">
         <?php 
-                        $qryCD = $wpdb->get_results("SELECT timestamp, urlrequested FROM $table_tmp_name WHERE wassup_id='".$cv->wassup_id."' ORDER BY timestamp ASC");
+                        $qryCD = $wpdb->get_results("SELECT `timestamp`, urlrequested FROM $table_tmp_name WHERE wassup_id='".$cv->wassup_id."' ORDER BY `timestamp` ASC");
                         $i=0;
                         foreach ($qryCD as $cd) {       
@@ -758 +764 @@
                 //#   -Helene D. 3/4/08.
                 if (!empty($_GET['deleteMARKED']) && $wassup_options->wmark == "1" ) {
-                        $rec_deleted = $wpdb->get_var("SELECT COUNT(ip) as deleted FROM $table_name WHERE ip='".urlencode(attribute_escape($_GET['dip']))."' AND timestamp BETWEEN $from_date AND $to_date");
+                        $rec_deleted = $wpdb->get_var("SELECT COUNT(ip) as deleted FROM $table_name WHERE ip='".urlencode(attribute_escape($_GET['dip']))."' AND `timestamp` BETWEEN $from_date AND $to_date");
                         if (method_exists($wpdb,'prepare')) {
-                                $wpdb->query($wpdb->prepare("DELETE FROM $table_name WHERE ip='%s' AND timestamp BETWEEN %s AND %s", urlencode(attribute_escape($_GET['dip'])), $from_date, $to_date));
+                                $wpdb->query($wpdb->prepare("DELETE FROM $table_name WHERE ip='%s' AND `timestamp` BETWEEN %s AND %s", urlencode(attribute_escape($_GET['dip'])), $from_date, $to_date));
                         } else {
-                                $wpdb->query("DELETE FROM $table_name WHERE ip='".urlencode(attribute_escape($_GET['dip']))."' AND timestamp BETWEEN $from_date AND $to_date");
+                                $wpdb->query("DELETE FROM $table_name WHERE ip='".urlencode(attribute_escape($_GET['dip']))."' AND `timestamp` BETWEEN $from_date AND $to_date");
                         }
                         echo '<p><strong>'.$rec_deleted.' '.__('records deleted','wassup').'</strong></p>';
@@ -936 +942 @@
                 $timeF = gmdate("H:i:s", $timestampF);
                 $datetimeF = gmdate('Y-m-d H:i:s', $timestampF);
-                $ip = @explode(",", $rk->ip);
-
-                // Visitor Record - raw data (hidden) ?>
-                <div id="raw-<?php echo $rk->wassup_id; ?>" style="display:none; padding-top:7px;" >
+                //$ip = @explode(",", $rk->ip);
+                $ip_proxy = strpos($rk->ip,",");
+                //if proxy, get 2nd ip...
+                if ($ip_proxy !== false) {
+                        $ip = substr($rk->ip,(int)$ip_proxy+1);
+                } else { 
+                        $ip = $rk->ip;
+                }
+
+                // Visitor Record - raw data (hidden)
+                $raw_div="raw-".substr($rk->wassup_id,0,25).rand(0,99);
+                echo "\n"; ?>
+                <div id="<?php echo $raw_div; ?>" style="display:none; padding-top:7px;" >
                 <h2><?php _e("Raw data","wassup"); ?>:</h2>
                 <style type="text/css">.raw { color: #542; padding-left:5px; }</style>
                 <ul style="list-style-type:none;padding:20px 0 0 30px;">
+                <li><?php echo __("Visit type","wassup").': <span class="raw">';
+                if ($rk->username != "") { 
+                        echo __("Logged-in user","wassup").' - '.$rk->username;
+                } elseif ($rk->spam == "1" || $rk->spam == "2" ) { 
+                        _e("Spammer","wassup");
+                } elseif ($rk->comment_author != "") { 
+                        echo __("Comment author","wassup").' - '.$rk->comment_author;
+                } elseif ($rk->feed != "") { 
+                        echo __("Feed","wassup").' - '.$rk->feed;
+                } elseif ($rk->spider != "") { 
+                        echo __("Spider","wassup").' - '.$rk->spider;
+                } else {
+                         _e("Regular visitor","wassup");
+                }
+                echo '</span>'; ?></li>
                 <li><?php echo __("IP","wassup").': <span class="raw">'.$rk->ip.'</span>'; ?></li>
                 <li><?php echo __("Hostname","wassup").': <span class="raw">'.$rk->hostname.'</span>'; ?></li>
+                <li><?php echo __("Url Requested","wassup").': <span class="raw">'.htmlspecialchars(html_entity_decode(clean_url($rk->urlrequested))).'</span>'; ?></li>
                 <li><?php echo __("User Agent","wassup").': <span class="raw">'.$rk->agent.'</span>'; ?></li>
                 <li><?php echo __("Referrer","wassup").': <span class="raw">'.urldecode($rk->referrer).'</span>'; ?></li>
                 <?php if ($rk->search != "") { ?>
-                <li><?php echo __("Search","wassup").': <span class="raw">'.$rk->search.'</span>'; ?></li>
+                <li><?php echo __("Search Engine","wassup").': <span class="raw">'.$rk->searchengine.'</span> &nbsp; &nbsp; ';
+                echo __("Search","wassup").': <span class="raw">'.$rk->search.'</span>'; ?></li>
                 <?php }
                 if ($rk->os != "") { ?>
@@ -957 +989 @@
                 <?php }
                 if ($rk->language != "") { ?>
-                <li><?php echo __("Language","wassup").': <span class="raw">'.$rk->language.'</span>'; ?></li>
+                <li><?php echo __("Locale/Language","wassup").': <span class="raw">'.$rk->language.'</span>'; ?></li>
                 <?php } ?>
-                <li><?php echo __("Url Requested","wassup").': <span class="raw">'.htmlspecialchars(html_entity_decode(clean_url($rk->urlrequested))).'</span>'; ?></li>
-                <li><?php echo __("End Timestamp","wassup").': <span class="raw">'.$datetimeF.' ( '.$rk->max_timestamp.' )</span>'; ?></li>
+                <li><?php echo 'Wassup ID'.': <span class="raw">'.$rk->wassup_id.'</span>'; ?></li>
+                <li><?php echo __("End timestamp","wassup").': <span class="raw">'.$datetimeF.' ( '.$rk->max_timestamp.' )</span>'; ?></li>
                 </ul>
                 </div> <!-- raw-wassup_id -->
@@ -983 +1015 @@
 
                 <div class="delID<?php echo $rk->wassup_id ?>">
-                <div class="<?php if ($wassup_options->wmark == 1 AND $wassup_options->wip == $ip[0]) echo "sum-nav-mark"; else echo "sum-nav"; ?>">
+                <div class="<?php if ($wassup_options->wmark == 1 AND $wassup_options->wip == $ip) echo "sum-nav-mark"; else echo "sum-nav"; ?>">
 
                 <p class="delbut">
                 <?php // Mark/Unmark IP
-                if ($wassup_options->wmark == 1 AND $wassup_options->wip ==  $ip[0]) { ?>
-                        <a  href="?<?php echo $_SERVER['QUERY_STRING']; ?>&deleteMARKED=1&dip=<?php print $ip[0]; ?>" style="text-decoration:none;">
+                if ($wassup_options->wmark == 1 AND $wassup_options->wip ==  $ip) { ?>
+                        <a  href="?<?php echo $_SERVER['QUERY_STRING']; ?>&deleteMARKED=1&dip=<?php print $ip; ?>" style="text-decoration:none;">
                         <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/cross.png" alt="'.__('delete','wassup').'" title="'.__('Delete ALL marked records with this IP','wassup'); ?>" /></a>
                         <a href="?page=<?php echo WASSUPFOLDER; ?>&wmark=0" style="text-decoration:none;">
@@ -995 +1027 @@
                         <a  href="#" class="deleteID" id="<?php echo $rk->wassup_id ?>" style="text-decoration:none;">
                         <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/cross.png" alt="'.__('delete','wassup').'" title="'.__('Delete this record','wassup'); ?>" /></a>
-                        <a href="?<?php echo $_SERVER['QUERY_STRING']; ?>&wmark=1&wip=<?php print $ip[0]; ?>" style="text-decoration:none;">
+                        <a href="?<?php echo $_SERVER['QUERY_STRING']; ?>&wmark=1&wip=<?php print $ip; ?>" style="text-decoration:none;">
                         <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/error_add.png" alt="'.__('mark','wassup').'" title="'.__('Mark IP','wassup'); ?>" /></a>
                 <?php } ?>
-                <a href="#TB_inline?height=400&width=<?php echo $res.'&inlineId=raw-'.$rk->wassup_id; ?>" class="thickbox">
+                <a href="#TB_inline?height=400&width=<?php echo $res.'&inlineId='.$raw_div; ?>" class="thickbox">
                 <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/database_table.png" alt="'.__('show raw table','wassup').'" title="'.__('Show the items as raw table','wassup'); ?>" /></a>
                 </p>
 
-                        <span class="sum-box"><?php if ($numurl >= 2) { ?><a  href="#" class="showhide" id="<?php echo $rk->id ?>"><?php print $ip[0]; ?></a><?php } else { ?><?php print $ip[0]; ?><?php } ?></span>
+                        <span class="sum-box"><?php if ($numurl >= 2) { ?><a  href="#" class="showhide" id="<?php echo $rk->id ?>"><?php print $ip; ?></a><?php } else { ?><?php print $ip; ?><?php } ?></span>
                         <span class="sum-date"><?php print $datetimeF; ?></span>
                         <div class="sum-det"><span class="det1">
@@ -1059 +1091 @@
                         <ul style="background:#fdeec8;" class="spider">
                                 <li class="feed"><span class="indent-li-agent"><?php _e('FEEDREADER','wassup'); ?>: <strong><?php print $rk->spider; ?></strong></span></li>
-                                <li class="feed"><span class="indent-li-agent"><?php _e('SUBSCRIBER(S)','wassup'); ?>: <strong><?php print $rk->feed; ?></strong></span></li>
+                                <?php if (is_numeric($rk->feed)) { ?>
+                                <li class="feed"><span class="indent-li-agent"><?php _e('SUBSCRIBER(S)','wassup'); ?>: <strong><?php print (int)$rk->feed; ?></strong></span></li>
+                                <?php  } ?>
                         </ul>
                         <?php  } else { ?>
@@ -1096 +1130 @@
                         <ul class="url">
         <?php 
-                        $qryCD = $wpdb->get_results("SELECT timestamp, urlrequested FROM $table_name WHERE wassup_id='".$rk->wassup_id."' ORDER BY timestamp ASC");
+                        $qryCD = $wpdb->get_results("SELECT `timestamp`, urlrequested FROM $table_name WHERE wassup_id='".$rk->wassup_id."' ORDER BY `timestamp` ASC");
                         $i=0;
                         foreach ($qryCD as $cd) {       
@@ -1242 +1276 @@
                 $ipAddress = "";
                 $hostname = "";
-                //#### Get the host/IP details from http header...
+                //#### Get the visitor's details from http header...
                 if (isset($_SERVER["REMOTE_ADDR"])) {
                 if ($_SERVER["HTTP_X_FORWARDED_FOR"] != ""){
-                        $IP = $_SERVER["HTTP_X_FORWARDED_FOR"];
+                        //in case of multiple forwarding
+                        list($IP) = explode(",",$_SERVER["HTTP_X_FORWARDED_FOR"]);
                         $proxy = $_SERVER["REMOTE_ADDR"];
-                        $hostname = @gethostbyaddr($_SERVER["HTTP_X_FORWARDED_FOR"]);
+                        $hostname = @gethostbyaddr($IP);
+                        if (empty($hostname) || $hostname == "unknown") {
+                                $hostname = @gethostbyaddr($proxy);
+                        }
                         $ipAddress = $proxy.",".$IP;
                 }else{
-                        $IP = $_SERVER["REMOTE_ADDR"];
-                        $hostname = @gethostbyaddr($_SERVER["REMOTE_ADDR"]);
-                        $ipAddress = $IP;
+                        list($IP) = explode(",",$_SERVER["REMOTE_ADDR"]);
+                        $hostname = @gethostbyaddr($IP);
+                        $ipAddress = $_SERVER["REMOTE_ADDR"];
                 } 
                 }
+                if (empty($IP)) { $IP = $ipAddress; }
+                if (empty($hostname)) { $hostname = "unknown"; }
                 $userAgent = (isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '');
                 //# Create a new wassup id for this visit from a 
@@ -1261 +1301 @@
                 //#  same ip/userAgent within a 30 minute-period, can be 
                 //#  tracked, even when session/cookies is disabled. 
-                $temp_id = sprintf("%-064.64s", date('YmdH').str_replace(array('','/','.','\'','"',"\\",'$','-','&','+','_',';',',','>','<',':','#','*','%','http',')','(',), '', intval(date('i')/30).$ipAddress.strrev($userAgent).strrev($hostname).intval(date('i')/30)).date('HdmY').rand());
+                $temp_id = sprintf("%-060.60s", date('YmdH').str_replace(array(' ','http://','www.','/','.','\'','"',"\\",'$','-','&','+','_',';',',','>','<',':','#','*','%','!','@',')','(',), '', intval(date('i')/30).$IP.strrev($userAgent).strrev($hostname).intval(date('i')/30)).date('HdmY').$hostname.rand());
 
                 //Work-around for cookie rejection:
@@ -1293 +1333 @@
         if (isset($_SERVER["REMOTE_ADDR"])) {
                 if ($_SERVER["HTTP_X_FORWARDED_FOR"] != ""){
-                        $IP = $_SERVER["HTTP_X_FORWARDED_FOR"];
+                        //in case of multiple forwarding
+                        list($IP) = explode(",",$_SERVER["HTTP_X_FORWARDED_FOR"]);
                         $proxy = $_SERVER["REMOTE_ADDR"];
-                        $hostname = @gethostbyaddr($_SERVER["HTTP_X_FORWARDED_FOR"]);
+                        $hostname = @gethostbyaddr($IP);
+                        if (empty($hostname) || $hostname == "unknown") {
+                                $hostname = @gethostbyaddr($proxy);
+                        }
                         $ipAddress = $proxy.",".$IP;
                 }else{
-                        $IP = $_SERVER["REMOTE_ADDR"];
-                        $hostname = @gethostbyaddr($_SERVER["REMOTE_ADDR"]);
-                        $ipAddress = $IP;
+                        list($IP) = explode(",",$_SERVER["REMOTE_ADDR"]);
+                        $hostname = @gethostbyaddr($IP);
+                        $ipAddress = $_SERVER["REMOTE_ADDR"];
                 } 
         }
+        if (empty($IP)) { $IP = $ipAddress; }
+        if (empty($hostname)) { $hostname = "unknown"; }
+
         // Get the visitor's resolution, TODO
         /*
@@ -1368 +1415 @@
         if ($wassup_options->wassup_loggedin == 1 || !is_user_logged_in() ) {
         if ($wassup_options->wassup_attack == 1 || stristr($userAgent,"libwww-perl") === FALSE ) {
+        if (!is_404()) {        //don't record 404 pages...
 
                 //##### Extract useful visit information from http header..
-                $dip = &new Detector("", $userAgent);
-                $browser =  $dip->browser." ".$dip->browser_version;
-                $os = $dip->os." ".$dip->os_version;
+                $browser = "";
+                $os = "";
+                list($browser,$os) = wGetBrowser($userAgent);
 
         //#===================================================
@@ -1383 +1431 @@
         //#  such, even when session/cookies is disabled. 
         //# An md5 encoded version of temp_id is saved as "wassup_id".
-        $temp_id = sprintf("%-064.64s", date('YmdH').str_replace(array('','/','.','\'','"',"\\",'$','-','&','+','_',';',',','>','<',':','#','*','%','http',')','(',), '', intval(date('i')/30).$ipAddress.strrev($userAgent).strrev($hostname).intval(date('i')/30)).date('HdmY').rand());
+        $temp_id = sprintf("%-060.60s", date('YmdH').str_replace(array(' ','http://','www.','/','.','\'','"',"\\",'$','-','&','+','_',';',',','>','<',':','#','*','%','!','@',')','(',), '', intval(date('i')/30).$IP.strrev($userAgent).strrev($hostname).intval(date('i')/30)).date('HdmY').$hostname.rand());
         $wassup_id = "";
         //Read the cookie for wassup_id
@@ -1494 +1542 @@
         if ($dup_urlrequest == 0) {
                 //##### Extract useful visit information from http header..
-                if ($os != "" OR $browser != "") { 
-                        $bot=wGetSpider($userAgent);
-                        if (is_array($bot)) {
-                                $spider = $bot[0];
-                                $feed = $bot[1];
-                        } else {
-                                $spider = trim($bot);
-                        }
-                }
+                if (empty($browser) || stristr($browser,"N/A")) {
+                        list($spider,$feed) = wGetSpider($userAgent,$hostname);
+                }
+                
                 //#I prefer to see os/browser info. for spiders/bots.
-                //if ($spider != '') { $os=''; $browser=''; }
 
         //spider exclusion control
@@ -1559 +1601 @@
         }
         if ( $wassup_options->wassup_spam == 1 && $spam == 0 ) {
-                //# some useragents to exclude from spam checking...
-                $goodbots = array('Google','Yahoo!','MSN','SummizeFeedReader');
+                //# some valid spiders to exclude from spam checking
+                $goodbot = false;
+                if ($hostname!="" && !empty($spider)) {
+                        if (preg_match('/^(googlebot|msnbot|yahoo\!\ slurp|technorati)/i',$spider)>0 && preg_match('/(googlebot|live|msn|yahoo|technorati)\.(com|net)$/i',$hostname)>0){
+                                $goodbot = true;
+                        }
+                }
 
                 //# No duplicate spam testing in same session unless there 
@@ -1569 +1616 @@
                 //# No spam check on known bots (google, yahoo,...) unless
                 //#  there is a comment or forum page request...
-                } elseif (empty($spider) || array_search($spider,$goodbots) === FALSE || stristr($urlRequested,"comment") !== FALSE || stristr($urlRequested,"forum") !== FALSE  || !empty($comment_user) ) { 
+                } elseif (empty($spider) || !$goodbot || stristr($urlRequested,"comment") !== FALSE || stristr($urlRequested,"forum") !== FALSE  || !empty($comment_user) ) { 
 
                    // Try to search for previous spammer detected by akismet with same IP
@@ -1654 +1701 @@
                 $recorded = true;
                 // Delete records older then 3 minutes
-                $wpdb->query("DELETE FROM $table_tmp_name WHERE timestamp<'".strtotime("-3 minutes", $timestamp)."'");
+                $wpdb->query("DELETE FROM $table_tmp_name WHERE `timestamp`<'".strtotime("-3 minutes", $timestamp)."'");
 
         } //end if $spam == 0
@@ -1661 +1708 @@
         } //end if dup_urlrequest == 0
 
+        } //end if !is_404
         } //end if wassup_attack
         } //end if wassup_loggedin
@@ -1678 +1726 @@
                 $from_date = strtotime($wassup_options->delete_auto, $timestamp);
                 //#check before doing delete as it could lock the table...
-                if ((int)$wpdb->get_var("SELECT COUNT(id) FROM $table_name WHERE timestamp<'$from_date'") > 0) {
-                        $wpdb->query("DELETE FROM $table_name WHERE timestamp<'$from_date'");
+                if ((int)$wpdb->get_var("SELECT COUNT(id) FROM $table_name WHERE `timestamp`<'$from_date'") > 0) {
+                        $wpdb->query("DELETE FROM $table_name WHERE `timestamp`<'$from_date'");
                 }
                 // Optimize table once a day
@@ -1726 +1774 @@
 
                 if (method_exists($wpdb,'prepare')) {
-                        $insert = $wpdb->query( $wpdb->prepare("INSERT INTO $table_name (wassup_id, timestamp, ip, hostname, urlrequested, agent, referrer, search, searchpage, os, browser, language, screen_res, searchengine, spider, feed, username, comment_author, spam) 
+                        $insert = $wpdb->query( $wpdb->prepare("INSERT INTO $table_name (wassup_id, `timestamp`, ip, hostname, urlrequested, agent, referrer, search, searchpage, os, browser, language, screen_res, searchengine, spider, feed, username, comment_author, spam) 
                            VALUES ( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )",
                            attribute_escape($wassup_id),
@@ -1750 +1798 @@
                 } else {
                         $insert = $wpdb->query("INSERT INTO " . $table_name .
-                           " (wassup_id, timestamp, ip, hostname, urlrequested, agent, referrer, search, searchpage, os, browser, language, screen_res, searchengine, spider, feed, username, comment_author, spam) " .
+                           " (wassup_id, `timestamp`, ip, hostname, urlrequested, agent, referrer, search, searchpage, os, browser, language, screen_res, searchengine, spider, feed, username, comment_author, spam) " .
                            "VALUES (
                            '".attribute_escape($wassup_id)."',
@@ -1905 +1953 @@
 }
 
-function wGetSpider($agent = null){
+//extract browser and platform info from a user agent string and
+// return the values