Changeset 444137

Timestamp:

09/27/2011 10:23:58 AM (14 years ago)

Author:

michelem

Message:

Release 1.8.3

Location:

wassup/trunk

Files:

• badhosts.txt (modified) (1 diff)
• css/images/Thumbs.db (added)
• css/images/list-bg.png (modified) (previous)
• css/images/list-bg2.png (modified) (previous)
• css/images/list-bg3.png (modified) (previous)
• css/wassup.css (modified) (27 diffs)
• img/Thumbs.db (added)
• img/b_delete.png (added)
• img/b_delete2.png (added)
• img/b_select.png (added)
• img/b_select2.png (added)
• img/error_add.png (modified) (previous)
• img/error_delete.png (modified) (previous)
• img/flags/Thumbs.db (added)
• js/jquery.min.js (added)
• lib/action.php (modified) (6 diffs)
• lib/compat_functions.php (modified) (1 diff)
• lib/main.php (modified) (37 diffs)
• lib/settings.php (modified) (11 diffs)
• lib/uadetector.class.php (modified) (42 diffs)
• lib/upgrade.php (modified) (13 diffs)
• lib/wassup.class.php (modified) (9 diffs)
• readme.txt (modified) (8 diffs)
• wassup.php (modified) (118 diffs)

wassup/trunk/badhosts.txt

@@ -738 +738 @@
 himailer\.com
 himsearch\.com
-hinet\.net
+\.sg[0-9]+\.myweb\.hinet\.net
 hitprofile\.com
 hj68\.com

wassup/trunk/css/wassup.css

@@ -4 +4 @@
  */
 #wassup-wrap {
-    padding: 1px 5px 3px;
     min-height: 500px;
-    background-color: #efebef;
+    padding: 1px 7px 3px;
+    font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
+    font-size: 13px;
     border:1px solid #d6d7d6;
-    -moz-border-radius: 10px 10px 0 0;
-    -webkit-border-top-left-radius: 10px;
-    -webkit-border-top-right-radius: 10px;
-    -khtml-border-top-left-radius: 10px;
-    -khtml-border-top-right-radius: 10px;
-    border-top-right-radius: 10px;
-    border-top-left-radius: 10px;
+    background: #efebef ; */
+    /* background: #efebef url("images/menu-shadow-rtl.png") left top repeat-y; */
+    -moz-border-radius: 5px 5px 0 0;
+    -webkit-border-top-left-radius: 5px;
+    -webkit-border-top-right-radius: 5px;
+    -khtml-border-top-left-radius: 5px;
+    -khtml-border-top-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-top-left-radius: 5px;
 }
 #wassup-wrap table { border-collapse: collapse; padding: 2px; }
@@ -24 +27 @@
 #wassup-wrap img { 
     display: inline; 
-    vertical-align:bottom; 
+    vertical-align: middle; 
     margin: 0 2px 2px 0; 
     padding:0;
@@ -35 +38 @@
 #wassup-wrap td.legend a { border-bottom: 1px solid; }
 #wassup-wrap a:visited { color: #229; }
-#wassup-wrap a:hover { color: #d11; }
+#wassup-wrap a:hover { color: #ff6d06; }
+#wassup-wrap a:active { color: #d11; }
 .wassup-icon {}
 .wassup-content { min-height:225px; }
@@ -42 +46 @@
 .wassup-menu-link {
     float: right;
-    font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+    font-family: Arial,"Bitstream Vera Sans",Helvetica,Verdana,sans-serif;
+    font-size: 12px;
     height: 22px;
     padding: 0;
@@ -86 +91 @@
     height: 22px;
     line-height: 22px;
-    font-size: 10px;
 }
 #wassup-menu li.current a {
@@ -110 +114 @@
 }
 #wassup-menu li.current, #wassup-menu-link:active { 
+    height: 24px !important;
+    margin-bottom: -2px !important;
     color: #00284a;
     background: url("images/link.png") no-repeat bottom center;
@@ -133 +139 @@
     color: #445;
     background-color: #dedade;
-    box-shadow: 0 0 5px rgba(24, 24, 64, 0.9); /* 0 0 2px rgba(108,108,168, 0.8); */
-    -moz-box-shadow: 0 0 5px rgba(24, 24, 64, 0.9);
-    -webkit-box-shadow: 0 0 5px rgba(24, 24, 64, 0.9);
-    border: 1px solid #c9d9e9; /* #a5a5bb; #efebef; */
-    /* border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px; */
+    -moz-box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
+    -webkit-box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
+    box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
+    border: 1px solid #e9e9ee;
+    -moz-border-radius: 3px 3px 0 0;
+    -webkit-border-top-left-radius: 3px;
+    -webkit-border-top-right-radius: 3px;
+    -khtml-border-top-left-radius: 3px;
+    -khtml-border-top-right-radius: 3px;
+    border-top-right-radius: 3px;
+    border-top-left-radius: 3px;
 }
 .main-tabs a, .main-tabs a:link { 
@@ -185 +195 @@
     background-color: #778;
     border: 1px solid #fafeee;
-    box-shadow: 0 0 2px rgba(50, 80, 80, 0.3);
     -moz-box-shadow:0 0 2px rgba(50, 80, 80, 0.3);
     -webkit-box-shadow:0 0 2px rgba(50, 80, 80, 0.3);
+    box-shadow: 0 0 2px rgba(50, 80, 80, 0.3);
 }
 .pagination .disabled {
@@ -216 +226 @@
     font-size: 11px;
     background-color: #f4f6f6;
-    border: 1px solid #c7c7cc; /* 89a; */
-    border-bottom: 3px solid #347;
+    border: 1px solid #ababca; /* 89a; */
+    border-top: 1px solid #cdccdc; /* #c7c7cc; */
+    /* border-bottom: 3px solid #347; */
 }
 .sum-nav, .sum-nav-mark, .sum-spy {
     position: relative;
     clear: left;
-    width: 100%;
+    /* width: 100%; */
     min-height: 50px;
     margin: 0 !important;
@@ -228 +239 @@
     font-size: 11px;
     border-top: 1px solid #fffcff;
-    border-bottom: 1px solid #ddd;
+    border-left: 1px solid #efefe0;
+    border-right: 1px solid #efefe0;
+    border-bottom: 0 none;
         background: url("images/list-bg.png") repeat-x;
 }
@@ -247 +260 @@
     margin: 12px 0 0 0 !important;
     padding: 1px 1px 0 !important;
-    border-top: 1px solid #89a;
-    border-right: 1px solid #789;
-    border-left: 1px solid #789;
+    border-top: 1px solid #fefffe;
+    border-right: 1px solid #779;
+    border-left: 1px solid #779;
     border-bottom: 3px solid #347;
     min-height: 50px;
         background: #f4f6f6 url("images/list-bg.png") repeat-x;
-    -webkit-box-shadow: 0 0 5px rgba(80, 100, 100, 0.5);
-    box-shadow: 0 0 5px rgba(80, 100, 100, 0.5);
-    -moz-box-shadow:0 0 5px rgba(80, 100, 100, 0.5);
+    -moz-box-shadow:0 2px 5px #779;
+    -webkit-box-shadow: 0 2px 5px #779;
+    box-shadow: 0 2px 5px #779;
 }
 .delbut {
@@ -273 +286 @@
     padding: 0;
     /* width: 100%; */
-    height: 1px;
+    height: 3px;
     clear: both;
-    background-color: #347 /* #899; */
+    background-color: #77799f;
 }
 .sum-det, .sum-det-spy {
@@ -300 +313 @@
 .det1 a { font-weight: bold; border-bottom: 1px solid !important; }
 .det2 a, .det2 a:link, .sum-det span.det2 a {
-    color: #349 !important; /*#00008c  #00284a */
+    color: #349 !important;
 }
 .det2 a:hover, .sum-det span.det2 a:hover {
@@ -328 +341 @@
     height: 28px;
     padding-top: 5px !important;
-    border: 1px solid #cacad0;
+    border: 1px solid #c0cccf;
+    /* -moz-box-shadow: 0 -2px 10px #BFBFBD inset;
+    -webkit-box-shadow: 0 -2px 10px #BFBFBD inset;
+    box-shadow: 0 --2px 10px #BFBFBD inset; */
 }
 .sum-box-ip { 
@@ -365 +381 @@
     line-height: 1.1em;
 }
-#toptenchart a { color: #464646; }
+#toptenchart { margin:0 auto; padding:0; }
+#toptenchart table {
+    margin: 0;
+    padding: 0; 
+    border-collapse: collapse;
+    border: 0 none;
+}
+#toptenchart a { color: #464646; margin-left: 1px; }
 #toptenchart a:hover { color: #d54d22; }
 ul.charts    {
@@ -371 +394 @@
     margin: 0; 
     padding: 0;
+    font: 8pt sans-serif;
+    line-height: 1.1em;
     border-bottom: 1px solid #dedede;
+    border-right: 1px solid #fff;
 }
 li.charts {
-    list-style-type: none;
-    font-size: 11px;
+    height: 25px !important;
+    list-style-type: none;
+    /* font-size: 11px; */
+    line-height: 22px;
     border-top: 1px #ddd solid;
-    margin: 0px 0 4px 0; 
-    padding: 2px 4px 4px 4px;
+    margin: 0; 
+    padding: 0 2px 0 2px;
     background: url("images/list-bg3.png");
 }
 li.chartsT {
+    height: 25px !important;
+    margin: 0; 
+    padding: 2px 2px 0 2px;
     list-style-type: none;
     color: #2683ae;
-    font-size: 11px;
+    /* font-size: 11px; */
     border-bottom: 2px solid #bfd0dd;
-    margin: 2px 0 0 0; 
-    padding: 2px 4px 2px 4px;
+    vertical-align: bottom;
     background: #cee1ef;
 }
+ul.rownums { background-color: #e6e9ef !important; }
 .sum-rec ul { border-top: 1px solid #999; }
 .detail-data { 
     margin: 0 auto !important;
     clear:both;
-    border-bottom: 0 none;
+    border-left: 1px solid #eeeeef;
+    border-right: 1px solid #eeeeef;
+    border-top: 0 none;
+    border-bottom: 1px solid #bcbcbf;
     color: #445;
     font-size: 11px;
@@ -402 +436 @@
 .detail-data ul {
     list-style-type: none;
-    width: 100%;
+    /* width: 100%; */
     margin: 0; 
     padding: 3px 0 4px 0;
@@ -409 +443 @@
     border-bottom: 1px solid #bbb;
 }
+.detail-data ul li { height: 25px; line-height: 22px; }
 ul.searcheng {
-    background-color: #abdbff; /* #adf; */
+    background-color: #abdbff;
     border-color: #9cd;
 }
@@ -425 +460 @@
 }
 ul.useragent { 
-    padding: 4px 0 2px 0; 
+    padding: 0; 
     background-color: #67a;
     border-bottom: 1px #ccc solid;
@@ -433 +468 @@
     color: #f5f5f5;
     width: 100%;
-    padding: 0 6px 0 0;
+    padding: 4px 6px 0 0;
+    line-height: 1.5em !important;
     text-align: center;
 }
@@ -467 +503 @@
     border-right: 1px dotted #8e8e8e;
 }
-ul.agent { border-color: #ddd; } 
+ul.agent { 
+    border-color: #ddd;
+    /* -moz-box-shadow: 0 -2px 10px #CDD0EE inset;
+    -webkit-box-shadow: 0 -2px 10px #CDD0EE inset;
+    box-shadow: 0 -2px 10px #CDD0EE inset; */
+} 
 li.agent {
     list-style-type: none;
@@ -495 +536 @@
 ul.url {
     list-style-type: none;
-    width: 100%;
+    /* width: 100%; */
     margin: 0; 
     padding: 0;
-    border: none;
-    border-top: 1px #999 solid;
+    border: 0 none;
     clear: left;
 }
-li.url {
+li.url, li.urlodd {
     list-style-type: none;
     width: 100%;
     margin: 0;
     padding: 0;
-    line-height: 2em;
+    height: 25px;
+    line-height: 22px;
     background-image: url("images/list-bg2.png");
-    border-bottom: 1px #ddd solid;
-}
-li.urlodd {
-    list-style-type: none;
-    width: 100%;
-    margin: 0;
-    padding: 4px 0 6px 0;
-    background-image: url("images/list-bg3.png");
-    border-bottom: 1px #ddd solid;
+    border-top: 1px solid #c0cfcf;
+}
+ul.url li.url { 
+    background-image: url("images/list-bg3.png") !important;
 }
 .url a, .url a:link { border-bottom: 1px solid !important; }
@@ -553 +589 @@
     padding: 1px 1px 2px !important;
     background-color: #dedade;
-    box-shadow: 0 0 5px rgba(24, 24, 64, 0.9); /* 0 0 5px rgba(44,44,104, 0.9); */
-    -moz-box-shadow: 0 0 5px rgba(24, 24, 64, 0.9);
-    -webkit-box-shadow: 0 0 5px rgba(24, 24, 64, 0.9);
-    border: 1px solid #c9d9e9; /* #efebef; */
+    box-shadow: 0 0 4px rgba(24, 24, 30, 0.9);
+    -moz-box-shadow: 0 0 4px rgba(24, 24, 30, 0.9);
+    -webkit-box-shadow: 0 0 4px rgba(24, 24, 30, 0.9);
+    border: 1px solid #ededef;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -khtml-border-radius: 3px;
+    border-radius: 3px;
 }
 #spyContainer { clear: both; padding: 5px 5px 0 0; }
@@ -603 +643 @@
 }
 .bubble { font-size:11px; }
-.top10 { color: #542; }
+.top10 { color: #542; padding-left: 1px; }
+.fixed { font-size:11px; font-family: monospace; color: #887; }
 
 /* wassup-option tabs styles */
 #tabcontainer { 
-    list-style:none;
     /* width: 97%;  */
     margin: 10px auto 3px auto; 
-    padding: 2px 5px 1px;
+    padding: 2px 2px 1px;
+    font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif !important;
+    font-size: 14px;
+    color: #445;
     border: 1px solid #efebef;
     border-radius: 3px;
@@ -616 +659 @@
     -moz-border-radius: 3px;
     background-color: #dedade;
-    color: #445;
-    box-shadow: 0 0 5px rgba(44,44,104, 0.9);
-    -moz-box-shadow: 0 0 5px rgba(44,44,104, 0.9);
-    -webkit-box-shadow: 0 0 5px rgba(44,44,104, 0.9);
+    list-style:none;
+    -moz-box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
+    -webkit-box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
+    box-shadow: 0 0 3px rgba(24, 24, 30, 0.9);
 }
 #tabcontainer ul.ui-tabs-nav {
@@ -658 +701 @@
     border-top-right-radius: 4px;
 }
+.ui-widget-header a {
+    color: #999 !important;
+    font-size: 1.1em;
+    font-weight: bold;
+    text-shadow: 0 -1px 0 rgba(255,255,221,0.5);
+}
+.ui-state-active a, .ui-widget-header a:hover {
+    color: #212121 !important;
+}
+
 #wassup_opt_frag-1, #wassup_opt_frag-2, #wassup_opt_frag-3,
 #wassup_opt_frag-4 { 
@@ -697 +750 @@
 #spy-pause a, #spy-play a { text-decoration: none; border-bottom: 0 none; }
 .wassup-button { 
--   width; 160px;
+    width: 155px !important;
     background: url("images/button.png") top center no-repeat; 
     border-color: #999 !important;
+    border-radius: 10px !important;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    -khtml-border-radius: 10px;
 }
 .wassup-hot-button { 
-    width; 160px;
+    width: 155px;
     background: url("images/button2.png") top center no-repeat; 
     border-color: #777 !important;
+    border-radius: 10px !important;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    -khtml-border-radius: 10px;
 }
 .wassup-button:hover {
     background-image: url("images/button2.png");
+    background-color: transparent !important;
+    color: #157 !important;
 }
 .wassup-hot-button:hover {
     background-image: url("images/hot-button.png");
 }
+.button-primary { border-color: #157 !important; }

wassup/trunk/lib/action.php

@@ -107 +107 @@
     }
 
-    $debug_mode=false;  //debug set below
+    $wdebug_mode=false; //debug set below
     //echo "Debug: Starting action.php from directory ".dirname(__FILE__).".  ABSPATH=".$wpabspath.".<br />\n"; //debug
 
@@ -127 +127 @@
     // ### Begin actions that have output...
     if (!empty($_GET['debug_mode'])) {
-        $debug_mode=true;
+        $wdebug_mode=true;
         $mode_reset=ini_get('display_errors');
         error_reporting(E_ALL); //debug, E_STRICT=php5 only
@@ -191 +191 @@
     } elseif ($_GET['action'] == "piechart") {
         // Prepare Pie Chart
-        $Tot = New MainItems($table_name,$from_date,$to_date);
-        $items_pie[] = $Tot->calc_tot("count", $search, "AND spam>0", "DISTINCT");
-        $items_pie[] = $Tot->calc_tot("count", $search, "AND searchengine!='' AND spam=0", "DISTINCT");
-        $items_pie[] = $Tot->calc_tot("count", $search, "AND searchengine='' AND referrer NOT LIKE '%".$this->WpUrl."%' AND referrer!='' AND spam=0", "DISTINCT");
-        $items_pie[] = $Tot->calc_tot("count", $search, "AND searchengine='' AND (referrer LIKE '%".$this->WpUrl."%' OR referrer='') AND spam=0", "DISTINCT"); ?>
+        $wTot = New WassupItems($table_name,$from_date,$to_date);
+        $items_pie[] = $wTot->calc_tot("count", $search, "AND spam>0", "DISTINCT");
+        $items_pie[] = $wTot->calc_tot("count", $search, "AND searchengine!='' AND spam=0", "DISTINCT");
+        $items_pie[] = $wTot->calc_tot("count", $search, "AND searchengine='' AND referrer NOT LIKE '%".$this->WpUrl."%' AND referrer!='' AND spam=0", "DISTINCT");
+        $items_pie[] = $wTot->calc_tot("count", $search, "AND searchengine='' AND (referrer LIKE '%".$this->WpUrl."%' OR referrer='') AND spam=0", "DISTINCT"); ?>
         <div style="text-align: center"><img src="http://chart.apis.google.com/chart?cht=p3&amp;chco=0000ff&amp;chs=600x300&amp;chl=Spam|Search%20Engine|Referrer|Direct&amp;chd=<?php Gchart_data($items_pie, null, null, null, 'pie'); ?>" /></div>
 
@@ -201 +201 @@
     // ACTION: LINE CHART - TODO
     //} elseif ($_GET['action'] == "chart") {
-    //  $chart = mainItems::theChart($from_date,$to_date,$search);
+    //  $chart = WassupItems::theChart($from_date,$to_date,$search);
 
     // ACTION: DISPLAY RAW RECORDS - no longer used (deprecated)
@@ -208 +208 @@
     // ACTION: SHOW TOP TEN
     } elseif ($_GET['action'] == "topten") {
-        $top_limit=10;
-        if ($debug_mode) {
+        $top_limit=0;   //use default setting
+        if ($wdebug_mode) {
             $title='WassUp '.__('Top Stats for Period','wassup');
             $wdformat = get_option("date_format");
@@ -225 +225 @@
         echo '<span style="color:red;">Action.php '.__("ERROR: Missing or unknown parameters","wassup").', action='.attribute_escape($_GET["action"]).'</span>';
     }  
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         if (function_exists('profiler_endSection')) {
             profiler_endSection('(Tot)Action.php');

wassup/trunk/lib/compat_functions.php

@@ -32 +32 @@
 }
 
+//'microtime_float' replicates microtime(true) from PHP5
+if (!function_exists('microtime_float')) {
+    function microtime_float() {
+        list($usec, $sec) = explode(" ", microtime());
+        return ((float)$usec + (float)$sec);
+    }
+}
+
 if (!function_exists('admin_url')) {
     function admin_url($admin_file="") {

wassup/trunk/lib/main.php

@@ -586 +586 @@
 } //end function
 
-//Output wassup records in Digg spy style...
+//Output wassup records in the old Digg spy style...
 function wassup_spiaView ($from_date="",$rows=0,$spytype="",$spy_datasource="") {
-    global $wpdb, $wp_version, $wassup_options, $debug_mode;
+    global $wpdb, $wp_version, $wassup_options, $wdebug_mode;
 
     if (!class_exists('wassupOptions') && file_exists(dirname(__FILE__). '/wassup.class.php')) {
@@ -807 +807 @@
 // Geocoding location with Google Maps
 function geocodeWassUp($location, $key) {
-    global $debug_mode;
+    global $wdebug_mode;
     //Three parts to querystring: q= address, output= format, and key
     $address = urlencode($location);
@@ -813 +813 @@
 
     /*
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $api_url);
-    curl_setopt($ch, CURLOPT_HEADER,0);
-    curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
-    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-    $data = curl_exec($ch);
-    curl_close($ch);
+    //$ch = curl_init();
+    //curl_setopt($ch, CURLOPT_URL, $api_url);
+    //curl_setopt($ch, CURLOPT_HEADER,0);
+    //curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+    //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+    //curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+    //$data = curl_exec($ch);
+    //curl_close($ch);
     */
     $apidata = wFetchAPIData($api_url);
     $data = explode(',',$apidata);
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         echo "\n<!--geocodeWassup data: ";
         print_r($data);
@@ -840 +840 @@
  */
 function wGeolocateIP($ip) {
-    global $wpdb, $debug_mode;
+    global $wpdb, $wdebug_mode;
 
     $wassup_settings=get_option('wassup_settings');
@@ -922 +922 @@
  */
 function wGetStats($stat_type, $stat_limit=10, $stat_condition="") {
-    global $wpdb, $debug_mode;
+    global $wpdb, $wdebug_mode;
 
     $wassup_settings = get_option('wassup_settings');
@@ -928 +928 @@
     $wpurl =  get_bloginfo('wpurl');
     $blogurl =  get_option('home');
-    $table_name = (!empty($wassup_settings['wassup_table'])?$wassup_settings['wassup_table'] : $wpdb->prefix . "wassup");
-    $table_tmp_name = $table_name . "_tmp";
+    $wtable_name = (!empty($wassup_settings['wassup_table'])?$wassup_settings['wassup_table'] : $wpdb->prefix . "wassup");
+    $wtable_tmp_name = $wtable_name . "_tmp";
 
     if (empty($stat_limit) || !(is_numeric($stat_limit))) {
@@ -950 +950 @@
     //top search phrases...
     if ($stat_type == "searches") {
-        $stat_results = $wpdb->get_results("SELECT count(search) AS top_count, search AS top_item, referrer AS top_link FROM $table_name WHERE $stat_condition AND search!='' AND spider='' GROUP BY search ORDER BY top_count DESC LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(search) AS top_count, search AS top_item, referrer AS top_link, max(`timestamp`) AS visit_timestamp FROM $wtable_name WHERE $stat_condition AND search!='' AND spider='' GROUP BY search ORDER BY top_count DESC, visit_timestamp DESC LIMIT $stat_limit");
 
     //top external referrers...
     } elseif ($stat_type == "referrers") {
         //exclude internal referrals
-        $url = parse_url($blogurl);
-        $sitedomain = $url['host'];
+        $wurl = parse_url($blogurl);
+        $sitedomain = $wurl['host'];
         $exclude_list = $sitedomain;
         if ($wpurl != $blogurl) {
-            $url = parse_url($wpurl);
-            $wpdomain = $url['host'];
+            $wurl = parse_url($wpurl);
+            $wpdomain = $wurl['host'];
             $exclude_list .= ",".$wpdomain;
         }
@@ -980 +980 @@
             }
         }
-        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, LOWER(referrer) AS top_item, referrer AS top_link FROM $table_name WHERE $stat_condition AND referrer!='' AND search='' AND spider='' $exclude_referrers GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
-        if ($debug_mode) {
+        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, LOWER(referrer) AS top_item, referrer AS top_link, max(`timestamp`) AS visit_timestamp FROM $wtable_name WHERE $stat_condition AND referrer!='' AND search='' AND spider='' $exclude_referrers GROUP BY top_item ORDER BY top_count DESC, visit_timestamp DESC LIMIT $stat_limit");
+        if ($wdebug_mode) {
             echo "\n<pre>exclude_referrers = $exclude_referrers </pre>\n";
         }
@@ -987 +987 @@
     //top url requests...
     } elseif ($stat_type == "urlrequested") {
-        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, LOWER(REPLACE(urlrequested, '/', '')) AS top_group, LOWER(urlrequested) AS top_item, urlrequested AS top_link FROM $table_name WHERE $stat_condition GROUP BY top_group ORDER BY top_count DESC LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, LOWER(REPLACE(urlrequested, '/', '')) AS top_group, LOWER(urlrequested) AS top_item, urlrequested AS top_link, max(`timestamp`) AS visit_timestamp FROM $wtable_name WHERE $stat_condition GROUP BY top_group ORDER BY top_count DESC, visit_timestamp DESC LIMIT $stat_limit");
 
     //top browser...
     } elseif ($stat_type == "browser") {
-        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, SUBSTRING_INDEX(SUBSTRING_INDEX(browser, ' 0.', 1), '.', 1) AS top_item FROM $table_name WHERE $stat_condition AND `browser`!='' AND `browser` NOT LIKE 'N/A%' AND `spider`='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, SUBSTRING_INDEX(SUBSTRING_INDEX(browser, ' 0.', 1), '.', 1) AS top_item FROM $wtable_name WHERE $stat_condition AND `browser`!='' AND `browser` NOT LIKE 'N/A%' AND `spider`='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
 
     //top os...
     } elseif ($stat_type == "os") {
-        $stat_results = $wpdb->get_results("SELECT count(os) as top_count, `os` AS top_item FROM $table_name WHERE $stat_condition AND `os`!='' AND `os` NOT LIKE 'N/A%' AND spider='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(os) as top_count, `os` AS top_item FROM $wtable_name WHERE $stat_condition AND `os`!='' AND `os` NOT LIKE 'N/A%' AND spider='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
 
     //top language/locale..
     } elseif ($stat_type == "language" || $stat_type == "locale") {
-        $stat_results = $wpdb->get_results("SELECT count(LOWER(language)) as top_count, LOWER(language) as top_item FROM $table_name WHERE $stat_condition AND language!='' AND spider='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(LOWER(language)) as top_count, LOWER(language) as top_item FROM $wtable_name WHERE $stat_condition AND language!='' AND spider='' GROUP BY top_item ORDER BY top_count DESC LIMIT $stat_limit");
 
     //top visitors...
     } elseif ($stat_type == "visitor" || $stat_type == "visitors") {
-        $stat_results = $wpdb->get_results("SELECT count(username) as top_count, username as top_item, '1loggedin_user' as visitor_type, `timestamp` as visit_timestamp FROM $table_name WHERE $stat_condition AND username!='' GROUP BY 2 UNION SELECT count(comment_author) as top_count, comment_author as top_item, '2comment_author' as visitor_type, `timestamp` as visit_timestamp FROM $table_name WHERE $stat_condition AND username='' AND comment_author!='' GROUP BY 2 UNION SELECT count(hostname) as top_count, hostname as top_item, '3hostname' as visitor_type, `timestamp` as visit_timestamp FROM $table_name WHERE $stat_condition AND username='' AND comment_author='' AND spider='' GROUP BY 2 ORDER BY 1 DESC, 3, 2 LIMIT $stat_limit");
+        $stat_results = $wpdb->get_results("SELECT count(username) as top_count, username as top_item, '1loggedin_user' as visitor_type, max(`timestamp`) as visit_timestamp FROM $wtable_name WHERE $stat_condition AND username!='' GROUP BY 2 UNION SELECT count(comment_author) as top_count, comment_author as top_item, '2comment_author' as visitor_type, max(`timestamp`) as visit_timestamp FROM $wtable_name WHERE $stat_condition AND username='' AND comment_author!='' GROUP BY 2 UNION SELECT count(hostname) as top_count, hostname as top_item, '3hostname' as visitor_type, max(`timestamp`) as visit_timestamp FROM $wtable_name WHERE $stat_condition AND username='' AND comment_author='' AND spider='' GROUP BY 2 ORDER BY 1 DESC, 3, 2 LIMIT $stat_limit");
+
+    //top postid (post|page)
+    } elseif ($stat_type == "postid" || $stat_type == "article") {
+        $stat_results = $wpdb->get_results("SELECT count(*) AS top_count, url_wpid AS top_group, post_title AS top_item, urlrequested AS top_link, max(`timestamp`) as visit_timestamp FROM $wtable_name, {$wpdb->prefix}posts WHERE $stat_condition AND url_wpid!='' AND url_wpid!='0' AND url_wpid = {$wpdb->prefix}posts.ID GROUP BY top_group ORDER BY top_count DESC, visit_timestamp DESC LIMIT $stat_limit");
+
     } else {
         //TODO: check that wp_wassup.$stat_type column exist and is char
         if (!empty($stat_type)) {
-            $stat_results = $wpdb->get_results("SELECT count($stat_type) AS top_count, `$stat_type` AS top_item FROM $table_name WHERE $stat_condition AND `$stat_type`!='' AND `$stat_type` NOT LIKE 'N/A%' GROUP BY `$stat_type` ORDER BY top_count DESC LIMIT $stat_limit");
+            $stat_results = $wpdb->get_results("SELECT count($stat_type) AS top_count, `$stat_type` AS top_item FROM $wtable_name WHERE $stat_condition AND `$stat_type`!='' AND `$stat_type` NOT LIKE 'N/A%' GROUP BY `$stat_type` ORDER BY top_count DESC LIMIT $stat_limit");
         }
     }
@@ -1024 +1029 @@
  * @return none
  */
-function wassup_top10view ($from_date="",$to_date="",$max_char_len="",$top_limit=10,$title=false) {
+function wassup_top10view ($from_date="",$to_date="",$max_char_len="",$top_limit=0,$title=false) {
     global $wpdb, $wassup_options;
     if (!class_exists('wassupOptions') && file_exists(dirname(__FILE__). '/wassup.class.php')) {
@@ -1031 +1036 @@
     $wassup_options = new wassupOptions;
     $top_ten = unserialize(html_entity_decode($wassup_options->wassup_top10));
-    $table_name = (!empty($wassup_options->wassup_table)? $wassup_options->wassup_table: $wpdb->prefix . "wassup");
-    $table_tmp_name = $table_name . "_tmp";
+    if (!is_array($top_ten)) $top_ten = $wassup_options->defaultSettings("top10");
+    //$table_name = (!empty($wassup_options->wassup_table)? $wassup_options->wassup_table: $wpdb->prefix . "wassup");
+    //$table_tmp_name = $table_name . "_tmp";
 
     $blogurl =  get_bloginfo('home');
@@ -1053 +1059 @@
         }
     }
-    //#add an extra width offset when columns count < 5
+    //#add an extra width offset when columns count < 6
     $col_count = array_sum($top_ten);
-    if ($col_count > 0 && $col_count < 5 ) {
-        $widthoffset = (($max_char_len*(5 - $col_count))/$col_count)*.4; //just a guess
+    if ($col_count > 0 && $col_count < 6 ) {
+        $widthoffset = (($max_char_len*(6 - $col_count))/$col_count)*.4; //just a guess
     } else { 
         $widthoffset = 0;
@@ -1062 +1068 @@
     //extend page width to make room for more than 5 columns
     $pagewidth = $wassup_options->wassup_screen_res;
-    if ($col_count > 5) {
-        $pagewidth = $pagewidth+17*($col_count-5);
+    if ($col_count > 6) {
+        $pagewidth = $pagewidth+17*($col_count-6);
+    }
+    //New in v1.8.3: top_limit in top10 array
+    if (empty($top_limit) || !is_numeric($top_limit)) {
+        if (!empty($top_ten['toplimit'])) {
+            $top_limit = (int) $top_ten['toplimit'];
+        } else {
+            $top_limit = 10;    //default
+        }
     }
 
     //mysql conditional query...
     $top_condition = '`timestamp` BETWEEN '.$from_date.' AND '.$to_date;
+    if (!empty($top_ten['top_nospider'])) {
+        $top_condition .= " AND spider=''";
+    }
     echo "\n"; ?>
     <div id="toptenchart" style="width:auto;">
-    <table width="100%" border="0" style="margin:0; padding:0;">
+    <table width="100%">
     <tr valign="top"><?php
     if (!empty($title)) { ?>
         <th colspan="<?php echo $col_count; ?>"><span style="centered"><?php echo $title; ?></span></th></tr><tr><?php 
     }
+    //show a line# column for long data columns
+    if ($top_limit > 10) wPrintRowNums($top_limit);
+
     //#output top 10 searches
     if ($top_ten['topsearch'] == 1) {
@@ -1083 +1103 @@
         <li class="chartsT"><?php echo _e("TOP QUERY", "wassup"); ?></li> <?php 
         $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
-            foreach ($top_results as $top10) { 
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': <a href="'.$top10->top_link.'" target="_BLANK" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</a>'; ?></li><?php
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) { 
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count, $ndigits).' <a href="'.$top10->top_link.'" target="_BLANK" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</a>'; ?></nobr></li><?php
                 $i++;
-            }
+        }
         }
         //finish list with empty <li> for style consistency
@@ -1105 +1127 @@
         <ul class="charts">
         <li class="chartsT"><?php _e("TOP REFERRER", "wassup"); ?></li><?php
-         $i=0;
+        $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
+            $ndigits = strlen("{$top_results[0]->top_count}");
         foreach ($top_results as $top10) {
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': ';
-            print '<a href="'.clean_url($top10->top_link,'','url').'" title="'.attribute_escape($top10->top_link).'" target="_BLANK">';
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits);
+            echo ' <a href="'.clean_url($top10->top_link,'','url').'" title="'.attribute_escape($top10->top_link).'" target="_BLANK">';
             //#cut http:// from displayed url and truncate
             //#   instead of using stringShortener
-            print substr(str_replace("http://", "", attribute_escape($top10->top_item)),0,$char_len);
+            echo substr(str_replace("http://", "", attribute_escape($top10->top_item)),0,$char_len);
             if (strlen($top10->top_item) > ($char_len + 7)) { 
-                print '...';
-            }
-            print '</a>'; ?></li><?php
+                echo '...';
+            }
+            echo '</a>'; ?></nobr></li><?php
             $i++;
         }
@@ -1136 +1160 @@
         <li class="chartsT"><?php _e("TOP REQUEST", "wassup"); ?></li><?php
         $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
-            foreach ($top_results as $top10) {
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': ';
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) {
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits);
             if (strstr($top10->top_item,'[404]')) { //no link for 404 pages
-                echo '<span class="top10" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</span>';
+                echo ' <span class="top10" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</span>';
             } else {
-                echo '<a href="'.wAddSiteurl($top10->top_link).'" target="_BLANK" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</a>';
-            } ?></li><?php
-                $i++;
-            }
+                echo ' <a href="'.wAddSiteurl($top10->top_link).'" target="_BLANK" title="'.substr($top10->top_item,0,$wassup_options->wassup_screen_res-100).'">'.stringShortener(preg_replace('/'.preg_quote($blogurl,'/').'/i', '', $top10->top_item),$char_len).'</a>';
+            } ?></nobr></li><?php
+            $i++;
+        }
         }
         //finish list with empty <li> for styling consistency 
@@ -1163 +1189 @@
         <li class="chartsT"><?php _e("TOP BROWSER", "wassup") ?></li><?php
         $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
-            foreach ($top_results as $top10) {
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': ';
-                echo '<span class="top10" title="'.$top10->top_item.'">'.stringShortener($top10->top_item, $char_len).'</span>'; ?></li><?php
-                $i++;
-            }
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) {
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits);
+            echo ' <span class="top10" title="'.$top10->top_item.'">'.stringShortener($top10->top_item, $char_len).'</span>'; ?></nobr></li><?php
+            $i++;
+        }
         }
         //finish list with empty <li> for styling consistency 
@@ -1186 +1214 @@
         <li class="chartsT"><?php _e("TOP OS", "wassup") ?></li><?php
         $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
-            foreach ($top_results as $top10) {
-                echo "\n"; ?>
-        <li class="charts"><?php print $top10->top_count.': '; ?><span class="top10" title="<?php echo $top10->top_item; ?>"><?php echo stringShortener($top10->top_item, $char_len); ?></span></li><?php
-                $i++;
-            }
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) {
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits); ?> <span class="top10" title="<?php echo $top10->top_item; ?>"><?php echo stringShortener($top10->top_item, $char_len); ?></span></nobr></li><?php
+            $i++;
+        }
         }
         //finish list with empty <li> for styling consistency 
@@ -1208 +1238 @@
         <li class="chartsT"><?php _e("TOP LOCALE", "wassup"); ?></li><?php
         $i=0;
+        $ndigits=1;
         if (count($top_results) >0) {
-            foreach ($top_results as $top10) {
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': ';
-            echo '<img src="'.WASSUPURL.'/img/flags/'.strtolower($top10->top_item).'.png" alt="" />'; ?>
-            <span class="top10" title="<?php echo $top10->top_item; ?>"><?php echo $top10->top_item; ?></span></li><?php
-                $i++;
-            }
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) {
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits);
+            echo ' <img src="'.WASSUPURL.'/img/flags/'.strtolower($top10->top_item).'.png" alt="" />'; ?>
+            <span class="top10" title="<?php echo $top10->top_item; ?>"><?php echo $top10->top_item; ?></span></nobr></li><?php
+            $i++;
+        }
         }
         //finish list with empty <li> for styling consistency 
