Changeset 149 for trunk

Timestamp:

07/13/08 22:14:55 (4 months ago)

Author:

root

Message:

Initial 1.6.2b with Google Maps GEO IP support

Location:

trunk

Files:

• img/marker_author.png (added)
• img/marker_bot.png (added)
• img/marker_loggedin.png (added)
• img/marker_user.png (added)
• img/shadow.png (added)
• lib/main.php (modified) (3 diffs)
• lib/settings.php (modified) (1 diff)
• lib/wassup.class.php (modified) (2 diffs)
• wassup.css (modified) (2 diffs)
• wassup.php (modified) (3 diffs)

trunk/lib/main.php

@@ -611 +611 @@
                    } 
                    // User is logged in or is a comment's author
-                   if ($cv->username != "" AND $cv->comment_author != "") {
+                   if ($cv->username != "") {
                         $unclass = "-log";
-                   } elseif ($cv->comment_author != "") {
+                        $map_icon = "marker_loggedin.png";
+                   } elseif ($cv->comment_author != "" AND $cv->username == "") {
                         $unclass = "-aut";
+                        $map_icon = "marker_author.png";
                    } elseif ($cv->spider != "") {
                         $unclass = "-spider";
-                   } 
+                        $map_icon = "marker_bot.png";
+                   } else {
+                        $map_icon = "marker_user.png";
+                   }
                    // Start getting GEOIP info
-                   /*
-                   // TODO
-                   $ch = curl_init("http://api.hostip.info/get_html.php?ip=".$ip[0]."&position=true");
-                   curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                   curl_setopt($ch, CURLOPT_HEADER, 0);
-                   $data = curl_exec($ch);
-                   curl_close($ch);
-                   */
+                   $geo_url = "http://api.hostip.info/get_html.php?ip=".$ip[0]."&position=true";
+                   $data = file($geo_url);
+                   $location = $data[0]." ".$data[1];
+                   $location = eregi_replace("country: ", "", $location);
+                   $location = eregi_replace("city: ", "", $location);
+        if ($wassup_settings['wassup_geoip_map'] == 1) {
+                $gkey = $wassup_settings['wassup_googlemaps_key'];
+                   if (trim($location) != "") {
+                           $geocode = explode(",", geocode($location, $gkey));
+                                if(array_search("Error", $geocode) == "") {
+                                        $lat = explode(":", $data[2]);
+                                        $lat = $lat[1];
+                                        $lon = explode(":", $data[3]);
+                                        $lon = $lon[1];
+                                } else {
+                                        $lat = $geocode[0];
+                                        $lon = $geocode[1];
+                                }
+                   } else {
+                           $lat = 0;
+                           $lon = 0;
+                   }
+        }
                    ?>
                    <div class="sum-spy">
-
                    <span class="sum-box<?php print $unclass; ?>">
                         <?php print $ip[0]; ?></span>
-                   <div class="sum-det"><span class="det1">
+                   <div class="sum-det-spy"><span class="det1">
                    <?php
                         print '<a href="'.wAddSiteurl(htmlspecialchars(html_entity_decode($cv->urlrequested))).'" target="_BLANK">';
@@ -638 +657 @@
                    </a></span><br />
                    <span class="det2"><strong><?php print gmdate("H:i:s", $timestamp); ?> - </strong>
-                   <?php print $referrer; ?></span>
+                   <?php print $referrer; ?>
+                   <?php print "<br />".$location; 
+                        ?>
+                   </span>
                    </div></div>
-<?php           } //end if row_count
+<?php
+        if ($wassup_settings['wassup_geoip_map'] == 1) {
+                if ($lat!=0 && $lon!=0) {
+                $item_id = $cv->id;
+                $img_dir = $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img';
+                echo "
+                <script type=\"text/javascript\">
+                var icon$item_id = new GIcon();
+                icon$item_id.image = '".$img_dir."/".$map_icon."';
+                icon$item_id.shadow = '$img_dir/shadow.png';
+                icon$item_id.iconSize = new GSize(20.0, 34.0);
+                icon$item_id.shadowSize = new GSize(38.0, 34.0);
+                icon$item_id.iconAnchor = new GPoint(10.0, 17.0);
+                icon$item_id.infoWindowAnchor = new GPoint(10.0, 17.0);
+                var point = new GLatLng($lat,$lon);
+                var marker$item_id = new GMarker(point, icon$item_id);
+                map.addOverlay(marker$item_id);
+                GEvent.addListener(marker$item_id, 'click', function() {
+                marker$item_id.openInfoWindowHtml('<div style=\"white-space:nowrap\"><div class=\"bubble\">Ip: ".
+                        $ip[0]
+                        ."<br />Hour: ".
+                        gmdate('H:i:s', $timestamp)
+                        ."<br />Request: <a href=".
+                        wAddSiteurl(htmlspecialchars(html_entity_decode($cv->urlrequested)))
+                        ." target=\"_BLANK\">".
+                        stringShortener(html_entity_decode($cv->urlrequested), round($max_char_len*.9,0))
+                        ."</a></div></div>');
+                });
+                map.panTo(new GLatLng($lat,$lon),3);
+                </script>";
+                }
+        }
+
+                } //end if row_count
                 $row_count=$row_count+1;
                 } //end foreach
@@ -650 +705 @@
         } //end if !empty($qryC)
 } //end function spyview
