From f878600423eb5e5dbf9bdbb5b9e1a3487dd303a3 Mon Sep 17 00:00:00 2001
From: xf0r3m <jakubstasinski@protonmail.com>
Date: Fri, 11 Aug 2023 10:59:07 +0200
Subject: [PATCH] =?utf8?q?Dodanie=20mo=C5=BCliwo=C5=9Bci=20zapisania=20zg?=
 =?utf8?q?=C5=82osze=C5=84=20(Zachowane=20zg=C5=82oszenia)=20w=20taki=20sp?=
 =?utf8?q?os=C3=B3b=20aby=20nie=20wy=C5=9Bwieta=C5=82y=20si=C4=99=20na=20l?=
 =?utf8?q?i=C5=9Bcie=20zg=C5=82osze=C5=84=20do=20rozpatrzenia,=20ale=20tak?=
 =?utf8?q?=C5=BCe=20nie=20by=C5=82y=20publicznie=20widoczne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bugs.php               |  2 +-
 forms/chbugstate.php   |  2 +-
 history.php            | 22 ++++++++++++++++++++++
 index.php              |  2 ++
 library.php            |  4 ++--
 modules/chbugstate.php |  4 ++--
 navbar.php             |  1 +
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 history.php

diff --git a/bugs.php b/bugs.php
index 9cbdef1..d3c942a 100644
--- a/bugs.php
+++ b/bugs.php
@@ -16,7 +16,7 @@
   </div>
   <div class="card-body">
 <?php
-  $cond = "state >= 3 ORDER BY id DESC";
+  $cond = "state >= 3 AND state < 5 ORDER BY id DESC";
   presentListBugs($connection, $cond);
 ?>
   </div>
diff --git a/forms/chbugstate.php b/forms/chbugstate.php
index 5244cbf..a7226c7 100644
--- a/forms/chbugstate.php
+++ b/forms/chbugstate.php
@@ -4,7 +4,7 @@
     <div class="col">
       <select class="form-select" name="chBugState">
         <?php
-        $stateTbl = array('Przyjęty', 'Potwierdzony', 'W trakcie', 'Zakończony', 'Odrzucony', 'Do usunięcia');
+        $stateTbl = array('Przyjęty', 'Potwierdzony', 'W trakcie', 'Zakończony', 'Odrzucony', 'Zachowany', 'Do usunięcia');
         $tableName = 'bug';
         $columnScheme = "state";
         $whereValue = "id = " . intval($row[0]);
diff --git a/history.php b/history.php
new file mode 100644
index 0000000..41a3b67
--- /dev/null
+++ b/history.php
@@ -0,0 +1,22 @@
+<?php
+  if ( session_status() != 2 ) {
+    session_start();
+  }
+  if ( isset($_SESSION["username"]) ) {
+?>
+<div class="card card-spacer">
+  <div class="card-header">
+    <h4>Zgłoszenia zachowane:</h4>
+  </div>
+  <div class="card-body">
+<?php
+  $cond = "state = 5 ORDER BY id DESC";
+  presentListBugs($connection, $cond);
+?>
+  </div>
+</div>
+<?php
+  } else {
+    include('403.php');
+  }
+?>
diff --git a/index.php b/index.php
index 2c889bc..16a29cc 100755
--- a/index.php
+++ b/index.php
@@ -53,6 +53,8 @@
               include('changelog.php');
             } else if ($_GET["p"] == "viewchlog") {
               include('viewchlog.php');
+            } else if ($_GET["p"] == "history") {
+              include('history.php');
             } else {
               include('404.php');
             }
diff --git a/library.php b/library.php
index 3df56dc..81312ea 100644
--- a/library.php
+++ b/library.php
@@ -108,7 +108,7 @@ function presentListBugs($connection, $cond) {
   $columnScheme = "*";
   $whereValue = $cond;
   $result = dbQuery($connection, $tableName, $columnScheme, $whereValue);
-  if ( mysqli_num_rows($result) > 0 ) {
+  if ( isset($result) && mysqli_num_rows($result) > 0 ) {
     echo "<table class=\"table\">";
     echo "<thead><tr><th scope=\"col\">#Lp.</th><th scope=\"col\">#id</th><th scope=\"col\">Produkt</th><th scope=\"col\">Komponent</th>";
     echo "<th scope=\"col\">Rodzaj zgłosz.</th><th scope=\"col\">Temat zgłosz.</th><th scope=\"col\">Opis zgłosz.</th>";
@@ -130,7 +130,7 @@ function presentListBugs($connection, $cond) {
       echo getFieldValue($result3);
       echo "</th><td>" . $row[3] . "</td><td>" . $row[4] . "</td><td>" . nl2br($row[5]) . "</td>";
       echo "<td>";
-      $stateTbl = array("Przyjęty", "Potwierdzony", "W trakcie", "Zakończony", "Odrzucony");
+      $stateTbl = array("Przyjęty", "Potwierdzony", "W trakcie", "Zakończony", "Odrzucony", "Zachowany");
       $index = $row[6];
       echo $stateTbl[$index]; 
       echo "</td>";
diff --git a/modules/chbugstate.php b/modules/chbugstate.php
index e0f1ba7..8828d38 100644
--- a/modules/chbugstate.php
+++ b/modules/chbugstate.php
@@ -3,7 +3,7 @@
   $columnScheme = "state";
   $whereValue = "id = " . intval($_POST["bugId"]);
   $newStateId = intval($_POST["chBugState"]);
-  if ( $newStateId == 5 ) {
+  if ( $newStateId == 6 ) {
     $tableName = 'comment';
     $whereValue = "bugId = " . intval($_POST["bugId"]);
     $result = dbDel($connection, $tableName, $whereValue);
@@ -35,7 +35,7 @@
       echo "<div class=\"alert alert-danger\" role=\"alert\">Status zgłoszenia nie został zmieniony</div>";
     }
 
-    $stateTbl = array("Przyjęty", "Potwierdzony", "W trakcie", "Zakończony", "Odrzucony");
+    $stateTbl = array("Przyjęty", "Potwierdzony", "W trakcie", "Zakończony", "Odrzucony", "Zachowany");
 
     $newState = $stateTbl[$newStateId];
     $oldState = $stateTbl[$oldStateId]; 
diff --git a/navbar.php b/navbar.php
index 28f0ef7..64139bb 100755
--- a/navbar.php
+++ b/navbar.php
@@ -15,6 +15,7 @@
             <?php
               session_start();
               if ( isset($_SESSION["username"]) ) {
+                echo "<li class=\"nav-item\"><a class=\"nav-link frontpage-link\" href=\"?p=history\">Zachowane zgłoszenia</a></li>";
                 echo "<li class=\"nav-item\"><a class=\"nav-link frontpage-link\" href=\"?p=siteListProducts&site=changelog\">Lista zmian</a></li>";
                 echo "<li class=\"nav-item\"><a class=\"nav-link frontpage-link\" href=\"?p=settings\">Ustawienia</a></li>";
                 echo "<li class=\"nav-item\"><span class=\"nav-link navbar-greetings\">Witaj, " . $_SESSION["username"] . "! (<a class=\"frontpage-link\" href=\"?p=logout\">Wyloguj się</a>)</span></li>";
-- 
2.39.5