From 3e7c7f8163be0a066457d4103c214ee68ecf9cc1 Mon Sep 17 00:00:00 2001
From: ruan <ruany@users.noreply.github.com>
Date: Fri, 9 Sep 2016 18:14:09 +0200
Subject: [PATCH] Fixed ghost pages again

---
 inc/page.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/inc/page.php b/inc/page.php
index 33b7658..c505c21 100644
--- a/inc/page.php
+++ b/inc/page.php
@@ -114,7 +114,6 @@ class Page {
     function run_query() {
         try {
             $table = $this->table;
-            $where = $this->settings->active_query;
             $limit = $this->settings->limit_per_page;
 
             $offset = 0;
@@ -125,11 +124,7 @@ class Page {
 
             $sel = $this->get_selection($table);
 
-            if ($where !== "") {
-                $where .= " AND ";
-            } else {
-                $where = "WHERE ";
-            }
+            $where = $this->where_append($this->settings->active_query);
             $where .= "(uuid <> '#offline#' AND uuid IS NOT NULL)";
 
             $query = "SELECT $sel FROM $table $where GROUP BY $table.id ORDER BY time DESC LIMIT :limit OFFSET :offset";
@@ -391,7 +386,10 @@ class Page {
         $page = $this->name . ".php";
 
         if ($total === -1) {
-            $result = $this->conn->query("SELECT COUNT(*) AS count FROM $table WHERE uuid <> '#offline#' AND uuid IS NOT NULL")->fetch(PDO::FETCH_ASSOC);
+            $where = $this->where_append($this->settings->active_query);
+            $where .= "(uuid <> '#offline#' AND uuid IS NOT NULL)";
+
+            $result = $this->conn->query("SELECT COUNT(*) AS count FROM $table $where")->fetch(PDO::FETCH_ASSOC);
             $total = $result['count'];
         }
 
@@ -450,4 +448,16 @@ class Page {
         $str[0] = strtolower($str[0]);
         return (string)$str;
     }
+
+    /**
+     * @param $where
+     * @return string
+     */
+    public function where_append($where) {
+        if ($where !== "") {
+            return $where . " AND ";
+        } else {
+            return "WHERE ";
+        }
+    }
 }