From ccb1d7e8f17d24ff12900d41f1ec9e6a3cb16dda Mon Sep 17 00:00:00 2001
From: antux18 <antux18@gmail.com>
Date: Fri, 1 Sep 2023 19:44:54 -0400
Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20page=20de=20confirmation=20pour?=
 =?UTF-8?q?=20le=20choix=20de=20l'=C3=A9quipe.=20Modification=20du=20style?=
 =?UTF-8?q?.=20Corrections=20mineures.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/teams.db          | Bin 45056 -> 45056 bytes
 index.php              |   2 +-
 puzzles.php            |  24 +++++++-------
 require/locales/en.php |   7 ++++
 require/locales/fr.php |   7 ++++
 style.css              |   3 +-
 team_confirm.php       |  73 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 101 insertions(+), 15 deletions(-)
 create mode 100644 team_confirm.php

diff --git a/data/teams.db b/data/teams.db
index 82b9f181c0e6401eda49c800c67b2070289ea4ce..27d92d3153fce3188cfb391d4913638c9c85c012 100644
GIT binary patch
delta 718
zcmZp8z|`=7X@WGbF9QPuHxRP}G3!JPb4K5d3G?miBYA;*CjM^>{J;6X@j25Q+E8NQ
zW<!B)UM9x98ynX%PX6XER?qupK%qW~)&t#d!pp=YvaykkY4W#tK|vN^TyOv}GZ1qD
sG56++^7;asAIR_IpCrIh&sjI1Fqf{@Z*1)0U}9^6g@A&<#tHgt07PEWpa1{>

literal 45056
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
QCft4{tIXB28PqQQ7orxx0ssI2

diff --git a/index.php b/index.php
index 6d78f9c..5e45407 100644
--- a/index.php
+++ b/index.php
@@ -39,7 +39,7 @@
             <article>
                 <ul>
                     <?php foreach ($teams as $team) : ?>
-                        <li><a href="puzzles.php?team=<?= $team["id"] ?>"><?= $tr["home"]["team"] . $team["id"] ?></a></li>
+                        <li><a href="team_confirm.php?team=<?= $team["id"] ?>"><?= $tr["home"]["team"] . $team["id"] ?></a></li>
                     <?php endforeach; ?>
                 </ul>
             </article>
diff --git a/puzzles.php b/puzzles.php
index e572353..f9b2d50 100644
--- a/puzzles.php
+++ b/puzzles.php
@@ -14,24 +14,22 @@
         $stmt->bindValue(":id", $team_id);
         $stmt->execute();
 
-        if (empty($stmt->fetchAll())) {
+        if (empty($stmt->fetch())) {
             header("Location: index.php");
             die();
         }
 
         else {
-            // On crée un cookie pour enregistrer l'équipe sélectionnée si ce n'est pas fait :
-            if (!isset($_COOKIE["team"])) {
-                setcookie(
-                    "team",
-                    $team_id,
-                    time() + (365 * 24 * 60 * 60),
-                    "/",
-                    "",
-                    false,
-                    false
-                );
-            }
+            // On crée un cookie pour enregistrer l'équipe sélectionnée :
+            setcookie(
+                "team",
+                $team_id,
+                time() + (365 * 24 * 60 * 60),
+                "/",
+                "",
+                false,
+                false
+            );
 
             // On vérifie si l'équipe a débloqué l'énigme bonus :
             $stmt = $database->pdo_teams->prepare("SELECT * FROM teams WHERE id = :id");
diff --git a/require/locales/en.php b/require/locales/en.php
index 3b3fca3..894141d 100644
--- a/require/locales/en.php
+++ b/require/locales/en.php
@@ -2,11 +2,13 @@
     $tr = [
         "tab_title" => [
             "home" => "Home - Lycée Pange Code Hunt",
+            "team_confirm" => "Team confirmation - Lycée Pange Code Hunt",
             "puzzles" => "Puzzles list - Lycée Pange Code Hunt",
             "article" => "Puzzle - Lycée Pange Code Hunt"
         ],
         "page_title" => [
             "home" => "Code Hunt",
+            "team_confirm" => "Team confirmation",
             "puzzles" => "Puzzles list for team n°",
             "article" => "Puzzle n°"
         ],
@@ -15,6 +17,11 @@
             "message" => "Select your team to begin :",
             "team" => "Team n°"
         ],
+        "team_confirm" => [
+            "subtitle" => "Please make sure you selected the right team.",
+            "message" => "Your name must appear on the following list : ",
+            "button" => "Yes, this is my team !"
+        ],
         "article" => [
             "message" => "This puzzle describes a specific place. Head to that place, then scan the QR code you'll find there.",
             "success" => "Well done ! Your team solved this puzzle !",
diff --git a/require/locales/fr.php b/require/locales/fr.php
index 6872f0d..dd252de 100644
--- a/require/locales/fr.php
+++ b/require/locales/fr.php
@@ -2,11 +2,13 @@
     $tr = [
         "tab_title" => [
             "home" => "Accueil - Chasse au code Lycée Pange",
+            "team_confirm" => "Confirmation du choix d'équipe - Chasse au code Lycée Pange",
             "puzzles" => "Liste des énigmes - Chasse au code Lycée Pange",
             "article" => "Énigme - Chasse au code Lycée Pange"
         ],
         "page_title" => [
             "home" => "Chasse au code",
+            "team_confirm" => "Confirmation du choix d'équipe",
             "puzzles" => "Liste des puzzles pour l'équipe n°",
             "article" => "Énigme n°"
         ],
@@ -15,6 +17,11 @@
             "message" => "Pour commencer, veuillez choisir votre groupe :",
             "team" => "Équipe n°"
         ],
+        "team_confirm" => [
+            "subtitle" => "Assurez-vous d'avoir sélectionné la bonne équipe.",
+            "message" => "Votre nom doit figurer dans la liste suivante : ",
+            "button" => "Oui, c'est bien mon équipe !"
+        ],
         "article" => [
             "message" => "Cette énigme décrit un endroit précis. Dirigez-vous vers cet endroit, puis scannez le QR code que vous-y trouverez.",
             "success" => "Bien joué ! Votre équipe a résolu cette énigme !",
diff --git a/style.css b/style.css
index 8511a5f..fd062b9 100644
--- a/style.css
+++ b/style.css
@@ -4,6 +4,7 @@
     --bg-light: #a4a4a4;
     --fg: #ffffff;
     --hl: #8080ff;
+    --hl-light: #aeaeff;
 }
 
 body {
@@ -70,7 +71,7 @@ input[type="submit"], button {
 }
 
 input[type="submit"]:hover, button:hover {
-    background: var(--bg-light);
+    background: var(--hl-light);
     color: var(--fg);
 }
 
diff --git a/team_confirm.php b/team_confirm.php
new file mode 100644
index 0000000..5d76b32
--- /dev/null
+++ b/team_confirm.php
@@ -0,0 +1,73 @@
+<?php
+    require_once "require/base.php";
+
+    $team_id = -1;
+
+    $database = new Database();
+
+    if (isset($_GET["team"])) {
+        $team_id = htmlspecialchars($_GET["team"]);
+
+        // Vérification de l'existence du groupe :
+        $stmt = $database->pdo_teams->prepare("SELECT * FROM teams WHERE id == :id");
+        $stmt->bindValue(":id", $team_id);
+        $stmt->execute();
+
+        if (empty($stmt->fetch())) {
+            header("Location: index.php");
+            die();
+        }
+
+        else {
+            // Recherche des membres du groupe :
+            $stmt = $database->pdo_teams->prepare("SELECT * FROM members WHERE team_id == :id");
+            $stmt->bindValue(":id", $team_id);
+            $stmt->execute();
+            $members = $stmt->fetchAll();
+        }
+    }
+
+    else {
+        header("Location: index.php");
+        die();
+    }
+?>
+
+<!DOCTYPE html>
+<html lang="fr">
+    <head>
+        <?php
+            require_once $rq_path . "head.php";
+        ?>
+        <title><?= $tr["tab_title"]["team_confirm"] ?></title>
+    </head>
+    <body>
+        <header>
+            <?php
+                require_once $rq_path . "nav.php";
+            ?>
+        </header>
+        <main>
+            <header>
+                <h1><?= $tr["page_title"]["team_confirm"] ?></h1>
+                <p><?= $tr["team_confirm"]["subtitle"] ?></p>
+                <p>
+                    <?= $tr["team_confirm"]["message"] ?>
+                    <?php foreach ($members as $member) : ?>
+                        <?= $member[0] ?> &nbsp;
+                    <?php endforeach; ?>
+                </p>
+                <a href="puzzles.php?team=<?= $team_id ?>">
+                    <button><?= $tr["team_confirm"]["button"] ?></button>
+                </a>
+            </header>
+            <article>
+            </article>
+        </main>
+        <footer>
+            <?php
+                require_once $rq_path . "footer.php";
+            ?>
+        </footer>
+    </body>
+</html>
\ No newline at end of file