From a8dde111d7b7bede818909a3303e899cf165746e Mon Sep 17 00:00:00 2001
From: flejk <snowflake@cocaine.ninja>
Date: Thu, 10 Feb 2022 13:37:45 +0100
Subject: [PATCH] KAPPA

---
 admin.php                 |  0
 article.php               |  0
 beer.php                  |  0
 brewery.php               |  0
 controller/listLatest.php |  4 ++--
 logout.php                |  0
 myList.php                |  0
 passChange.php            |  0
 search.php                |  1 -
 verify.php                |  0
 view/sidebar.php          | 13 ++++++-------
 11 files changed, 8 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 admin.php
 mode change 100644 => 100755 article.php
 mode change 100644 => 100755 beer.php
 mode change 100644 => 100755 brewery.php
 mode change 100644 => 100755 logout.php
 mode change 100644 => 100755 myList.php
 mode change 100644 => 100755 passChange.php
 mode change 100644 => 100755 search.php
 mode change 100644 => 100755 verify.php

diff --git a/admin.php b/admin.php
old mode 100644
new mode 100755
diff --git a/article.php b/article.php
old mode 100644
new mode 100755
diff --git a/beer.php b/beer.php
old mode 100644
new mode 100755
diff --git a/brewery.php b/brewery.php
old mode 100644
new mode 100755
diff --git a/controller/listLatest.php b/controller/listLatest.php
index ba9e458..6f332da 100644
--- a/controller/listLatest.php
+++ b/controller/listLatest.php
@@ -1,6 +1,6 @@
 <?php
 
-function listLatestBeers($pdo, $where){
+/*function listLatestBeers($pdo, $where){
   $conn = $pdo;
   try {
     $sql = "SELECT * FROM beer ORDER BY time DESC LIMIT $where";
@@ -26,7 +26,7 @@ function listLatestBreweries($pdo, $where){
     echo "Error in Breweries: " . $e->getMessage();
   }
   return $arrayOfBreweries;
-}
+}*/
 
 function listLatestUsers($pdo, $where){
   $conn = $pdo;
diff --git a/logout.php b/logout.php
old mode 100644
new mode 100755
diff --git a/myList.php b/myList.php
old mode 100644
new mode 100755
diff --git a/passChange.php b/passChange.php
old mode 100644
new mode 100755
diff --git a/search.php b/search.php
old mode 100644
new mode 100755
index 11ea4f8..2d2aa33
--- a/search.php
+++ b/search.php
@@ -62,7 +62,6 @@ if($_GET["type"]=="article"){
 if($_GET["type"]=="all"){
     $name=$_GET["keyword"];
     $array=listArticleByName($pdo, $name);
-    foreach($arrayOfBeers as $row):
         foreach($array as $row) :
             echo "<div class=\"box\">";
             echo "<article>";
diff --git a/verify.php b/verify.php
old mode 100644
new mode 100755
diff --git a/view/sidebar.php b/view/sidebar.php
index f10d044..9fa6df7 100755
--- a/view/sidebar.php
+++ b/view/sidebar.php
@@ -1,8 +1,11 @@
 <?php
-require_once("model/db.php");
-require_once("controller/listLatest.php");
+require("model/db.php");
+echo "kappa";
+require("controller/listLatest.php");
+echo "kappa";
 ?>
 
+
 <aside>
 
 <?php
@@ -22,11 +25,7 @@ $title = "Breweries";
 $where = "5";
 $what = "brewery";
 
-<<<<<<< HEAD
-$array = listBreweriesNAN($pdo);
-=======
-$array = listBeersByBreweryNAN($pdo);
->>>>>>> 93e36a779e5f963953576602543f9564d860498b
+$array = listBreweriesNAN( $pdo );
 
 require("sidebar/sidebarLister.php");