From 7e73139acebbc50c826032121bc95999ea17fa32 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:02:45 +0100
Subject: [PATCH 1/6] make '+' button redirect to /recipe/new

---
 Views/common/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Views/common/header.php b/Views/common/header.php
index 2bee9e0..5d2967a 100644
--- a/Views/common/header.php
+++ b/Views/common/header.php
@@ -2,7 +2,7 @@
 $array_header = array(
     '<img src="/static/img/logo.png" alt="Logo">' => "/",
     "Recette" => "/Recipe/view/36",
-    "+" => "/recipe/edit",
+    "+" => "/recipe/new",
     "Rechercher" => "rechercher",
     '<img src="/static/img/default_user.svg" type="image/svg+xml">' => "/user/view"
 );

From 961cd27e882b6a549f62ba7a4ac32083ff23ef2d Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:03:17 +0100
Subject: [PATCH 2/6] move debug echo in recipe/edit

---
 Views/recipe/edit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Views/recipe/edit.php b/Views/recipe/edit.php
index 3182faf..dabc63b 100644
--- a/Views/recipe/edit.php
+++ b/Views/recipe/edit.php
@@ -3,7 +3,6 @@ function getOrEmpty($A_Dict, $S_keyName) {
     if (isset($A_Dict[$S_keyName])) {
         return $A_Dict[$S_keyName];
     } else {
-        echo "$S_keyName EMPTY";
         if($S_keyName == "TYPE" || $S_keyName == "INGREDIENTS")
             return array();
         return "";

From ff6ac2eb4976f4a6a50122c7199ad99dfc6fcb6d Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:03:23 +0100
Subject: [PATCH 3/6] add action recipe/new

---
 Controllers/RecipeController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index 57e62f9..70f0cdc 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -47,6 +47,11 @@ final class RecipeController
         View::show("recipe/edit", $A_returnArray);
     }
 
+    public function newAction(Array $A_urlParams = null, Array $A_postParams = null)
+    {
+        View::show("recipe/edit", array());
+    }
+
     public function searchAction(Array $A_urlParams = null, Array $A_postParams = null, Array $A_getParams = null)
     {
         if (isset($A_getParams["query"])) {

From 8871d9bb21df89a18da89f347b16f3de7e452fe4 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:09:53 +0100
Subject: [PATCH 4/6] modify structure sent to recipe/edit to include POST_URI

---
 Controllers/RecipeController.php | 10 +++++-----
 Views/recipe/edit.php            | 29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index 70f0cdc..51962c3 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -35,21 +35,21 @@ final class RecipeController
         }
 
         $O_recipeModel = new RecipeModel();
-        $A_returnArray = $O_recipeModel->getFullRecipe($A_urlParams[0]);
-        if ($A_returnArray === null) {
+        $A_recipe = $O_recipeModel->getFullRecipe($A_urlParams[0]);
+        if ($A_recipe === null) {
             throw new HTTPSpecialCaseException(404);
         }
 
-        if ($A_returnArray["AUTHOR_ID"] !== $_SESSION["ID"]) {
+        if ($A_recipe["AUTHOR_ID"] !== $_SESSION["ID"]) {
             throw new HTTPSpecialCaseException(400, "You are not the owner of this recipe");
         }
 
-        View::show("recipe/edit", $A_returnArray);
+        View::show("recipe/edit", array("POST_URI" => "/recipe/update", "RECIPE" => $A_recipe));
     }
 
     public function newAction(Array $A_urlParams = null, Array $A_postParams = null)
     {
-        View::show("recipe/edit", array());
+        View::show("recipe/edit", array("POST_URI" => "/recipe/create", "RECIPE" => array()));
     }
 
     public function searchAction(Array $A_urlParams = null, Array $A_postParams = null, Array $A_getParams = null)
diff --git a/Views/recipe/edit.php b/Views/recipe/edit.php
index dabc63b..452122c 100644
--- a/Views/recipe/edit.php
+++ b/Views/recipe/edit.php
@@ -1,4 +1,7 @@
 <?php
+
+$A_recipe = $A_view["RECIPE"];
+
 function getOrEmpty($A_Dict, $S_keyName) {
     if (isset($A_Dict[$S_keyName])) {
         return $A_Dict[$S_keyName];
@@ -12,42 +15,42 @@ function getOrEmpty($A_Dict, $S_keyName) {
 
 <main>
 
-    <form action="/recipe/save" method="post">
+    <form action="<?= $A_view["POST_URI"] ?>" method="post">
 
         <label for="recipeImage">Entrez l'image de haut de page&nbsp;:</label>
         <input type="file" name="recipeImage" id="recipeImage" required>
 
         <label for="recipeName">Nom de la recette&nbsp;:</label>
-        <input type="text" name="recipeName" id="recipeName" placeholder="Nom du plat" value="<?= getOrEmpty($A_view, "NAME") ?>" required>
+        <input type="text" name="recipeName" id="recipeName" placeholder="Nom du plat" value="<?= getOrEmpty($A_recipe, "NAME") ?>" required>
         </br>
         <label for="recipeDescription">Description de la recette</label>
         </br>
-        <textarea name="recipeDescription" id="recipeDescription"><?= getOrEmpty($A_view, "DESC") ?></textarea>
+        <textarea name="recipeDescription" id="recipeDescription"><?= getOrEmpty($A_recipe, "DESC") ?></textarea>
 
         <section>
             <h1>Informations alimentaires</h1>
 
             <label for="recipeFifficulte">Niveau de difficulé&nbsp;:</label>
             <select name="recipeDifficulte" id="recipeDifficulte" required>
-                <option value="tresFacile" <?= getOrEmpty($A_view, "DIFFICULTY_NAME")=="Très facile"? 'selected="selected"' : "" ?> >Très facile</option>
-                <option value="facile" <?= getOrEmpty($A_view, "DIFFICULTY_NAME")=="Facile"? 'selected="selected"' : "" ?>>Facile</option>
-                <option value="moyen" <?= getOrEmpty($A_view, "DIFFICULTY_NAME")=="Moyen"? 'selected="selected"' : "" ?>>Moyen</option>
-                <option value="difficile" <?= getOrEmpty($A_view, "DIFFICULTY_NAME")=="Difficle"? 'selected="selected"' : "" ?>>Difficile</option>
+                <option value="tresFacile" <?= getOrEmpty($A_recipe, "DIFFICULTY_NAME")=="Très facile"? 'selected="selected"' : "" ?> >Très facile</option>
+                <option value="facile" <?= getOrEmpty($A_recipe, "DIFFICULTY_NAME")=="Facile"? 'selected="selected"' : "" ?>>Facile</option>
+                <option value="moyen" <?= getOrEmpty($A_recipe, "DIFFICULTY_NAME")=="Moyen"? 'selected="selected"' : "" ?>>Moyen</option>
+                <option value="difficile" <?= getOrEmpty($A_recipe, "DIFFICULTY_NAME")=="Difficle"? 'selected="selected"' : "" ?>>Difficile</option>
             </select>
 
 
             <legend>Type de plat&nbsp;:</legend>
-            <input type="checkbox" name="recipeVegan" id="recipeVegan" <?= in_array("Végan", getOrEmpty($A_view, "TYPE"))? "checked":"" ?> >
+            <input type="checkbox" name="recipeVegan" id="recipeVegan" <?= in_array("Végan", getOrEmpty($A_recipe, "TYPE"))? "checked":"" ?> >
             <label for="recipeVegan">Végan</label>
-            <input type="checkbox" name="recipeLactoseFree" id="recipeLactoseFree" <?= in_array("Sans lactose", getOrEmpty($A_view, "TYPE"))? "checked":"" ?> >
+            <input type="checkbox" name="recipeLactoseFree" id="recipeLactoseFree" <?= in_array("Sans lactose", getOrEmpty($A_recipe, "TYPE"))? "checked":"" ?> >
             <label for="recipeLactoseFree">Sans lactose</label>
-            <input type="checkbox" name="recipeGlutenFree" id="recipeGlutenFree" <?= in_array("Sans gluten", getOrEmpty($A_view, "TYPE"))? "checked":"" ?> >
+            <input type="checkbox" name="recipeGlutenFree" id="recipeGlutenFree" <?= in_array("Sans gluten", getOrEmpty($A_recipe, "TYPE"))? "checked":"" ?> >
             <label for="recipeGlutenFree">Sans gluten</label>
 
             </br>
 
             <label for="recipeTime">Temps de préparation&nbsp;:</label>
-            <input type="number" name="recipeTime" id="recipeTime" min="5" max="1500" step="5" placeholder="Temps de préparation" value="<?= getOrEmpty($A_view, "TIME") ?>" required>
+            <input type="number" name="recipeTime" id="recipeTime" min="5" max="1500" step="5" placeholder="Temps de préparation" value="<?= getOrEmpty($A_recipe, "TIME") ?>" required>
             <label for="recipeTime">minutes</label>
 
         </section>
@@ -59,7 +62,7 @@ function getOrEmpty($A_Dict, $S_keyName) {
 
             <ul class="recipeIngredients">
                 <?php
-                $ingredients = getOrEmpty($A_view, "INGREDIENTS");
+                $ingredients = getOrEmpty($A_recipe, "INGREDIENTS");
                 if(sizeof($ingredients) > 0) {
                     $i = 1;
                     foreach($ingredients as $ingredient) {
@@ -97,7 +100,7 @@ function getOrEmpty($A_Dict, $S_keyName) {
 
             <ol class="recipeInstructions">
                 <?php
-                    $preparation = getOrEmpty($A_view, "RECIPE");
+                    $preparation = getOrEmpty($A_recipe, "RECIPE");
                     if(!empty($preparation)) {
                         $steps = explode("\n", $preparation);
                         $i = 1;

From ef61cbcb3e51a2a555461c8ce4d4e5b5c7f4cac8 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:12:16 +0100
Subject: [PATCH 5/6] allow admins to edit any recipe

---
 Controllers/RecipeController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index 51962c3..d57a834 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -41,7 +41,9 @@ final class RecipeController
         }
 
         if ($A_recipe["AUTHOR_ID"] !== $_SESSION["ID"]) {
-            throw new HTTPSpecialCaseException(400, "You are not the owner of this recipe");
+            if(!Session::is_admin()){
+                throw new HTTPSpecialCaseException(400, "You are not the owner of this recipe");
+            }
         }
 
         View::show("recipe/edit", array("POST_URI" => "/recipe/update", "RECIPE" => $A_recipe));

From 1a1226700b07309dbbb6b63080fdcd8c09b493e1 Mon Sep 17 00:00:00 2001
From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:12:29 +0100
Subject: [PATCH 6/6] require login to create a new recipe

---
 Controllers/RecipeController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index d57a834..ede024f 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -51,6 +51,8 @@ final class RecipeController
 
     public function newAction(Array $A_urlParams = null, Array $A_postParams = null)
     {
+        Session::login_or_die();
+
         View::show("recipe/edit", array("POST_URI" => "/recipe/create", "RECIPE" => array()));
     }