Changeset 136 for trunk/wassup.php

Timestamp:

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

Author:

root

Message:

1.5.1 almost ready

Files:

• trunk/wassup.php (modified) (7 diffs)

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