Changeset 136

Timestamp:

04/22/08 11:25:27 (3 months ago)

Author:

root

Message:

1.5.1 almost ready

Location:

trunk

Files:

• lib/action.php (modified) (2 diffs)
• lib/settings.php (modified) (2 diffs)
• lib/wassup.class.php (modified) (2 diffs)
• wassup.php (modified) (7 diffs)

trunk/lib/action.php

@@ -3 +3 @@
 
 //force browser to disable caching so action.php works as an ajax request
-header("Expires: Fri, 22 Jun 2007 05:00:00 GMT"); // Date in the past
+/* header("Expires: Fri, 22 Jun 2007 05:00:00 GMT"); // Date in the past
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
 // HTTP/1.1
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
-//echo "\n";
+*/
+echo "\n";
 //#debug...
 //error_reporting(E_ALL | E_STRICT);    //debug, E_STRICT=php5 only
@@ -199 +200 @@
                         //# exclude $wpurl from search results...
                         //# ...$siteurl already excluded in db query.
-                        if ($wpurl == $siteurl || !eregi($wpurl,$top10->referrer)) { ?>
+                        //if ($wpurl == $siteurl || !eregi($wpurl,$top10->referrer)) { 
+                        if (!eregi($siteurl,$top10->referrer)) { ?>
                         <li class="charts"><?php echo $top10->top_referrer.': ';
                            print '<a href="'.$top10->referrer.'" title="'.$top10->referrer.'" target="_BLANK">';

trunk/lib/settings.php

@@ -38 +38 @@
           h3 { margin-bottom:0px; padding-bottom:5px; color:#333; }
           form p { margin-top:0px; padding-top:0px; padding-left:15px; }
+        <?php if (version_compare($wp_version, '2.5', '<')) { ?>
+          #wassup_opt_frag-1, #wassup_opt_frag-2, 
+          #wassup_opt_frag-3, #wassup_opt_frag-4 { 
+                background-color: #e6eff6; 
+                border-left: 1px solid #cce; 
+                border-right: 1px solid #cce; 
+                border-bottom: 1px solid #cce;
+                font-size: 85%;
+          }
+          #tab_container { list-style:none; }
+          #tab_container ul li { min-width:60px; display:inline;}
+          #tab_container ul li a span { font-size: 105%; }
+        <?php } else { ?>
           #wassup_opt_frag-1 { height: 100%; margin:0;}
           #wassup_opt_frag-2 { height: 100%; margin:0;}
           #wassup_opt_frag-3 { height: 100%; margin:0;}
           #wassup_opt_frag-4 { height: 100%; margin:0;}
+        <?php } //end if version_compare ?>
         </style>
         <h2><?php _e('Options','wassup'); ?></h2>
@@ -71 +85 @@
                 <?php $wassup_options->showFormOptions("wassup_userlevel"); ?>
                 </select></p><br />
+
+                <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><br />
 
                 <br /><h3><?php _e('Visit Detail Settings','wassup'); ?></h3>

trunk/lib/wassup.class.php

@@ -15 +15 @@
         var $wassup_default_limit = "10";
         var $wassup_top10 ;
+        var $wassup_dashboard_chart;
 
         /* recording settings */
@@ -93 +94 @@
                 $this->wassup_default_type = "everything";
                 $this->wassup_default_limit = "10";
+                $this->wassup_dashboard_chart = "0";
                 $this->wassup_widget_title = "Visitors Online";
                 $this->wassup_widget_ulclass = "links";

trunk/wassup.php

@@ -4 +4 @@
 Plugin URI: http://www.wpwp.org
 Description: Wordpress plugin to analyze your visitors traffic with real time stats, chart and a lot of chronological informations. It has sidebar Widget support to show current online visitors and other statistics.
-Version: 1.5
+Version: 1.5.1
 Author: Michele Marcucci
 Author URI: http://www.michelem.org/
@@ -17 +17 @@
         die('Permission Denied! You are not allowed to call this page directly.');
 }
-$version = "1.5";
+$version = "1.5.1";
 define('WASSUPFOLDER', dirname(plugin_basename(__FILE__)), TRUE);
 require_once(dirname(__FILE__).'/lib/wassup.class.php');
@@ -399 +399 @@
 
 function WassUp() {
-        global $wpdb, $version, $wpurl, $wassup_options, $whash;
+        global $wpdb, $wp_version, $version, $wpurl, $wassup_options, $whash;
 
         //#debug...
@@ -443 +443 @@
                 $wassup_options->wassup_refresh = $_POST['wassup_refresh'];
                 $wassup_options->wassup_userlevel = $_POST['wassup_userlevel'];
+                $wassup_options->wassup_dashboard_chart = $_POST['wassup_dashboard_chart'];
                 $wassup_options->wassup_default_type = $_POST['wassup_default_type'];
                 $wassup_options->wassup_default_limit = $_POST['wassup_default_limit'];
@@ -1392 +1393 @@
 
            //### Extract useful visit information from http header...
-           $language = @explode("-", $language);
-           $language = @explode(",", $language[1]);
-           $language = @explode(";", $language[0]);
+           //
+           //#use country code for language, if it exists in hostname
+           if (!empty($hostname) && preg_match("/\.[a-zA-Z]{2}$/", $hostname) > 0) {
+                $country = strtoupper(substr($hostname,-2));
+                if ($country == "UK") { $country = "GB"; } //change UK to GB for consistent language codes
+                $language = array("$country");
+           } else {
+                $language = @explode("-", $language);
+                $language = @explode(",", $language[1]);
+                $language = @explode(";", $language[0]);
+           }
 
            list($searchengine,$search_phrase)=explode("|",wGetSE($referrer));
@@ -1651 +1660 @@
 // This is the function to print out a chart's preview in the dashboard
 function wassupDashChart() {
-        global $wpdb;
+        global $wpdb, $wassup_options;
+        if ($wassup_options->wassup_dashboard_chart == 1) {
         $table_name = $wpdb->prefix . "wassup";
         $to_date = wassup_get_time();
@@ -1658 +1668 @@
         $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>';
         echo $Chart->TheChart(1, "400", "125", "", $wassup_options->wassup_chart_type, "bg,s,00000000", "dashboard", "left");
+        }
 } //end function wassupDashChart