Changeset 129

Timestamp:

04/09/08 10:24:31 (8 months ago)

Author:

root

Message:

dhasborad chart excluded

Location:

trunk

Files:

• lib/main.php (modified) (1 diff)
• wassup.php (modified) (4 diffs)

trunk/lib/main.php

@@ -850 +850 @@
                 $hour_fromdate = strtotime("-".$strto, $hour_todate);
 
+                if ($hour_fromdate == "") $hour_fromdate = strtotime("-24 hours", $hour_todate);
+
                 /* Debug
                 $q = "SELECT COUNT(DISTINCT wassup_id) as items, COUNT(wassup_id) as pages, DATE_FORMAT(FROM_UNIXTIME((timestamp-$UTCoffset)), '$x_axes_label') as thedate FROM ".$this->tableName." WHERE wassup_id IS NOT NULL AND timestamp BETWEEN $hour_fromdate AND $hour_todate ".$this->whereis." $ss GROUP BY DATE_FORMAT(FROM_UNIXTIME((timestamp-$UTCoffset)), '$Ctimeformat') ORDER BY timestamp";

trunk/wassup.php

@@ -41 +41 @@
         add_action('admin_menu', 'wassup_add_pages');
         add_action('send_headers', 'wassupAppend');
-        add_action('activity_box_end', 'wassupDashChart');
+        //add_action('activity_box_end', 'wassupDashChart');
 }
 
@@ -1312 +1312 @@
                                 $spamresult = $_SESSION['spamresult'];
                         }
-                        if ( $_SESSION['urlrequest'] == $urlRequested && (($timestamp - (int)$_SESSION['visittime']) < 5)) {
+                        if (( eregi_replace("$", "/", $_SESSION['urlrequest']) == $urlRequested ||  $_SESSION['urlrequest'] == $urlRequested) && (($timestamp - (int)$_SESSION['visittime']) < 5)) {
                                 $dup_urlrequest=1;
                         }
@@ -1628 +1628 @@
         $Chart->tableName = $table_name;
         $Chart->to_date = $to_date;
-
-        $itemstot = $Chart->calc_tot("count", $search, null, "DISTINCT");
-        print $itemstot;
 
         echo '<h3>WassUp Stats <cite><a href="admin.php?page=wassup">More &raquo;</a></cite></h3>';
@@ -2264 +2261 @@
         $currenttot = $TotWid->calc_tot("count", null, null, "DISTINCT");
         $currentlogged = $TotWid->calc_tot("count", null, "AND  username!=''", "DISTINCT");
-        $currentauth = $TotWid->calc_tot("count", null, "AND  comment_author!=''' AND username=''", "DISTINCT");
+        $currentauth = $TotWid->calc_tot("count", null, "AND  comment_author!='' AND username=''", "DISTINCT");
 
         print $before_title . $title . $after_title;