Changeset 6172

Timestamp:

May 13, 2010, 9:37:29 PM (14 years ago)

Author:

vdigital

Message:

Fix: Flags are coming back

Location:

extensions/whois_online

Files:

• Changelog.txt.php (modified) (1 diff)
• include/wo_functions.inc.php (modified) (5 diffs)
• main.inc.php (modified) (2 diffs)

extensions/whois_online/Changelog.txt.php

@@ -3 +3 @@
 Plugin Name: Whois online
 ** History **
+  2010-04-24 2.0.n
+                                                 Fix: Flags are coming back 
+
   2010-04-24 2.0.m
                                                  Fix: IE8 User agent could be too long
                                                  Fix: Failure on localisation (a French internet provider blocks external get_files)
                                                  Fix: Loss of previous collected data
-                                                 
   2010-04-18 2.0.l
                                                  "Undefined index:  Code" is removed

extensions/whois_online/include/wo_functions.inc.php

@@ -151 +151 @@
 function whois_country($trace, $bypass = false) {
   if (!isset($trace['country'])) {
-                        pwg_query('ALTER TABLE ' . WHOIS_ONLINE_TABLE . ' ADD `country` VARCHAR( 255 ) NOT NULL AFTER `lang` ;');
+                        pwg_query('ALTER TABLE ' . WHOIS_ONLINE_TABLE . ' ADD `country` VARCHAR( 254 ) NOT NULL AFTER `lang` ;');
                         $trace['country']='';
         }
@@ -157 +157 @@
         if ($trace['country']!='') $c = @unserialize(htmlspecialchars_decode($trace['country']));
         if (isset($c['Code']) and $c['Code']!='' and $c['Code']!='__') return $c; 
-        if ($bypass and isset($c['Code']) and $c['Code']=='__') return $c;
+        if ($bypass and isset($c['Code'])) return $c;
     $result = pwg_get_contents ('http://api.hostip.info/get_html.php?ip=' . $trace['IP'], 'r');
         if ( $result !== false ) { 
@@ -163 +163 @@
                 $c = array ('Name' => $tokens[1], 'City' => substr($tokens[3],0,-3));
                 if (strpos ($c['Name'], '?') === FALSE) {
-                        $tokens = preg_split ("/[\(\)]/", $c['Name']);
-                        $c['Code'] = isset($tokens[1]) ? $tokens[1]:'__';
+                        $c['Code'] = substr($c['Name'],-8,2); # " (Private Address) (XX) City"
                         $c['Name'] = ucwords ( strtolower( substr($c['Name'],0,-5)));
                 }
@@ -170 +169 @@
         }
         if (stripos($c['Name'], 'Squid')!==false) $c = Array('Code' => '__', 'Name' => l10n('Unknown country'), 'City' => 'N/A',);
-        else $c = Array('Code' => '__', 'Name' => l10n('Unknown country'), 'City' => 'N/A',);
+        // else $c = Array('Code' => '__', 'Name' => l10n('Unknown country'), 'City' => 'N/A',);
         if ($c['Code'] == 'Private Address') {
                 $c['Name'] = l10n('Private Address');
@@ -186 +185 @@
 function whois_flag($trace, &$step, $limit = 10) {
   $flag = WHOIS_ONLINE_PATH . 'flags/' . $trace['Country']['Code'] . '.jpg';
-        if (file_exists($flag)) return $flag;
+        if (file_exists($flag) and $flag != '__' ) return $flag;
         if ( $step > $limit ) return WHOIS_ONLINE_PATH . 'flags/__.jpg';
         $f = fopen  ('http://api.hostip.info/flag.php?ip=' . $trace['IP'], 'r');

extensions/whois_online/main.inc.php

@@ -23 +23 @@
 /*
 Plugin Name: Whois online
-Version: 2.0.m
+Version: 2.0.n
 Description: Who is online?
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=279
@@ -29 +29 @@
 Author URI: http://www.vdigital.org
 */
-define('WHOIS_ONLINE_VER', '2.0.m'); 
+define('WHOIS_ONLINE_VER', '2.0.n'); 
 global $prefixeTable, $conf;
 // $conf['debug_l10n'] = true;