@@ -1232 +1264 @@
         <li class="chartsT"><?php _e("TOP VISITOR", "wassup"); ?></li><?php 
         $i=0;
+        $ndigits=1;
         if (count($top_results)>0) {
-            foreach ($top_results as $top10) { 
-                if ($top10->visitor_type == "1loggedin_user")
-                    $uclass=" userslogged";
-                elseif ($top10->visitor_type == "2comment_author")
-                    $uclass=" users";
-                else
-                    $uclass="";
-                echo "\n"; ?>
-        <li class="charts"><?php echo $top10->top_count.': <span class="top10'.$uclass.'" title="'.$top10->top_item.'">'.stringShortener($top10->top_item, $char_len).'</span>'; ?></li><?php
-                $i++;
-            } //end loop
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) { 
+            if ($top10->visitor_type == "1loggedin_user")
+                $uclass=" userslogged";
+            elseif ($top10->visitor_type == "2comment_author")
+                $uclass=" users";
+            else
+                $uclass="";
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits).' <span class="top10'.$uclass.'" title="'.$top10->top_item.'">'.stringShortener($top10->top_item, $char_len).'</span>'; ?></nobr></li><?php
+            $i++;
+        } //end loop
         }
         //finish list with empty <li> for styling consistency 
@@ -1250 +1284 @@
         </td>
 <?php   } // end if topvisitor
+
+    //#output top article (post|page by id)
+    if ($top_ten['toppostid'] == 1) {
+        echo "\n<!--heartbeat-->";
+        $top_results = wGetStats("postid",$top_limit,$top_condition);
+        $char_len = round(($max_char_len*.28)+$widthoffset,0); ?>
+        <td style="min-width:<?php echo ($char_len-5); ?>px;">
+        <ul class="charts">
+        <li class="chartsT"><?php _e("TOP ARTICLE", "wassup"); ?></li><?php
+        $i=0;
+        $ndigits=1;
+        if (count($top_results) >0) {
+            $ndigits = strlen("{$top_results[0]->top_count}");
+        foreach ($top_results as $top10) {
+            echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($top10->top_count,$ndigits);
+            echo ' <a href="'.wAddSiteurl($top10->top_link).'" target="_BLANK" title="'.$top10->top_item.'">'.stringShortener($top10->top_item,$char_len).'</a>'; ?> </nobr></li><?php
+            $i++;
+        }
+        }
+        //finish list with empty <li> for styling consistency 
+        wListFiller($i,$top_limit,"charts"); ?>
+        </ul>
+        </td><?php 
+    } // end if toppost
+    //show a line# column for long data columns
+    if ($top_limit > 10 && $col_count > 6) {
+        wPrintRowNums($top_limit);
+    }
     ?></tr>
-    </table><?php 
-    if ($wassup_options->wassup_spamcheck == 1) { ?>
-    <br/><span style="font-size:6pt;">* <?php _e("This report excludes Spam records","wassup"); ?></span><?php
-    } ?>
+    </table>
+    <span style="font-size:7pt;"> <?php 
+    if ($wassup_options->wassup_spamcheck == 1 || !empty($top_ten['top_nospider'])) { ?><br/>*<?php
+        if ($wassup_options->wassup_spamcheck == 1 && !empty($top_ten['top_nospider'])) {
+            _e("This report excludes spam and spider records","wassup");
+        } elseif (!empty($top_ten['top_nospider'])) {
+            _e("This report excludes spider records","wassup");
+        } else {
+            _e("This report excludes spam records","wassup");
+        }
+    } ?> </span>
     </div> <?php
 } //end wassup_top10view
@@ -1267 +1337 @@
     }
 } //end wListFiller
