Changeset 73 for trunk

Timestamp:

02/12/08 14:08:39 (11 months ago)

Author:

root

Message:

cleaned code

Location:

trunk

Files:

• lib/action.php (modified) (1 diff)
• lib/main.php (modified) (2 diffs)
• wassup.php (modified) (8 diffs)

trunk/lib/action.php

@@ -42 +42 @@
                 $Tot->from_date = $from_date;
                 $Tot->to_date = $to_date;
-                $items_pie[] = $Tot->calc_tot("items_by_type", $search, "spam");
-                $items_pie[] = $Tot->calc_tot("items_by_type", $search, "searchengine");
-                $items_pie[] = $Tot->calc_tot("items_by_type", $search, "referrer");
-                $items_pie[] = $Tot->calc_tot("items_by_type", $search, "direct");
+                $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");
                 echo "<div align='center'><img src=http://chart.apis.google.com/chart?cht=p3&chco=0000ff&chs=600x300&chl=Spam|Search%20Engine|Referrer|Direct&chd=".chart_data($items_pie, null, null, null, 'pie')."></div>";
         // ACTION: DISPLAY RAW RECORDS

trunk/lib/main.php

@@ -717 +717 @@
         var $Limit;
         var $Last;
-        var $Marked_ip;
         var $WpUrl;
 
         // Function to show main query and count items
-        function calc_tot($Type, $Search="", $pertype="") {
+        function calc_tot($Type, $Search="", $specific_where_clause=null, $distinct_type=null) {
                 global $wpdb;
                 $this->ItemsType = $Type;
@@ -737 +736 @@
                         break;
                         // These are the queries to count the items hits/pages/spam
-                        case "items":
-                                $itemstot = $wpdb->get_var("SELECT COUNT(DISTINCT wassup_id) AS itemstot FROM ".$this->tableName." WHERE wassup_id IS NOT NULL AND timestamp BETWEEN ".$this->from_date." AND ".$this->to_date." $ss ".$this->whereis);
+                        case "count":
+                                $itemstot = $wpdb->get_var("SELECT COUNT(".$distinct_type." wassup_id) AS itemstot FROM ".$this->tableName." WHERE wassup_id IS NOT NULL ".$specific_where_clause." AND timestamp BETWEEN ".$this->from_date." AND ".$this->to_date." $ss ".$this->whereis);
                                 return $itemstot;
-                        break;
-                        case "pages":
-                                $pagestot = $wpdb->get_var("SELECT COUNT(wassup_id) AS pagestot FROM ".$this->tableName." WHERE wassup_id IS NOT NULL AND timestamp BETWEEN ".$this->from_date." AND ".$this->to_date." $ss ".$this->whereis);
-                                return $pagestot;
-                        break;
-                        case "spam":
-                                $spamtot = $wpdb->get_var("SELECT COUNT(wassup_id) AS spamtot FROM ".$this->tableName." WHERE wassup_id IS NOT NULL AND spam>0 AND timestamp BETWEEN ".$this->from_date." AND ".$this->to_date." $ss ".$this->whereis);
-                                return $spamtot;
-                        break;
-                        // Switch by specific count
-                        case "items_by_type":
-                                switch ($pertype) {
-                                        case "spam":
-                                        $items_type = "spam>0";
-                                        break;
-                                        case "marked":
-                                        $items_type = "ip LIKE '%".$this->Marked_ip."%'";
-                                        break;
-                                        case "searchengine":
-                                        $items_type = "searchengine!='' AND spam=0";
-                                        break;
-                                        case "referrer":
-                                        $items_type = "searchengine='' AND referrer NOT LIKE '%".$this->WpUrl."%' AND referrer!='' AND spam=0";
-                                        break;
-                                        case "direct":
-                                        $items_type = "searchengine='' AND (referrer LIKE '%".$this->WpUrl."%' OR referrer='') AND spam=0";
-                                        break;
-                                }
-                                $itemstot_by_type = $wpdb->get_var("SELECT COUNT(DISTINCT wassup_id) AS itemstot FROM ".$this->tableName." WHERE wassup_id IS NOT NULL AND $items_type AND timestamp BETWEEN ".$this->from_date." AND ".$this->to_date." $ss ".$this->whereis);
-                                return $itemstot_by_type;
                         break;
                 }

trunk/wassup.php

@@ -608 +608 @@
                 $Tot->WpUrl = $wpurl;
 
-                $itemstot = $Tot->calc_tot("items", $search);
-                $pagestot = $Tot->calc_tot("pages", $search);
-                $spamtot = $Tot->calc_tot("spam", $search);
+                $itemstot = $Tot->calc_tot("count", $search, null, "DISTINCT");
+                $pagestot = $Tot->calc_tot("count", $search, null, null);
+                $spamtot = $Tot->calc_tot("count", $search, "AND spam>0");
                 // Check if some records was marked
                 if ($wassup_settings['wmark'] == 1) {
-                        $Tot->Marked_ip = $wassup_settings['wip']; 
-                        $markedtot = $Tot->calc_tot("items_by_type", $search, "marked");
+                        $markedtot = $Tot->calc_tot("count", $search, "AND ip LIKE '%".$wassup_settings['wip']."%'", "DISTINCT");
                 }
 
@@ -1100 +1099 @@
            }
            session_start();     //required to use/update $_SESSION
