diff --git a/Dockerfile b/Dockerfile
index 643dae5293f02e5eb93f8ea5daaf536af080d83e..30e22626b28b17344261408f0060b345cc7a917c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM php:8.0-apache
-EXPOSE 8080
+FROM php:8.1.2-apache
+EXPOSE 8081
RUN apt-get update
diff --git a/public/components/Navbar.php b/public/components/Navbar.php
index e09ed430ff67e8aef7087e74997ee52bd7a87f16..c2c26e9ff5117b8a5b045fffd2e161079f5cf957 100644
--- a/public/components/Navbar.php
+++ b/public/components/Navbar.php
@@ -6,7 +6,10 @@
<?php
// Check if the user is logged in (You will need to implement this logic)
$loggedIn = isset($_SESSION['user_id']);
- $isAdmin = isset($_SESSION['isAdmin']) && $_SESSION['isAdmin'] === 1;
+ $isAdmin = isset($_SESSION['isAdmin']) && $_SESSION['isAdmin'];
+// echo isset($_SESSION['isAdmin'])===1;
+// echo ('<script>console.log('.$isAdmin.')</script>') ;
+// echo "<li><a>$loggedIn</a></li>";
if ($isAdmin) {
echo '<li><a href="user">Manage Users</a></li>';
}
diff --git a/public/view/cats.php b/public/view/cats.php
index 198d530ae67e7b2512fab15220b37005aae76121..c52f794736c9fa36b405e1a298650c9a1ccc192e 100644
--- a/public/view/cats.php
+++ b/public/view/cats.php
@@ -66,7 +66,7 @@
<div class="cat-cards-container">
<?php foreach ($responseCats as $cat): ?>
<div class="cat-card" id="cat-card-<?= $cat['cat_id'] ?>">
- <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin'] === 1): ?>
+ <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin']): ?>
<!-- Edit and delete buttons for admin users -->
<a class="delete-button" href="/cat/<?= htmlspecialchars($cat['cat_id']) ?>">X</a>
<?php endif; ?>
@@ -106,7 +106,7 @@
<source src="public/<?= htmlspecialchars($cat['sound_path']) ?>" type="audio/mp4">
<source src="public/<?= htmlspecialchars($cat['sound_path']) ?>" type="audio/mp3">
</audio>
- <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin'] === 1): ?>
+ <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin']): ?>
<!-- Edit and delete buttons for admin users -->
<button class="edit-button" onclick="editCat(<?= $cat['cat_id'] ?>)">Edit</button>
@@ -115,7 +115,7 @@
<?php endforeach; ?>
</div>
<?php require_once(PROJECT_ROOT_PATH . '/public/components/Pagination.php'); ?>
- <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin'] === 1): ?>
+ <?php if (isset($_SESSION['isAdmin']) && $_SESSION['isAdmin']): ?>
<div>
<div id="edit-cat-modal" class="modal">
<div class="modal-content">
diff --git a/public/view/sighting.php b/public/view/sighting.php
index ab2b770af978c89788475fa7f9a9a93c5d9a285f..b24a57289b3faa11fe9518f25a3407f8349c96ce 100644
--- a/public/view/sighting.php
+++ b/public/view/sighting.php
@@ -37,7 +37,7 @@
<div class="sighting-cards-container">
<?php foreach ($responseSightings as $sighting):?>
<div class="sighting-card" id="sighting-card-<?=$sighting['sighting_id']?>">
- <?php if ($_SESSION['user_id']!=null &&$_SESSION['user_id']==$sighting['user_id']){
+ <?php if (isset($_SESSION['user_id']) &&$_SESSION['user_id']==$sighting['user_id']){
echo ("<a class=\"delete-button\" href='sighting/" . $sighting['sighting_id'] . "'>X<a>");
}?>
<!-- --><?php //if ($_SESSION['user_id']===$sighting['user_id']): ?>
@@ -68,7 +68,7 @@
<?=htmlspecialchars($sighting['sighting_description'])?>
</p>
<img class="cat-image" src="public/<?= htmlspecialchars($sighting['image_url'])?>" alt="cat_image">
- <?php if ($_SESSION['user_id']===$sighting['user_id']): ?>
+ <?php if (isset($_SESSION['user_id'])&&$_SESSION['user_id']===$sighting['user_id']): ?>
<a class="edit-button" onclick="editSighting(<?= $sighting['sighting_id']?>)">Edit</a>
<?php endif;?>
</div>
diff --git a/src/controllers/cat/CatController.php b/src/controllers/cat/CatController.php
index 9289d2dad20840003fa64617a10dd2757b210716..478338d7d58853a5123a4a3a0e5ed87e20a24a00 100644
--- a/src/controllers/cat/CatController.php
+++ b/src/controllers/cat/CatController.php
@@ -26,7 +26,7 @@ class CatController extends BaseController
public function get($urlParams)
{
if (!$urlParams) {
- if (!$_GET["pageNo"] || !$_GET["pageSize"]) {
+ if (!isset($_GET["pageNo"]) || !$_GET["pageNo"] || !$_GET["pageSize"]) {
header("Location: /cat?pageNo=1&pageSize=10");
}
$cats = $this->srv->getAll([
diff --git a/src/controllers/sightings/SightingController.php b/src/controllers/sightings/SightingController.php
index 78e31a6ef6ead2e969de93f95243092fd1e1717f..11288bc8fef6e879d560f36a3d3ee6c0f90b5dca 100644
--- a/src/controllers/sightings/SightingController.php
+++ b/src/controllers/sightings/SightingController.php
@@ -27,7 +27,7 @@ class SightingController extends BaseController
public function get($urlParams)
{
if (!$urlParams) {
- if (!$_GET["pageNo"] || !$_GET["pageSize"]) {
+ if (!isset($_GET["pageNo"]) || !$_GET["pageNo"] || !$_GET["pageSize"]) {
header("Location: /sighting?pageNo=1&pageSize=10");
}
$sightings = $this->srv->getAll([
@@ -75,7 +75,7 @@ class SightingController extends BaseController
$sighting_description = $_POST['sighting_description'];
$image_url = null;
$uploaded_file = handleFileUpload('image_url', 'public/images/');
- echo $uploaded_file;
+// echo $uploaded_file;
if ($uploaded_file !== null) {
$image_url = "images/" . $uploaded_file;
}
@@ -89,6 +89,7 @@ class SightingController extends BaseController
];
if ($image_url !== null) {
+// echo ("console.log(".$image_url.")");
$sightingData['image_url'] = $image_url;
}
@@ -121,9 +122,9 @@ class SightingController extends BaseController
'sighting_description' => $sighting_description,
'image_url' => $image_url,
];
- foreach ($sightingData as $key => $value) {
- echo ($key . ":" . $value . "<br>");
- }
+// foreach ($sightingData as $key => $value) {
+// echo ($key . ":" . $value . "<br>");
+// }
$sighting = $this->srv->createSighting($sightingData);
if ($sighting) {
$response = new BaseResponse(true, $sighting->toResponse(), "Sighting successfully updated", 200);
diff --git a/src/repositories/SightingRepository.php b/src/repositories/SightingRepository.php
index 7a6feaced341a82270220732be1b268a8f5863ac..e74a6e528d93160196f80507198425ff73d7ebba 100644
--- a/src/repositories/SightingRepository.php
+++ b/src/repositories/SightingRepository.php
@@ -61,31 +61,31 @@ class SightingRepository extends BaseRepository
// }
public function join($columns = "*",$where=[],$orderBy=[],$page=1,$perPage=10,$isDesc=false){
$query = "SELECT $columns FROM sightings s join (cats c, users u) on (c.cat_id=s.cat_id and u.user_id=s.user_id)";
- echo "aaaa";
- echo "<br>";
- echo $query;
+// echo "aaaa";
+// echo "<br>";
+// echo $query;
// $query = "select * from cats c join sightings s on c.cat_id=s.cat_id join users u on s.user_id=u.user_id";
if (!empty($where)){
$query .= " WHERE ".implode(" AND ",$where);
- echo "<br>";
- echo $query;
+// echo "<br>";
+// echo $query;
}
- echo ("<br>");
- echo $query;
- echo ("<br>");
+// echo ("<br>");
+// echo $query;
+// echo ("<br>");
if (!empty($orderBy)){
$orderByWithDesc = array_map(function ($column) use ($isDesc){
return $column .($isDesc && $isDesc!="false"?" DESC": "");
},$orderBy);
$query .= " ORDER BY ".implode(", ", $orderByWithDesc);
}
- echo $query;
- echo ("<br>");
+
if (!empty($perPage)) {
$offset = ($page - 1) * $perPage;
$query .= " LIMIT $perPage OFFSET $offset";
}
-
+ echo $query;
+ echo ("<br>");
$stmt = $this->pdo->prepare($query);
$stmt->execute();
diff --git a/src/services/SightingSrv.php b/src/services/SightingSrv.php
index 21b3f9596743adb7f07a62c83908e9d6db14196f..e02d2c60f63f554882ebbaa6db88ba17fcf842f7 100644
--- a/src/services/SightingSrv.php
+++ b/src/services/SightingSrv.php
@@ -30,16 +30,16 @@ class SightingSrv extends BaseSrv
if ($search) {
$where[] = "(name LIKE '%$search%' OR sighting_location LIKE '%$search%' OR username LIKE '%$search%')";
}
- foreach ($where as $w) {
- echo $w;
- }
+// foreach ($where as $w) {
+// echo $w;
+// }
$order = [];
if ($config["order"]) {
$order = explode(",", $config["order"]);
}
- foreach ($order as $o) {
- echo $o;
- }
+// foreach ($order as $o) {
+// echo $o;
+// }
$res = $this->repository->join("*", $where, $order, $config["pageNo"], $config['pageSize'], $config['isDesc']);
// foreach ($res as $re) {