Changeset 17758 for extensions/EStat/lib/statDB.class.inc.php

Timestamp:

Sep 5, 2012, 4:15:54 PM (12 years ago)

Author:

grum

Message:

version 0.1.0b

. Fix install bugs
. Manage anonymous directories
. Manage CSV export options settings
. Fix IPadress<=>country association bug & improve join performances
. Fix bug on IP filter
. Improve performances for history consult

File:

• extensions/EStat/lib/statDB.class.inc.php (modified) (12 diffs)

extensions/EStat/lib/statDB.class.inc.php

@@ -193 +193 @@
    *
    * @param String $file
+   * @param Boolean $force: if true, $force the filename affectation even if file doesn't exist
    * @return String: file name set
    */
-  public function setIpCountryFile($file)
-  {
-    if(file_exists($file))
+  public function setIpCountryFile($file, $force=false)
+  {
+    if($force or file_exists($file))
       $this->ipCountryFile=$file;
     return($this->ipCountryFile);
@@ -728 +729 @@
             break;
           case 'between':
+          case 'not between':
             if($field=='IPadress')
             {
@@ -737 +739 @@
               $num++;
             }
-            $where[]=' '.$field." BETWEEN ".$param['minValue']." AND ".$param['maxValue']." ";
+            $where[]=' '.$field.' '.strtoupper($param['operator']).' '.$param['minValue']." AND ".$param['maxValue']." ";
             break;
         }
@@ -824 +826 @@
   }
 
+
+  /**
+   * to be used with IP filter: replace the given operator with 'between' or 'not between'
+   *
+   * @param Array $value
+   * @return Array
+   */
+  protected function checkIPFilter($value)
+  {
+    if(is_array($value))
+    {
+      if(isset($value['operator']))
+      {
+        if($value['operator']=='=' or
+           $value['operator']=='>' or
+           $value['operator']=='>=' or
+           $value['operator']=='<' or
+           $value['operator']=='<=' or
+           $value['operator']=='like')
+        {
+          $value['operator']='between';
+          $value['minValue']=$value['value'];
+          $value['maxValue']=$value['value'];
+          $value['value']=null;
+        }
+        elseif($value['operator']=='!=' or
+               $value['operator']=='not like')
+        {
+          $value['operator']='not between';
+          $value['minValue']=$value['value'];
+          $value['maxValue']=$value['value'];
+          $value['value']=null;
+        }
+      }
+    }
+    return($value);
+  } // checkIPFilter
 
 
@@ -856 +895 @@
           case '<=':
           case '!=':
+          case 'like':
+          case 'not like':
             if(isset($value['value']))
             {
@@ -866 +907 @@
                   break;
                 case 'IP':
-                  $value['value']=$this->checkValueIP($value['value']);
+                  // for IP, replace internaly the operator with a 'between'
+                  $value['value']=$this->checkValueIP($value['value'], 0);
                   if($value['value']==null) return(null);
                   break;
@@ -893 +935 @@
                     break;
                   case 'IP':
-                    $val=$this->checkValueIP($val);
+                    $val=$this->checkValueIP($val, 0);
                     if($val!=null) $returned[]=$val;
                     break;
@@ -910 +952 @@
             break;
           case 'between':
+          case 'not between':
             if(isset($value['minValue']) and  isset($value['maxValue']))
             {
@@ -921 +964 @@
                   break;
                 case 'IP':
-                  $value['minValue']=$this->checkValueIP($value['minValue']);
+                  $value['minValue']=$this->checkValueIP($value['minValue'], 0);
                   if($value['minValue']==null) return(null);
-                  $value['maxValue']=$this->checkValueIP($value['maxValue']);
+                  $value['maxValue']=$this->checkValueIP($value['maxValue'], 255);
                   if($value['maxValue']==null) return(null);
                   break;
@@ -981 +1024 @@
    *
    * @param String $value
+   * @param Integer $completeCode
    * @return String
    */
-  protected function checkValueIP($value)
-  {
-    $returned=self::IPBinaryEncode($value);
+  protected function checkValueIP($value, $completeCode=0)
+  {
+    $returned=self::IPBinaryEncode($value, $completeCode);
     if($returned=="\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00") return(null);
     return($returned);
@@ -1000 +1044 @@
    *
    * @param String $IP: text IP string
+   * @param Integer $completeCode
    * @return String: a binary string
    */
-  static public function IPBinaryEncode($IP)
+  static public function IPBinaryEncode($IP, $completeCode=0)
   {
     $value=trim($IP);
-    if(preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i',$value)>0)
+    if(preg_match('/\d{1,3}(\.\d{1,3}(\.\d{1,3}(\.\d{1,3})?)?)?/i',$value)>0)
     {
       //IPv4
       $tmp=explode('.',$value);
+      while(count($tmp)<4) $tmp[]=$completeCode;
+
       return("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".chr($tmp[0]+0).chr($tmp[1]+0).chr($tmp[2]+0).chr($tmp[3]+0));
     }
@@ -1088 +1135 @@
 
 
-
-
-
+/*
+ used to display binary values when debug is necessary...
+
+function toHexDump($data)
+  {
+    $returned="";
+    $maxItems=strlen($data);
+
+    $tmp=array();
+    for($i=0;$i<$maxItems;$i++)
+    {
+      $tmp[]=sprintf("%02x", ord($data{$i}));
+    }
+    $returned.=implode(" ", $tmp);
+    return($returned);
+  }
+*/