+           
+           // Prevent Session Fixation attack (http://shiflett.org/articles/session-fixation)
+           if (!isset($_SESSION['initiated'])) { 
+              session_regenerate_id(); 
+              $_SESSION['initiated'] = true; 
+           } 
+
            //#confirm that session is started...
            if (isset($_SESSION)) {
@@ -1280 +1286 @@
                 $insert = $wpdb->query( $wpdb->prepare("INSERT INTO $table_name (wassup_id, timestamp, ip, hostname, urlrequested, agent, referrer, search, searchpage, os, browser, language, screen_res, searchengine, spider, feed, username, comment_author, spam) 
                    VALUES ( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )",
-                   $wassup_id,
-                   $timestamp,
+                   attribute_escape($wassup_id),
+                   attribute_escape($timestamp),
                    attribute_escape($ipAddress),
                    attribute_escape($hostname),
@@ -1287 +1293 @@
                    attribute_escape($userAgent),
                    attribute_escape($referrer),
-                   $search_phrase,
-                   $searchpage, 
-                   $os, 
-                   $browser, 
-                   $language[0], 
-                   $screen_res, 
-                   $searchengine, 
-                   $spider, 
-                   $feed, 
+                   attribute_escape($search_phrase),
+                   attribute_escape($searchpage), 
+                   attribute_escape($os), 
+                   attribute_escape($browser), 
+                   attribute_escape($language[0]), 
+                   attribute_escape($screen_res), 
+                   attribute_escape($searchengine), 
+                   attribute_escape($spider), 
+                   attribute_escape($feed), 
                    attribute_escape($logged_user), 
                    attribute_escape($comment_user), 
-                   $spam
+                   attribute_escape($spam)
                    ));
 
@@ -1852 +1858 @@
         $wassup_settings = get_option('wassup_settings');
         
-        if (isset($_POST['submit']))
+        if (isset($_POST['wassup-submit']))
         {
                 $wassup_settings['wassup_widget_title'] = $_POST['wassup_widget_title'];
@@ -1875 +1881 @@
         <div class="wrap" style="text-align:left">
         <h3>Wassup Widget</h3>
-        <form action="" method="post">
         <p style="text-align:left"><input type="text" name="wassup_widget_title" size="20" value="<?php echo $wassup_settings['wassup_widget_title'] ?>" /> What title for the widget (default "Visitors Online")</p>
         <p style="text-align:left"><input type="text" name="wassup_widget_ulclass" size="3" value="<?php echo $wassup_settings['wassup_widget_ulclass'] ?>" /> What style sheet class for &lt;ul&gt; attribute (default "links")</p>
@@ -1889 +1894 @@
         <p style="text-align:left"><input type="checkbox" name="wassup_widget_topos" value="1" <?php if ($wassup_settings['wassup_widget_topos'] == 1) echo "CHECKED"; ?> /> Check if you want to show top operating systems (default Yes)</p>
         <p style="text-align:left"><input type="text" name="wassup_widget_toposlimit" size="3" value="<?php echo $wassup_settings['wassup_widget_toposlimit'] ?>" /> How many top operating systems want to show (default 5)</p>
-        <p style="text-align:left"><input type="submit" name="submit" value="Save Settings" /></p>
-        </form>
+        <p style="text-align:left"><input type="hidden" name="wassup-submit" id="wassup-submit" value="1" /> </p>
         </div>
         <?php
@@ -1900 +1904 @@
                         $wassup_settings['wassup_userlevel'] = 8;
                         update_option('wassup_settings', $wassup_settings);
-                }
-                if ($wassup_settings['wassup_refresh'] == "") {
+        }
+        if ($wassup_settings['wassup_refresh'] == "") {
                         $wassup_settings['wassup_refresh'] = 3;
                         update_option('wassup_settings', $wassup_settings);