From 9b544784f39f5d6624872cac45941ba8b40664bf Mon Sep 17 00:00:00 2001
From: JoseluCross <jlgarrido97@gmail.com>
Date: Thu, 12 Oct 2017 01:39:15 +0200
Subject: [PATCH] changes

---
 Source/src/DB.php  | 16 +++++++++-------
 Source/src/app.php | 12 +++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Source/src/DB.php b/Source/src/DB.php
index 44106b9..1798839 100644
--- a/Source/src/DB.php
+++ b/Source/src/DB.php
@@ -97,13 +97,11 @@ class DB
      *
      * @return mysqli_result the las 10 snippets hosted
      */
-    public function loadLast()
+    public function loadLast($page = 0)
     {
-        if (isset($_GET["o"]))
-            $first = $_GET["o"] * 10;
-        else
-            $first = 0;
-        $query = "SELECT IDC,Name,nick,Lang,Description,Code,Version FROM Users NATURAL JOIN Sources as S NATURAL JOIN Codes WHERE Version = (SELECT MAX(Version) FROM Sources WHERE S.Lang = Lang AND S.IDC = IDC) ORDER BY Modification DESC LIMIT $first, 10";
+        $page=$page*10;
+        $query = "SELECT IDC,Name,nick,Lang,Description,Code,Version FROM Users NATURAL JOIN Sources as S NATURAL JOIN Codes WHERE Version = (SELECT MAX(Version) FROM Sources WHERE S.Lang = Lang AND S.IDC = IDC) ORDER BY Modification DESC LIMIT $page, 10";
+        //echo $query;
         $code = dbw_query($this->conn, $query);
         return $code;
     }
@@ -216,7 +214,11 @@ class DB
             $first = $array["o"] * 10;
         else
             $first = 0;
-        $queryLast = ") AND Version = (SELECT MAX(Version) FROM Sources WHERE S.Lang = Lang AND S.IDC = IDC)" . $this->search($array["search"]) . " ORDER BY Modification DESC LIMIT $first, 10";
+        if(array_key_exists("search",$array))
+            $search = $array("search");
+        else
+            $search = "";
+        $queryLast = ") AND Version = (SELECT MAX(Version) FROM Sources WHERE S.Lang = Lang AND S.IDC = IDC)" . $search . " ORDER BY Modification DESC LIMIT $first, 10";
         //echo $query.$where.$queryLast;
         return dbw_query($this->conn, $query . $where . $queryLast);
     }
diff --git a/Source/src/app.php b/Source/src/app.php
index 4047661..ba9479b 100644
--- a/Source/src/app.php
+++ b/Source/src/app.php
@@ -107,16 +107,22 @@ function sendHTTPError($code){
     echo $twig->render('error.twig',array("page" => $page, "path" => $path, "user"  =>  $user,"error" => $error));
 }
 
+/**
+ * Index page
+ *
+ * @param bool $filter if filters are enabled (when ajax)
+ * @param bool $globalSearch if filters are in nav-bar search box
+ */
 function firstPage($filter=false,$globalSearch=false){
     global $supported,$twig,$path,$user;
     $db = new DB();
-    if(!$filter and !$globalSearch)
-        if(isset($_GET["p"]))
+    if(!$filter and !$globalSearch) //Common index
+        if(isset($_GET["p"])) //If page (not 0)
             $query = $db->loadLast($_GET["p"]);
         else
             $query = $db->loadLast();
     else
-        $query = $db->loadFilter($_POST);;
+        $query = $db->loadFilter($_POST);
     $last = lastToArray($db,$query,$supported);
     $page = array(
         "title"     =>  "CodeShare",