+
+// Geocoding location with Google Maps
+function geocode($location, $key) {
+//Three parts to the querystring: q is address, output is the format (
+$address = urlencode($location);
+$url = "http://maps.google.com/maps/geo?q=".$address."&output=csv&key=".$key;
+
+$ch = curl_init();
+
+curl_setopt($ch, CURLOPT_URL, $url);
+curl_setopt($ch, CURLOPT_HEADER,0);
+curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER[HTTP_USER_AGEN]);
+curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+$data = curl_exec($ch);
+curl_close($ch);
+
+$data = explode(",",$data);
+if ($data[0] == 200)
+{
+$lat = $data[2];
+$lon = $data[3];
+$coords = $lat.":".$lon;
+return $coords;
+
+} else {
+$coords = $data[0];
+return $coords;
+}
+}
 
 // How many digits have an integer

trunk/lib/settings.php

@@ -89 +89 @@
                 <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 />
+
+                <?php // Test Google Maps Key If the test fails deactivate *map options 
+                if ($wassup_options->wassup_geoip_map == 1 && $wassup_options->wassup_googlemaps_key != "") {
+                        $code = geocode("Ancona", $wassup_options->wassup_googlemaps_key);
+                                if ($code != "200") { 
+                                        $style_key = "style='background:red'";
+                                        $code_error = "<p>--->> <strong>WARNING</strong> Activation problem >> Error code: <a href='http://code.google.com/apis/maps/documentation/reference.html#GGeoStatusCode' target='_BLANK'>".$code."</a> <<---</p>";
+                                        $wassup_options->wassup_geoip_map = 0;
+                                        $wassup_options->wassup_googlemaps_key = "";
+                                        $wassup_options->saveSettings();
+                                }
+                      }
+                ?>
+                <br /><h3><?php _e('GEO IP Map (Spy view)','wassup'); ?></h3>
+                <?php echo $code_error; ?>
+                <p><input type="checkbox" name="wassup_geoip_map" value="1" <?php if($wassup_options->wassup_geoip_map == 1) print "CHECKED"; ?> /> <strong><?php _e('Display a GEO IP Map in the spy visitors view','wassup'); ?></strong>
+                </p>
+                <p><strong>Google Maps API key:</strong> <input <?php echo $style_key; ?> type="text" name="wassup_googlemaps_key" size="40" value="<?php print $wassup_options->wassup_googlemaps_key; ?>" /> - <a href="http://www.google.com/maps/api_signup?url=<?php echo $wpurl; ?>">signup for your key</a></p></br />
 
                 <br /><h3><?php _e('Time format','wassup'); ?></h3>

trunk/lib/wassup.class.php

@@ -16 +16 @@
         var $wassup_top10 ;
         var $wassup_dashboard_chart;
+        var $wassup_geoip_map;
+        var $wassup_googlemaps_key;
         var $wassup_time_format;        //new
 
@@ -98 +100 @@
                 $this->wassup_default_limit = "10";
                 $this->wassup_dashboard_chart = "0";
+                $this->wassup_geoip_map = "0";
+                $this->wassup_googlemaps_key = "";
                 $this->wassup_time_format = "24";
                 $this->wassup_widget_title = "Visitors Online";

trunk/wassup.css

@@ -53 +53 @@
 }
 .sum-spy {
+        min-height: 54px;
         position: relative;
         clear: left;
@@ -96 +97 @@
         width: 100%;
 }
+.sum-det-spy {
+        float:left;
+        margin: 0px 0 0px 0;
+        padding: 0;
+        line-height: 20px;
+        font-size: 14px;
+}
 .sum-det {
         margin: 0px 0 0px 0;

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.1
+Version: 1.6.2b
 Author: Michele Marcucci, Helene D.
 Author URI: http://www.michelem.org/
@@ -460 +460 @@
                 $wassup_options->wassup_userlevel = $_POST['wassup_userlevel'];
                 $wassup_options->wassup_dashboard_chart = $_POST['wassup_dashboard_chart'];
+                $wassup_options->wassup_geoip_map = $_POST['wassup_geoip_map'];
+                $wassup_options->wassup_googlemaps_key = $_POST['wassup_googlemaps_key'];
                 $wassup_options->wassup_time_format = $_POST['wassup_time_format'];
                 $wassup_options->wassup_default_type = $_POST['wassup_default_type'];
@@ -647 +649 @@
                 <a href="#?" onclick="return playSpy();"><span id="spy-play"><?php _e("Play", "wassup"); ?></span></a>
                 <br />&nbsp;<br /></div>
+
+        <?php // GEO IP Map
+        if ($wassup_options->wassup_geoip_map == 1 AND $wassup_options->wassup_googlemaps_key != "") { ?>
+                <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo $wassup_options->wassup_googlemaps_key; ?>" type="text/javascript"></script>
+                <div id="map" style="width: <?php echo ($screen_res_size*95/100); ?>px; height: 220px;border:2px solid #999;"></div>
+                    <script type="text/javascript">
+                    //<![CDATA[
+                    if (GBrowserIsCompatible()) { 
+                      // Display the map, with some controls and set the initial location 
+                      var map = new GMap2(document.getElementById("map"));
+                      map.addControl(new GSmallMapControl());
+                      map.addControl(new GMapTypeControl());
+                      //map.enableScrollWheelZoom();
+                      map.setCenter(new GLatLng(0,0),3);
+                    }
+                    // display a warning if the browser was not compatible
+                    else {
+                      alert("Sorry, the Google Maps API is not compatible with this browser");
+                    }
+                    //]]>
+                    </script>
+                <p>&nbsp;</p>
+        <? } //end if geoip_map ?>
                 <div id="spyContainer">
                 <?php