Changeset 157 for trunk

Timestamp:

09/15/08 10:02:34 (4 months ago)

Author:

root

Message:

some bugs fixed

Location:

trunk

Files:

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

trunk/lib/main.php

@@ -356 +356 @@
                         } elseif (preg_match("/^(?:.*)compatible;\sMSIE\s([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "IE";
+                        } elseif (preg_match("/^Mozilla(?:.*)(?:.*)Chrome/",$useragent,$match)) {
+                                $browser = "Google Chrome";
                         } elseif (preg_match("/^Mozilla(?:.*)(?:.*)Safari/",$useragent,$match)) {
                                 $browser = "Safari";
@@ -645 +647 @@
                    // Start getting GEOIP info
                    $geo_url = "http://api.hostip.info/get_html.php?ip=".$ip[0]."&position=true";
-                   $data = file($geo_url);
+                   $ci = curl_init();
+
+                   curl_setopt($ci, CURLOPT_URL, $geo_url);
+                   curl_setopt($ci, CURLOPT_HEADER,0);
+                   curl_setopt($ci, CURLOPT_USERAGENT, $_SERVER[HTTP_USER_AGENT]);
+                   curl_setopt($ci, CURLOPT_FOLLOWLOCATION, 1);
+                   curl_setopt($ci, CURLOPT_RETURNTRANSFER, 1);
+
+                   $data = curl_exec($ci);
+                   curl_close($ci);
+
+                   $data = explode("\n",$data);
+                   
                    if (eregi("unknown", $data[0])) {
                            $loc_country = eregi_replace("country: ", "", $data[0]);
@@ -656 +670 @@
                                 $gkey = $wassup_settings['wassup_googlemaps_key'];
                                    if ($geoloc != "") {
-                                           $geocode = geocode($geoloc, $gkey);
+                                           $geocode = geocodeWassUp($geoloc, $gkey);
                                                 if($geocode[0] != 200) {
                                                         $lat = explode(":", $data[2]);
@@ -734 +748 @@
 
 // Geocoding location with Google Maps
-function geocode($location, $key) {
+function geocodeWassUp($location, $key) {
         //Three parts to the querystring: q is address, output is the format (
         $address = urlencode($location);

trunk/lib/settings.php

@@ -95 +95 @@
                 <?php // Test Google Maps Key If the test fails deactivate *map options 
                 if ($wassup_options->wassup_geoip_map == 1) {
-                        $code = geocode("Ancona", $wassup_options->wassup_googlemaps_key);
+                        $code = geocodeWassUp("Ancona", $wassup_options->wassup_googlemaps_key);
                                 if ($code[0] != "200") { 
                                         $code_error = "<script type=\"text/javascript\">jQuery(document).ready(function($){ $(\"#key_error\").fadeIn(2000); });</script><p id='key_error' style='text-align:center;background:#FA8C97;border:1px solid #999;padding:4px;margin:4px;width:40%;display:none;'>--->> <strong>WARNING</strong> Activation problem >> Error code: <a href='http://code.google.com/apis/maps/documentation/reference.html#GGeoStatusCode' target='_BLANK'>".$code."</a> <<---</p>";

trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.2
 Tested up to: 2.5.* - 2.3.2 - 2.3.1 - 2.3 - 2.2
-Stable tag: 1.6.2
+Stable tag: 1.6.3
 
 Analyze your visitors traffic with real time statistics, chart, a lot of chronological information and a sidebar Widget.

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.6.2
+Version: 1.6.3
 Author: Michele Marcucci, Helene D.
 Author URI: http://www.michelem.org/