-
-// How many digits have an integer
-function digit_count($n, $base=10) {
-  if($n == 0) return 1;
-  if($base == 10) {
-    # using the built-in log10(x)
-    # might be more accurate than log(x)/log(10).
-    return 1 + floor(log10(abs($n)));
-  }else{
-    # here  logB(x) = log(x)/log(B) will have to do.
-   return 1 + floor(log(abs($n))/ log($base));
-  }
+/*
+ * print a table column with line number rows from 1 to "$top_limit"
+ * @param integer
+ * @output html
+ * @return none
+ */
+function wPrintRowNums($top_limit=10) {
+    $ndigits = strlen("{$top_limit}");
+    echo "\n"; ?>
+        <td style="min-width:8px;">
+        <ul class="charts rownums">
+        <li class="chartsT">&nbsp;</li><?php
+    for ($i=1; $i<= $top_limit; $i++) {
+        echo "\n"; ?>
+        <li class="charts"><nobr><?php echo wPadNum($i, $ndigits); ?></nobr></li><?php
+    } ?>
+        </td><?php
+} //end function
+
+/**
+ * return html code to pad an integer ($li_number) with spaces to match a
+ * width of $li_width
+ * @param integer (2)
+ * @return string (html)
+ */
+function wPadNum($li_number, $li_width=1) {
+    $numstr = (int)$li_number;
+    $ndigits = strlen("$numstr");
+    $padding = '';
+    if ($ndigits < $li_width) {
+        for ($i=$ndigits; $i < $li_width; $i++) $padding .= '&nbsp;';
+    }
+    $padhtml = '<span class="fixed">'."$padding{$numstr}</span>";
+    return ($padhtml);
 }
+
+// How many digits have an integer -- quicker to use 'strlen' function
+// function digit_count($n, $base=10) {
+//  if($n == 0) return 1;
+//  if($base == 10) {
+//    # using the built-in log10(x)
+//    # might be more accurate than log(x)/log(10).
+//    return 1 + floor(log10(abs($n)));
+//  }else{
+//    # here  logB(x) = log(x)/log(B) will have to do.
+//   return 1 + floor(log(abs($n))/ log($base));
+//  }
+//}
 
 //Round the integer to the next near 10
 function roundup($value) {
-    $dg = digit_count($value);
+    //$dg = digit_count($value);
+    $numstr = (int)$value;
+    $dg = strlen("$numstr");
     if ($dg <= 2) {
         $dg = 1;
@@ -1293 +1400 @@
 
 function Gchart_data($Wvisits, $pages=null, $atime=null, $type, $charttype=null, $axes=null, $chart_loc=null) {
-    global $debug_mode;
+    global $wdebug_mode;
     $chartAPIdata = false;
 // Port of JavaScript from http://code.google.com/apis/chart/
@@ -1374 +1481 @@
 
 // Used to show main visitors details query, to count items and to extract data for main chart
-class MainItems {
+class WassupItems {
     // declare variables
         var $tableName;
@@ -1387 +1494 @@
 
     /* Constructor */
-    function mainitems($table_name,$date_from,$date_to,$whereis=null,$limit=null) {
-        global $wpdb, $wassup_options, $debug_mode;
+    function wassupitems($table_name,$date_from,$date_to,$whereis=null,$limit=null) {
+        global $wpdb, $wassup_options, $wdebug_mode;
         if (empty($wassup_options->wassup_table)) {
             $wassup_options = new wassupOptions;
@@ -1421 +1528 @@
     // Function to show main query and count items
         function calc_tot($Type, $Search="", $specific_where_clause=null, $distinct_type=null) {
-        global $wpdb, $wassup_options, $debug_mode;
+        global $wpdb, $wassup_options, $wdebug_mode;
 
                 $this->ItemsType = $Type;
@@ -1444 +1551 @@
             //  - retrieve one row per wassup_id with timestamp = max(timestamp) (ie. latest record)
             // "sql_buffer_result" select option helps in cases where it takes a long time to retrieve results.  -Helene D. 2/29/09
-            $qry = sprintf("SELECT SQL_BUFFER_RESULT *, max(`timestamp`) as max_timestamp, count(wassup_id) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY wassup_id ORDER BY max_timestamp DESC %s",
+            $qry = sprintf("SELECT SQL_BUFFER_RESULT *, max(`timestamp`) as max_timestamp, min(`timestamp`) as min_timestamp, count(wassup_id) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY wassup_id ORDER BY max_timestamp DESC %s",
                 $this->tableName,
                 $this->from_date, 
@@ -1452 +1559 @@
             $results = $wpdb->get_results($qry);
             if (empty($results) || !is_array($results)) { //try without buffer
-                $qry = sprintf("SELECT *, max(`timestamp`) as max_timestamp, count(wassup_id) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY wassup_id ORDER BY max_timestamp DESC %s",
+                $qry = sprintf("SELECT *, max(`timestamp`) as max_timestamp, min(`timestamp`) as min_timestamp, count(wassup_id) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY wassup_id ORDER BY max_timestamp DESC %s",
                     $this->tableName,
                     $this->from_date, 
@@ -1476 +1583 @@
         case "main-ip":     //TODO
             // These are the queries to count the hits/pages/spam by ip
-            $qry = sprintf("SELECT *, max(`timestamp`) as max_timestamp, count(`ip`) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY ip ORDER BY max_timestamp DESC %s",
+            $qry = sprintf("SELECT *, max(`timestamp`) as max_timestamp, min(`timestamp`) as min_timestamp, count(`ip`) as page_hits FROM %s WHERE `timestamp` >= %s %s %s GROUP BY ip ORDER BY max_timestamp DESC %s",
                     $this->tableName,
                     $this->from_date, 
@@ -1506 +1613 @@
     // $Search = string to add to where clause
         function TheChart($Ctype, $Res, $chart_height, $Search="", $axes_type, $chart_bg, $chart_loc="page", $chart_group="") {
-        global $wpdb, $wassup_options, $debug_mode;
+        global $wpdb, $wassup_options, $wdebug_mode;
 
         $mysqlversion=substr(mysql_get_server_info(),0,3);
@@ -1529 +1636 @@
                 $chart_url = html_entity_decode($wassup_cache[0]->meta_value);
                 $cache_id = $wassup_cache[0]->meta_id;
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\n<!-- Cached chart found. cache_id=$cache_id -->\n";
                 }
@@ -1705 +1812 @@
                 }
             }
-            if ($debug_mode) {
+            if ($wdebug_mode) {
                 echo "\n<!-- \$x-points= ".implode("|",$tlabel)."\n";
                 echo " \$tgroup=".implode("|",$tgroup)."-->";
@@ -1731 +1838 @@
             $ss); 
         }
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             echo "\n<!-- \$query= $qry-->\n";
         }
@@ -1770 +1877 @@
             //if (count($x_label) > 20 && $chart_width < 1000) {
             //}
-            if ($debug_mode) {
+            if ($wdebug_mode) {
                 echo "\n<!-- \$x-group= ".implode("|",$x_group);
                 echo "\n \$x-labels= ".implode("|",$x_label)."-->\n";
@@ -1844 +1951 @@
     } //end function buildSearch
 
-} //end class mainItems
+} //end class WassupItems
 
 // Class to check if a previous comment with a specific IP was detected as SPAM by Akismet default plugin
@@ -1946 +2053 @@
  */
 function wFetchAPIData($api_url) {
-    global $debug_mode;
+    global $wdebug_mode;
 
     $wassup_settings=get_option('wassup_settings');
@@ -1986 +2093 @@
         $api_method='file_get_contents';    //debug
     }
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         echo "\n<!-- <br>API Fetch using $api_method data: "; //debug
         print_r($apidata);

wassup/trunk/lib/settings.php

@@ -9 +9 @@
  */
 function wassup_optionsView() {
-    global $wpdb, $wp_version, $user_level, $wassupversion, $wassup_options, $debug_mode;
+    global $wpdb, $wp_version, $user_level, $wassupversion, $wassup_options, $wdebug_mode;
 
     $GMapsAPI="http://code.google.com/intl/en/apis/maps";
@@ -20 +20 @@
     $alertstyle = 'color:red; background-color:#ffd;';
     $wassup_table = (!empty($wassup_options->wassup_table))? $wassup_options->wassup_table: $wpdb->prefix . "wassup";
+    $wassup_meta_table = $wassup_table . "_meta";
     $table_engine = "";
     $table_collation = "";
@@ -77 +78 @@
         <?php $wassup_options->showFormOptions("wassup_screen_res"); ?>
             </select>
-            </p>
-        <h3><?php _e('Set minimum users level which can view and manage WassUp plugin (default Administrators)','wassup'); ?></h3>
-        <p><select name="wassup_userlevel">
+            </p><br/>
+        <h3><?php _e('User Permissions'); ?></h3>
+        <p><strong><?php _e('Set minimum users level which can view and manage WassUp plugin','wassup'); ?></strong>:
+        <select name="wassup_userlevel">
         <?php $wassup_options->showFormOptions("wassup_userlevel"); ?>
-        </select></p>
+        </select>
+        <?php echo "(".__('default Administrator','wassup').")"; ?>
+        </p><br/>
 
         <h3><?php _e('Dashboard Settings','wassup'); ?></h3>
         <p><input type="checkbox" name="wassup_dashboard_chart" value="1" <?php if($wassup_options->wassup_dashboard_chart == 1) print "CHECKED"; ?> /> <strong><?php _e('Display small chart in the dashboard','wassup'); ?></strong>
-        </p>
-
-        <h3><?php _e('GEO IP Map (Spy view)','wassup'); ?></h3>
-        <p><input type="checkbox" name="wassup_geoip_map" value="1" <?php
+        </p><br/>
+
+        <h3><?php _e('Spy Visitors Settings','wassup'); ?></h3>
+        <p> <input type="checkbox" name="wassup_geoip_map" value="1" <?php
         //if (!function_exists('curl_init')) { print "DISABLED"; }
         if ($wassup_options->wassup_geoip_map == 1) print "CHECKED"; ?> />
@@ -105 +109 @@
             }
         } ?>
-        <p><strong>Google Maps API <?php _e("key","wassup"); ?>:</strong> <input type="text" name="wassup_googlemaps_key" size="40" value="<?php print $wassup_options->wassup_googlemaps_key; ?>" /> - <a href="<?php echo $GMapsAPI.'/signup.html?url='.get_bloginfo('wpurl'); ?>"><?php _e("signup for your key","wassup"); ?></a></p></br /> <?php
+        <p> <strong>Google Maps API <?php _e("key","wassup"); ?>:</strong> <input type="text" name="wassup_googlemaps_key" size="40" value="<?php print $wassup_options->wassup_googlemaps_key; ?>" /> - <a href="<?php echo $GMapsAPI.'/signup.html?url='.get_bloginfo('wpurl'); ?>"><?php _e("signup for your key","wassup"); ?></a></p> <?php
         //no curl - now works without cUrl using 'wp_remote_get'
         //} else {
         //echo '<p class="small">'.__("Geo IP Map requires","wassup")." PHP <strong>Curl</strong>. ".__("Please install it to be able to activate this feature","wassup").".</p>";
-        //} ?><br/>
+        //} ?>
+        <p> <strong><?php echo _e('Set update speed of Spy data in microseconds','wassup'); ?></strong> :
+        <input type="text" name="wassup_spy_speed" size="5" value="<?php if (empty($wassup_options->wassup_spy_speed)) echo "5000"; else echo $wassup_options->wassup_spy_speed; ?>" />
+        <?php echo "<nobr>(".__('default 5000, minimum 1000','wassup').")</nobr>"; ?><br/>
+        <?php  echo __('Decrease if some visitor records are missing from Spy view. Increase if multiple duplicate records are shown.','wassup'); ?>
+        </p><br/>
 
         <h3><?php _e('Visitor Detail Settings','wassup'); ?></h3>
-        <p><strong><?php _e('Time format 12/24 Hour','wassup'); ?></strong>:
+        <p> <strong><?php _e('Time format 12/24 Hour','wassup'); ?></strong>:
         &nbsp; 12h <input type="radio" name="wassup_time_format" value="12" <?php if($wassup_options->wassup_time_format == 12) print "CHECKED"; ?> />
         &nbsp; &nbsp; 24h <input type="radio" name="wassup_time_format" value="24" <?php if($wassup_options->wassup_time_format == 24) print "CHECKED"; ?> />
         </p>
-
-        <p><strong><?php _e('Show chart type - How many axes','wassup'); ?></strong>:
-        <select name='wassup_chart_type'><?php 
-        $wassup_options->showFormOptions("wassup_chart_type");
-        ?></select>
-        </p>
-
-        <p><strong><?php echo __('Set how many minutes wait for automatic page refresh','wassup'); ?></strong>:
+        <p> <strong><?php _e('Show chart type - How many axes','wassup'); ?></strong>:
+        <select name='wassup_chart_type'>
+        <?php $wassup_options->showFormOptions("wassup_chart_type"); ?>
+        </select>
+        </p>
+        <p> <strong><?php echo __('Set how many minutes wait for automatic page refresh','wassup'); ?></strong>:
         <input type="text" name="wassup_refresh" size="2" value="<?php print $wassup_options->wassup_refresh; ?>" /> <?php _e('minutes (default 3)','wassup'); ?>
         </p>
-
-        <p><strong><?php _e('Show visitor details for the last','wassup');
-        ?></strong>: <select name='wassup_time_period'> <?php 
-        $wassup_options->showFormOptions("wassup_time_period");
-        ?></select>
-        </p>
-        <p><strong><?php _e('Filter visitor details for','wassup');
-        ?></strong>: <select name='wassup_default_type'> <?php 
-        $wassup_options->showFormOptions("wassup_default_type");
-        ?></select>
-        </p>
-
-        <p><strong><?php _e('Number of items per page','wassup'); ?></strong>:
+        <p> <strong><?php _e('Show visitor details for the last','wassup'); ?></strong>:
+        <select name='wassup_time_period'>
+        <?php $wassup_options->showFormOptions("wassup_time_period"); ?>
+        </select>
+        </p>
+        <p> <strong><?php _e('Filter visitor details for','wassup'); ?></strong>: 
+        <select name='wassup_default_type'>
+        <?php $wassup_options->showFormOptions("wassup_default_type"); ?>
+        </select>
+        </p>
+        <p> <strong><?php _e('Number of items per page','wassup'); ?></strong>:
         <select name='wassup_default_limit'>
         <?php $wassup_options->showFormOptions("wassup_default_limit"); ?>
         </select>
         </p><br />
-        <?php
-        //TODO: Make Top 10 Customizable with up to 10 choices
+
+        <h3><?php _e('Customize Top Stats Lists','wassup'); ?></h3><?php
+        //New in 1.8.3: 
+        //  1) toplimit option to customize top stats list size
+        //  2) toppostid option to list top post-ID items (articles)
+        //  3) top_nospider option to exclude spider visits from all
+        //     top stats lists
         $top_ten = unserialize(html_entity_decode($wassup_options->wassup_top10));
-        ?>
-        <h3><?php _e('Customize Top Ten List','wassup'); ?></h3>
-        <p style="margin-top:5px;"> <strong> <?php _e("Choose one or more items for your Top Ten list", "wassup"); ?></strong> (<?php _e("over 5 selections may cause horizontal scrolling","wassup"); ?>):<br />
+        if (!is_array($top_ten)) {  //in case corrupted
+            $top_ten = $wassup_options->defaultSettings("top10");
+        }
+        if (empty($top_ten["toplimit"])) $top_ten["toplimit"] = 10;
+        echo "\n"; ?>
+        <p> <strong> <?php _e("Set the list length size for Top Stats", "wassup"); ?></strong>:
+        <input type="text" name="toplimit" size="2" value="<?php echo (int)$top_ten['toplimit']; ?>" /> (<?php _e("default 10","wassup"); ?>)
+        </p>
+        <p style="margin-top:5px;"> <strong> <?php _e("Choose one or more items to list in Top Stats", "wassup"); ?></strong> (<?php _e("over 5 selections may cause horizontal scrolling","wassup"); ?>):<br />
         <div style="padding-left:25px;padding-top:0;margin-top:0;display:block;clear:left;">
         <div style="display:block; vertical-align:top; float:left; width:225px;">
             <input type="checkbox" name="topsearch" value="1" <?php if($top_ten['topsearch'] == 1) print "CHECKED"; ?> /><?php _e("Top Searches", "wassup"); ?><br />
-            <input type="checkbox" name="topreferrer" value="1" <?php if($top_ten['topreferrer'] == 1) print "CHECKED"; ?> /><?php _e("Top Referrers", "wassup"); ?><br />
+            <input type="checkbox" name="topreferrer" value="1" <?php if($top_ten['topreferrer'] == 1) print "CHECKED"; ?> /><?php _e("Top Referrers", "wassup"); ?>*<br />
         <input type="checkbox" name="toprequest" value="1" <?php if($top_ten['toprequest'] == 1) print "CHECKED"; ?> /><?php _e("Top Requests", "wassup"); ?><br />
         </div>
@@ -161 +177 @@
         </div>
         <div style="vertical-align:top; float:left; width:225px;">
-        <input type="checkbox" name="topvisitor" value="1" <?php if($top_ten['topvisitor'] == 1) print "CHECKED"; ?> /><?php _e("Top Visitors", "wassup"); ?><br /><!--  
+        <input type="checkbox" name="topvisitor" value="1" <?php if(!empty($top_ten['topvisitor'])) print "CHECKED"; ?> /><?php _e("Top Visitors", "wassup"); ?><br />
+            <input type="checkbox" name="toppostid" value="1" <?php if(!empty($top_ten['toppostid'])) print "CHECKED"; ?> /><?php _e("Top Articles", "wassup"); ?></span><br /><!--  
         //TODO
             <input type="checkbox" name="topfeed" value="1" DISABLED /><?php _e("Top Feeds", "wassup"); ?><br />
@@ -167 +184 @@
         </div>
         </div>
-        </p>
-        <p style="margin-top:10px; clear:left;"> <strong><?php _e("Websites/domains to exclude from top referrers", "wassup"); ?></strong> :<br />
+        </p><p style="clear:left;"></p>
+        <p style="margin-top:5px;"> *<strong><?php _e("Exclude the following website domains from Top Referrers", "wassup"); ?></strong> :<br />
         <span style="padding-left:10px;display:block;clear:left;">
         <textarea name="topreferrer_exclude" rows="2" style="width:66%;"><?php echo $top_ten['topreferrer_exclude']; ?></textarea><br />
-        <?php  echo __("Comma separated value","wassup")."(ex: mydomain2.net, mydomain2.info). ". __("List whole domains only. Wildcards and partial domains will NOT be excluded.","wassup"). " ";
+        <?php  echo __("Comma separated value","wassup")." (ex: mydomain2.net, mydomain2.info). ". __("List whole domains only. Wildcards and partial domains will be ignored.","wassup"). " ";
         _e("Don't list your website domain defined in WordPress","wassup"); ?>.</span>
         </p>
+        <p> <input type="checkbox" name="top_nospider" value="1" <?php if($top_ten['top_nospider'] == 1) print "CHECKED"; ?> />
+        <strong> <?php _e("Exclude all spider records from Top Stats", "wassup"); ?></strong>
+        </p>
         <br /><br />
-        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options" class="submit-opt wassup-button" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
+        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options" class="submit-opt wassup-button button-primary" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
     </div>
 
@@ -206 +226 @@
         <br /><span style="padding-left:10px;display:block;clear:left;">
             <textarea name="wassup_exclude_user" rows="2" style="width:60%;"><?php print $wassup_options->wassup_exclude_user; ?></textarea></span> &nbsp; <?php _e("comma separated value, enter a registered user's login name (ex: bobmarley, enyabrennan, etc.)", "wassup") ?></p>
-        <br /><p><strong><?php echo __("Posts/pages","wassup")."\n<br /> &nbsp; ".__('enter requested URLs to exclude from recording','wassup'); ?></strong>:
+        <br /><p><strong><?php echo __("Posts/pages","wassup")."\n<br /> &nbsp; ".__('Enter requested URLs to exclude from recording','wassup'); ?></strong>:
         <br /><span style="padding-left:10px;display:block;clear:left;">
             <textarea name="wassup_exclude_url" rows="2" style="width:60%;"><?php print $wassup_options->wassup_exclude_url; ?></textarea></span> &nbsp; <?php _e("comma separated value, don't enter entire url, only the last path or some word to exclude (ex: /category/wordpress, 2007, etc...)", "wassup") ?></p>
-        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options2" class="submit-opt wassup-button" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
+        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options2" class="submit-opt wassup-button button-primary" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
     </div>
     
     <div id="wassup_opt_frag-3" class="optionstab<?php if ($tab == "3") echo ' tabselected'; ?>">
-       <?php /*
-    //   <h3>&lt;?php _e('Temporary files location folder','wassup'); ?&rt;</h3>
-    //  <p>&lt;?php echo '<strong>'.__('Current "Save path" directory for storing temporary files used to track visitor activity','wassup').'</strong>:<br />';
-    //  $sessionpath = $wassup_options->wassup_savepath;
-    //  if (empty($sessionpath)) {
-    //      $sessionpath = getSessionpath();
-    //  }
-    //  //$sessionpath = "/fakefolder/temp";    //#debug
-    //  $sessionstyle = '';
-    //  //# check that session_save_path exists and is writable...
-    //  if ($sessionpath == "" || $wassup_options->isWritableFolder($sessionpath) == false) {
-    //      $sessionwarn = '<span style="font-size:95%; padding-left:5px;'.$alertstyle.'"><span style="text-decoration:blink;">'.__('WARNING','wassup').'!</span> '.__('Directory does not exist or is not writable. Please enter a different path above or change "session.save_path" in "php.ini" to point to a valid, writable folder','wassup').'.</span>';
-    //      $sessionstyle = $alertstyle;
-    //  } else {
-    //      $sessionwarn ='<span style="font-size:95%; color:#555; padding-left:5px;">'.__('Note: To adjust, modify the directory shown in the box above or edit "sessions.save_path" in','wassup').' <i>php.ini</i>.</span>';
-    //  } 
-    //  <textarea name="wassup_savepath" rows="1" style="width:550px;padding-left:25px;clear:left;&lt;?php echo $sessionstyle; ?&rt;">&lt;?php echo $sessionpath; ?&rt;</textarea>
-    //  <br />&nbsp;&nbsp;&lt;?php echo __('Use absolute directory paths only. This value is usually','wassup').' "/tmp".'."\n"; ?&rt;
-    //  <br />&nbsp; <span style="font-size:95%; color:#555;">System default for session.save_path="&lt;?php echo session_save_path(); //debug ?&rt;" from <i>php.ini</i> or from web server configuration.</span>
-    //  <br />&nbsp;&lt;?php echo $sessionwarn."\n"; ?&rt;
+<?php /*
+       //TODO ?
+       //<!--
+       //<br /><h3><?php _e('Rescan Old Records','wassup'); ?></h3>
+    //  <p><?php _e("Statistical records collected by earlier versions of WassUp may not have the latest spider, search engine, and spam data properly identified.  Click the \"Rescan\" button to retroactively scan and update old records","wassup"); ?>.
+    //  <br /><input type="button" name="rescan" value="<?php _e('Rescan Old Records','wassup'); ?>" /> 
     //  </p><br />
-    */ ?>
-       <?php //TODO ?>
-       <!--
-       <br /><h3><?php _e('Rescan Old Records','wassup'); ?></h3>
-        <p><?php _e("Statistical records collected by earlier versions of WassUp may not have the latest spider, search engine, and spam data properly identified.  Click the \"Rescan\" button to retroactively scan and update old records","wassup"); ?>.
-        <br /><input type="button" name="rescan" value="<?php _e('Rescan Old Records','wassup'); ?>" /> 
-        </p><br />
-       -->
+    //   -->
+*/ ?>
         <h3><?php _e('Select actions for table growth','wassup'); ?></h3>
         <p><?php _e("WassUp table grows very fast, especially if your site is frequently visited. I recommend you delete old records sometimes.","wassup");
-        echo " ".__("You can select an option below to delete all Wassup records (empty table); or you can delete selected old records on either an automatic schedule (daily), or as manual task now (once). If you haven't database space problems, you can leave the table as is.","wassup"); ?></p>
+        echo "<br/>".__('You can delete all Wassup records now (Empty Table), you can set an automatic delete option to delete selected old records daily, and you can manually delete selected old records once (Delete NOW).','wassup');
+        echo " ".__("If you haven't database space problems, you can leave the table as is.","wassup"); ?></p>
         <p><?php _e('Current WassUp table usage is','wassup'); ?>:
         <strong><?php
@@ -279 +280 @@
         </p><br/>
         <h3><?php _e('Cache storage option','wassup'); ?></h3>
-        <p><input type="checkbox" name="wassup_cache" value="1" <?php if($wassup_options->wassup_cache == 1 ) print "CHECKED"; ?> /> <strong><?php echo __('Enable cache for storing some remote API services data locally in WassUp table','wassup'); ?></strong></p>
+        <p><input type="checkbox" name="wassup_cache" value="1" <?php 
+        if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_meta_table'") != $wassup_meta_table) { 
+            echo "DISABLED"; //meta table required for cache
+        } elseif ($wassup_options->wassup_cache == 1 ) {
+            echo "CHECKED"; 
+        } ?> /> <strong><?php echo __('Enable cache for storing some remote API data locally in WassUp table','wassup'); ?></strong></p>
         <p style="color:#555; margin-top:0; padding-top:0;"><?php _e('Reduces the number of requests to remote API servers and may improve WassUp admin page load.','wassup'); ?></p><br/>
 
@@ -485 +491 @@
                 }
             }
-            if ($debug_mode) {
+            if ($wdebug_mode) {
                 print_r($sql_vars); //debug
             }
@@ -579 +585 @@
         </ul></p>
         <br /><br />
-        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options3" class="submit-opt wassup-button" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
+        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options3" class="submit-opt wassup-button button-primary" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" class="reset-opt wassup-button" value="<?php _e('Reset','wassup'); ?>" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
     </div>
     
@@ -596 +602 @@
         <br /><p><?php _e("To help improve this plugin, we would appreciate your feedback at","wassup"); ?> <a href="http://www.wpwp.org">www.wpwp.org</a>.</p>
         <br /><br />
-        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options4" class="submit-opt wassup-button" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" value="<?php _e('Reset','wassup'); ?>" class="reset-opt wassup-button" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
+        <p style="clear:both;padding-left:0;padding-top:15px;"><input type="submit" name="submit-options4" class="submit-opt wassup-button button-primary" value="<?php _e('Save Settings','wassup'); ?>" />&nbsp;<input type="reset" name="reset" value="<?php _e('Reset','wassup'); ?>" class="reset-opt wassup-button" /> - <input type="submit" name="reset-to-default" class="default-opt wassup-button" value="<?php _e("Reset to Default", "wassup"); ?>" /></p><br />
     </div>
         </form>

wassup/trunk/lib/uadetector.class.php

@@ -2 +2 @@
 /**
  * UADetector.class.php
- * Description: a PHP class for browser and spider identification
- * Updated: 2010-09-02
- * @version 0.9a3
- * @author Helene D. <[email protected]>
- * Author URI: http://www.techfromhel.com/
+ * Description: a PHP4 class for browser and spider identification
+ * Updated: 2011-07-13
+ * @version 0.9a5
+ * @author Helene Duncker <[email protected]>
+ * Author URI: http://techfromhel.webege.com/
  *
- * @copyright Copyright (c) 2009,2010 Helene Duncker
+ * @copyright Copyright (c) 2009-2011 Helene Duncker
  * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License
  */
@@ -16 +16 @@
  *
  * Note: UADetector attempts to find the actual browser in use. This may 
- *    cause the browser "name" to differ from browser "emulation" field
- *    when user-agent "spoofing" is detected. This means that:
- *    a) "Name" field is best used for information and statistics only.
- *    b) "Emulation" field is best used to format web page by browser type.
+ *    cause the "name" field to differ from "emulation" field when 
+ *    user-agent "spoofing" is detected. Use the appropriate field 
+ *    for your application type:
+ *      a) "Name" field is best for information and statistics only.
+ *      b) "Emulation" field is best for UI and customizations by browser type.
  *
  * Disclaimer: Use at your own risk. No warranty expressed or implied is provided.
  */
 class UADetector {
-    var $name = '';     //name of browser or spider, not null
-    var $version = '';  //version of browser|spider, if available
+    var $name = '';     //browser or spider name, not null
+    var $version = '';  //browser or spider version, if available
     var $os = '';       //operating system+version, if available
-    var $platform = ''; //operating system|device platform
+    var $platform = ''; //operating system or device platform
     var $emulation = '';    //emulated browser plus major version#
-    var $language = ''; //language code, if available
-    var $device = '';   //PC, PDA, Phone, TV, if known
-    var $model = '';    //Manufacturer model, if known
+    var $language = ''; //language code (not locale), if available
+    var $device = '';   //PC, PDA, Phone, TV, if available
+    var $model = '';    //Device manufacturer model, if available
     var $resolution = '';   //screen size (MMMxNNN), if in user-agent
-    var $subscribers = '';  //feed subscribers, if in user-agent
+    var $subscribers = '';  //feed subscriber count, if in user-agent
     var $is_mobile = false;
     var $is_browser = false;
@@ -64 +65 @@
      * @access  public
      * @param   string $ua (optional)
-     * @return  object(12)
+     * @return  object(16)
      */
     function __construct($ua="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         $do_profile= false;
-        if ($debug_mode && function_exists('profiler_beginSection')) {
+        if ($wdebug_mode && function_exists('profiler_beginSection')) {
             $do_profile = true;
             profiler_beginSection('(Subtot)uaDetector');
@@ -139 +140 @@
         //  "WassUp", a web statistics plugin for WordPress 2.2+ 
         //   available at http://www.wpwp.org
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
 
         // User agent parameter or class variable is required.
@@ -174 +175 @@
                 $top_ua['device'] = $match[3];
             }
-        // #3 Firefox or other Mozilla browsers on Windows
+        // #3 Firefox and other Mozilla browsers on Windows
         } elseif (preg_match('#^Mozilla/\d\.\d\s\(Windows;\sU;\s(.+);\s([a-z]{2}(?:\-[A-Za-z]{2})?);\srv\:\d(?:\.\d+)+\)\sGecko/\d+\s([A-Za-z\-0-9]+)/(\d+(?:\.\d+)+)(?:\s\(.*\))?$#',$ua,$match)>0) {
             $top_ua['name'] = $match[3];
@@ -193 +194 @@
             }
             $top_ua['agenttype']= 'R';
-        // #5 MSNBot, MSNbot-media
-        } elseif (preg_match('#^(?:msnbot(\-media)?)/(\d\.\d)[^a-z0-9]+http\://search\.msn\.com/msnbot\.htm.$#',$ua,$match)>0) {
-            $top_ua['name'] = 'MSNBot';
+        // #5 BingBot
+        } elseif (preg_match('#^Mozilla/\d\.\d\s\(compatible;\sbingbot/(\d\.\d)[^a-z0-9]+http\://www\.bing\.com/bingbot\.htm.$#',$ua,$match)>0) {
+            $top_ua['name'] = 'BingBot';
             if (!empty($match[1])) { 
                 $top_ua['name'].=$match[1];
@@ -203 +204 @@
             }
             $top_ua['agenttype']= 'R';
-        // #6 Twiceler
-        } elseif (preg_match('#^Mozilla/\d\.\d\s\(Twiceler\-(\d\.\d)\shttp://www\.cuill?\.com/twiceler/robot\.html\)$#',$ua,$match)>0) {
-            $top_ua['name'] = 'Twiceler';
-            $top_ua['version']=$match[1];
-            $top_ua['agenttype']= 'R';
-        // #7 FeedBurner
+        // #6 FeedBurner
         } elseif (preg_match('#^FeedBurner/(\d\.\d)\s\(http\://www\.FeedBurner\.com\)$#',$ua,$match)>0) {
             $top_ua['name'] = 'FeedBurner';
             $top_ua['version']=$match[1];
             $top_ua['agenttype']= 'F';
-        // #8 Wordpress
+        // #7 Wordpress
         } elseif (preg_match('#^WordPress/(?:wordpress(\-mu)\-)?(\d\.\d+)(?:\.\d+)*(?:\-[a-z]+)?(?:\;\shttp\://[a-z0-9_\.\:\/]+)?$#',$ua,$match)>0) {
             $top_ua['name'] = 'Wordpress';
@@ -221 +217 @@
             $top_ua['version']=$match[2];
             $top_ua['agenttype']= 'U';
-        // #9 Firefox and Gecko browsers on Mac|*nix|OS/2 etc...
+        // #8 Firefox and Gecko browsers on Mac|*nix|OS/2 etc...
         } elseif (preg_match('#^Mozilla/\d\.\d\s\((Macintosh|X11|OS/2);\sU;\s(.+);\s([a-z]{2}(?:\-[A-Za-z]{2})?)(?:-mac)?;\srv\:\d(?:.\d+)+\)\sGecko/\d+\s([A-Za-z\-0-9]+)/(\d+(?:\.[0-9a-z\-\.]+))+(?:(\s\(.*\))(?:\s([A-Za-z\-0-9]+)/(\d+(?:\.\d+)+)))?$#',$ua,$match)>0) {
             $top_ua['name'] = $match[4];
@@ -237 +233 @@
             list($top_ua['os']) = $this->OSversion($os,$top_ua['platform'],$ua);
             $top_ua['agenttype']= 'B';
-        // #10 Safari and Webkit-based browsers on all platforms
+        // #9 Safari and Webkit-based browsers on all platforms
         } elseif (preg_match('#^Mozilla/\d\.\d\s\(([A-Za-z0-9/\.]+);\sU;?\s?(.*);\s?([a-z]{2}(?:\-[A-Za-z]{2})?)?\)\sAppleWebKit/[0-9\.]+\+?\s\((?:KHTML,\s)?like\sGecko\)(?:\s([a-zA-Z0-9\./]+(?:\sMobile)?)/?[A-Z0-9]*)?\sSafari/([0-9\.]+)$#',$ua,$match)>0) {
             $top_ua['name'] = 'Safari';
@@ -260 +256 @@
             $top_ua['language']=$match[3];
             $top_ua['agenttype']= 'B';
+
+        // #10 Google Chrome browser on all platforms with or without language string
+        } elseif (preg_match('#^Mozilla/\d+\.\d+\s(?:[A-Za-z0-9\./]+\s)?\((?:([A-Za-z0-9/\.]+);(?:\sU;)?\s?)?([^;]*)(?:;\s[A-Za-z]{3}64)?;?\s?([a-z]{2}(?:\-[A-Za-z]{2})?)?\)\sAppleWebKit/[0-9\.]+\+?\s\((?:KHTML,\s)?like\sGecko\)(?:\s([A-Za-z0-9_\-]+[^i])/([A-Za-z0-9\.]+)){1,3}(?:\sSafari/[0-9\.]+)?$#',$ua,$match)>0) {
+            $top_ua['name'] = $match[4];
+            $top_ua['version'] = $match[5];
+            if (empty($match[2])) {
+                $os = $match[1];
+            } else {
+                $top_ua['platform'] = $match[1];
+                $os = $match[2];
+            }
+            if ($top_ua['platform'] == 'Windows') {
+                $top_ua['os'] = $this->winOSversion($os);
+            } else {
+                list($top_ua['os']) = $this->OSversion($os,$top_ua['platform'],$ua);
+            }
+            if (!empty($match[3])) {
+                $top_ua['language']=$match[3];
+            }
+            $top_ua['agenttype']= 'B';
         }
         //check http header for user agent spoofing and for os and screen resolution
@@ -280 +296 @@
             $top_ua=false;
         }
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             echo "\n".'<br />uadetector: top_ua->name='.$top_ua['name']."&nbsp; ".'top_ua->os='.$top_ua['os']; //debug
             if ($do_profile) {
@@ -296 +312 @@
      */
     function isBrowserAgent($agent="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         $ua="";
         $is_current_ua = false;
@@ -311 +327 @@
 
         //spiders are not detected here, so exclude user agents that are likely spiders (ie. contains an email or URL, or spider-like keywords)
-        if (isset($this->done_spiders) && !$this->done_spiders && preg_match('#(robot|bot[\s\-_\/\)]|bot$|blog|checker|crawl|feed|fetcher|libwww|[^\.e]link\s?|parser|reader|spider|verifier|href|https?\://|.+(?:\@|\s?at\s?)[a-z0-9_\-]+(?:\.|\s?dot\s?)|www[0-9]?\.[a-z0-9_\-]+\..+|\/.+\.(html?|aspx?|php5?|cgi))#i',$ua)>0) {
+        if (isset($this->done_spiders) && !$this->done_spiders && preg_match('#(robot|bot[\s\-_\/\)]|bot$|blog|checker|crawl|feed|fetcher|libwww|[^\.e]link\s?|parser|reader|spider|verifier|href|https?\://|.+(?:\@|\s?at\s?)[a-z0-9_\-]+(?:\.|\s?dot\s?)|www[0-9]?\.[a-z0-9_\-]+\..+|\/.+\.(s?html?|aspx?|php5?|cgi))#i',$ua)>0) {
             //not spider if embedded browser or is a browser add-on such as spyware or translator
             if (preg_match('#(embedded\s?(WB|Web\sbrowser)|dynaweb|bsalsa\.com|muuk\.co|translat[eo]r?)#i',$ua)==0) {
@@ -320 +336 @@
             profiler_beginSection('_____ua::isBrowser');
         }
-        //Separate check for mobile browsers beforehand
+        //### Step 1: check for mobile or embedded browsers
         $ismobile = false;
-        //check for mobile or embedded browser
         $wap = $this->isMobileAgent($ua);
         if (!empty($wap) && is_array($wap)) {
             $ismobile = true;
+            $browser['name'] = $wap['name'];
+            $browser['version'] = $wap['version'];
             $browser['device'] = $wap['device'];
             $browser['model'] = $wap['model'];
-            $browser['platform'] = $wap['platform'];
-            if (empty($browser['name'])) {
-                $browser['name'] = $wap['name'];
-                $browser['version'] = $wap['version'];
-            }
-            if (!empty($wap['os'])) $browser['os'] = $wap['os'];
+            $browser['os'] = $wap['os'];
+            $browser['platform'] = "WAP";
             if (!empty($wap['language'])) $browser['language'] = $wap['language'];
         }
+        //### Step 2: Check for MSIE-based browsers
         if (!$ismobile || empty($browser['name'])) {
-            //MSIE browsers
             if (preg_match('/compatible(?:\;|\,|\s)+MSIE\s(\d+)(\.\d+)+(.*)/',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for MSIE-based browser<br/>";
                 }
@@ -375 +388 @@
                 }
 
+        //### Step 3: Check for All Other browsers
             //Opera browsers
-            } elseif (preg_match('#(Opera\s(?:Mini|Mobile))[/ ]([0-9\.]+)#',$ua,$pcs)>0) {
-                $browser['name'] = $pcs[1];
-                $browser['version'] = $pcs[2];
             } elseif (preg_match('#Opera[/ ]([0-9\.]+)#',$ua,$pcs)>0) {
                 $browser['name'] = 'Opera';
@@ -385 +396 @@
             //Firefox-based browsers (Camino, Flock) (find before FF)
             } elseif (preg_match('#[^a-z](Camino|Flock|Galeon|Orca)/(\d+[\.0-9a-z]*)#',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for Firefox-based browser<br/>";
                 }
@@ -393 +404 @@
             //other Gecko-type browsers (incl. Firefox)
             } elseif (preg_match('#Gecko/\d+\s([a-z0-9_\- ]+)/(\d+[\.0-9a-z]*)(?:$|[^a-z0-9_\-]+([a-z0-9_\- ]+)/(\d+[\.0-9a-z]*)|[^a-z0-9_\-]*\(.*\))#i',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for Gecko-type browser<br/>";
                 }
@@ -404 +415 @@
             //Firefox browser
             } elseif (preg_match('#[^a-z](Fire(?:fox|bird))/?(\d+[\.0-9a-z]*)?#',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for Firefox browser<br/>";
                 }
@@ -413 +424 @@
             //Mozilla browser (like FF, but nothing after "rv:" or "Gecko")
             } elseif (preg_match('/^Mozilla\/\d\.\d.+\srv\:(\d[\.0-9a-z]+)[^a-z0-9]+(?:Gecko\/\d+)?$/i',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for Mozilla browser<br/>";
                 }
@@ -423 +434 @@
             //WebKit-based browsers
             } elseif (preg_match('#^Mozilla/\d\.\d\s\((?:([a-z]{3,}.*\s)?([a-z]{2}(?:\-[A-Za-z]{2})?)?)\)\sAppleWebKit/[0-9\.]+\+?\s\([a-z, ]*like\sGecko[a-z\; ]*\)\s([a-zA-Z0-9\./]+(?:\sMobile)?/?[A-Z0-9]*)?(\sSafari/([0-9\.]+))?$#',$ua,$pcs)>0) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for WebKit-based browser<br/>";
                 }
@@ -439 +450 @@
             //Text-only browsers Lynx, ELinks...(yep, they still exist)
             } elseif (preg_match("#^(E?Links|Lynx|(?:Emacs\-)?w3m)[^a-z0-9]+([0-9\.]+)?#i",$ua,$pcs)) {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     echo "\nMatch for text browser<br/>";
                 }
@@ -479 +490 @@
             }
             }
-        } //end if ($ismobile)
+        } //end if (!$ismobile)
 
         //get operating system
@@ -522 +533 @@
             $browser['agenttype']= "S";
         }
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             echo "\n".'<br />uadetector: browser->name='.$browser['name']."&nbsp; ".'browser->os='.$browser['os']; //debug
         }
@@ -550 +561 @@
      */
     function isMobileAgent($agent="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         $ua="";
         $is_current_ua = false;
@@ -565 +576 @@
         }
         $ismobile = false;
-        $device = $ua;
-        $wap = array('name'=>"", 
-                'version'=>"",
-                'device'=>"",
-                'model'=>"",
-                'platform'=>"WAP");
+        //$device = $ua;
+        $wap = array('name'=>"", 'version'=>"",
+            'device'=>"", 'model'=>"",
+            'os'=>"", 'platform'=>"WAP");
         //detect known mobile browsers
 
         //Android-based devices
         if (preg_match("#^(?:([a-z0-9\-\s_]{3,})\s)?Mozilla/\d\.\d\s\([a-z\;\s]+Android\s([0-9\.]+)(?:\;\s([a-z]{2}(?:\-[A-Za-z]{2})?)\;)?.*Gecko\)\s([a-zA-Z0-9\./]+(?:\sMobile)?/?[A-Z0-9]*)?(\sSafari/([0-9\.]+))?#i",$ua,$pcs)) {
-            $ismobile = true;
             if (!empty($pcs[4])) { $vers = $pcs[4]; } 
             else { $vers = $pcs[6]; }
@@ -586 +594 @@
             if (!empty($pcs[2])) $wap['os'] .= " ".$this->majorVersion($pcs[2]);
             if (!empty($pcs[3])) $wap['language'] = $pcs[3];
-            if (!empty($pcs[1])) $device = $pcs[1];
+            if (!empty($pcs[1])) $wap['device'] = $pcs[1];
+
+        //Windows Mobile browsers
+        } elseif (preg_match('#Windows\sCE;\s?IEMobile\s(\d+)(\.\d+)*\)#i',$ua,$pcs)>0) {
+            $wap['name'] = 'IEMobile';
+            $wap['version'] = $pcs[1];
+            $wap['os'] = 'WinCE';
+        //Opera Mini/mobile browsers
+        } elseif (preg_match('#(Opera\s(?:Mini|Mobile))[/ ]([0-9\.]+)#',$ua,$pcs)>0) {
+            $wap['name'] = $pcs[1];
+            $wap['version'] = $pcs[2];
 
         //NetFront and other mobile/embedded browsers
         } elseif (preg_match("#(NetFront|NF\-Browser)/([0-9\.]+)#i",$ua,$pcs)) {
-            $ismobile = true;
             $wap['name'] = "NetFront";
             $wap['version'] = $pcs[2];
-        } elseif (preg_match("#[^a-z0-9](Bolt|Iris|Minimo|Novarra\-Vision|Polaris)/([0-9\.]+)#i",$ua,$pcs)) {
-            $ismobile = true;
+        } elseif (preg_match("#[^a-z0-9](Bolt|Iris|Jasmine|Minimo|Novarra\-Vision|Polaris)/([0-9\.]+)#i",$ua,$pcs)) {
             $wap['name'] = $pcs[1];
             $wap['version'] = $pcs[2];
         } elseif (preg_match("#(UP\.browser|SMIT\-Browser)/([0-9\.]+)#i",$ua,$pcs)) {
-            $ismobile = true;
             $wap['name'] = $pcs[1];
             $wap['version'] = $pcs[2];
         } elseif (preg_match("#\((jig\sbrowser).*\s([0-9\.]+)[^a-z0-9]#i",$ua,$pcs)) {
-            $ismobile = true;
             $wap['name'] = $pcs[1];
             $wap['version'] = $pcs[2];
         } elseif (preg_match("#[^a-z]Obigo#i",$ua,$pcs)) {
-            $ismobile = true;
             $wap['name'] = 'Obigo';
         } elseif (preg_match("#openwave(\suntrusted)?/([0-9\.]+)#i",$ua,$pcs)) {
-            $ismobile = true;
             $wap['name'] = 'OpenWave';
             $wap['version'] = $pcs[2];
+        }
+        if (!empty($wap['name'])) {
+            $ismobile = true;
         }
 
@@ -649 +664 @@
                 }
             }
