From 0048d676a2bed3addadea670fa5d802a314af473 Mon Sep 17 00:00:00 2001 From: Debulois Date: Fri, 6 May 2022 22:01:01 +0200 Subject: Correction des imports et supression des trailin white space pour le déploiement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Template/Include/incl_table_myMission.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Template/Include/incl_table_myMission.php') diff --git a/Template/Include/incl_table_myMission.php b/Template/Include/incl_table_myMission.php index e55346d..96182ae 100644 --- a/Template/Include/incl_table_myMission.php +++ b/Template/Include/incl_table_myMission.php @@ -8,12 +8,12 @@ // ############################################################################ // Import des textes en fonction de la langue définie dans la variable "lang" de la session. -require_once(dirname( __FILE__ )."./".$_SESSION["lang"]."/text.php"); +require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/text.php"); // Import des en-tête des tables. -require_once(dirname( __FILE__ )."./".$_SESSION["lang"]."/table.php"); +require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/table.php"); // Import des metodes de la base de donnée pour les recherches. -require_once(dirname( __FILE__ )."./../../Database/meth_dbsearch.php"); -require_once(dirname( __FILE__ )."./../../Database/meth_dbmission.php"); +require_once(dirname( __FILE__ )."/../../Database/meth_dbsearch.php"); +require_once(dirname( __FILE__ )."/../../Database/meth_dbmission.php"); // Instanciation de la bdd avec les méthodes de recherche. $dbsearch = new DbSearch; @@ -47,7 +47,7 @@ for ($i = 0; $i < count($result); $i++) { if (!$result[$i]["acceptedByPro"] ) { array_push($missionStatus["pending"], $result[$i]); - } elseif (!$result[$i]["validatedByPro"] + } elseif (!$result[$i]["validatedByPro"] || !$result[$i]["validatedByClient"] ) { array_push($missionStatus["ongoing"], $result[$i]); @@ -127,7 +127,7 @@ if ($missionStatus["ongoing"]) {
'.$rows["subject"].'
'.$rows["validatedByClient"].'
'.$rows["validatedByPro"].'
'); - if (!$rows["validatedByClient"] && $_SESSION["userStatus"] == 2 + if (!$rows["validatedByClient"] && $_SESSION["userStatus"] == 2 || (!$rows["validatedByPro"] && $_SESSION["userStatus"] == 1) ) { echo(' -- cgit v1.2.3