Changeset 357 for wp-slimstat-ex

Timestamp:

06/28/08 07:15:16 (6 months ago)

Author:

082net

Message:

## wp-slimstat-ex ##

Added option for select whois database (dnsstuff or ip-lookup)

Location:

wp-slimstat-ex

Files:

• branches/pins/GeoSlimStat/pin.php (modified) (5 diffs)
• trunk/lib/functions.php (modified) (1 diff)
• trunk/wp-slimstat-ex-config.php (modified) (1 diff)
• trunk/wp-slimstat-ex-options.php (modified) (1 diff)

wp-slimstat-ex/branches/pins/GeoSlimStat/pin.php

@@ -369 +369 @@
                 for ($i = 0; $i < $count_ips; $i++) {
                         $uris[$i] = 'http://www.seomoz.org/ip2location/look.php?ip='.long2ip($ips[$i]);
+//                      $uris[$i] = 'http://www.webconfs.com/ip-to-city.php?submit=submit&ipaddress='.long2ip($ips[$i]);
                 }
                 $data = $this->multi_remote_fopen($uris, false);
@@ -406 +407 @@
         }
 
+        function ip_lookup_multi_sub($ips) {// just for city information
+                $count_ips = count($ips);
+                $uris = array();
+                $info = array();
+                for ($i = 0; $i < $count_ips; $i++) {
+                        $uris[$i] = 'http://www.melissadata.com/lookups/iplocation.asp?ipaddress='.long2ip($ips[$i]);
+                }
+                $data = $this->multi_remote_fopen($uris, false);
+                for ($i = 0; $i < $count_ips; $i++) {
+                        $result = trim(strip_tags($data[$i], '<b>'));
+                        if (preg_match('#City\s*<b>(.*?)</b>\s*State or Region\s*<b>(.*?)</b>#is', $result, $loc)) {
+                                $city = trim($loc[1]) == '-' ? '' : trim($loc[1]);
+                                $city .= trim($loc[2]) == '-' ? '' : ', '.trim($loc[2]);
+                                $info[$ips[$i]] = ucwords(strtolower($city));
+                        }
+                }
+                return $info;
+        }
+
+        function insert_geo_data($info) {
+                global $wpdb;
+                $ip = $info['ip'];
+                $lat = $info['lat'];
+                $long = $info['long'];
+                $city = $wpdb->escape($info['city']);
+                $country_abrv = $wpdb->escape($info['country_abrv']);
+                $query = "INSERT INTO {$this->tbGeo} (ip, country_abrv, city, latitude, longitude)
+                                                                        VALUES ($ip, '$country_abrv', '$city', '$lat', '$long')";
+                $result = $wpdb->query($query);
+        }
+
         function multi_queryHostIP($iparrs) {
                 global $wpdb;
@@ -427 +459 @@
                         $count_ips = count($iparrs[$i]);
                         $infos = $this->ip_lookup_multi($iparrs[$i]);
-
+                        $info_sub = $ips_sub = array();
                         for ($j=0; $j<$count_ips; $j++) {
-                                $info = $infos[$iparrs[$i][$j]];
+                                $ip = $iparrs[$i][$j];
+                                $info = $infos[$ip];
                                 $lat = round(trim($info['lat']), 4);
                                 $long = round(trim($info['long']), 4);
-                                $city = $ip_info['city'] ? trim($info['city']) : '';
-                                $country_abrv = SSTrack::_determineCountry($iparrs[$i][$j]);
                                 if(!$lat && !$long) {
-                                        $_neg[] = $iparrs[$i][$j];
+                                        $_neg[] = $ip;
                                         update_option('geo_slimstat_negip', $_neg);
                                         continue;
@@ -441 +472 @@
                                 if (is_null($lat)) $lat = 0;
                                 if (is_null($long)) $long = 0;
-                                $country_abrv = $wpdb->escape($country_abrv);
-                                $city = $wpdb->escape($city);
-                                $query = "INSERT INTO {$this->tbGeo} (ip, country_abrv, city, latitude, longitude)
-                                                                                                                        VALUES (".$iparrs[$i][$j].", '$country_abrv', '$city', '$lat', '$long')";
-                                $result = $wpdb->query($query);
+                                $country_abrv = SSTrack::_determineCountry($ip);
+                                $city = $info['city'] ? trim($info['city']) : '';
+                                if ($city == '') {
+                                        $ips_sub[] = $ip;
+                                        $info_sub[$ip]['lat'] = $lat;
+                                        $info_sub[$ip]['long'] = $long;
+                                        $info_sub[$ip]['country_abrv'] = $country_abrv;
+                                } else {
+                                        $this->insert_geo_data( array( 'ip'=>$ip, 'city'=>$city, 'lat'=>$lat, 'long'=>$long, 'country_abrv'=>$country_abrv ) );
+                                }
+                        }
+
+                        if (!empty($ips_sub)) {
+                                $cities = $this->ip_lookup_multi_sub($ips_sub);
+                                foreach ($ips_sub as $ip) {
+                                        $city = isset($cities[$ip]) ? $cities[$ip] : '';
+                                        $this->insert_geo_data( array( 'ip'=>$ip, 'city'=>$city, 'lat'=>$info_sub[$ip]['lat'], 'long'=>$info_sub[$ip]['long'], 'country_abrv'=>$info_sub[$ip]['country_abrv'] ) );
+                                }
                         }
                 }
@@ -580 +624 @@
                                                 if ( function_exists('curl_multi_init') ) {
                                                         $count = count($ips[$i]);
-                                                        if ( $count !=0 && ($count % 20) == 0 ) $i++;
+                                                        if ( $count !=0 && ($count % 50) == 0 ) $i++;
                                                         $ips[$i][] = $r['remote_ip'];
                                                 } else {

wp-slimstat-ex/trunk/lib/functions.php

@@ -584 +584 @@
         function _whoisLink($ip) {
                 global $SlimCfg;
-                $output = ($SlimCfg->option['whois'])?'<a href="http://ip-lookup.net/?'.$ip.'" title="Who is?" onclick="window.open(this.href, \'whois\', \'width=550,height=600,scrollbars=yes\'); return false;">':'';
+                $output = '';
+                if ($SlimCfg->option['whois']) {
+                        $link = $SlimCfg->option['whois_db'] == 'iplookup' ? 'http://ip-lookup.net/?'.$ip : 'http://private.dnsstuff.com/tools/ipall.ch?ip='.$ip.'#map';
+                        $w_h = $SlimCfg->option['whois_db'] == 'iplookup' ? 'width=550,height=600,scrollbars=yes' : 'width=550,height=800,scrollbars=yes';
+                        $output .= '<a href="'.$link.'" title="Who is?" onclick="window.open(this.href, \'whois\', \''.$w_h.'\'); return false;">';
+                }
                 $output .= ($SlimCfg->option['iptohost'])?$SlimCfg->trimString(gethostbyaddr($ip)):$ip;
                 $output .= ($SlimCfg->option['whois'])?'</a>':'';

wp-slimstat-ex/trunk/wp-slimstat-ex-config.php

@@ -58 +58 @@
 
         function default_options() {
-                return array('tracking'=>1, 'usepins'=>1, 'cachelimit'=>0, 'guesstitle'=>1, 'dbmaxage'=>0, 'limitrows'=>20, 'iptohost'=>0, 'whois'=>1, 'meta'=>0, 'visit_type'=>'uniques', 'count_type'=>'hits', 'stats_type'=>'all', 'time_offset'=>0, 'use_ajax'=>1, 'nice_titles'=>1, 'ignore_bots'=>0, 'track_mode'=>'full');
+                return array('tracking'=>1, 'usepins'=>1, 'cachelimit'=>0, 'guesstitle'=>1, 'dbmaxage'=>0, 'limitrows'=>20, 'iptohost'=>0, 'whois'=>1, 'whois_db'=>'dnsstuff', 'meta'=>0, 'visit_type'=>'uniques', 'count_type'=>'hits', 'stats_type'=>'all', 'time_offset'=>0, 'use_ajax'=>1, 'nice_titles'=>1, 'ignore_bots'=>0, 'track_mode'=>'full');
         }
 

wp-slimstat-ex/trunk/wp-slimstat-ex-options.php

@@ -299 +299 @@
           <option value="1"<?php selected(1, (int)$SlimCfg->option['whois']); ?>>true</option>
           <option value="0"<?php selected(0, (int)$SlimCfg->option['whois']); ?>>false</option>
+          </select> &mdash 
+                                        <select name="ssex_op[whois_db]">
+          <option value="dnsstuff"<?php selected('dnsstuff', $SlimCfg->option['whois_db']); ?>>dnsstuff.com</option>
+          <option value="iplookup"<?php selected('iplookup', $SlimCfg->option['whois_db']); ?>>ip-lookup.net</option>
           </select><br />
 <?php _e('&mdash; Use &quot;Whois&quot; link on &quot;Visitors&quot; modules', 'wp-slimstat-ex') ?></td>