Changeset 1967

Timestamp:

12/10/09 22:04:14 (13 years ago)

Author:

wattoo

Message:

Fix pb d'url en query string

Location:

plugins/commentIpGeo

Files:

• CHANGELOG (modified) (1 diff)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• class.commentIpGeo.php (modified) (1 diff)
• class.public.commentIpGeo.php (modified) (1 diff)
• class.tpl.commentIpGeo.php (modified) (3 diffs)
• rs.extensions.php (modified) (1 diff)

plugins/commentIpGeo/CHANGELOG

@@ +1 @@
+0.9 : 08/09/09
+  - Fix bugs
+  - Add {{tpl:commentIpGeoIsp}} to get the ISP of comment poster
+
 0.8 : 06/06
   - Add ipGeoCityLite database (installed on my own web server and requested by the plugins to get Country AND City). Wipmania is still available but is not the default setup (see about:config)

plugins/commentIpGeo/_define.php

@@ -16 +16 @@
      /* Description*/    "Add templates tags CommentIpGeo and CommentIpGeoFlag. It uses WIPmania.com or IpGeoCityLite, WorldIP - free geolocation databases",
      /* Author */        "Frederic PLE <dotclear@frederic.ple.name>",
-     /* Version */       '0.8',
+     /* Version */       '0.9',
      /* Permissions */   'admin'
 );

plugins/commentIpGeo/_install.php

@@ -13 +13 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$db_flush = array('0.3','0.7');
+$db_flush = array('0.3','0.7','0.9');
 
 $m_version = $core->plugins->moduleInfo('commentIpGeo','version');

plugins/commentIpGeo/_public.php

@@ -15 +15 @@
      $core->tpl->addValue('commentIpGeoFlag',array('tplCommentIpGeo','country_flag'));
      $core->tpl->addValue('commentIpGeoCity',array('tplCommentIpGeo','country_city'));
+     $core->tpl->addValue('commentIpGeoISP',array('tplCommentIpGeo','isp'));
      $core->tpl->addValue('commentDebug',array('tplCommentIpGeo','debug'));
      $core->addBehavior('publicHeadContent',array('tplCommentIpGeo','publicHeadContent'));

plugins/commentIpGeo/class.commentIpGeo.php

@@ -18 +18 @@
           else
                $ip_geo = netHttp::quickGet("http://frederic.ple.name/tools/inc_geoip.php?ip=" . $ip . "&from=" . urlencode(str_replace('http://','',$rs->core->blog->url)));
-          if ($ip_geo === false or $ip_geo === null)
+          if ($ip_geo === false or $ip_geo === null or strpos($ip_geo,'<') !== false)
                return false;
           else

plugins/commentIpGeo/class.public.commentIpGeo.php

@@ -30 +30 @@
           $rs = $c_rs->core->con->select($strReq);
           while($rs->fetch()) {
-               if ($rs->comment_ip_geo === false or $rs->comment_ip_geo === "" or $rs->comment_ip_geo === null or strstr($rs->comment_ip_geo,':') === false) {
+               if ($rs->comment_ip_geo === false or $rs->comment_ip_geo === "" or $rs->comment_ip_geo === null or strstr($rs->comment_ip_geo,':') === false or strstr($rs->comment_ip_geo,'<') === false) {
                     $ip_geo = commentIpGeo::ip2country($c_rs,$rs->comment_ip);
                     if ($ip_geo === false) {

plugins/commentIpGeo/class.tpl.commentIpGeo.php

@@ -17 +17 @@
     echo '<style type="text/css" media="all">
   /*-------------------------Flags and languages--------------------------------*/
-  .flags {background: url("' . $core->blog->url . '?pf=commentIpGeo/default-templates/flags.png") no-repeat top left; width:18px; height:12px; vertical-align:middle;}
+  .flags {background: url("' . $core->blog->url . ((substr($core->blog->url,-1) == '?') ? '' : '?') . 'pf=commentIpGeo/default-templates/flags.png") no-repeat top left; width:18px; height:12px; vertical-align:middle;}
 </style>
-<link rel="stylesheet" media="all" type="text/css" href="' . $core->blog->url . '?pf=commentIpGeo/default-templates/flags.css" />
+<link rel="stylesheet" media="all" type="text/css" href="' . $core->blog->url . ((substr($core->blog->url,-1) == '?') ? '' : '?') . 'pf=commentIpGeo/default-templates/flags.css" />
+<link rel="stylesheet" media="all" type="text/css" href="' . $core->blog->url . ((substr($core->blog->url,-1) == '?') ? '' : '?') . 'pf=commentIpGeo/default-templates/isp.css" />
 ';
   }
@@ -38 +39 @@
   static public function country_flag($attr) {
     return self::__process('"<img src=\\"" . $core->blog->url' .
-               ' . "?pf=commentIpGeo/default-templates/_.gif\\" ' .
+               ' . ((substr($core->blog->url,-1) == \'?\') ? \'\' : \'?\')' .
+               ' . "pf=commentIpGeo/default-templates/_.gif\\" ' .
                ' class=\\"flags flag-" . $_ctx->comments->getIpGeoCountryCode() . ' .
                '"\\" alt=\\"" . $_ctx->comments->getIpGeoCountryCode() . "-flag\\" />"');
@@ -47 +49 @@
   }
 
+  static public function isp($attr) {
+    return self::__process('"<img src=\\"" . $core->blog->url' .
+               ' . ((substr($core->blog->url,-1) == \'?\') ? \'\' : \'?\')' .
+               ' . "pf=commentIpGeo/default-templates/_isp.png\\" ' .
+               ' class=\\"isp isp-" . $_ctx->comments->getIpGeoIsp() . ' .
+               '"\\" alt=\\"" . $_ctx->comments->getIpGeoIsp() . "-ISP\\" />"');
+  }
+
   static public function debug($attr) {
-    return '<!-- DEBUG :' . "\n" . '<?php echo $_ctx->comments->debug(); ?> -->';
+    return '<?php
+      if ($core->blog->settings->commentIpGeo_debug)
+        echo "<!-- DEBUG :\n" . $_ctx->comments->debug() . " -->\n";
+     ?>';
   }
 }

plugins/commentIpGeo/rs.extensions.php

@@ -12 +12 @@
 
 class rsExtCommentIpGeo {
+     public static function __process(&$rs,$i) {
+          global $core;
+          $t = explode(':',publicCommentIpGeo::$c_info[$rs->comment_id]['comment_ip_geo'],3);
+          return $t[$i - 1];
+     }
+
      public static function getIpGeoCountryCode(&$rs) {
           global $core;
-          list($country,$city) = explode(':',publicCommentIpGeo::$c_info[$rs->comment_id]['comment_ip_geo'],2);
-          return $country;
+          return rsExtCommentIpGeo::__process($rs,1);
      }
      
      public static function getIpGeoCountryCity(&$rs) {
           global $core;
-          list($country,$city) = explode(':',publicCommentIpGeo::$c_info[$rs->comment_id]['comment_ip_geo'],2);
-          return $city;
+          return rsExtCommentIpGeo::__process($rs,2);
+     }
+
+     public static function getIpGeoIsp(&$rs) {
+          global $core;
+          return rsExtCommentIpGeo::__process($rs,3);
      }