-        }
-        //TODO: check for wireless transcoder service user agents
-        if (!$ismobile && preg_match('#wireless\stranscoder#i',$ua)>0) {
-            $ismobile=true;
-        }
-        if ($debug_mode) {
+            //TODO: check for wireless transcoder service user agents
+            if (!$ismobile && preg_match('#wireless\stranscoder#i',$ua)>0) {
+                $ismobile=true;
+            }
+        }
+        //set os = device, if missing
+        if ($ismobile) {
+            if (!empty($wap['device'])) {
+                if (empty($wap['name'])) {
+                    $wap['name'] = $wap['device'];
+                } elseif (empty($wap['os'])) {
+                    $wap['os'] = $wap['device'];
+                }
+            }
+        }
+        if ($wdebug_mode) {
             echo "\n".'<br />uadetector: wap->name='.$wap['name']."&nbsp; ".'wap->device='.$wap['device']; //debug
         }
@@ -661 +686 @@
         }
         if ($ismobile) {
+            if (empty($wap['os'])) $wap['os'] = "WAP";
             return $wap;
         } else {
@@ -674 +700 @@
      */
     function isSpiderAgent($agent="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         $ua="";
         $is_current_ua = false;
@@ -692 +718 @@
             $spider['agenttype']= 'F';
         
-        // #12 FeedFetcher Google
+        // #12 Twiceler
+        } elseif (preg_match('#^Mozilla/\d\.\d\s\(Twiceler\-(\d\.\d)\shttp://www\.cuill?\.com/twiceler/robot\.html\)$#',$ua,$match)>0) {
+            $spider['name'] = 'Twiceler';
+            $spider['version']=$match[1];
+            $spider['agenttype']= 'R';
+
+        // #13 FeedFetcher Google
         } elseif (preg_match('#^Feedfetcher\-Google[;\s\(\+]+http\://www\.google\.com/feedfetcher\.html[;\)\s]+(?:(\d)\ssubscriber)?#',$ua,$match)>0) {
             $spider['name'] = 'FeedFetcher-Google';
@@ -753 +785 @@
                 $spider['version']=$match[2];
             }
+            if (strlen($match[1]) < 5) {
+                $spider['name'] = $match[1]. " Spider";
+            }
 
         //TODO: Libwww spiders
@@ -763 +798 @@
                 $spider['version'] = $match[3];
             }
+        } elseif (preg_match('#^Mozilla\/\d\.\d\s\(compatible;\s([a-z_ ]+)(?:[-/](\d+\.\d+))?;\s.?http://(?:www\.)?[a-z]+(?:[a-z\.]+)\.(?:[a-z]{2,4})/?[a-z/]*(?:\.s?html?|\.php|\.aspx?)?\)$#i',$ua,$match)>0) {
+            $spider['name'] = $match[1];
+            if (!empty($match[2])) {
+                $spider['version'] = $match[2];
+            }
+
         // #Assume bot if user-agent 1st word and a contact domain are the same name, ex: Feedburner-feedburner.com, CazoodleBot, 
         } elseif (preg_match('/([a-z\_\s\.]+)[\s\/\-_]?(v?[0-9\.]+)?.*(?:http\:\/\/|www\.)(\1)\.[a-z0-9_\-]+/i',$ua,$match)>0) {
@@ -790 +831 @@
 
         // #Assume bot if user-agent includes contact email
+        } elseif (preg_match('#^Mozilla\/\d\.\d\s\(compatible;\s([a-z_ ]+)(?:[-/](\d+\.\d+))?;\s[^a-z0-9]?([a-z0-9\.]+@[a-z0-9]+\.[a-z]{2,4})\)$#i',$ua,$match)>0) {
+            $spider['name'] = $match[1];
+            if (!empty($match[2])) {
+                $spider['version'] = $match[2];
+            }
         } elseif (preg_match('/^(([a-z]+)\s?(bot|crawler|robot|spider|\s[a-z]+)?)[\/\-\s_](v?[0-9\.]+)?.*[^a-z]+(?:\1|\2|\3)(?:\@|\s?at\s?)[a-z\-_]{2,}(?:\.|\s?dot\s)[a-z]{2,4}/i',$ua,$match)>0) {
             $spider['name'] = $match[1];
@@ -888 +934 @@
             $spider['agenttype']= "S";
         }
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             echo "\n".'<br />uadetector: spider->name='.$spider['name']."&nbsp; "; //debug
         }
@@ -916 +962 @@
             }
         }
