add protection

action.php

@@ -77,9 +77,9 @@ class action {
         return $list;
     }
 
-    public function isBlocked($ip) {
-        $dbAction = $this->db->prepare("SELECT ip FROM (SELECT ip FROM list WHERE ip = ? UNION SELECT ip FROM blacklist WHERE ip = ?) AS IP");
-        $dbAction->bind_param('ii',$ip,$ip);
+    private function isListed($ip) {
+        $dbAction = $this->db->prepare("SELECT ip FROM list WHERE ip = ?");
+        $dbAction->bind_param('i',$ip);
         $dbAction->execute();
         $dbAction->store_result();
         if($dbAction->num_rows() == 0) {
@@ -88,8 +88,8 @@ class action {
         return true;
     }
 
-    private function isListed($ip) {
-        $dbAction = $this->db->prepare("SELECT ip FROM list WHERE ip = ?");
+    private function isBlackListed($ip) {
+        $dbAction = $this->db->prepare("SELECT ip FROM blacklist WHERE ip = ?");
         $dbAction->bind_param('i',$ip);
         $dbAction->execute();
         $dbAction->store_result();
@@ -99,6 +99,13 @@ class action {
         return true;
     }
 
+    public function isBlocked($ip) {
+        if($this->isListed($ip)||$this->isBlackListed($ip)) {
+            return true;
+        }
+        return false;
+    }
+
     private function isWhiteListed($ip) {
         $dbAction = $this->db->prepare("SELECT ip FROM whitelist WHERE ip = ?");
         $dbAction->bind_param('i',$ip);