Changeset 17758 for extensions/EStat/estat_ajax.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/estat_ajax.php (modified) (7 diffs)

extensions/EStat/estat_ajax.php

@@ -475 +475 @@
 
       $gStatFile=new StatDBGlobal($this->fileStatDir, self::FILE_GLOBAL);
-      $gStatFile->setIpCountryFile(ESTAT_PATH.'data/ipCountry.db');
+      $gStatFile->setIpCountryFile($this->fileStatDir.'/'.self::FILE_COUNTRY.'.db', true);
       $gStatFile->open(ASDF_OPEN_WRITE);
       if($gStatFile->getInfoProperty('log', 'startImport')==null)
@@ -575 +575 @@
 
       // prepare an EStat_IdList to buid a list of unique Id
-      $idList=new EStat_IdList(array('catId', 'imageId', 'tagsId', 'userId', 'IPadress'));
+      $idList=new EStat_IdList(array('catId', 'imageId', 'tagsId', 'userId'));
       // $idAssoc will get the label associated to the id
       $idAssoc=array(
@@ -581 +581 @@
         'imageId'=>array(),
         'tagsId'=>array(),
-        'userId'=>array(),
-        'IPadress'=>array()
+        'userId'=>array()
       );
 
@@ -612 +611 @@
         $this->prepareIdList($idAssoc, 'userId', "SELECT id, username AS name FROM ".USERS_TABLE." WHERE id IN (".implode(',', $idList->getItems('userId')).") ORDER BY id;");
 
-      // for reverse DNS
-      if($this->config['logs.ipCountry']=='y')
-        $this->getIpInfos($idAssoc, $idList->getItems('IPadress'));
-
       // complete the data
       foreach($returned['rows'] as $key=>$row)
@@ -636 +631 @@
           'date' => date('Y-m-d H:i:s', $row['date']),
           'IpUserId' => ($row['userId']==2)?$row['IPadress']:$this->getId($idAssoc, 'userId', $row['userId'], $row['IPadress'], 'name'),
-          //'country' => $row['country'],
+          'country' => $row['country'],
           'catId' => GPCCore::getUserLanguageDesc($this->getId($idAssoc, 'catId', $row['catId'], ($row['catId']==0)?'-':'?')),
           'imageId' => $this->getId($idAssoc, 'imageId', $row['imageId'], ($row['imageId']==0)?'-':'?', 'name'),
@@ -702 +697 @@
         if($row['userId']==2)
         {
-          $ipInfo=$this->getId($idAssoc, 'IPadress', $tmp['IpUserId'], '?');
           if($this->config['logs.reverseDNS']=='y')
           {/*
@@ -716 +710 @@
           }
 
-          if($ipInfo['country']!='--' and $ipInfo['country']!='XA')
+          if($row['country']!='--' and $row['country']!='XA')
           {
-            $tmp['IpUserId'].='<span class="geoip">[<a href="http://www.geoiptool.com/fr/?IP='.$tmp['IpUserId'].'">'.$ipInfo['country'].'</a>]</span>';
+            $tmp['IpUserId'].='<span class="geoip">[<a href="http://www.geoiptool.com/fr/?IP='.$tmp['IpUserId'].'">'.$row['country'].'</a>]</span>';
           }
           else