Changeset 3707 for extensions/AStat/astat_aip.class.inc.php

Timestamp:

Jul 30, 2009, 9:21:36 PM (15 years ago)

Author:

grum

Message:

Update AStat 2.1.0 - add some features to new features

File:

• extensions/AStat/astat_aip.class.inc.php (modified) (10 diffs)

extensions/AStat/astat_aip.class.inc.php

@@ -420 +420 @@
     }
 
-    if($this->my_config['AStat_BlackListedIP']!="")
+    if(($this->my_config['AStat_UseBlackList']!="false")&&($this->my_config['AStat_BlackListedIP']!=""))
     {
       ($sql_where=="")?$sql_where=" where ":$sql_where.=" AND ";
-      $sql_where .= " NOT ".$this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
+      ($this->my_config['AStat_UseBlackList']=="true")?$sql_where .= " NOT ":"";
+      $sql_where .= $this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
     }
 
@@ -498 +499 @@
     }
 
-    if($this->my_config['AStat_BlackListedIP']!="")
+    if(($this->my_config['AStat_UseBlackList']!="false")&&($this->my_config['AStat_BlackListedIP']!=""))
     {
       ($sql_where=="")?$sql_where=" where ":$sql_where.=" AND ";
-      $sql_where .= " NOT ".$this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
+      ($this->my_config['AStat_UseBlackList']=="true")?$sql_where .= " NOT ":"";
+      $sql_where .= $this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
+      $sql.=" , 'N' AS blacklist";
+    }
+    else
+    {
+      if($this->my_config['AStat_BlackListedIP']=='')
+      {
+        $sql.=" , 'N' AS blacklist";
+      }
+      else
+      {
+        $sql.=" , (CASE ";
+        $tmp=explode(',', $this->my_config['AStat_BlackListedIP']);
+        foreach($tmp as $key=>$val)
+        {
+          $sql.=" WHEN IP LIKE '".$val."' THEN 'Y' ";
+        }
+        $sql.="ELSE 'N' END) AS blacklist ";
+      }
     }
 
@@ -508 +528 @@
             from ".HISTORY_TABLE." LEFT JOIN ".USERS_TABLE." ON ".HISTORY_TABLE.".user_id = ".USERS_TABLE.".id ".$sql_where.$sql_group.") as n) as n ";
     $sql=$sql_select.$sql.$sql_nfomax.$sql_from.$sql_max.$sql_where.$sql_group.$sql_order.$sql_limit;
+
 
     $result = pwg_query($sql);
@@ -605 +626 @@
     $sql_where .= "  ic2.catid = ".HISTORY_TABLE.".category_id ";
 
-    if($this->my_config['AStat_BlackListedIP']!="")
-    {
-      $sql_where .= " AND NOT ".$this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
+    if(($this->my_config['AStat_UseBlackList']!="false")&&($this->my_config['AStat_BlackListedIP']!=""))
+    {
+      ($this->my_config['AStat_UseBlackList']=="true")?$sql_where .= " NOT ":"";
+      $sql_where .= $this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
     }
 
@@ -700 +722 @@
     }
 
-    if($this->my_config['AStat_BlackListedIP']!="")
+    if(($this->my_config['AStat_UseBlackList']!="false")&&($this->my_config['AStat_BlackListedIP']!=""))
     {
       ($sql_where=="")?$sql_where=" where ":$sql_where.=" AND ";
-      $sql_where .= " NOT ".$this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
+      ($this->my_config['AStat_UseBlackList']=="true")?$sql_where .= " NOT ":"";
+      $sql_where .= $this->make_IP_where_clause($this->my_config['AStat_BlackListedIP']);
     }
 
@@ -1046 +1069 @@
         }
 
-        $ip_blacklist=$this->format_link("[".l10n('AStat_IP_blacklist')."]", $ip_blacklist);
+        if($stats[$i]["blacklist"]=='Y')
+        {
+          $ip_blacklist="[".l10n('AStat_IP_blacklist')."]";
+        }
+        else
+        {
+          $ip_blacklist=$this->format_link("[".l10n('AStat_IP_blacklist')."]", $ip_blacklist);
+        }
       }
       else
@@ -1471 +1501 @@
     $template_datas['AStat_showthumbcat_selected']=$this->my_config['AStat_ShowThumbCat'];
     $template_datas['AStat_showthumbimg_selected']=$this->my_config['AStat_ShowThumbImg'];
+    $template_datas['AStat_UseBlackList_selected']=$this->my_config['AStat_UseBlackList'];
 
     // making lists zones
@@ -1507 +1538 @@
     $template_list_values['yesno'][]='false';
     $template_list_labels['yesno'][]=l10n('AStat_yesno_false');
+
+    $template_list_values['enableddisabled'][]='true';
+    $template_list_values['enableddisabled'][]='false';
+    $template_list_values['enableddisabled'][]='invert';
+    $template_list_labels['enableddisabled'][]=l10n('AStat_enableddisabled_true');
+    $template_list_labels['enableddisabled'][]=l10n('AStat_enableddisabled_false');
+    $template_list_labels['enableddisabled'][]=l10n('AStat_enableddisabled_invert');
 
     $template_datas["L_STAT_TITLE"]=l10n('AStat_config_title');
@@ -1521 +1559 @@
     $template->assign("AStat_yesno_list_values", $template_list_values['yesno']);
     $template->assign("AStat_yesno_list_labels", $template_list_labels['yesno']);
+    $template->assign("AStat_enableddisabled_list_values", $template_list_values['enableddisabled']);
+    $template->assign("AStat_enableddisabled_list_labels", $template_list_labels['enableddisabled']);
 
     $template->assign_var_from_handle('ASTAT_BODY_PAGE', 'body_page');
@@ -2406 +2446 @@
   }
 
+
   /* ---------------------------------------------------------------------------
    * AJAX functions