-        //distinguish feed readers from other spiders
+        //separate feed readers from spiders
         if (preg_match("/([0-9]+)\s?subscriber/i",$ua,$subscriber) >0) {
             // It's a feedreader with some subscribers
@@ -968 +1014 @@
      */
     function isWTF($ua="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         //recheck browsers or check PHP's browser capabilities file
         if (isset($this->done_browsers) && !$this->done_browsers) {
@@ -981 +1027 @@
                 $this->setClassVars($unknown_agent);
             }
-            if ($debug_mode) {
+            if ($wdebug_mode) {
                 echo "\n".'<br />uadetector: unknown_agent->name='.$unknown_agent['name']."&nbsp; "; //debug
             }
@@ -996 +1042 @@
      */
     function OSversion($os="",$platform="",$ua="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         if ($do_profile) {
             profiler_beginSection('_____ua::OSversion');
@@ -1227 +1273 @@
      */
     function linuxOSversion($os="") {
-        global $debug_mode, $do_profile;
+        global $wdebug_mode, $do_profile;
         if (empty($os)) { $os = $this->agent; }
         if (empty($os)) { return false; }
@@ -1293 +1339 @@
      */
     function webkitVersion($webkit="",$ua="") {
-        global $debug_mode;
+        global $wdebug_mode;
         $browser = "Safari";
         $vers = "";
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             echo "<br />webkit=".$webkit."\n"; //debug
         }
         if (empty($webkit)) { 
             return false;
-        } elseif (preg_match("#^([a-zA-Z]+)/([0-9](?:[A-Za-z\.0-9]+))(\sMobile)?#",$webkit,$match)>0) {
+        } elseif (preg_match("#^([a-zA-Z]+)/([0-9]+(?:[A-Za-z\.0-9]+))(\sMobile)?#",$webkit,$match)>0) {
             if ($match[1] != "Version") { //Chrome,Iron,Shiira
                 $browser = $match[1];
@@ -1396 +1442 @@
      */
     function getBrowscap($ua="") {
-        global $debug_mode;
+        global $wdebug_mode;
         if (empty($ua)) $ua = $this->agent;
         $browsercap = false;
@@ -1407 +1453 @@
         if (ini_get("browscap")!="") {
             $browsercap = get_browser($ua,true);
-            if ($debug_mode) {
+            if ($wdebug_mode) {
                 echo "\n<br/>Browsercap=";
                 print_r($browsercap);

wassup/trunk/lib/upgrade.php

@@ -7 +7 @@
  * Contains functions to create and update the tables required for WassUp
  *   install and upgrade. These functions are loaded only when plugin is 
- *   activated via the 'wassup_install' hook function.
+ *   activated through the 'wassup_install' hook function.
  * @since version 1.8
  * @author Helene D.
@@ -14 +14 @@
 /**
  * Table install manager function that calls either 'wCreateTable' or 
- * 'wUpdateTable' depending on whether this is a new install or upgrade.
+ * 'wUpdateTable' depending on whether this is a new install or an upgrade.
  * @param none
  * @return boolean
@@ -25 +25 @@
     $wassup_tmp_table = $wassup_table."_tmp";
     $wassup_meta_table = $wassup_table."_meta";
-    $charset=true;
-    $success=false;
-
-    //CREATE new table
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_table'") != $wassup_table) { 
+    $wcharset=true;
+    $wsuccess=false;
+    //$wpdb->show_errors = true;
+
+    //CREATE/UPGRADE table
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_table}'") == $wassup_table) { 
+        $wcharset=false;
+        $wsuccess=wUpdateTable(); //<== wassup_tmp is added here, if missing
+    } else {
         if (wCreateTable()) {   //1st attempt
-            $charset=true;
+            $wcharset=true;
         }
         //2nd attempt: no character set in table
-        if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_table'") != $wassup_table) { 
-            $charset=false;
-            wCreateTable("",$charset);
-        }
-
-    } else {
-        //'wUpdateTable' now uses 'wCreateTable' and Wordpress' 'dbdelta' function to upgrade table structure
-        $charset=false;
-        wUpdateTable(); //<== wassup_tmp is added here, if missing
+        if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_table}'") != $wassup_table) { 
+            $wcharset=false;
+            wCreateTable("",$wcharset);
+        }
+
     }
 
     //check that install was successful, issue warnings, start tracker
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_table'") == $wassup_table) {
-        $success=true;
+    if ($wsuccess || $wpdb->get_var("SHOW TABLES LIKE '{$wassup_table}' ") == $wassup_table) {
+        $wsuccess=true;
         //double-check that temp and meta were created
-        if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_tmp_table'") != $wassup_tmp_table) {
-            wCreateTable($wassup_tmp_table,$charset);
-        }
-        if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_meta_table'") != $wassup_meta_table) {
-            wCreateTable($wassup_meta_table,$charset);
-        }
-    }
-    return $success;    
+        if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_tmp_table}' ") != $wassup_tmp_table) {
+            wCreateTable($wassup_tmp_table,$wcharset);
+        }
+        if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_meta_table}' ") != $wassup_meta_table) {
+            wCreateTable($wassup_meta_table,$wcharset);
+        }
+    }
+    //$wpdb->show_errors = false;
+    return($wsuccess);
 } //#end function wassup_tableInstaller
 
@@ -65 +66 @@
  * @return boolean
  */
-function wCreateTable($table="",$withcharset=true) {
-    global $wpdb, $current_user, $wassupversion, $wassup_options;
+function wCreateTable($wtable="",$withcharset=true) {
+    global $wpdb, $current_user, $wp_version, $wassupversion, $wassup_options;
 
     $wassup_table = (!empty($wassup_options->wassup_table))? $wassup_options->wassup_table: $wpdb->prefix . "wassup";
     $wassup_tmp_table = $wassup_table."_tmp";
     $wassup_meta_table = $wassup_table."_meta";
-    if (empty($table)) $table_name = $wassup_table;
-    else $table_name = $table;
+    if (empty($wtable)) $wtable_name = $wassup_table;
+    else $wtable_name = $wtable;
     $is_new_table = false;
 
@@ -89 +90 @@
     $charset_collate = '';
     //Add charset on new table only
-    if ($wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name) {
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wtable_name}'") == $wtable_name) {
         $withcharset = false;
     } else {
@@ -106 +107 @@
 
     //wassup table structure
-    if ($table_name == $wassup_table || $table_name == $wassup_tmp_table) {
-        $sql_createtable = "CREATE TABLE $table_name (
-  `id` mediumint(9) NOT NULL auto_increment,
+    if ($wtable_name == $wassup_table || $wtable_name == $wassup_tmp_table) {
+        $sql_createtable = "CREATE TABLE $wtable_name (
+  `id` mediumint(9) unsigned NOT NULL auto_increment,
   `wassup_id` varchar(60) NOT NULL,
   `timestamp` varchar(20) NOT NULL,
-  ip varchar(50) default NULL,
+  `ip` varchar(50) default NULL,
   `hostname` varchar(150) default NULL,
   `urlrequested` text,
   `agent` varchar(255) default NULL,
-  `referrer` text default NULL,
+  `referrer` text,
   `search` varchar(255) default NULL,
-  `searchpage` int(11) default 0,
+  `searchpage` int(11) unsigned default '0',
   `os` varchar(15) default NULL,
   `browser` varchar(50) default NULL,
@@ -125 +126 @@
   `spider` varchar(50) default NULL,
   `feed` varchar(50) default NULL,
-  `username`  VARCHAR(50) default NULL,
-  `comment_author` VARCHAR(50) default NULL,
-  `spam` VARCHAR(5) default 0,
+  `username` varchar(50) default NULL,
+  `comment_author` varchar(50) default NULL,
+  `spam` varchar(5) default '0',
   `url_wpid` varchar(50) default NULL,
-  UNIQUE KEY id (`id`),
-  KEY idx_wassup (wassup_id(32),`timestamp`),
-  INDEX (os),
-  INDEX (browser),
-  INDEX (`timestamp`)) {$charset_collate};";
+  UNIQUE KEY `id` (`id`),
+  KEY `idx_wassup` (`wassup_id`(32),`timestamp`),
+  INDEX (`os`),
+  INDEX (`browser`),
+  INDEX `timestamp` (`timestamp`)) {$charset_collate};";
     //Note: index (username,ip) was removed because of problems with
     //  non-romanic language display
-    //New in v.1.8: increased ip width to 50 for ipv6 support
+    //Since v1.8: increased ip width to 50 for ipv6 support
 
     //...Include a first record if new table (not temp table)
     $sql_firstrecord = '';
-    if ($table_name == $wassup_table && $is_new_table) {
+    if ($wtable_name == $wassup_table && $is_new_table) {
         if (!class_exists('UADetector'))
             include_once (dirname(__FILE__) . '/lib/uadetector.class.php');
@@ -160 +161 @@
             trim($ua->name.' '.$ua->majorVersion($ua->version)),
             $locale, $screen_res, $logged_user);
-}
+    } // end if wassup && is_new_table
 
     //...create/upgrade wassup table
-    if (!empty($sql_firstrecord)) {
+
+    //New in 1.8.3: Don't use Wordpress' "dbdelta" function on
+    //  pre-existing "wp_wassup" table because "dbDelta" fails to 
+    //  upgrade wp_wassup's large table structure in Wordpress 3.1+ 
+    //  (throws MySQL ALTER TABLE error). 
+    if ($wtable_name != $wassup_table) {
+        $result = dbDelta($sql_createtable);
+    } elseif (!empty($sql_firstrecord)) {
         $result = dbDelta(array($sql_createtable,$sql_firstrecord));
-    } else {
-        $result = dbDelta($sql_createtable);
     } 
+    //$wpdb->print_error(); //debug
 
     //...return 'true' if table created successfully, false otherwise
     $retvalue=true;
-    if ($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wtable_name}'") != $wtable_name) {
 
         $retvalue=false;
     } else {
-        if ($table == "" && version_compare(mysql_get_server_info(),'4.1.0','>')) {
+        if ($wtable == "" && version_compare(mysql_get_server_info(),'4.1.0','>')) {
             //'CREATE TABLE LIKE' syntax not supported in MySQL 4.1 or less
-            $upgrade = dbDelta("CREATE TABLE $wassup_tmp_table LIKE {$wassup_table}");
+            $wupgrade = dbDelta("CREATE TABLE $wassup_tmp_table LIKE {$wassup_table}");
+            //$wpdb->print_error(); //debug
         }
     }
     } //end if wassup_table
     
-    //New in v1.8: "meta" table to extend wassup. Used as a temporary
+    //Since v1.8: "meta" table to extend wassup. Used as a temporary
     // data cache and can be used to capture additional visitor data
-    if ($table == "") $table_name = $wassup_meta_table;
-    if ($table_name == $wassup_meta_table) {
+    if ($wtable == "") $wtable_name = $wassup_meta_table;
+    if ($wtable_name == $wassup_meta_table) {
 
     // Wassup Meta Table Structure:
@@ -197 +205 @@
     // `meta_expire` is a timestamp that is an expiration date in unix
     //      timestamp format...for temporary/cache-only records.
-    $sql_createtable_meta = "CREATE TABLE `$wassup_meta_table` (
+    $sql_create_meta = "CREATE TABLE `$wassup_meta_table` (
   `meta_id` integer(15) unsigned auto_increment,
   `wassup_key` varchar(150) NOT NULL,
@@ -203 +211 @@
   `meta_value` longtext,
   `meta_expire` integer(10) unsigned default '0',
-  UNIQUE KEY (`meta_id`),
+  UNIQUE KEY meta_id (`meta_id`),
   INDEX (`wassup_key`),
-  INDEX (`meta_key`)) {$charset_collate};";
+  INDEX (`meta_key`)) {$charset_collate}; ";
 
     //create/upgrade wassup table
-    $result = dbDelta($sql_createtable_meta);
+    $result = dbDelta($sql_create_meta);
+    //$wpdb->print_error(); //debug
 
     //...return 'false' if table was not created 
-    if ($table == $wassup_meta_table && $wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
+    if ($wtable == $wassup_meta_table && $wpdb->get_var("SHOW TABLES LIKE '{$wtable_name}'") != $wtable_name) {
         $retvalue=false;
     }
     } //end if wassup_meta_table 
 
-    return $retvalue;
+    return($retvalue);
     //#TODO: 
     // 1. create stored procedure that selects records by timestamp
@@ -238 +247 @@
     $wassup_tmp_table = $wassup_table."_tmp";
     $wassup_meta_table = $wassup_table."_meta";
+    $wsuccess=true;
 
     //queue table content upgrades
@@ -251 +261 @@
     $wpdb->query("SET wait_timeout = 180");
 
-    //do table content upgrade
-    if (!empty($upgrade_sql)) {
-        wassup_scheduled_dbtask($upgrade_sql);
-    }
-
-    // For all upgrades: Drop and re-create all indices except 'id'
-    //# get list of all wassup indices
-    $qryresult = mysql_query("SHOW INDEX FROM {$wassup_table}");
-    if ($qryresult) { 
-        $row_count = mysql_num_rows($qryresult); 
-    } else {
-        $row_count = 0;
-    }
-    //# get the names of all indices
-    $idx_names = array();
-    $prev_key = ""; //names listed multiples times per columns in key
-    if ($row_count > 1) {
-        while ($row = mysql_fetch_array($qryresult,MYSQL_ASSOC)) {
-            if ($row["Column_name"] != "id" && $row["Key_name"] != $prev_key) {
-                $idx_names[] = $row["Key_name"];
+    //do table content upgrade - after table upgrade to avoid lockouts
+    //if (!empty($upgrade_sql)) {
+    //  wassup_scheduled_dbtask($upgrade_sql);
+    //}
+
+    // For all upgrades: Drop and re-create all indices except 'id' and
+    // 'meta_id' on 'wp_wassup' and 'wp_wassup_meta' tables
+    $wtables = array("$wassup_table", "$wassup_meta_table");
+    foreach ($wtables AS $wtbl) {
+        //# get list of all wassup indices
+        $wqryresult = mysql_query("SHOW INDEX FROM `{$wtbl}`");
+        if ($wqryresult) { 
+            $wrow_count = mysql_num_rows($wqryresult); 
+        } else {
+            $wrow_count = 0;
+        }
+        //# get the names of all indices
+        $idx_names = array();
+        $prev_key = ""; //names listed multiples times per columns in key
+        if ($wrow_count > 1) {
+        while ($wrow = mysql_fetch_array($wqryresult,MYSQL_ASSOC)) {
+            if ($wrow["Column_name"]!= "id" && $wrow["Column_name"]!= "meta_id" && $wrow["Key_name"]!= $prev_key) {
+                $idx_names[] = $wrow["Key_name"];
             }
-            $prev_key = $row["Key_name"];
+            $prev_key = $wrow["Key_name"];
         } //end while
-    } //end if row_count
-    mysql_free_result($qryresult);
-    //# drop all the indices in $idx_names and drop temp table...
-    //drop indices
-    foreach ($idx_names AS $idx_drop) {
-        mysql_query("DROP INDEX $idx_drop ON {$wassup_table}");
+        } //end if wrow_count
+        mysql_free_result($wqryresult);
+        //# drop all the indices in $idx_names and drop temp table...
+        //drop indices
+        foreach ($idx_names AS $idx_drop) {
+            mysql_query("DROP INDEX $idx_drop ON `{$wtbl}`");
+        }
+        unset ($wrow, $wrow_count, $prev_key, $idx_names);
     }
 
     //NOTE: All column updates replaced by single call to 'wcreateTable' function which uses 'dbDelta' to update table structure
 
-    //## For all upgrades
-    //# Drop and re-create all indices except 'id'
-    //Get list of all wp_wassup indices...
-    //$idx_cols = $wpdb->get_col("SHOW INDEX FROM $wassup_table","Column_name"); //doesn't work
-    $qryresult = mysql_query("SHOW INDEX FROM {$wassup_table}");
-    if ($qryresult) { 
-        $row_count = mysql_num_rows($qryresult); 
-    } else {
-        $row_count = 0;
-    }
-    //store names of all indices in an array...
-    $idx_names = array();
-    $prev_key = ""; //names listed multiples times per columns in key
-    if ($row_count > 1) {
-        while ($row = mysql_fetch_array($qryresult,MYSQL_ASSOC)) {
-            if ($row["Column_name"] != "id" && $row["Key_name"] != $prev_key) {
-                $idx_names[] = $row["Key_name"];
-            }
-            $prev_key = $row["Key_name"];
-        } //end while
-    } //end if row_count
-    mysql_free_result($qryresult);
-    //drop indices in array...
-    foreach ($idx_names AS $idx_drop) {
-        mysql_query("DROP INDEX $idx_drop ON {$wassup_table}");
-    }
+    ////## For all upgrades - redundant code
+    ////# Drop and re-create all indices except 'id'
+    ////Get list of all wp_wassup indices...
+    ////$idx_cols = $wpdb->get_col("SHOW INDEX FROM $wassup_table","Column_name"); //doesn't work
+    //$qryresult = mysql_query("SHOW INDEX FROM {$wassup_table}");
+    //if ($qryresult) { 
+    //  $row_count = mysql_num_rows($qryresult); 
+    //} else {
+    //  $row_count = 0;
+    //}
+    ////store names of all indices in an array...
+    //$idx_names = array();
+    //$prev_key = "";   //names listed multiples times per columns in key
+    //if ($row_count > 1) {
+    //  while ($row = mysql_fetch_array($qryresult,MYSQL_ASSOC)) {
+    //      if ($row["Column_name"] != "id" && $row["Key_name"] != $prev_key) {
+    //          $idx_names[] = $row["Key_name"];
+    //      }
+    //      $prev_key = $row["Key_name"];
+    //  } //end while
+    //} //end if row_count
+    //mysql_free_result($qryresult);
+    ////drop indices in array...
+    //foreach ($idx_names AS $idx_drop) {
+    //  mysql_query("DROP INDEX $idx_drop ON {$wassup_table}");
+    //}
     // drop wp_wassup_tmp table...
     //$wpdb->query("DROP TABLE IF EXISTS $table_tmp_name"); //incorrectly causes an activation error in Wordpress
-    mysql_query("DROP TABLE IF EXISTS $wassup_tmp_table"); 
+    mysql_query("DROP TABLE IF EXISTS `{$wassup_tmp_table}`"); 
 
     //call 'wCreateTable' to update tables structure and rebuild indices using wordpress' 'dbdelta' function...
-    $success=wCreateTable();
-
-    //build secondary tables, in case failed
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_tmp_table'") != $wassup_tmp_table) { 
+    //NOTE: 'wcreateTable' no longer upgrades "wp_wassup" table since v.1.8.3
+    $wsuccess=wCreateTable();
+
+    //New in 1.8.3: 'wCreateTable' and 'dbdelta' workaround code
+    // Since Wordpress 3.1, Wordpress' "dbDelta" function fails to 
+    // upgrade "wp_wassup" table structure (throws MySQL ALTER TABLE 
+    // error). To work around this problem, restored column-by-column 
+    // upgrades from earlier versions of WassUp (pre 1.7) and restored 
+    // manual index rebuilds.
+
+    //upgrades for version 1.7 or less
+    if (empty($wassup_options->wassup_version) OR version_compare($wassup_options->wassup_version,"1.7","<")) {
+        // Upgrade from version < 1.3.9 - add 'spam' field to wassup table
+        if ($wpdb->get_var("SHOW COLUMNS FROM $wassup_table LIKE 'spam'") == "") {
+            $wpdb->query("ALTER TABLE {$wassup_table} ADD COLUMN spam VARCHAR(5) DEFAULT '0'");
+        }
+
+        // Upgrade from version <= 1.5.1 - increase 'wassup_id' size
+        $wassup_col = $wpdb->get_results("SHOW COLUMNS FROM $wassup_table LIKE 'wassup_id'");
+        foreach ($wassup_col as $wID) {
+            if ($wID->Type != "varchar(60)") {
+                $wpdb->query("ALTER TABLE {$wassup_table} CHANGE COLUMN wassup_id wassup_id varchar(60) DEFAULT NULL");
+            }
+        }
+        // - increase size of 'searchengine' and 'spider' fields
+        $col_size = $wpdb->get_results("SHOW COLUMNS FROM $wassup_table LIKE 'searchengine'");
+        foreach ($col_size as $wCol) {
+            if ($wCol->Type != "varchar(25)") {
+                $wpdb->query("ALTER TABLE {$wassup_table} CHANGE COLUMN searchengine searchengine varchar(25) DEFAULT NULL");
+            }
+        }
+        $col_size = $wpdb->get_results("SHOW COLUMNS FROM $wassup_table LIKE 'spider'");
+        foreach ($col_size as $wCol) {
+            if ($wCol->Type != "varchar(50)") {
+                $wpdb->query("ALTER TABLE {$wassup_table} CHANGE COLUMN spider spider varchar(50) DEFAULT NULL");
+            }
+        }
+    } //end if wassup_version
+    //upgrades for versions 1.7 thru 1.8.2
+    if (empty($wassup_options->wassup_version) OR version_compare($wassup_options->wassup_version,"1.8.3","<")) {
+        //Since v1.8: add new field 'url_wpid' for post_id tracking
+        if ($wpdb->get_var("SHOW COLUMNS FROM $wassup_table LIKE 'url_wpid'") == "") {
+            $wpdb->query("ALTER TABLE {$wassup_table} ADD COLUMN url_wpid varchar(50) DEFAULT NULL");
+        }
+        //Since v1.8: increase size of 'ip' field for IPv6 addresses
+        $wpdb->query("ALTER TABLE {$wassup_table} CHANGE COLUMN ip `ip` varchar(50) DEFAULT NULL");
+    }
+    //TODO: show an upgrade warning error when table structure is not updated
+    //rebuild indices on 'wp_wassup' - this also optimizes
+    //...could take a long time, so run in background in case of timeout
+    ignore_user_abort(1);
+    $wpdb->query("ALTER TABLE {$wassup_table} ADD KEY idx_wassup (wassup_id(32),`timestamp`)");
+    $wpdb->query("ALTER TABLE {$wassup_table} ADD INDEX (os)");
+    $wpdb->query("ALTER TABLE {$wassup_table} ADD INDEX (browser)");
+    $wpdb->query("ALTER TABLE {$wassup_table} ADD INDEX (`timestamp`)");
+
+    //build secondary tables, in case upgrade failed in 'wCreateTable'
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_tmp_table}'") != $wassup_tmp_table) { 
         wCreateTable($wassup_tmp_table,false);
     }
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_meta_table'") != $wassup_meta_table) { 
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_meta_table}'") != $wassup_meta_table) { 
         wCreateTable($wassup_meta_table,false);
     }
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_table'") == $wassup_table) { 
-        //table upgrade warning error
-        return true;
-    } else {
-        //table upgrade fatal error
-        return false;
-    }
+    if ($wsuccess || $wpdb->get_var("SHOW TABLES LIKE '{$wassup_table}'") == $wassup_table) { 
+        $wsuccess=true;
+    }
+
+    //lastly do table content upgrade, if any
+    if ($wsuccess) {
+        if (!empty($upgrade_sql)) {
+            wassup_scheduled_dbtask($upgrade_sql);
+        }
+    }
+    return($wsuccess);
 } //end function wUpdateTable
 
@@ -351 +424 @@
         if (file_exists($footer_file)) {
             $footer = file_get_contents($footer_file);
-            //Note: Commented out 'wp_footer()' calls will match as true in test below...should be skipped
+            //Note: if 'wp_footer()' is commented-out in template code, it will still match as true in test below
             if (stristr($footer,'wp_footer(')!==false || stristr($footer,'wp_footer (')!==false) $result=true;
             else $result=false;

wassup/trunk/lib/wassup.class.php

@@ -11 +11 @@
  *   settings in Wordpress' wp_options table and to output those
  *   values for use in forms. 
- * @author: Helene Duncker. 2/24/08, 6/21/09, 2009-11-15
+ * @author: Helene Duncker. 2/24/08, 6/21/09, 2009-11-15, 2011-04-17
  */
 class wassupOptions {
@@ -22 +22 @@
     var $wassup_default_spy_type = "";
     var $wassup_default_limit = "10";
-    var $wassup_top10 ; //array containg top ten preferences
+    var $wassup_top10 ; //array containg top stats preferences
     var $wassup_dashboard_chart;    
     var $wassup_geoip_map;  
     var $wassup_googlemaps_key;
+    var $wassup_spy_speed = "5000"; //New in 1.8.3
     var $wassup_time_format;
-    var $wassup_time_period; //new in 1.8 - for visitor details default date/time range
+    var $wassup_time_period;    //since 1.8 - visitor details default range
 
     /* recording settings */
@@ -46 +47 @@
 
     /* table/file management settings */
-    //var $wassup_savepath; //deprecated
+    //var $wassup_savepath; //deprecated
     var $delete_auto;
-    var $delete_filter; //new in 1.8 for deleting select records
+    var $delete_filter; //since 1.8 - auto delete select records
     var $wassup_remind_mb;
     var $wassup_remind_flag;
@@ -56 +57 @@
     var $wassup_table;  //since 1.7.2 - WassUp table name
     var $wassup_dbengine;   //since 1.7.2 - MySQL table engine type
-    var $wassup_cache;  //new in 1.8 for using wassup_meta table as cache
+    var $wassup_cache;  //since 1.8 - use wassup_meta table as cache
 
     /* chart display settings */
@@ -78 +79 @@
 
     /* temporary action settings */
-    var $wassup_alert_message;  //used to display alerts
+    var $wassup_alert_message;  //to display alerts
     var $wmark;
     var $wip;
@@ -102 +103 @@
      * @return array
      */
-    function defaultSettings() {
+    function defaultSettings($dsetting="") {
         global $wpdb;
+        $top10 = array( "toplimit"=>"10",   //new in 1.8.3 - top stats list size
+                "topsearch"=>"1",
+                "topreferrer"=>"1",
+                "toprequest"=>"1",
+                "topbrowser"=>"1",
+                "topos"=>"1",
+                "toplocale"=>"0",
+                "topvisitor"=>"0",
+                "toppostid"=>"0",   //new in v1.8.3 - top article by post-id
+                "topreferrer_exclude"=>"",
+                "top_nospider"=>"0");   //new in v1.8.3 - exclude spiders from top stats
         $defaults = array(
             'wassup_active'     =>"1",
@@ -133 +145 @@
             'wassup_geoip_map'  =>"0",
             'wassup_googlemaps_key' =>"",
+            'wassup_spy_speed'  =>"5000",
             'wassup_time_format'    =>"24",
             'wassup_time_period'    =>"1",
@@ -151 +164 @@
             'wassup_uninstall'  =>"0",
             'wassup_optimize'   =>current_time('timestamp'),
-            'wassup_top10'  =>attribute_escape(serialize(array(
-                    "topsearch"=>"1",
-                    "topreferrer"=>"1",
-                    "toprequest"=>"1",
-                    "topbrowser"=>"1",
-                    "topos"=>"1",
-                    "toplocale"=>"0",
-                    "topvisitor"=>"0",
-                    "topfeed"=>"0",
-                    "topcrawler"=>"0",
-                    "topreferrer_exclude"=>""))),
+            'wassup_top10'  =>attribute_escape(serialize($top10)),
+//                  "topsearch"=>"1", - moved
+//                  "topreferrer"=>"1", - moved
+//                  "toprequest"=>"1", - moved
+//                  "topbrowser"=>"1", - moved
+//                  "topos"=>"1", - moved
+//                  "toplocale"=>"0", - moved
+//                  "topvisitor"=>"0", - moved
+//                  "topfeed"=>"0", - moved
+//                  "topcrawler"=>"0", - moved
+//                  "topreferrer_exclude"=>""))), - moved
             'whash'     =>$this->get_wp_hash(),
             'wassup_version'=>"",
@@ -178 +191 @@
             $defaults['wassup_table']= $this->wassup_table;
         }
-        return $defaults;
+        //New in 1.8.3: return a single default value when function argument given
+        if (!empty($dsetting)) {
+            if ($dsetting == "top10" || $dsetting == "wassup_top10" || $dsetting == "top_stats") {
+                return ($top10);
+            } elseif (!empty($defaults[$dsetting])) {
+                return ($defaults[$dsetting]);
+            } else {
+                return (null);
+            }
+        } else { 
+            return($defaults);
+        };
     } //end defaultSettings
 

wassup/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.2
 Tested up to: 3.2.1
-Stable tag: 1.8.2
+Stable tag: 1.8.3
 
 Analyze your visitors traffic with real-time statistics, a lot of chronological information, charts, a sidebar widget.
@@ -73 +73 @@
 
 = How do I add WassUp's chart to my admin dashboard? =
-Go to Wassup >> Options submenu, select [General Setup] tab and check "Display small chart in dashboard", then click [Save Settings] button. 
+Enable the dashboard chart in WassUp's settings. Go to Wassup >> Options >> [General Setup] tab and check "Display small chart in dashboard", then click [Save Settings] button. 
 
 = My Wordpress theme is not widget ready. Is it possible to add WassUp Widget to my site? =
@@ -79 +79 @@
 
 = How do I exclude a visitor from being recorded? =
-Go to Wassup >> Options, select [Statistics Recording] tab and enter the IP address or username to be excluded in the appropriate text area.
+Add a username or IP to WassUp's recording exclusion settings. Go to Wassup >> Options >> [Statistics Recording] tab and enter the IP address or username to be excluded in the appropriate text area.
 
 = How do I stop (temporarily) WassUp from recording new visits on my site? =
-Go to Wassup >> Options, select [Statistics Recording] tab and uncheck "Enable/disable recording", then click [Save Settings] button.
+Disable recording in WassUp's settings. Go to Wassup >> Options >> [Statistics Recording] tab and uncheck "Enable/disable recording", then click [Save Settings] button.
+
+= My popular web site is hosted on a shared server that has database size limits. How do I make sure that WassUp's table size never goes over my allotted quota? =
+Change WassUp's settings to enable "auto delete" of old records and to set a warning notice to be emailed to you when WassUp's table growth exceeds a preset size limit. Go to Wassup >> Options >> [Manage Files & Database] tab to enable these settings.
 
 = Can Wassup record visits on a web site that is not Wordpress? =
@@ -93 +96 @@
 [WP Widget Cache](http://wordpress.org/extend/plugins/wp-widget-cache/) is the only caching plugin verified to work with WassUp. However, some WassUp users have reported success using [DB Cache Reloaded](http://wordpress.org/extend/plugins/db-cache-reloaded/) and [Quick Cache](http://wordpress.org/extend/plugins/quick-cache/) plugins with WassUp.
 
-= Why does WassUp stats show more page views than actual pages clicked by a user? =
+= Why does WassUp stats sometimes show more page views than actual pages clicked by a user? =
 "Phantom" page views can occur when a user's browser does automatic feed retrieval, link pre-fetching, or a page refresh. WassUp tracks these because they are valid requests from that user's browser and are indistinguishable from user link clicks.
    
 = How do I uninstall WassUp? =
-To completely remove WassUp's settings and tables from Wordpress, go to Wassup >> Wassup-Options, select [Uninstall] tab, check the "Uninstall" box, click the "[Save Settings]" button, then deactivate WassUp in "Plugins".
+To completely remove WassUp's settings and tables from Wordpress, go to Wassup >> Options >> [Uninstall] tab, check the "Uninstall" box, click the "[Save Settings]" button, then deactivate WassUp in "Plugins".
 
 Visit [http://www.wpwp.org](http://trac.wpwp.org/wiki/Documentation) for more FAQs.
@@ -142 +145 @@
 == Changelog ==
 
+= 1.8.3 =
+= Urgent bugfix, compatibility, and feature improvement upgrade = 
+* fixed typo that caused a php "foreach" error in v.1.8.2.
+* fixed table upgrade function to prevent errors that can cause activation failure.
+* new "Top Stats" settings for improved statistics: 
+* 1. list length - an input field to customize "top stats" list length size
+* 1. "Top Articles" - a top stats selection to display the most popular articles (posts and pages) by post title, and
+* 1. "exclude spiders" - a checkbox option to exclude all spiders from top stats.
+* new option for manual adjust of SPY data speed.
+* improved tracking of logged-in users.
+* improved detection of referrer spammers and faked referrer strings.
+* improved detection of spiders, mobile browsers and google chrome.
+* improved search engine and search phrase detection.
+* improved namespace compatibility with other Wordpress plugins.
+* updated jQuery library to v.1.6.4 and jqueryUI library to v.1.8.16
+* miscellaneous minor code and style changes.
+
 = 1.8.2 =
 = Urgent bugfix, compatibility and feature improvement upgrade = 
-* fixed regex bug that caused a `preg.match` compilation warning error to display in some configurations.
-* fixed a typo in `wassup_install` function and updated code to suppress warning errors when 1st table install attempt fails.
-* added a javascript cookie to footer function for better screen resolution tracking in IE.
-* added 'Google Web Preview' snapshot bot to list of known spiders.
-* added code to detect faked referrer strings.
-* added new referrer spammers and removed obsolete domains from spammer lists.
-* added validity check to refresh timer to limit user input range to between 0 and 180 minutes (3 hours). An input value of 0 disables the timer.
-* improved search engine/search phrase detection.
-* improved namespace compatibility with other plugins.
+* fixed a regex bug that caused a `preg.match` compilation warning in some configurations.
+* fixed a typo in `wassup_install` function that caused plugin activation to fail in some configurations.
+* updated refresh timer to have a range limit (0-180 min.) with a value of 0 disabling the timer.
+* improved spider detection.
+* improved referrer spam detection.
+* improved screen resolution detection for IE.
 * miscellaneous minor code and style changes.
 
@@ -158 +175 @@
 = Urgent bugfix and code improvement upgrade =
 * fixed bug that caused `set_time_limit` and other warning errors to display to visitors. 
-* improved upgrade instructions in `readme.txt`.
+* new upgrade instructions in `readme.txt`.
 * miscellaneous minor code changes.
  
@@ -189 +206 @@
 == Upgrade Notice ==
 
-= 1.8.2 =
-* Urgent bug fix and feature improvement upgrade. Required for WassUp 1.8+ users. Read plugin install instructions for important upgrade information.
+= 1.8.3 =
+* Urgent bug fix, compatibility, and feature improvement upgrade. Required for WassUp 1.8+ users. Read plugin install instructions for important upgrade information.
 
 == Infos ==
@@ -196 +213 @@
 You could find every informations and much more at [http://www.wpwp.org](http://www.wpwp.org) - [http://trac.wpwp.org](http://trac.wpwp.org/wiki/Documentation) - [http://www.wpwp.org/forums](http://www.wpwp.org/forums/)
 
-Credits to: [Jquery](http://www.jquery.com) for the amazing Ajax framework, [FAMFAMFAM](http://www.famfamfam.com/) for the flags icons and a big thanks to [Helene D.](http://www.techfromhel.com/) for her help to improve WassUp!
-
+Credits to: [Jquery](http://www.jquery.com) for the amazing Ajax framework, [FAMFAMFAM](http://www.famfamfam.com/) for the flags icons and a big thanks to [Helene D.](http://techfromhel.webege.com/) for her help to improve WassUp!
+

wassup/trunk/wassup.php

@@ -4 +4 @@
 Plugin URI: http://www.wpwp.org
 Description: Analyze your visitors traffic with real-time stats, charts, and a lot of chronological information. Includes a sidebar widget of current online visitors and other statistics and an admin dashboard widget with chart. For Wordpress 2.2 or higher. Caution: don't upgrade when your site is busy!
-Version: 1.8.2
+Version: 1.8.3
 Author: Michele Marcucci, Helene Duncker
 Author URI: http://www.michelem.org/
 Disclaimer: Use at your own risk. No warranty expressed or implied is provided.
 
-Copyright (c) 2007-2010 Michele Marcucci
+Copyright (c) 2007-2011 Michele Marcucci
 Released under the GNU General Public License (GPL)
 http://www.gnu.org/licenses/gpl.txt
@@ -24 +24 @@
 //wassup globals & constants
 global $wp_version, $current_user, $user_level, $wassup_options;
-$wassupversion="1.8.2";
+$wassupversion="1.8.3";
 $wassup_cookie_value="";
-$debug_mode=false;  //turn on debugging (global)...Use cautiously! Will display errors from all plugins, not just WassUp
+$wdebug_mode=false; //turn on debugging (global)...Use cautiously! Will display errors from all plugins, not just WassUp
 define('WASSUPDIR', dirname(__FILE__));     //new constant in v1.8
 define('WASSUPFOLDER', plugin_basename(dirname(__FILE__)));
@@ -67 +67 @@
     $wassup_options = new wassupOptions; //#settings initialized here
     $wassup_table = (!empty($wassup_options->wassup_table))? $wassup_options->wassup_table : $wpdb->prefix . "wassup";
+    $wassup_meta_table = $wassup_table . "_meta";
 
     //# wassup should not be active during install
@@ -108 +109 @@
     } else {
         echo "file: ".WASSUPDIR.'/lib/upgrade.php does not exist!';
-        exit (1);
-    }
-    $success = @wassup_tableInstaller();
+        exit(1);
+    }
+    $wsuccess = wassup_tableInstaller();
     //double-check that main table was installed
-    $wassup_table = (!empty($wassup_options->wassup_table))? $wassup_options->wassup_table : $wpdb->prefix . "wassup";
-    if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_table'") == $wassup_table){ 
+    if ($wsuccess){ 
+        $wassup_options->wassup_alert_message = "Wassup $wassupversion: ".__("Database created/upgraded successfully","wassup"); //debug
+    } else {
+        $wassup_options->wassup_alert_message = "Wassup $wassupversion: ".__("An error occured during the upgrade. WassUp table structure may not have been updated properly.","wassup"); //debug
+    }
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$wassup_table}'") == $wassup_table) { 
         //Reset 'dbengine' MySQL setting with each upgrade...because host server settings can change
         if (!empty($wassup_options->wassup_version)) {  //upgrade only
@@ -119 +124 @@
         }
         //turn off wassup_cache if meta table does not exist
-        $wassup_meta_table = $wassup_table . "_meta";
         if ($wassup_options->wassup_cache == 1) {
-            if ($wpdb->get_var("SHOW TABLES LIKE '$wassup_meta_table'") != $wassup_meta_table) { 
+            if ($wpdb->get_var("SHOW TABLES LIKE \'$wassup_meta_table\'") != $wassup_meta_table) { 
                 $wassup_options->wassup_cache = 0;
             }
@@ -128 +132 @@
         //show warning when 'WP_CACHE' constant is set
         if (wassup_compatCheck("WP_CACHE") == true) {
-            $wassup_options->wassup_alert_message = '<strong style="color:#c00;padding:5px;">'.__("Page caching affect WassUp's ability to generate accurate statistics. If your cache plugin does whole page caching, WassUp won't run properly. Please deactivate that plugin and remove \"WP_CACHE\" from \"wp_config.php\".","wassup").'</strong>';
+            $wassup_options->wassup_alert_message = '<strong style="color:#c00;padding:5px;">'.__("WassUp cannot generate accurate statistics with page caching enabled.","wassup")." ".__("If your cache plugin stores whole Wordpress pages/posts as HTML documents, then WassUp won't run properly. Please deactivate your cache plugin and remove \"WP_CACHE\" from \"wp_config.php\".","wassup").'</strong>';
         }
         //TODO: Show warning when 'wp_footer()' does not exist in active theme template (non-cache setups only)
@@ -135 +139 @@
         $wassup_options->wassup_version = $wassupversion;
 
-        if (empty($wassup_options->wassup_alert_message)) {
-            $wassup_options->wassup_alert_message = "Wassup $wassupversion: ".__("database created/upgraded successfully","wassup"); //debug
-        }
         $wassup_options->wassup_active = 1;  //start recording
         $wassup_options->saveSettings();
@@ -147 +148 @@
             deactivate_plugins(__FILE__);
         }
-        echo '<strong style="color:#c00;padding:5px;">'.__("Error installing WassUp tables","wassup").'.</strong>';
+        echo '<strong style="color:#c00;padding:5px;">'.__("An error occured during WassUp table install","wassup").'</strong>'.". <br/>debug: return code: ".(int)$wsuccess." <br/>wassup table: $wassup_table &nbsp; meta table: $wassup_meta_table";
         exit(1);    //exit with error
     }
@@ -195 +196 @@
 /**
  * Output javascript in page head for wassup tracking 
- * @param string (optional);
+ * @param none 
  * @return none;
  */
-function wassup_head($screen_res="") {
-    global $wassup_options, $wassupversion, $current_user;
-
-    if ($wassup_options->wassup_active == "1") {
-        //Since v.1.8: removed meta tag to reduce plugin bloat
-        //print '<meta name="wassup-version" content="'.$wassupversion.'" />'."\n";
-        //add screen resolution javascript to blog header
-        if ($screen_res == "" && isset($_COOKIE['wassup_screen_res'])) {
-            $screen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
-            if ($screen_res == "x") $screen_res = "";
-        }
-        if (empty($screen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
-            //resolution in IE/IEMobile header sometimes
-            $screen_res = str_replace('X',' x ',$_SERVER['HTTP_UA_PIXELS']);
-        }
-        if (empty($screen_res) && isset($_COOKIE['wassup'])) {
-            $cookie_data = explode('::',attribute_escape(base64_decode(urldecode($_COOKIE['wassup']))));
-            $screen_res=(!empty($cookie_data[2]))?$cookie_data[2]:"";
-        }
+function wassup_head() {
+    global $wassup_options, $wassupversion, $wscreen_res, $current_user;
+
+    //if ($wassup_options->wassup_active == "1") { //redundant, in hook
+    //Since v.1.8: removed meta tag to reduce plugin bloat
+    //print '<meta name="wassup-version" content="'.$wassupversion.'" />'."\n";
+    //add screen resolution javascript to blog header
+    if ($wscreen_res == "" && isset($_COOKIE['wassup_screen_res'])) {
+        $wscreen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
+        if ($wscreen_res == "x") $wscreen_res = "";
+    }
+    if (empty($wscreen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
+        //resolution in IE/IEMobile header sometimes
+        $wscreen_res = str_replace('X',' x ',$_SERVER['HTTP_UA_PIXELS']);
+    }
+    if (empty($wscreen_res) && isset($_COOKIE['wassup'])) {
+        $cookie_data = explode('::',attribute_escape(base64_decode(urldecode($_COOKIE['wassup']))));
+        $wscreen_res=(!empty($cookie_data[2]))?$cookie_data[2]:"";
+    }
     //Get visitor's screen resolution using javascript and a cookie.
     // - Added here so javascript code is placed in document <head> 
@@ -223 +224 @@
 <script type="text/javascript">
 //<![CDATA[
-    var screen_res = "<?php echo $screen_res; ?>";
-<?php   if (empty($screen_res) && !isset($_COOKIE['wassup_screen_res'])) { ?>
+    var screen_res = "<?php echo $wscreen_res; ?>"; 
+<?php
+    if (empty($wscreen_res) && !isset($_COOKIE['wassup_screen_res'])) { ?>
     function writeCookie(name,value,hours) {
         var the_cookie = name+"="+escape(value)+"; expires=";
@@ -256 +258 @@
 ?>
 //]]>
-</script>
-<?php
-    } // end if wassup_active == "1"
+</script><?php
+    echo "\n";
+    //} // end if wassup_active == "1"
 } //end function wassup_head
 
@@ -269 +271 @@
 
     //block any obvious sql injection attempts involving WassUp -Helene D. 2009-06-16
-    if (stristr($_SERVER['REQUEST_URI'],'wassup') !==FALSE || (isset($_SERVER['HTTP_REFERER']) && stristr($_SERVER['HTTP_REFERER'],'wassup') !==FALSE)) {
-        if (preg_match('/[&?].+\=(\-(1|9)+|.*(select|update|delete|alter|drop|union|create)[ %&].*(?:from)?.*wp_\w+)/i',str_replace(array('\\','&#92;','"','%22','&#34;','&quot','&#39;','\'','`','&#96;'),'',$_SERVER['REQUEST_URI']))>0) {
+    $request_uri = $_SERVER['REQUEST_URI'];
+    if (!$request_uri) $request_uri = $_SERVER['SCRIPT_NAME']; // IIS
+    if (stristr($request_uri,'wassup')!==FALSE || (isset($_SERVER['HTTP_REFERER']) && stristr($_SERVER['HTTP_REFERER'],'wassup')!==FALSE)) {
+        if (preg_match('/[&?].+\=(\-(1|9)+|.*(select|update|delete|alter|drop|union|create)[ %&].*(?:from)?.*wp_\w+)/i',str_replace(array('\\','&#92;','"','%22','&#34;','&quot','&#39;','\'','`','&#96;'),'',$request_uri))>0) {
             header("HTTP/1.1 403 Forbidden");
             wp_die('Illegal request - Permission Denied!');
@@ -291 +295 @@
                 }
                 // the safe way to load jquery into WP
-                wp_register_script('jquery', WASSUPURL.'/js/jquery.js',FALSE,'1.4.2'); 
+                wp_register_script('jquery', WASSUPURL.'/js/jquery.min.js',FALSE,'1.6.2'); 
             } 
             if ($_GET['page'] == "wassup-spia") {
@@ -298 +302 @@
             } elseif($_GET['page'] == "wassup-options") {
                 //if (version_compare($wp_version, '2.7', '<')) {
-                    wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js', array('jquery'), '1.8');
+                    wp_enqueue_script('jqueryui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js', array('jquery'), '1.8.16');
                 //} else {
                 //  wp_enqueue_script('ui.core', array('jquery'));
@@ -331 +335 @@
 //Add the wassup stylesheet and other javascripts...
 function add_wassup_css() {
-    global $wassup_options, $debug_mode;
+    global $wassup_options, $wdebug_mode;
 
     $plugin_page = $_GET['page'];
@@ -344 +348 @@
         //preassign "GET" parameters for "action.php" in "action_param"
         $action_param='&whash='.$wassup_options->whash;
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             $action_param .= '&debug_mode=true';
         }
@@ -367 +371 @@
 <script type='text/javascript'>
   //<![CDATA[
-//  var selftimerID = 0;
+  //  var selftimerID = 0;
   function selfRefresh(){
     location.href='?<?php print $_SERVER['QUERY_STRING']; ?>';
   }
-//  selftimerID = setTimeout('selfRefresh()', <?php print ($wassup_options->wassup_refresh * 60000)+2000; ?>);
+  //  selftimerID = setTimeout('selfRefresh()', <?php print ($wassup_options->wassup_refresh * 60000)+2000; ?>);
   //]]>
-</script>
-<?php           //New in 1.8.2: restrict refresh to range 0-180 minutes (3 hrs)
+</script><?php
+            //Since 1.8.2: restrict refresh to range 0-180 minutes (3 hrs)
             $wrefresh = 0;
             if (!is_numeric($wassup_options->wassup_refresh) || $wassup_options->wassup_refresh < 0  || $wassup_options->wassup_refresh > 180) {
@@ -451 +455 @@
     //show larger icons on mouse-over
     $("img.delete-icon").mouseover(function() {
-        $(this).attr("src","<?php echo WASSUPURL.'/img/cross2.png'; ?>"); 
+        $(this).attr("src","<?php echo WASSUPURL.'/img/b_delete2.png'; ?>"); 
     }).mouseout(function() {
-        $(this).attr("src","<?php echo WASSUPURL.'/img/cross.png'; ?>");
+        $(this).attr("src","<?php echo WASSUPURL.'/img/b_delete.png'; ?>");
     }); 
     $("img.table-icon").mouseover(function() {
-        $(this).attr("src","<?php echo WASSUPURL.'/img/database_table2.png'; ?>"); 
+        $(this).attr("src","<?php echo WASSUPURL.'/img/b_select2.png'; ?>"); 
     }).mouseout(function() {
-        $(this).attr("src","<?php echo WASSUPURL.'/img/database_table.png'; ?>");
+        $(this).attr("src","<?php echo WASSUPURL.'/img/b_select.png'; ?>");
     });
 
@@ -473 +477 @@
                 $("div#delID" + id).fadeOut("slow");
             else 
-                $("div#delID" + id).find('p.delbut').append("<br/><br/><small style='color:#404;font-weight:bold;text-align:right;float:right;'> <nobr>Sorry, delete failed!</nobr> " + html + "</small>");
+                $("div#delID" + id).find('p.delbut').append("<br/><br/><small style='color:#404;font-weight:bold;text-align:right;float:right;'> <nobr><?php _e('Sorry, delete failed!','wassup'); ?></nobr> " + html + "</small>");
             },
           error: function (XMLHttpReq, txtStatus, errThrown) {
-              $("div#delID" + id).find('p.delbut').append("<br/><br/><small style='color:#404;font-weight:bold;text-align:right;float:right;'> <nobr>Sorry, delete failed!</nobr> " + txtStatus + ": " + errThrown + "</small>");
+              $("div#delID" + id).find('p.delbut').append("<br/><br/><small style='color:#404;font-weight:bold;text-align:right;float:right;'> <nobr><?php _e('Sorry, delete failed!','wassup'); ?></nobr> " + txtStatus + ": " + errThrown + "</small>");
             }
         });
@@ -486 +490 @@
             echo "\n"; ?>
        $("div.search-ip").slideDown("slow");
-       $("a.show-search").html("<a href='#' class='show-search'><?php _e("Hide Search", "wassup") ?></a>");
+       $("a.show-search").html("<?php _e('Hide Search', 'wassup'); ?>");
     },function() {
        $("div.search-ip").slideUp("slow");
-       $("a.show-search").html("<a href='#' class='show-search'><?php _e("Search", "wassup") ?></a>");
+       $("a.show-search").html("<?php _e('Search', 'wassup'); ?>");
        return false; <?php  
         } else {
             echo "\n"; ?>
        $("div.search-ip").slideUp("slow");
-       $("a.show-search").html("<a href='#' class='show-search'><?php _e("Search", "wassup") ?></a>");
+       $("a.show-search").html("<?php _e('Search', 'wassup'); ?>");
     },function() {
        $("div.search-ip").slideDown("slow");
-       $("a.show-search").html("<a href='#' class='show-search'><?php _e("Hide Search", "wassup") ?></a>");
+       $("a.show-search").html("<?php _e('Hide Search', 'wassup'); ?>");
        return false; <?php  
         }
         echo "\n"; ?>
     });
-    $("a.show-topten").toggle(function(){
-       $("div.topten").slideDown("slow");
-       $("a.show-topten").html("<a href='#' class='show-topten'><?php _e("Hide TopTen", "wassup") ?></a>");
-    },function() {
-       $("div.topten").slideUp("slow");
-       $("a.show-topten").html("<a href='#' class='show-topten'><?php _e("Show TopTen", "wassup") ?></a>");
-       return false;
-    });
-
+    /*
+
+    // Since v1.8.3: deleted hide/show "top stats" javascript because it is not used
+
+    */
     $("a.toggle-all").toggle(function() {
        $("div.togglenavi").slideDown("slow");
-       $("a.toggle-all").html("<a href='#' class='toggle-all boxed'><?php _e("Collapse All", "wassup") ?></a>");
+       $("a.toggle-all").html("<?php _e('Collapse All', 'wassup'); ?>");
     },function() {
        $("div.togglenavi").slideUp("slow");
-       $("a.toggle-all").html("<a href='#' class='toggle-all boxed'><?php _e("Expand All", "wassup") ?></a>");
+       $("a.toggle-all").html("<?php _e('Expand All', 'wassup'); ?>");
        return false;
     });
     $("a.toggle-allcrono").toggle(function() {
        $("div.togglecrono").slideUp("slow");
-       $("a.toggle-allcrono").html("<a href='#' class='toggle-allcrono boxed'><?php _e("Expand Chronology", "wassup") ?></a>");
+       $("a.toggle-allcrono").html("<?php _e('Expand Chronology', 'wassup'); ?>");
     },function() {
        $("div.togglecrono").slideDown("slow");
-       $("a.toggle-allcrono").html("<a href='#' class='toggle-allcrono boxed'><?php _e("Collapse Chronology", "wassup") ?></a>");
+       $("a.toggle-allcrono").html("<?php _e('Collapse Chronology', 'wassup'); ?>");
        return false;
     });
 <?php           
-    //don't add refresh timer click function if refresh==0
+    //Since v1.8.2: don't add timer click function when wrefresh==0
     if ($wrefresh > 0) {  ?>
     $("#CountDownPanel").click(function(){  //Pause|Resume countdown
@@ -551 +551 @@
 <?php } //end if page != wassup-options
 
-// Since v1.8: go and go2 javascripts deleted because they are not used
-
 if ($_GET['page'] == "wassup-options") {
         //#Current active tabs are indentified after page reload with 
@@ -560 +558 @@
 //<link rel="stylesheet" href="WASSUPURL.'/css/ui.tabs.css'" type="text/css" />
 echo "\n"; ?>
-<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css' rel='stylesheet' type='text/css'/>
+<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css' rel='stylesheet' type='text/css' />
 <script type="text/javascript">
   //<![CDATA[
   jQuery(document).ready(function($) {
       var $tabs = $('#tabcontainer').tabs();
-      //$('#tabcontainer > ul').tabs({ fx: { opacity: 'toggle' } });
       $('.submit-opt').click(function(){
         $(this).css("background-color", "#d71");
@@ -595 +592 @@
         limit: 12, 
         fadeLast: 5, 
-        ajax: '<?php echo WASSUPURL."/lib/action.php?action=spia&spiatype=".$spytype.$action_param; ?>',
-        timeout: 5000, 
+        ajax: <?php echo "'".WASSUPURL."/lib/action.php?action=spia&spiatype=".$spytype.$action_param."',\n";
+        if (!empty($wassup_options->wassup_spy_speed) && is_numeric($wassup_options->wassup_spy_speed)) {
+            echo "\t\ttimeout: ".$wassup_options->wassup_spy_speed;
+        } else {
+            echo "\t\ttimeout: 5000";
+        } ?>,
         'timestamp': myTimestamp, 
         fadeInSpeed: 1100 });
@@ -605 +606 @@
         if (!empty($wassup_options->wassup_geoip_map)) {
             echo "\n"; ?>
-        $("div#map").css({"opacity": "0.5", "background": "none"}); <?php
+        $("div#map").css({"opacity": "0.6", "background": "none"}); <?php
         } ?>
     });
@@ -683 +684 @@
  */
 function WassUp() {
-    global $wpdb, $wp_version, $current_user, $user_level, $wassupversion, $wassup_options, $debug_mode;
+    global $wpdb, $wp_version, $current_user, $user_level, $wassupversion, $wassup_options, $wdebug_mode;
     
     // Start getting time of execution to debug SQL query
@@ -689 +690 @@
 
     //#debug...
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         $mode_reset=ini_get('display_errors');
         //error_reporting(E_ALL | E_STRICT);    //debug, E_STRICT=php5 only
@@ -708 +709 @@
     //"action_param" are preassigned "GET" parameters used for "action.php" external/ajax calls like "top ten" 
     $action_param='&whash='.$wassup_options->whash;
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         $action_param .= '&debug_mode=true';
     }
@@ -823 +824 @@
         }
         $wassup_options->wassup_screen_res = $_POST['wassup_screen_res'];
-        //validate wassup_refresh option input
+        //Since v1.8.2: validate wassup_refresh input value
         if (is_numeric($_POST['wassup_refresh']) && $_POST['wassup_refresh']>=0 && $_POST['wassup_refresh']<=180) { 
             $wassup_options->wassup_refresh = (int)$_POST['wassup_refresh'];
@@ -834 +835 @@
             $wassup_options->wassup_googlemaps_key = $_POST['wassup_googlemaps_key'];
         }
+        if (!empty($_POST['wassup_spy_speed']) && is_numeric($_POST['wassup_spy_speed']) && (int)$_POST['wassup_spy_speed'] >1000) {
+            $wassup_options->wassup_spy_speed = (int)$_POST['wassup_spy_speed'];
+        }
         $wassup_options->wassup_time_format = $_POST['wassup_time_format'];
         $wassup_options->wassup_time_period = $_POST['wassup_time_period'];
         $wassup_options->wassup_default_type = $_POST['wassup_default_type'];
         $wassup_options->wassup_default_limit = $_POST['wassup_default_limit'];
-        $top_ten = array("topsearch" => $_POST['topsearch'],
+        //New in v1.8.3: 1) toplimit input for top stats (top10) 
+        // list size and 2) top_nospider input to exclude spiders 
+        // from all top stats
+        $top_ten = array("toplimit" => (isset($_POST['toplimit'])? (int)$_POST['toplimit']:"10"),
+                "topsearch" => $_POST['topsearch'],
                 "topreferrer" => $_POST['topreferrer'],
                 "toprequest" => $_POST['toprequest'],
@@ -845 +853 @@
                 "toplocale" => (isset($_POST['toplocale'])?$_POST['toplocale']:"0"),
                 "topvisitor" => (isset($_POST['topvisitor'])?$_POST['topvisitor']:"0"),
-                "topfeed" => "0",
-                "topcrawler" => "0",
-                "topreferrer_exclude" => $_POST['topreferrer_exclude']);
+                "toppostid" => (isset($_POST['toppostid'])?$_POST['toppostid']:"0"),
+                "topreferrer_exclude" => $_POST['topreferrer_exclude'],
+                "top_nospider" => (isset($_POST['top_nospider'])?$_POST['top_nospider']:"0"));
         $wassup_options->wassup_top10 = attribute_escape(serialize($top_ten));
         $wassup_options->wassup_cache = (!empty($_POST['wassup_cache'])?"1":"0");
@@ -1193 +1201 @@
         $to_date = current_time("timestamp");   //wordpress time function
         if (isset($_GET['last']) && is_numeric($_GET['last'])) { 
-            $last = $_GET['last'];
-            $stickyFilters.='&last='.$last;
+            $wlast = $_GET['last'];
+            $stickyFilters.='&last='.$wlast;
         } else {
-            $last = $wassup_options->wassup_time_period; 
-        }
-        if ($last == 0) {
+            $wlast = $wassup_options->wassup_time_period; 
+        }
+        if ($wlast == 0) {
             $from_date = "0";   //all time
         } else {
-            $from_date = $to_date - (int)(($last*24)*3600);
+            $from_date = $to_date - (int)(($wlast*24)*3600);
             //extend start date to within a rounded time    
-            if ($last < .25) {  //start on 1 minute
+            if ($wlast < .25) {     //start on 1 minute
                 $from_date = ((int)($from_date/60))*60;
-            } elseif ($last < 7) {
+            } elseif ($wlast < 7) {
                 $from_date = ((int)($from_date/300))*300;
-            } elseif ($last < 30) {
+            } elseif ($wlast < 30) {
                 $from_date = ((int)($from_date/1800))*1800;
-            } elseif ($last < 365) {
+            } elseif ($wlast < 365) {
                 $from_date = ((int)($from_date/86400))*86400;
             } else {
@@ -1218 +1226 @@
         //## Filter detail lists by visitor type...
         if (isset($_GET['type'])) {
-            $type = attribute_escape($_GET['type']);
-            $stickyFilters.='&type='.$type;
+            $wtype = attribute_escape($_GET['type']);
+            $stickyFilters.='&type='.$wtype;
         } else {
-            $type = $wassup_options->wassup_default_type;
-        }
-        if (!empty($type) && $type != 'everything') {
-            $whereis=$wassup_options->getKeyOptions("wassup_default_type","sql",$type);
+            $wtype = $wassup_options->wassup_default_type;
+        }
+        if (!empty($wtype) && $wtype != 'everything') {
+            $wwhereis=$wassup_options->getKeyOptions("wassup_default_type","sql",$wtype);
         } else {
-            $type="";
-            $whereis="";
+            $wtype="";
+            $wwhereis="";
         }
         //## Filter detail lists by a specific page and number
         //#  of items per page...
-        $items = 10;    //default
+        $witems = 10;   //default
         if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-            //$items = htmlentities(attribute_escape($_GET['limit'])); 
-            $items = (int)$_GET['limit']; 
+            //$witems = htmlentities(attribute_escape($_GET['limit'])); 
+            $witems = (int)$_GET['limit']; 
         } elseif ($wassup_options->wassup_default_limit != '') {
-            $items = $wassup_options->wassup_default_limit;
-        }
-        if ((int)$items < 1 ) { $items = 10; }
+            $witems = $wassup_options->wassup_default_limit;
+        }
+        if ((int)$witems < 1 ) { $witems = 10; }
         //# current page selections
         if (isset($_GET['pages']) && is_numeric($_GET['pages'])) {
-            $pages = (int)$_GET['pages'];
+            $wpages = (int)$_GET['pages'];
         } else {
-            $pages = 1;
-        }
-        if ( $pages > 1 ) {
-            $limit = " LIMIT ".(($pages-1)*$items).",$items";
+            $wpages = 1;
+        }
+        if ( $wpages > 1 ) {
+            $wlimit = " LIMIT ".(($wpages-1)*$witems).",$witems";
         } else {
-            $limit = " LIMIT $items";
+            $wlimit = " LIMIT $witems";
         }
 
         //## Filter detail lists by a searched item
                 if (!empty($_GET['search'])) { 
-                        $search = attribute_escape(strip_tags(html_entity_decode($_GET['search'])));
-            $stickyFilters.='&search='.$search;
+                        $wsearch = attribute_escape(strip_tags(html_entity_decode($_GET['search'])));
+            $stickyFilters.='&search='.$wsearch;
                 } else {
-                        $search = "";
+                        $wsearch = "";
                 }
 
@@ -1281 +1289 @@
 
         // Instantiate class to count items
-        $Tot = New MainItems($wassup_table,$from_date,$to_date,$whereis,$limit);
-        $Tot->whereis = $whereis;
-        $Tot->Limit = $limit;
-        $Tot->WpUrl = $wpurl;
+        $wTot = New WassupItems($wassup_table,$from_date,$to_date,$wwhereis,$wlimit);
+        $wTot->whereis = $wwhereis;
+        $wTot->Limit = $wlimit;
+        $wTot->WpUrl = $wpurl;
         echo "<!--heartbeat-->\n";
 
         // MAIN QUERY
-        $main = $Tot->calc_tot("main", $search);
+        $wmain = $wTot->calc_tot("main", $wsearch);
         echo "<!--heartbeat-->\n";
-        $itemstot = $Tot->calc_tot("count", $search, null, "DISTINCT");
+        $witemstot = $wTot->calc_tot("count", $wsearch, null, "DISTINCT");
         echo "<!--heartbeat-->\n";
-        $pagestot = $Tot->calc_tot("count", $search);
+        $wpagestot = $wTot->calc_tot("count", $wsearch);
         echo "<!--heartbeat-->\n";
-        $spamtot = $Tot->calc_tot("count", $search, "AND spam>0");
+        $wspamtot = $wTot->calc_tot("count", $wsearch, "AND spam>0");
         // Check if some records was marked
         if ($wassup_options->wmark == "1") {
-            $markedtot = $Tot->calc_tot("count", $search, "AND ip = '".$wassup_options->wip."'", "DISTINCT");
+            $markedtot = $wTot->calc_tot("count", $wsearch, "AND ip = '".$wassup_options->wip."'", "DISTINCT");
         }
         echo "<!--heartbeat-->\n";
         // Check if some records were searched
-        if (!empty($search)) {
-            $searchtot = $Tot->calc_tot("count", $search, null, "DISTINCT");
+        if (!empty($wsearch)) {
+            $searchtot = $wTot->calc_tot("count", $wsearch, null, "DISTINCT");
         }
         //#  remove any delete request from $_SERVER['QUERY_STRING'] 
@@ -1344 +1352 @@
         <select style="font-size: 11px;" name="last" onChange="window.location.href=this.options[this.selectedIndex].value;"><?php 
         $optionargs="?".attribute_escape($new_last."&last=");
-        $wassup_options->showFormOptions("wassup_time_period","$last","$optionargs"); ?>
+        $wassup_options->showFormOptions("wassup_time_period","$wlast","$optionargs"); ?>
         </select></td>
         <td class="legend" align="right"><?php _e('Items per page','wassup'); ?>: <select name="navi" style="font-size: 11px;" onChange="window.location.href=this.options[this.selectedIndex].value;"><?php
@@ -1353 +1361 @@
             $new_limit = $URLQuery;
         }
-                $selected=$items;
+                $selected=$witems;
                 $optionargs="?".$new_limit."&limit=";
         $wassup_options->showFormOptions("wassup_default_limit","$selected","$optionargs"); ?>
@@ -1360 +1368 @@
                 <?php
                 //selectable filter by type of record (wassup_default_type)
-                $selected=$type;
-        $filter_args=str_replace("&type=$type","",$stickyFilters);
+                $selected=$wtype;
+        $filter_args=str_replace("&type=$wtype","",$stickyFilters);
         $optionargs="?page=".WASSUPFOLDER.$filter_args."&type=";
                 $wassup_options->showFormOptions("wassup_default_type","$selected","$optionargs"); ?>
@@ -1371 +1379 @@
                 <div id='usage'>
                         <ul>
-                        <li><span style="border-bottom:2px solid #0077CC;"><?php echo $itemstot; ?></span> <?php _e('Visits','wassup'); ?></li>
-                        <li><span style="border-bottom:2px dashed #FF6D06;"><?php echo $pagestot; ?></span> <?php _e('Pageviews','wassup'); ?></li>
-                        <li><span><?php echo @number_format(($pagestot/$itemstot), 2); ?></span> <?php _e('Pages/Visits','wassup'); ?></li><?php
+                        <li><span style="border-bottom:2px solid #0077CC;"><?php echo $witemstot; ?></span> <?php _e('Visits','wassup'); ?></li>
+                        <li><span style="border-bottom:2px dashed #FF6D06;"><?php echo $wpagestot; ?></span> <?php _e('Pageviews','wassup'); ?></li>
+                        <li><span><?php echo @number_format(($wpagestot/$witemstot), 2); ?></span> <?php _e('Pages/Visits','wassup'); ?></li><?php
         // Print spam usage only if enabled
         if ($wassup_options->wassup_spamcheck == 1) { ?>
-            <li><span> <a href="#TB_inline?width=400&inlineId=hiddenspam" class="thickbox"><?php echo $spamtot; ?><span class="plaintext">(<?php echo @number_format(($spamtot*100/$pagestot), 1); ?>%)</span></a></span> <?php _e('Spams','wassup'); ?></li><?php
+            <li><span> <a href="#TB_inline?width=400&inlineId=hiddenspam" class="thickbox"><?php echo $wspamtot; ?><span class="plaintext">(<?php echo @number_format(($wspamtot*100/$wpagestot), 1); ?>%)</span></a></span> <?php _e('Spams','wassup'); ?></li><?php
         } ?>
             </ul><br/>
@@ -1384 +1392 @@
         // Page breakdown
         // paginate only when total records > items per page
-        if ($itemstot > $items) {
+        if ($witemstot > $witems) {
             $p=new wassup_pagination();
-            $p->items($itemstot);
-            $p->limit($items);
-            $p->currentPage($pages);
-            $p->target("admin.php?page=".WASSUPFOLDER."&limit=$items&type=$type&last=$last&search=$search");
+            $p->items($witemstot);
+            $p->limit($witems);
+            $p->currentPage($wpages);
+            $p->target("admin.php?page=".WASSUPFOLDER."&limit=$witems&type=$wtype&last=$wlast&search=$wsearch");
             echo "<!--heartbeat-->\n";
             $p->calculate();
@@ -1418 +1426 @@
     <td align="right" class="legend">
         <a href="<?php echo wCleanURL(WASSUPURL.'/lib/action.php?action=topten&from_date='.$from_date.'&to_date='.$to_date.$action_param.'&width='.($res+250).'&height=440','','url'); 
-        if ($debug_mode) echo '" target="_blank';
+        if ($wdebug_mode) echo '" target="_blank';
         else echo '" class="thickbox';
-        ?>" title="Wassup <?php _e('Top Stats for Period','wassup');
+        ?>" title="Wassup <?php _e('Top Stats for','wassup');
         $wdformat = get_option("date_format");
         if (($to_date - $from_date) > 24*60*60) {
@@ -1429 +1437 @@
         <span class="separator">|</span> 
         <a href="#" class='show-search'><?php 
-            if (!empty($search)) {
+            if (!empty($wsearch)) {
                 _e('Hide Search','wassup'); 
             } else {
@@ -1436 +1444 @@
     </tr>
     <tr><td align="left" class="legend" colspan="2"><?php
-        if (!empty($search)) { 
-            echo " &nbsp; <strong>".(int)$searchtot."</strong> ".__('Matches found for search','wassup').": <strong>$search</strong>";
+        if (!empty($wsearch)) { 
+            echo " &nbsp; <strong>".(int)$searchtot."</strong> ".__('Matches found for search','wassup').": <strong>$wsearch</strong>";
         } else { 
             echo "<br/>";
@@ -1443 +1451 @@
     </td>
     <td align="right" class="legend">
-        <div class="search-ip" <?php if (empty($search)) echo 'style="display: none;"'; ?>>
+        <div class="search-ip" <?php if (empty($wsearch)) echo 'style="display: none;"'; ?>>
         <form action="" method="get">
         <input type="hidden" name="page" value="<?php echo WASSUPFOLDER; ?>" /><?php
         if (!empty($stickyFilters)) {
             $wfilterargs=wGetQueryPairs($stickyFilters);
-        if (!empty($wfilterargs)) {
-            foreach ($w_filterargs AS $wfilter) {
-                $wfilterval=explode('=',$wfilter);
-                if (!empty($wfilterval[0]) && $wfilterval[0]!= 'type') { ?>
-        <input type="hidden" name="<?php echo $wfilterval[0].'" value="'.$wfilterval[1]; ?>" /><?php
-                }
-            }
-        } } ?>
-        <input type="text" size="25" name="search" value="<?php if ($search != "") print attribute_escape($search); ?>" /><input type="submit" name="submit-search" value="search" />
+            if (!empty($wfilterargs)) {
+                foreach ($wfilterargs AS $wfilter) {
+                    $wfilterval=explode('=',$wfilter);
+                    if (!empty($wfilterval[0]) && $wfilterval[0]!= 'type') {
+                        echo "\n"; ?>
+                        <input type="hidden" name="<?php echo $wfilterval[0].'" value="'.$wfilterval[1]; ?>" /><?php
+                    }
+                }
+            }
+        }
+        echo "\n"; ?>
+        <input type="text" size="25" name="search" value="<?php if ($wsearch != "") print attribute_escape($wsearch); ?>" /><input type="submit" name="submit-search" value="search" />
         </form>
         </div> <!-- /search-ip -->
@@ -1464 +1475 @@
     print $expcol;
         //# Show Page numbers/Links...
-    if ($itemstot > $items) {
+    if ($witemstot > $witems) {
         echo '<div id="pag" align="center">'.$p->show()."</div>\n";
         }
     //# Detailed List of Wassup Records...
-    if ($itemstot >0 && count($main) >0) {
-    foreach ($main as $rk) {
+    if ($witemstot >0 && count($wmain) >0) {
+    foreach ($wmain as $rk) {
         $timestampF = $rk->max_timestamp;
         $dateF = gmdate("d M Y", $timestampF);
@@ -1560 +1571 @@
         } ?>
         <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>
+        <li><?php
+        if ($numurl > 1) _e("End timestamp","wassup");
+        else _e("Timestamp","wassup");
+        echo ': <span class="raw">'.$datetimeF.' ( '.$rk->max_timestamp.' )</span>'; ?></li>
         </ul>
         </div> <!-- raw-wassup_id -->
@@ -1586 +1600 @@
             <a href="?<?php echo attribute_escape($URLQuery.'&wmark=0'); ?>" style="text-decoration:none;"><img class="unmark-icon" src="<?php echo WASSUPURL.'/img/error_delete.png" alt="'.__('unmark','wassup').'" title="'.__('UnMark IP','wassup'); ?>" /></a><?php
         } else { ?>
-            <a href="#" class="deleteID" id="<?php echo $rk->wassup_id ?>" style="text-decoration:none;"><img class="delete-icon" src="<?php echo WASSUPURL.'/img/cross.png" alt="'.__('delete','wassup').'" title="'.__('Delete this record','wassup'); ?>" /></a>
+            <a href="#" class="deleteID" id="<?php echo $rk->wassup_id ?>" style="text-decoration:none;"><img class="delete-icon" src="<?php echo WASSUPURL.'/img/b_delete.png" alt="'.__('delete','wassup').'" title="'.__('Delete this record','wassup'); ?>" /></a>
             <a href="?<?php echo attribute_escape($URLQuery.'&wmark=1&wip='.$ip); ?>" style="text-decoration:none;"><img class="mark-icon" src="<?php echo WASSUPURL.'/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_div; ?>" class="thickbox"><img class="table-icon" src="<?php echo WASSUPURL.'/img/database_table.png" alt="'.__('show raw table','wassup').'" title="'.__('Show the items as raw table','wassup'); ?>" /></a>
+            <a href="#TB_inline?height=400&width=<?php echo $res.'&inlineId='.$raw_div; ?>" class="thickbox"><img class="table-icon" src="<?php echo WASSUPURL.'/img/b_select.png" alt="'.__('show raw table','wassup').'" title="'.__('Show the items as raw table','wassup'); ?>" /></a>
             </p>
             <div class="sum-box">
@@ -1746 +1760 @@
     } //end foreach qry
     print $expcol; //moved
-    } //end if itemstot > 0
-    if ($itemstot > $items) {
+    } //end if witemstot > 0
+    if ($witemstot > $witems) {
         print '<div align="center">'.$p->show().'</div><br />'."\n";
     } ?>
@@ -1755 +1769 @@
         $chart_type = ($wassup_options->wassup_chart_type >0)? $wassup_options->wassup_chart_type: "2";
         //show Google!Charts image
-        if ($pagestot > 12) {
+        if ($wpagestot > 12) {
             $chartwidth=$res;
             //let browser resize chart for small screens
@@ -1761 +1775 @@
                 $chartwidth=640;
             }
-            $chart_url = $Tot->TheChart($last, $chartwidth, "180", $search, $chart_type, "bg,s,dedade|c,lg,90,edffff,0,dedade,0.8", "page", $type);
+            $chart_url = $wTot->TheChart($wlast, $chartwidth, "180", $wsearch, $chart_type, "bg,s,dedade|c,lg,90,edffff,0,dedade,0.8", "page", $wtype);
             $html='<img src="'.$chart_url.'" alt="'.__("Graph of visitor hits","wassup").'" class="chart" width="'.$res.'" />';
         } else {
@@ -1784 +1798 @@
     <nobr><span class="separator">|</span> <?php echo __('Exec time','wassup').": $totaltime"; ?></nobr></small></p>
     <?php 
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         //display MySQL errors/warnings in admin menus - for debug
         $wpdb->print_error();   //debug
@@ -1796 +1810 @@
 } //end function Wassup
 
-//Since v.1.8: createTable/upgradeTable functions were moved to 
-//  'upgrade.php' module where they are loaded only when needed to keep 
-//   WassUp fast
+//Since v.1.8: createTable/upgradeTable functions moved to 'upgrade.php'
+//  module and are loaded during install/upgrade/uninstall only to keep WassUp fast.
 } //end if is_admin
 
@@ -1804 +1817 @@
 //Set Wassup_id and cookie (before headers sent)
 function wassupPrepend() {
-    global $wassup_options, $current_user, $user_level, $screen_res, $wassup_cookie_value, $debug_mode;
+    global $wassup_options, $current_user, $user_level, $wscreen_res, $wassup_cookie_value, $wdebug_mode;
 
     //reload wassup_options in case changed elsewhere (by admin)
@@ -1815 +1828 @@
     $wassup_id = "";
     $session_timeout = 1;
-    $screen_res = "";
+    $wscreen_res = "";
     $cookieIP = "";
     $cookieHost = "";
+    $cookieUser = "";
     $wassup_cookie_value="";
     $wassup_dbtask=array();
@@ -1831 +1845 @@
             $session_timeout = ((int)$wassup_timer - (int)time());
         }
-        if (!empty($cookie_data[2])) $screen_res = $cookie_data[2];
+        if (!empty($cookie_data[2])) $wscreen_res = $cookie_data[2];
         if (!empty($cookie_data[3])) {
             $cookieIP = $cookie_data[3];
@@ -1838 +1852 @@
             }
         }
+        //new in v1.8.3: username in wassup cookie
+        if (!empty($cookie_data[5])) {
+            $cookieUser = $cookie_data[5];
+        }
     }
     //set screen resolution value from cookie or browser header data, if any
-    if (empty($screen_res)) {
+    if (empty($wscreen_res)) {
         if (isset($_COOKIE['wassup_screen_res'])) {
-            $screen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
-            if ($screen_res == "x") $screen_res="";
+            $wscreen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
+            if ($wscreen_res == "x") $wscreen_res="";
         } 
-        if (empty($screen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
+        if (empty($wscreen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
             //resolution in IE/IEMobile header sometimes
-            $screen_res = str_replace('X',' x ',$_SERVER['HTTP_UA_PIXELS']);
-        }
-        //if (empty($screen_res) && isset($_GET['wscr'])) {
-        //  $screen_res = $_GET['wscr'];
+            $wscreen_res = str_replace('X',' x ',$_SERVER['HTTP_UA_PIXELS']);
+        }
+        //if (empty($wscreen_res) && isset($_GET['wscr'])) {
+        //  $wscreen_res = $_GET['wscr'];
         //} 
     }
@@ -1858 +1876 @@
         get_currentuserinfo();  //sets $current_user, $user_xx 
     //}
-    $logged_user = (!empty($current_user->user_login)? $current_user->user_login: "");
+    //sometimes current_user is empty during wordpress init so use "cookieUser" variable sometimes
+    $logged_user = (!empty($current_user->user_login)? $current_user->user_login: $cookieUser);
     //exclude valid wordpress admin page visits and admin hits
     if (($wassup_options->wassup_admin == "1" || $user_level < 8) && (!is_admin() || empty($logged_user))) {
 
         //write wassup cookie for new visits, visit timeout (45 mins) or empty screen_res
-        if (empty($wassup_id) || $session_timeout < 1 || (empty($cookie_data[2]) && !empty($screen_res))) {
+        if (empty($wassup_id) || $session_timeout < 1 || (empty($cookie_data[2]) && !empty($wscreen_res))) {
             $ipAddress = "";
             $proxy = "";
@@ -1971 +1990 @@
             }
             $expire = time()+3000;  //expire based on utc timestamp, not on Wordpress time
-            $cookie_data = implode('::',array("$wassup_id","$wassup_timer","$screen_res","$IP","$hostname"));
+            $cookie_data = implode('::',array("$wassup_id","$wassup_timer","$wscreen_res","$IP","$hostname","$logged_user"));
             $wassup_cookie_value = urlencode(base64_encode($cookie_data));
             setcookie("wassup", "$wassup_cookie_value", $expire, $cookiepath, $cookiedomain);
@@ -1978 +1997 @@
 
         //place wassup tag and javascript in document head
-        add_action('wp_head', 'wassup_head', 10, "$screen_res");
+        add_action('wp_head', 'wassup_head', 10);
         //track visitor hits: 
         //  use 'send_headers' hook to track media, downloads, and feed hits
@@ -2008 +2027 @@
 //Track visitors and save record in wassup table, after page is displayed
 function wassupAppend() {
-    global $wpdb, $wassup_options, $current_user, $user_level, $wassupversion, $wassup_cookie_value, $debug_mode;
+    global $wpdb, $wassup_options, $current_user, $user_level, $wassupversion, $wassup_cookie_value, $wscreen_res, $wdebug_mode;
 
     if ($wassup_options->wassup_active == 0) {  //do nothing
@@ -2015 +2034 @@
     @ignore_user_abort(1); // finish script in background if visitor aborts
 
-    if ($debug_mode) {  //#debug...
+    if ($wdebug_mode) { //#debug...
         //debug mode must be off for media and non-html requests 
         if (preg_match("/(\.(gif|ico|jpe?g|png|tiff|css|doc|js|jar|rdf|rtf|pdf|ppt|psd|txt|xls|xlt|xml|flv|mov|mpg|mp4|mp3|ogg|swf|wmv|Z|gz|zip)$)|[=\/](feed|atom)/i", $_SERVER['REQUEST_URI'])>0) {
-            $debug_mode=false;
+            $wdebug_mode=false;
         } elseif (is_feed()) {
-            $debug_mode=false;
+            $wdebug_mode=false;
         } else {
             $mode_reset=ini_get('display_errors');
-            $debug_reset=$debug_mode;
+            $debug_reset=$wdebug_mode;
             error_reporting(E_ALL); //debug, E_STRICT=php5 only
             ini_set('display_errors','On'); //debug
@@ -2037 +2056 @@
             @error_reporting(E_ERROR);
         }
-    } //end if $debug_mode
+    } //end if $wdebug_mode
 
     $wpurl = get_bloginfo('wpurl');
@@ -2050 +2069 @@
     else $post_ID=0;
     //if (empty($current_user->user_login)) { 
-        get_currentuserinfo();  //sets $current_user, $user_xx 
+        get_currentuserinfo();  //gets $current_user, $user_xx 
     //}
     $logged_user = (!empty($current_user->user_login)? $current_user->user_login: "");
@@ -2066 +2085 @@
     //# First exclusion control is for admin user
     if ($wassup_options->wassup_admin == "1" || $user_level < 8) {
+
+    //# TODO?: Exclude wp-cron utility hits
+    //if (stristr($urlRequested,"/wp-cron.php?doing_wp_cron")===FALSE || (!empty($_SERVER['SERVER_ADDR']) && $_SERVER['SERVER_ADDR'] != $_SERVER['REMOTE_ADDR'])) {
 
     //# Record non-admin page visits and or hack attempts
@@ -2108 +2130 @@
     if (!$exclude_visit) {
         $wassup_id = "";
-        $screen_res = "";
         $cookieIP = "";
         $cookieHost = "";
@@ -2120 +2141 @@
             $wassup_id = $wassup_cookie[0];
             if (!empty($wassup_cookie[2])) { 
-                $screen_res = $wassup_cookie[2];
+                $wscreen_res = $wassup_cookie[2];
             }
             if (!empty($wassup_cookie[3])) {
@@ -2130 +2151 @@
         }
         //### set screen resolution value from cookie or browser header data, if any
-        if (empty($screen_res)) {
+        if (empty($wscreen_res)) {
             if (isset($_COOKIE['wassup_screen_res'])) {
-                $screen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
-                if ($screen_res == "x") $screen_res = "";
+                $wscreen_res = attribute_escape(trim($_COOKIE['wassup_screen_res']));
+                if ($wscreen_res == "x") $wscreen_res = "";
             } 
-            if (empty($screen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
+            if (empty($wscreen_res) && isset($_SERVER['HTTP_UA_PIXELS'])) {
                 //resolution in IE/IEMobile header sometimes
-                $screen_res = str_replace('X',' x ',attribute_escape($_SERVER['HTTP_UA_PIXELS']));
+                $wscreen_res = str_replace('X',' x ',attribute_escape($_SERVER['HTTP_UA_PIXELS']));
             }
         }
@@ -2246 +2267 @@
     // visitor.  Dup==same wassup_id, same URL, and timestamp <180 secs
     $dup_urlrequest=0;
-    $w_pageviews=0;
+    $wpageviews=0;
     $spamresult=0;
     $wpdb->query("SET wait_timeout = 7"); //don't wait for slow responses
-    $recent = $wpdb->get_results("SELECT wassup_id, urlrequested, spam, screen_res, `timestamp`, browser, spider, os, feed, `language`, `agent`, `referrer` FROM ".$table_tmp_name." WHERE wassup_id='".$wassup_id."' AND `timestamp` >".($timestamp-180)." ORDER BY `timestamp` DESC");
-    if (!empty($recent)) {
-        $w_pageviews=count($recent);
+    $recent_hit = $wpdb->get_results("SELECT wassup_id, urlrequested, spam, screen_res, `timestamp`, browser, spider, os, feed, `language`, `agent`, `referrer` FROM ".$table_tmp_name." WHERE wassup_id='".$wassup_id."' AND `timestamp` >".($timestamp-180)." ORDER BY `timestamp` DESC");
+    if (!empty($recent_hit)) {
+        $wpageviews=count($recent_hit);
         //check 1st record only
         //record is dup if same url (with 'wscr' removed) and same user-agent
-        if ($recent[0]->urlrequested == $urlRequested || $recent[0]->urlrequested == remove_query_arg('wscr',$urlRequested) || $recent[0]->urlrequested == "[404] $urlRequested") {
-            if ($recent[0]->agent == $userAgent || empty($recent[0]->agent)) {
+        if ($recent_hit[0]->urlrequested == $urlRequested || $recent_hit[0]->urlrequested == remove_query_arg('wscr',$urlRequested) || $recent_hit[0]->urlrequested == "[404] $urlRequested") {
+            if ($recent_hit[0]->agent == $userAgent || empty($recent_hit[0]->agent)) {
                 $dup_urlrequest=1;
             }
@@ -2264 +2285 @@
 
         //retrieve previous spam check results
-        $spamresult = $recent[0]->spam;
+        $spamresult = $recent_hit[0]->spam;
 
         //check for screen resolution and update, if not previously recorded
         //...queue the update because of "delayed insert"
-        if (empty($recent[0]->screen_res) && !empty($screen_res)) {
-            $wassup_dbtask[] = "UPDATE $wassup_table SET `screen_res`='$screen_res' WHERE `wassup_id`='$wassup_id' AND `screen_res`='' ";
+        if (empty($recent_hit[0]->screen_res) && !empty($wscreen_res)) {
+            $wassup_dbtask[] = "UPDATE $wassup_table SET `screen_res`='$wscreen_res' WHERE `wassup_id`='$wassup_id' AND `screen_res`='' ";
         }
 
@@ -2275 +2296 @@
         //  avoid redundant tests
         if ($dup_urlrequest == 0) {
-            if (empty($screen_res) && !empty($recent[0]->screen_res)) {
-                $screen_res = $recent[0]->screen_res;
+            if (empty($wscreen_res) && !empty($recent_hit[0]->screen_res)) {
+                $wscreen_res = $recent_hit[0]->screen_res;
             }
             if ($spam == 0 && (int)$spamresult >0 ) {
                 $spam = $spamresult;
             }
-            if ($recent[0]->agent == $userAgent || empty($userAgent)) {
-                $browser = $recent[0]->browser;
-                $spider = $recent[0]->spider;
-                $os = $recent[0]->os;
+            if ($recent_hit[0]->agent == $userAgent || empty($userAgent)) {
+                $browser = $recent_hit[0]->browser;
+                $spider = $recent_hit[0]->spider;
+                $os = $recent_hit[0]->os;
                 if (empty($language)) {
-                    $language = $recent[0]->language;
+                    $language = $recent_hit[0]->language;
                 }
                 //feed reader only if this page is feed
-                if (!empty($recent[0]->feed) && is_feed()) {
-                    $feed = $recent[0]->feed;
+                if (!empty($recent_hit[0]->feed) && is_feed()) {
+                    $feed = $recent_hit[0]->feed;
                 }
             }
@@ -2296 +2317 @@
         // Detect disguised spiders and harvesters by checking for
         //  excessive pageviews (threshold: 8+ views in < 16 secs)
-        if ($w_pageviews >7 && empty($spider)) {
-            $visitstart = $recent[7]->timestamp;
-            if (($timestamp - $recent[7]->timestamp) < 16) {
+        if ($wpageviews >7 && empty($spider)) {
+            $pageurls = array();
+            $visitstart = $recent_hit[7]->timestamp;
+            if (($timestamp - $recent_hit[7]->timestamp) < 16) {
                 $is_spider=true;
-                $pagetest[]="$urlRequested";
+                $pageurls[]="$urlRequested";
                 //a spider is unlikely to hit same page 2+ times
-                foreach ($recent AS $w_pgview) {
+                foreach ($recent_hit AS $w_pgview) {
                     if (stristr($w_pgview->urlrequested,"robots.txt")!==false) {
                         $is_spider = true;
                         break;
-                    } elseif (in_array($w_pgview->urlrequested,$pagetest)) {
+                    } elseif (in_array($w_pgview->urlrequested,$pageurls)) {
                         $is_spider = false;
                         break;
                     } else {
-                        $pagetest[] = $w_pgview->urlrequested;
+                        $pageurls[] = $w_pgview->urlrequested;
                     }
                 }
@@ -2319 +2341 @@
             }
         }
-    } //end if recent
-    if ($debug_mode) {  //debug
-        if (!empty($recent)) {
+    } //end if recent_hit
+    if ($wdebug_mode) { //debug
+        if (!empty($recent_hit)) {
             echo "<br />\nRecent visit data found in wassup_tmp:\n"; //debug
-            print_r($recent); //debug
+            print_r($recent_hit); //debug
             echo "\n";
-            $debug_output .="\n\n".date('H:i:s.u').' Recent data lookup results: $recent='.serialize($recent)."\n";
+            $debug_output .="\n\n".date('H:i:s.u').' Recent data lookup results: $recent_hit='.serialize($recent_hit)."\n";
             if ($dup_urlrequest == 1) {
                 echo "\nDuplicate record!\n";
             }
-            if ($recent[0]->agent != $userAgent) {
+            if ($recent_hit[0]->agent != $userAgent) {
                 echo "\nUser Agents NOT Identical:";
                 echo "\n\tCurrent user agent: ".$userAgent;
-                echo "\n\tPrevious user agent:".$recent[0]->agent."\n";
+                echo "\n\tPrevious user agent:".$recent_hit[0]->agent."\n";
             }
         } else {
@@ -2341 +2363 @@
 
     //don't record 404 unless 1st visit or hack attempt
-    if ($req_code == 200 || empty($recent) || ($hackercheck && (stristr($urlRequested,"/wp-")!==FALSE || preg_match('/\.(php|ini|aspx?|dll|cgi)|(\.\.\/\.\.\/|root[^a-z0-9\-_]|[^a-z0-9\-_]passw|\=admin[^a-z0-9\-_]|\=\-\d+|(bin|etc)\/)/i',$urlRequested)>0))) {
+    if ($req_code == 200 || empty($recent_hit) || ($hackercheck && (stristr($urlRequested,"/wp-")!==FALSE || preg_match('/\.(php|ini|aspx?|dll|cgi)|(\.\.\/\.\.\/|root[^a-z0-9\-_]|[^a-z0-9\-_]passw|\=admin[^a-z0-9\-_]|\=\-\d+|(bin|etc)\/)/i',$urlRequested)>0))) {
         //identify hackers 
-        if ($req_code != 200 && preg_match('#(\.(php|cgi|aspx?)|[\*\,\'"]|\=\-1$)#i',$urlRequested)>0) {
-            //visitors trying to run non-existent server-side scripts are up to no good.
-            $spam = 3;
+        if ($req_code != 200 && preg_match('#(([a-z0-9_\*\-\#\,]+\.php[456]?)|\.(?:cgi|aspx?)|[\*\,\'"]|\=\-1$)#i',$urlRequested,$matches)>0) {
+            //visitors requesting non-existent server-side scripts are up to no good
+            if (empty($matches[2]) || $matches[2]!= "index.php") {
+                $spam = 3;
+            }
         } elseif (preg_match('#\.\./\.\./(etc/passwd|\.\./\.\./)#i',$urlRequested)>0 || preg_match('#[\[&\?/](dir|document_root\]?|id|page|thisdir)\=https?\://#i',$urlRequested)>0) { 
             //anyone trying to access root files, password or ids are up to no good
@@ -2353 +2377 @@
         }
         //retroactively update record for hack attempt
-        if ($spam == "3" && $spamresult == "0" && !empty($recent)) {
+        if ($spam == "3" && $spamresult == "0" && !empty($recent_hit)) {
             $wassup_dbtask[] = "UPDATE $wassup_table SET `spam`='3' WHERE `wassup_id`='$wassup_id' AND `spam`='0' ";
         }
 
-    //# Exclude duplicates and avoid redundant checks on multi-page visits
+    //# Exclude duplicates and avoid redundant checks for multi-page visitors
     if ($dup_urlrequest == 0) {
         //##### Extract useful visit information from http header..
@@ -2386 +2410 @@
                 $os = $ua->os;
                 if (!empty($ua->resolution)) {
-                //TODO?: Write 'wassup_screen_res' cookie, if none
-                    $screen_res = (preg_match('/^\d+x\d+$/',$ua->resolution)>0)?str_replace('x',' x ',$ua->resolution):$ua->resolution;
+                    $wscreen_res = (preg_match('/^\d+x\d+$/',$ua->resolution)>0)?str_replace('x',' x ',$ua->resolution):$ua->resolution;
                 }
                 if (!empty($ua->language) && empty($language)) {
                     $language=$ua->language;
                 }
-                if ($debug_mode) $debug_output .= "\n".date('H:i:s.u').' UAdetecter results: $ua='.serialize($ua)."\n";
+                if ($wdebug_mode) $debug_output .= "\n".date('H:i:s.u').' UAdetecter results: $ua='.serialize($ua)."\n";
             } //end if $ua->name
 
@@ -2401 +2424 @@
                 list($browser,$os) = wGetBrowser($userAgent);
                 if (!empty($browser)) $agent= $browser;
-                if ($debug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetBrowser results: $browser='.$browser.'  $os='.$os."\n";
+                if ($wdebug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetBrowser results: $browser='.$browser.'  $os='.$os."\n";
             }
 
@@ -2412 +2435 @@
             if (empty($agent) || stristr($agent,'unknown')!==false || preg_match($spider_hosts,$hostname)>0 ) {
                 list($spider,$spidertype,$feed) = wGetSpider($userAgent,$hostname,$browser);
-                if ($debug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetSpider results: $spider='.$spider.'  $spidertype='.$spidertype.' $feed='.$feed."\n";
+                if ($wdebug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetSpider results: $spider='.$spider.'  $spidertype='.$spidertype.' $feed='.$feed."\n";
                 //it's a browser
                 if ($spidertype == "B" && $urlRequested != "/robots.txt") { 
@@ -2427 +2450 @@
             } elseif(!empty($userAgent) && (strlen($agent)<5 || strstr($agent,'N/A') || ($agent == $browser && (empty($os) || preg_match("#\s?([a-z]+(?:bot|crawler|spider|reader|agent))[^a-z]#i",$userAgent)>0 || strstr($urlRequested,"robots.txt")!==FALSE || is_feed())))) {
                 list($spider,$spidertype,$feed) = wGetSpider($userAgent,$hostname,$browser);
-                if ($debug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetSpider results: $spider='.$spider.'  $spidertype='.$spidertype.' $feed='.$feed."\n";
+                if ($wdebug_mode) $debug_output .= "\n".date('H:i:s.u').' wGetSpider results: $spider='.$spider.'  $spidertype='.$spidertype.' $feed='.$feed."\n";
                 //it's a browser
                 if ($spidertype == "B" && $urlRequested != "/robots.txt") { 
@@ -2445 +2468 @@
 
         //if 1st request is "robots.txt" then this is a bot
-        if (empty($spider) && strstr($urlRequested,"robots.txt")!==FALSE && empty($recent)) {
+        if (empty($spider) && strstr($urlRequested,"robots.txt")!==FALSE && empty($recent_hit)) {
             $spider = __("Unknown Spider","wassup");
 
@@ -2459 +2482 @@
         //# some valid spiders to exclude from spam check below
         $goodbot = false;
-        if ($hostname!="" && !empty($spider) && preg_match('/^(googlebot|bingbot|msnbot|yahoo\!\ slurp|technorati)/i',$spider)>0 && preg_match('/\.(googlebot|live|msn|yahoo|technorati)\.(com|net)$/i',$hostname)>0){
+        if ($hostname!="" && !empty($spider) && preg_match('#^(googlebot|bingbot|msnbot|yahoo\!\sslurp|technorati)#i',$spider)>0 && preg_match('#\.(googlebot|live|msn|yahoo|technorati)\.(com|net)$#i',$hostname)>0){
             $goodbot = true;
         }
 
         //do spam exclusion controls, unless disabled in wassup_spamcheck
-    if ($wassup_options->wassup_spamcheck == 1 && $spam == 0) {
+    if ($wassup_options->wassup_spamcheck == 1 && $spam == 0 && !$goodbot) {
         $spamComment = New wassup_checkComment;
 
         //### 1st Check for referrer spam...faster, if positive
-        if ($wassup_options->wassup_refspam == 1 && !empty($referrer) && !$goodbot) {
+        if ($wassup_options->wassup_refspam == 1 && !empty($referrer)) {
             //#...skip if referrer is own blog
-            if (stristr($referrer,$wpurl)===FALSE && stristr($referrer,$blogurl)===FALSE && !$debug_mode) {
+            if (stristr($referrer,$wpurl)===FALSE && stristr($referrer,$blogurl)===FALSE && !$wdebug_mode) {
             // Do a control if it is Referrer Spam
-            //check if referer is a previous comment spammer
+            //check if referrer is a previous comment spammer
             if ($spamComment->isRefSpam($referrer)>0) {
                 $spam = 2;
             //check referer against a list of known spammers
             } else {
-                if ($debug_mode) {
+                if ($wdebug_mode) {
                     $isspam = wGetSpamRef($referrer,$hostname);
                 } else {
@@ -2490 +2513 @@
         //# No spam check on known bots (google, yahoo,...) unless
         //#  there is a comment or forum page request...
-        if ($spam == 0 && (empty($spider) || !$goodbot || stristr($urlRequested,"comment")!== FALSE || stristr($urlRequested,"forum")!== FALSE  || !empty($comment_user))) { 
+        if ($spam == 0 && (empty($spider) || stristr($urlRequested,"comment")!== FALSE || stristr($urlRequested,"forum")!== FALSE  || !empty($comment_user))) { 
 
         //if (isset($spamresult) && stristr($urlRequested,"comment") === FALSE && stristr($urlRequested,"forum") === FALSE && empty($comment_user) && empty($_POST['comment'])) {
@@ -2505 +2528 @@
             }
             //#lastly check for comment spammers using Akismet API
-            //  Note: this may cause "header already sent" errors with "send_headers" hook in some Wordpress configurations
-            if ($wassup_options->wassup_spam == 1 && stristr($urlRequested,"comment") !== FALSE && $spam == 0) {
+            // Note: Akismet spam test may cause "header already sent" errors with "send_headers" hook in some Wordpress configurations
+            if ($spam == 0 && $wassup_options->wassup_spam == 1 && stristr($urlRequested,"comment")!== FALSE && stristr($urlRequested,"/comments/feed/")== FALSE) {
                 $akismet_key = get_option('wordpress_api_key');
                 $akismet_class = dirname(__FILE__).'/lib/akismet.class.php';
@@ -2535 +2558 @@
 
             //retroactively update visitor's hits as spam, in case late detection
-            if (!empty($recent) && !empty($spam) && $spamresult==0) {
+            if (!empty($recent_hit) && !empty($spam) && $spamresult==0) {
                 //queue the update...
                 $wassup_dbtask[]="UPDATE $wassup_table SET `spam`='".$spam."' WHERE `wassup_id`='".$wassup_id."' AND `spam`='0' ";
@@ -2554 +2577 @@
         $search_phrase="";
         $searchpage="";
+        $searchcountry="";
         //don't check own blog for search engine data
-        if (!empty($referrer) && $spam == "0" && stristr($referrer,$blogurl)!=$referrer && !$debug_mode) {
-            //if ($debug_mode) {    //debug
+        if (!empty($referrer) && $spam == "0" && stristr($referrer,$blogurl)!=$referrer && !$wdebug_mode) {
+            //if ($wdebug_mode) {   //debug
             //  echo '<br />\n$Referrer="'.$referrer.'" is NOT own site: '.$blogurl.'. Checking for search engine data...'."\n"; //debug
             //}
             //get GET type search results, ex: search=x
             if (strpos($referrer,'=')!==false) {
-                list($searchengine,$search_phrase,$searchpage,$searchlang,$searchcountry)=explode("|",wGetSE($referrer));
+                list($searchengine,$search_phrase,$searchpage,$searchlang,$searchlocale)=explode("|",wGetSE($referrer));
                 if ($search_phrase != '') {
                     $sedomain = parse_url($referrer);
@@ -2581 +2605 @@
             if (!empty($searchengine)) {
                 if (stristr($searchengine,"images")===FALSE && stristr($referrer,'&imgurl=')===FALSE) {
+                // 2011-04-18: "page" parameter is now used on referrer string for Google Images et al.
+                if (preg_match('#page[=/](\d+)#i',$referrer,$pcs)>0) {
+                    if ($searchpage != $pcs[1]) {
+                        $searchpage = $pcs[1];
+                    }
+                } else {
                 // NOTE: Position retrieved in Google Images is 
                 // the position number of image NOT page rank position like web search
                     $searchpage=(int)($searchpage/10)+1;
                 }
-                if (empty($searchcountry) && preg_match('/(\.([a-z]{2})$|^([a-z]{2})\.)/i',$searchdomain,$match)) {
+                }
+                //append country code to search engine name
+                if (preg_match('/(\.([a-z]{2})$|^([a-z]{2})\.)/i',$searchdomain,$match)) {
                     if (!empty($match[2])) {
                             $searchcountry = $match[2];
@@ -2591 +2623 @@
                             $searchcountry = $match[3];
                     }
-                }
-                if (!empty($searchcountry) && $searchcountry != "us") {
-                    $searchengine .= " ".strtoupper($searchcountry);
+                    if (!empty($searchcountry) && $searchcountry != "us") {
+                        $searchengine .= " ".strtoupper($searchcountry);
+                    }
                 }
             } else {
@@ -2599 +2631 @@
             }
             //use search engine country code as locale
-            $searchcountry = trim($searchcountry);
-            if (!empty($searchcounty) && ($language == "us" || empty($language))) {
+            $searchlocale = trim($searchlocale);
+            if (!empty($searchlocale)) {
+                $language = $searchlocale;
+            } elseif (!empty($searchcountry) && ($language == "us" || empty($language))) {
                 $language=$searchcountry;
             }
@@ -2624 +2658 @@
                 'browser'=>$browser, 
                 'language'=>$language, 
-                'screen_res'=>$screen_res, 
+                'screen_res'=>$wscreen_res, 
                 'spider'=>$spider, 
                 'feed'=>$feed, 
@@ -2658 +2692 @@
     } //end if !exclude_visit
     } //end if !is_admin
+    //} //TODO end if wp-cron.php?doing_wp_cron===FALSE
     } //end if loggeduser_level
     
@@ -2723 +2758 @@
     //perform scheduled database tasks 
     if (count($wassup_dbtask)>0) {
-        if ($debug_mode) {
+        if ($wdebug_mode) {
             $debug_output.="\n"."Performing Scheduled tasks:".serialize($wassup_dbtask)."\n";
         }
         wassup_scheduled_dbtask($wassup_dbtask);
     }
-    if ($debug_mode) {
+    if ($wdebug_mode) {
         if (!empty($wassup_rec)) {
             echo "<br />\nWassUp record data:\n";
@@ -2847 +2882 @@
  */
 function wGetQueryPairs($urlstring){
-    $return = array();
+    $wreturn = array();
     if (!empty($urlstring)) {
-        $tab=parse_url($urlstring);
-        if (key_exists("query",$tab)){
-            $query=$tab["query"];
-            $return=explode("&",$query);
+        $wtab=parse_url($urlstring);
+        if (key_exists("query",$wtab)){
+            $query=$wtab["query"];
+            $wreturn=explode("&",$query);
         } else {
-            $return=explode("&",$urlstring); //partial url
-        }
-    }
-    return $return;
+            $wreturn=explode("&",$urlstring); //partial url
+        }
+    }
+    return $wreturn;
 } //end wGetQueryPairs
 
@@ -2955 +2990 @@
         "Google|www.google.|q|cd|hl||",
         "Google|www.google.|as_q|start|hl||",   //advanced query
-        "Yahoo Images|images.search.yahoo.com|p||||", 
-        "Yahoo Mobile|m.search.yahoo.|p||||", 
-        "Yahoo|search.yahoo.|p||||", 
-        "Yahoo|answers.yahoo.com|p||||", 
+        "Yahoo! Images|images.search.yahoo.com|p||||", 
+        "Yahoo! Mobile|m.search.yahoo.|p||||", 
+        "Yahoo! Mobile|search.yahoo.com/mobile/|p||||", 
+        "Yahoo!|search.yahoo.|p||||", 
+        "Yahoo!|answers.yahoo.com|p||||", 
         "Bing Mobile|m.bing.com|q|first|||", 
         "Bing Images|.bing.com/images/|q|first|||", 
@@ -3037 +3073 @@
         "Web|.web.de|su|||de|", 
         "Yahoo! Mobile|m.yahoo.com|p||||",
+        "Yahoo! Mobile|m2.yahoo.com|p||||",
+        "Yahoo!|.yahoo.com|p||||", 
         "Yandex|yandex.ru|text|||ru|",
         "Yippy|search.yippy.com|query||||",
@@ -3058 +3096 @@
             $searchengine = $nome;
             $search_phrase = "";
-            $variables=array();
+            $svariables=array();
             // Google Images or Google Translate needs additional processing of search phrase after 'prev='
             if ($nome == "Google Images" || $nome == "Google Translate") {
                 //'prev' is an encoded substring containing actual "q" query, so use html_entity_decode to show [&?] in url substring
-                $variables = wGetQueryPairs(html_entity_decode(preg_replace('#/\w+\?#i','', urldecode($match[1]))));
+                $svariables = wGetQueryPairs(html_entity_decode(preg_replace('#/\w+\?#i','', urldecode($match[1]))));
                 $key='q';   //q is actual search key
             } elseif ($nome == "Google Cache") {
@@ -3069 +3107 @@
                 //blogurl in search phrase: cache of own site
                     $search_phrase = attribute_escape(urldecode(substr($match[1],$n+strlen($blogurl))));
-                    $variables = wGetQueryPairs($referrer);
+                    $svariables = wGetQueryPairs($referrer);
                 } elseif (strpos($referrer,$blogurl)!==false && preg_match('/\&prev\=([^&]+)/',$referrer,$match)!==false) {
                     //NOTE: 'prev=' requires html_entity_decode to show [&?] in url substring
-                    $variables = wGetQueryPairs(html_entity_decode(preg_replace('#/\w+\?#i','', urldecode($match[1]))));
+                    $svariables = wGetQueryPairs(html_entity_decode(preg_replace('#/\w+\?#i','', urldecode($match[1]))));
                 } else {
                 //no blogurl in search phrase: cache of an external site with referrer link
@@ -3084 +3122 @@
                 }
                 $search_phrase = attribute_escape(urldecode($match[1]));
-                $variables = wGetQueryPairs($referrer);
+                $svariables = wGetQueryPairs($referrer);
             }
             //retrieve search engine parameters
-            $i = count($variables);
+            $i = count($svariables);
             while($i--){
-                $tab=explode("=",$variables[$i]);
+                $tab=explode("=",$svariables[$i]);
                 if($tab[0] == $key && empty($search_phrase)){
                     $search_phrase=attribute_escape($tab[1]);
@@ -3098 +3136 @@
                     if (!empty($lang) && $lang == $tab[0]) {
                         $searchlang = attribute_escape($tab[1]);
+                    }
+                    //Indentify locale via Google search's new parameter, 'gl'
+                    if (strstr($nome,'Google')!==false && $tab[0] == "gl" && !empty($tab[1])) {
+                        $selocale = attribute_escape($tab[1]);
                     }
                 }
@@ -3250 +3292 @@
         if (substr($hostname,-16) == ".crawl.yahoo.net" || (substr($hostname,-10)==".yahoo.com" && substr($hostname,0,3)=="ycar")) {
             if (stristr($ua,"Slurp")) {
-                $crawler = "Yahoo!Slurp";
+                $crawler = "Yahoo! Slurp";
                 $crawlertype="R";
             } elseif (stristr($ua,"mobile")) {
-                $crawler = "Yahoo!Mobile";
+                $crawler = "Yahoo! Mobile";
                 $crawlertype="R";
             } else {
@@ -3316 +3358 @@
         // array format: "Spider Name|UserAgent keywords (no spaces)| Spider type (R=robot, B=Browser/downloader, F=feedreader, H=hacker, L=Link checker, M=siteMap generator, S=Spammer/email harvester, V=CSS/Html validator)
         $lines = array("Googlebot|Googlebot/|R|", 
-            "Yahoo!|Yahoo!Slurp|R|",
+            "Yahoo!|Yahoo! Slurp|R|",
             "FeedBurner|FeedBurner|F|",
             "AboutUsBot|AboutUsBot/|R|", 
@@ -3654 +3696 @@
 //#get the visitor locale/language
 function wGetLocale($language="",$hostname="",$referrer="") {
-    global $wpdb, $wassup_options, $debug_mode;
+    global $wpdb, $wassup_options, $wdebug_mode;
     $clocale="";
     $country="";
@@ -3743 +3785 @@
  */
 function wGetSpamRef($referrer,$hostname="") {
-    global $debug_mode;
+    global $wdebug_mode;
     $referrer=attribute_escape(strip_tags(str_replace(" ","",html_entity_decode($referrer))));
     $badhost=false;
@@ -3759 +3801 @@
             //$referrer_path = $rurl['path'];
             $thissite = parse_url(get_option('home'));
+            //exclude current site as referrer
             if (isset($thissite['host']) && $referrer_host == $thissite['host']) {
                 $referrer_host = "";
+            //New in v1.8.3: check the path|query part of url for spammers
+            } else {
+                //rss.xml|sitemap.txt in referrer is faked
+                if (preg_match('#.+/(rss\.xml|sitemap\.txt)$#',$referrer)>0) {
+                    $badhost=true;
+                //membership|user id in referrer is faked
+                } elseif (preg_match('#.+[^a-z0-9]((?:show)?user|u)\=\d+$#',$referrer)>0) {
+                    $badhost=true;
+                //youtube video in referrer is faked
+                } elseif (preg_match('#(\.|/)youtube\.com/watch\?v\=.+#"',$referrer)>0) {
+                    $badhost=true;
+                //some facebook links in referrer are faked
+                } elseif (preg_match('#(\.|/)facebook\.com\/ASeaOfSins$#"',$referrer)>0) {
+                    $badhost=true;
+                }
             }
         } else {    //faked referrer string
@@ -3768 +3826 @@
         if (!$badhost && !empty($referrer_host)) {
             $url_shorteners = array('bit.ly', 'cli.gs', 
-                'goo.gl', 'is.gd', 
-                'shorturl.com', 'snurl.com',
+                'goo.gl', 'is.gd', 'ow.ly',
+                'shorturl.com', 'snurl.com', 'su.pr',
                 'tinyurl.com','tr.im');
             if(in_array($referrer_host,$url_shorteners)) {
@@ -3778 +3836 @@
     if (empty($referrer_host) || $badhost) return $badhost;
     
-    if ($debug_mode) echo "\$referrer_host = $referrer_host.\n";
+    if ($wdebug_mode) echo "\$referrer_host = $referrer_host.\n";
     //compare against a list of recent referer spammers
     $lines = array( '123666123\.com',
             '209\.29\.25\.180',
+            '[a-z]+19[0-9]{2}\.co\.cc',
             'aerhaethjsry\.com',
             'aimtrust\.com',
@@ -3788 +3847 @@
             'all\-lasik\-centers\.com',
             'allmymovies\.biz',
+            'articlemarketingrobots\.org',
             'baby\-kleidung\.runashop\.com',
             'bayanbag\.tk',
@@ -3799 +3859 @@
             'celebritydietdoctor\.com',
             'celebrity\-?diets\.(com|org|net|info|biz)',
+            '[a-z0-9]+\.cheapchocolatesale\.com',
             'chocolate\.com',
             'clients\.your\-server\.de',
             'couplesresortsonline\.com',
+            'creditcardsinformation\.info',
+            '.*\.css\-build\.info',
+            'h\-1.+\.cssgroup\.lv',
             '.*dietplan\.com',
+            'dogcareinsurancetips\.sosblog\.com',
+            'dollhouserugs\.com',
             'dreamworksdentalcenter\.com',
             'duunot\.eu',
@@ -3811 +3877 @@
             'frenchforbeginnerssite\.com',
             'gameskillinggames\.net',
+            'gardenactivities\.webnode\.com',
             'globalringtones\.net',
+            'gossipchips\.com',
             'gskstudio\.com',
-            'h\-13\d\-\d{3}\.cssgroup\.lv',
             'hearcam\.org',
+            'hearthealth\-hpe\.org',
             'highheelsale\.com',
             'homebasedaffiliatemarketingbusiness\.com',
@@ -3824 +3892 @@
             'it\.n\-able\.com',
             'justanimal\.com',
+            'justbazaar\.com',
+            'knowledgehubdata\.com',
             'koreanracinggirls\.com',
+            'lacomunidad\.elpais\.com',
             'lactoseintolerancesymptoms\.net',
             'liquiddiet[a-z\-]*\.com',
@@ -3842 +3913 @@
             'pinky\-vs\-cherokee\.com',
             'pinkyxxx\.org',
+            '[a-z]+\.pixnet\.net',
             'play\-mp3\.com',
             'poker\-review\.tk',
@@ -3856 +3928 @@
             'sitetalk\-revolution\.com',
             'smartforexsignal\.com',
+            'socratestheme\.me',
+            'stableincomeplan\.blogspot\.com',
             'staphinfectionpictures\.org',
             'static\.theplanet\.com',
             '[a-z]+\-[a-z]+\-symptoms\.com',
+            'thebestweddingparty\.com',
             'thik\-chik\.com',
             'thisweekendsmovies\.com',
@@ -4135 +4210 @@
 // hook function to put a timestamp in page footer for page caching test
 function wassup_foot() {
-    global $wassup_options, $wassupversion, $debug_mode;
-    if ($wassup_options->wassup_active == "1") {
-        //New in 1.8.2: separate screen resolution cookie for IE
-        if (!isset($_COOKIE['wassup_screen_res'])) { 
-            echo "\n"; ?>
+    global $wassup_options, $wassupversion, $wscreen_res, $wdebug_mode;
+
+    //Since 1.8.2: separate 'wassup_screen_res' cookie in footer for
+    // IE users because Internet Explorer does not report screen height
+    // or width until after it begins to render the document body.
+    if (empty($wscreen_res) && !isset($_COOKIE['wassup_screen_res'])) {
+        echo "\n"; ?>
 <!--[if IE]>
 <script language=javascript>
-    var sheight = screen.height;
-    var swidth = screen.width;
-    document.cookie = "wassup_screen_res=" + swidth + " x " + sheight + "; path=/; domain=" + document.domain;
+//<![CDATA[
+    if (screen_res=="") {
+        screen_res = screen.width + " x " + screen.height;
+    }
+    if (screen_res!=" x ") {
+        var cdate = new Date();
+        cdate.setTime(cdate.getTime()+(48*60*60*1000));
+        var cexpires = cdate.toGMTString();
+        //var the_cookie = "wassup_screen_res="+escape(screen_res)+"; expires="+cexpires;
+        document.cookie = "wassup_screen_res=" + escape(screen_res)+ "; path=/; domain=" + document.domain;
+
+    }
+//]]>
 </script>
 <![endif]--><?php
-        }
-        //Output a comment with a current timestamp to verify that page is not cached (i.e. visit is being recorded).
-        echo "<!--\n<p class=\"small\"> WassUp $wassupversion ".__("timestamp","wassup").": ".date('Y-m-d h:i:sA T')." (".gmdate('h:iA',time()+(get_option('gmt_offset')*3600)).")<br />\n";
-        echo __("If above timestamp is not current time, this page is cached","wassup").".</p> -->\n";
-    }
-}
+    } //end if !isset('wassup_screen_res')
+
+    //Output a comment with a current timestamp to verify that page is not cached (i.e. visit is being recorded).
+    echo "<!--\n<p class=\"small\"> WassUp $wassupversion ".__("timestamp","wassup").": ".date('Y-m-d h:i:sA T')." (".gmdate('h:iA',time()+(get_option('gmt_offset')*3600)).")<br />\n";
+    echo __("If above timestamp is not current time, this page is cached","wassup").".</p> -->\n";
+} //end wassup_foot
 
 /**
@@ -4270 +4357 @@
     }
 
+    $wstart = (int)(current_time('timestamp') - 30.4*86400); //1 month in seconds
     // Widget TOP Browsers
     if ($wassup_settings['wassup_widget_topbr'] == 1) {
-        $top_period = '`timestamp` > 0';    //all time
+        $top_period = "'`timestamp` > $wstart'";    //one month
         $top_limit = attribute_escape($topbrlimit);
         $top_results =  wGetStats("browser",$top_limit,$top_period);
@@ -4287 +4375 @@
     // Widget TOP OSes
     if ($wassup_settings['wassup_widget_topos'] == 1) {
-        $top_period = '`timestamp` > 0';    //all time
+        $top_period = "'`timestamp` > $wstart'";    //one month
         $top_limit = attribute_escape($toposlimit);
         $top_results =  wGetStats("os",$top_limit,$top_period);
@@ -4301 +4389 @@
 
     // Widget Visitors Online
-    $TotWid = New MainItems($table_tmp_name,$from_date,$to_date);
+    $TotWid = New WassupItems($table_tmp_name,$from_date,$to_date);
 
     $currenttot = $TotWid->calc_tot("count", null, null, "DISTINCT");
@@ -4521 +4609 @@
     }
 
+    $wstart = (int)(current_time('timestamp') - 30.4*86400); //1 month in seconds
     if ($wtopbr == 1) {
-        $top_period = '`timestamp` > 0';    //all time
+        $top_period = "'`timestamp` > $wstart'";    //one month
         $top_limit = attribute_escape($topbrlimit);
         $top_results =  wGetStats("browser",$top_limit,$top_period);
@@ -4536 +4625 @@
 
     if ($wtopos == 1) {
-        $top_period = '`timestamp` > 0';    //all time
+        $top_period = "'`timestamp` > $wstart'";    //one month
         $top_limit = attribute_escape($toposlimit);
         $top_results =  wGetStats("os",$top_limit,$top_period);
@@ -4550 +4639 @@
 
     // Visitors Online
-    $TotWid = New MainItems($table_tmp_name,$from_date,$to_date);
+    $TotWid = New WassupItems($table_tmp_name,$from_date,$to_date);
 
     $currenttot = $TotWid->calc_tot("count", null, null, "DISTINCT");
@@ -4584 +4673 @@
         $chart_type = ($wassup_options->wassup_chart_type >0)? $wassup_options->wassup_chart_type: "2";
         $to_date = current_time("timestamp");
-        $Chart = New MainItems($wassup_table,"",$to_date);
+        $Chart = New WassupItems($wassup_table,"",$to_date);
             $chart_url = $Chart->TheChart(1, "400", "125", "", $chart_type, "bg,s,efebef|c,lg,90,edffff,0,efebef,0.8", "dashboard"); ?>
     <h3>WassUp <?php _e('Stats','wassup'); ?> <cite><a href="admin.php?page=<?php echo WASSUPFOLDER; ?>"><?php _e('More','wassup'); ?> &raquo;</a></cite></h3>
@@ -4602 +4691 @@
     $chart_type = ($wassup_options->wassup_chart_type >0)? $wassup_options->wassup_chart_type: "2";
     $res = ((int)$wassup_options->wassup_screen_res-160)/2;
-    $Chart = New MainItems($wassup_table,"",$to_date);
+    $Chart = New WassupItems($wassup_table,"",$to_date);
     $chart_url = $Chart->TheChart(1, $res, "180", "", $chart_type, "bg,s,efebef|c,lg,90,edffff,0,eae9e9,0.8", "dashboard"); 
     $max_char_len= 40;
@@ -4611 +4700 @@
         margin:-10px !important;
         padding:2px 0 5px;
-        background: #eae9e9 url("'.WASSUPFOLDER.'/css/images/bg_wrap.png") repeat;
+        background: #eae9e9 url("'.WASSUPFOLDER.'/img/bg_wrap.png") repeat;
         font-size:11px;
     }