summaryrefslogtreecommitdiff
path: root/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Core')
-rw-r--r--Core/Functions/func_admin.php4
-rw-r--r--Core/Functions/func_info.php2
-rw-r--r--Core/Functions/func_language.php2
-rw-r--r--Core/Functions/func_login.php10
-rw-r--r--Core/Functions/func_myMission.php2
-rw-r--r--Core/Functions/func_register.php4
-rw-r--r--Core/Functions/func_search.php4
-rw-r--r--Core/wrapper.php56
8 files changed, 42 insertions, 42 deletions
diff --git a/Core/Functions/func_admin.php b/Core/Functions/func_admin.php
index baccdae..0c5b6f8 100644
--- a/Core/Functions/func_admin.php
+++ b/Core/Functions/func_admin.php
@@ -54,7 +54,7 @@ function admin_job_del($jobId) {
} else {
$message = ["adminDelJob", "fail"];
}
-
+
// Redirection vers message avec l'index du message à afficher.
$_SESSION["message"] = $message;
header("Location: /Template/message.php");
@@ -71,7 +71,7 @@ function admin_mission_del($missionId) {
} else {
$message = ["adminDelMission", "fail"];
}
-
+
// Redirection vers message avec l'index du message à afficher.
$_SESSION["message"] = $message;
header("Location: /Template/message.php");
diff --git a/Core/Functions/func_info.php b/Core/Functions/func_info.php
index 89b1688..43b874c 100644
--- a/Core/Functions/func_info.php
+++ b/Core/Functions/func_info.php
@@ -30,7 +30,7 @@ function info_update_user_infos($userInfos, $userId, $userStatus) {
} else {
$dbuser->update_user_infos($userInfos, $userId, $isPro);
}
-
+
// Redirection vers message avec l'index du message à afficher.
$message = ["infosUpdate", "success"];
$_SESSION["message"] = $message;
diff --git a/Core/Functions/func_language.php b/Core/Functions/func_language.php
index b92395d..a222e19 100644
--- a/Core/Functions/func_language.php
+++ b/Core/Functions/func_language.php
@@ -9,7 +9,7 @@
function language_set($language) {
$_SESSION["lang"] = $language;
-
+
// Redirection vers la page actuelle avec la langue à affiche.
if ($_SESSION["src"] == "index") {
header("Location: /".$_SESSION["src"].".php");
diff --git a/Core/Functions/func_login.php b/Core/Functions/func_login.php
index 77ab982..cbe4d62 100644
--- a/Core/Functions/func_login.php
+++ b/Core/Functions/func_login.php
@@ -35,8 +35,8 @@ function login($cookie, $email = null, $pass = null, $remember = 0) {
$_SESSION[$key] = $value;
}
- // Partie notification,
- // Ajout à la session d'un élément "notification".
+ // Partie notification,
+ // Ajout à la session d'un élément "notification".
$_SESSION["notification"] = 0;
// Si c'est un pro
if ($_SESSION["userStatus"] == "1") {
@@ -57,7 +57,7 @@ function login($cookie, $email = null, $pass = null, $remember = 0) {
// on en génère un nouveau.
if ($remember || $cookie) {
$name = "autoLogin";
- // On génère une chaine de caractère aléatoire de 32 bytes en supprimant les caractères spéciaux de base64.
+ // On génère une chaine de caractère aléatoire de 32 bytes en supprimant les caractères spéciaux de base64.
$token = substr(str_replace(["+", "/", "="], "",base64_encode(random_bytes(64))) ,0 , 32);
// On update le nouveau token.
$dbuser->update_token_autologin($_SESSION["email"], $token);
@@ -77,10 +77,10 @@ function login($cookie, $email = null, $pass = null, $remember = 0) {
}
} else {
// Si la connection a échoué.
- if (!$cookie) {
+ if (!$cookie) {
$message = ["login", "fail"];
// Si la connection à échoué par cookie.
- } else {
+ } else {
// Suppression du cookie.
unset($_COOKIE["autoLogin"]);
setcookie("autoLogin", "", time() - 3600, "/");
diff --git a/Core/Functions/func_myMission.php b/Core/Functions/func_myMission.php
index c6d4594..9f553dd 100644
--- a/Core/Functions/func_myMission.php
+++ b/Core/Functions/func_myMission.php
@@ -53,7 +53,7 @@ function mymission_complete_mission($missionId, $userStatus) {
} else {
$message = ["missionValidated", "fail"];
}
-
+
// Redirection vers message avec l'index du message à afficher.
$_SESSION["message"] = $message;
header("Location: /Template/message.php");
diff --git a/Core/Functions/func_register.php b/Core/Functions/func_register.php
index d0b7ba2..4c6b00a 100644
--- a/Core/Functions/func_register.php
+++ b/Core/Functions/func_register.php
@@ -20,7 +20,7 @@ function register($email, $password, $userStatus) {
&& preg_match($regEmail, $email)
) {
$dbuser = new DbUser;
-
+
$registered = $dbuser->register_user($email,
$password,
$userStatus
@@ -40,7 +40,7 @@ function register($email, $password, $userStatus) {
} else {
// Si le mdp est arrivé jusque là et est insuffisament "fort"
$message = ["userAdd", "fail"];
-
+
// Redirection vers message avec l'index du message à afficher.
$_SESSION["message"] = $message;
header("Location: /Template/message.php");
diff --git a/Core/Functions/func_search.php b/Core/Functions/func_search.php
index 69740da..9575026 100644
--- a/Core/Functions/func_search.php
+++ b/Core/Functions/func_search.php
@@ -40,7 +40,7 @@ function search($request, $isResearch) {
}
}
- // On fait la moyenne des notes,
+ // On fait la moyenne des notes,
// et pour les étoiles on "coupe" tout ce qui est après la virgule en castant en "int".
if ($notes) {
$average = array_sum($notes) / count($notes);
@@ -75,7 +75,7 @@ function search($request, $isResearch) {
$_SESSION["search"] = $search;
header("Location: /index.php#separator2");
- die();
+ die();
}
?> \ No newline at end of file
diff --git a/Core/wrapper.php b/Core/wrapper.php
index 0fcc47e..925402a 100644
--- a/Core/wrapper.php
+++ b/Core/wrapper.php
@@ -12,20 +12,20 @@
// #############################################################################
// Import de toutes les fonctions et des méthodes pour gérer la BDD.
-require_once(dirname( __FILE__ )."./../Database/meth_dbuser.php");
-require_once(dirname( __FILE__ )."./../Database/meth_dbadmin.php");
-require_once(dirname( __FILE__ )."./../Database/meth_dbsearch.php");
-require_once(dirname( __FILE__ )."./../Database/meth_dbmission.php");
-require_once(dirname( __FILE__ )."./Functions/func_info.php");
-require_once(dirname( __FILE__ )."./Functions/func_admin.php");
-require_once(dirname( __FILE__ )."./Functions/func_login.php");
-require_once(dirname( __FILE__ )."./Functions/func_logout.php");
-require_once(dirname( __FILE__ )."./Functions/func_search.php");
-require_once(dirname( __FILE__ )."./Functions/func_mission.php");
-require_once(dirname( __FILE__ )."./Functions/func_register.php");
-require_once(dirname( __FILE__ )."./Functions/func_language.php");
-require_once(dirname( __FILE__ )."./Functions/func_sanitize.php");
-require_once(dirname( __FILE__ )."./Functions/func_myMission.php");
+require_once(dirname( __FILE__ )."/../Database/meth_dbuser.php");
+require_once(dirname( __FILE__ )."/../Database/meth_dbadmin.php");
+require_once(dirname( __FILE__ )."/../Database/meth_dbsearch.php");
+require_once(dirname( __FILE__ )."/../Database/meth_dbmission.php");
+require_once(dirname( __FILE__ )."/Functions/func_info.php");
+require_once(dirname( __FILE__ )."/Functions/func_admin.php");
+require_once(dirname( __FILE__ )."/Functions/func_login.php");
+require_once(dirname( __FILE__ )."/Functions/func_logout.php");
+require_once(dirname( __FILE__ )."/Functions/func_search.php");
+require_once(dirname( __FILE__ )."/Functions/func_mission.php");
+require_once(dirname( __FILE__ )."/Functions/func_register.php");
+require_once(dirname( __FILE__ )."/Functions/func_language.php");
+require_once(dirname( __FILE__ )."/Functions/func_sanitize.php");
+require_once(dirname( __FILE__ )."/Functions/func_myMission.php");
session_start();
// Si la session existe et que la variable src est bien présente.
@@ -51,7 +51,7 @@ if (isset($_SESSION["src"])) {
// ****************************************************************************
// Condition pour le changement de la langue
if (isset($_POST["langSel"])
- && ($_POST["langSel"] == "en"
+ && ($_POST["langSel"] == "en"
|| $_POST["langSel"] == "fr")
) {
language_set($_POST["langSel"]);
@@ -90,8 +90,8 @@ if (isset($_SESSION["src"])) {
&& isset($_POST["email"],
$_POST["password"],
$_POST["userStatus"]
- )
- && $_POST["email"] !== ""
+ )
+ && $_POST["email"] !== ""
&& $_POST["password"] !== ""
) {
register($_POST["email"],
@@ -114,9 +114,9 @@ if (isset($_SESSION["src"])) {
$_POST["rememberMe"] = 0;
}
login(0, $_POST["email"], $_POST["password"], $_POST["rememberMe"]);
-
+
} elseif ($_SESSION["src"] == "autoLogin"
- && isset($_COOKIE["autoLogin"])
+ && isset($_COOKIE["autoLogin"])
) {
// Si connection par cookie, on le décode avant de le passer à la fonction.
login(json_decode(base64_decode($_COOKIE["autoLogin"])));
@@ -125,7 +125,7 @@ if (isset($_SESSION["src"])) {
// ****************************************************************************
// DECONNECTION
// ****************************************************************************
- } elseif ($_SESSION["src"] == "logout"
+ } elseif ($_SESSION["src"] == "logout"
&& isset($_SESSION["loggedIn"])
&& $_SESSION["loggedIn"]
) {
@@ -143,7 +143,7 @@ if (isset($_SESSION["src"])) {
$_POST["adress"], $_POST["zipCode"], $_POST["city"]
)
&& $_SESSION["userStatus"] == 2
- && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
+ && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
&& $_POST["phoneNumber"] !== "" && $_POST["adress"] !== ""
&& $_POST["zipCode"] !== "" && $_POST["city"] !== ""
// Ou si pro
@@ -153,10 +153,10 @@ if (isset($_SESSION["src"])) {
$_POST["degree"], $_POST["capability"], $_POST["description"]
)
&& $_SESSION["userStatus"] == 1
- && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
+ && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
&& $_POST["phoneNumber"] !== "" && $_POST["adress"] !== ""
&& $_POST["zipCode"] !== "" && $_POST["city"] !== ""
- && $_POST["degree"] !== "" && $_POST["capability"] !== ""
+ && $_POST["degree"] !== "" && $_POST["capability"] !== ""
&& $_POST["description"] !== ""
)
) {
@@ -184,7 +184,7 @@ if (isset($_SESSION["src"])) {
} elseif ($_SESSION["src"] == "mission"
&& isset($_SESSION["loggedIn"], $_SESSION["userStatus"],
- $_POST["missionSubject"], $_POST["missionJob"],
+ $_POST["missionSubject"], $_POST["missionJob"],
$_POST["missionProId"]
)
&& $_SESSION["loggedIn"]
@@ -201,7 +201,7 @@ if (isset($_SESSION["src"])) {
} elseif ($_SESSION["src"] == "mission"
&& isset($_SESSION["loggedIn"], $_SESSION["userStatus"],
- $_POST["missionCompletedId"], $_POST["review"],
+ $_POST["missionCompletedId"], $_POST["review"],
$_POST["note"]
)
&& $_SESSION["loggedIn"]
@@ -228,7 +228,7 @@ if (isset($_SESSION["src"])) {
)
) {
- if (isset($_POST["acceptedMissionId"])
+ if (isset($_POST["acceptedMissionId"])
&& $_POST["acceptedMissionId"] !== ""
) {
mymission_accept_mission($_POST["acceptedMissionId"]);
@@ -251,10 +251,10 @@ if (isset($_SESSION["src"])) {
// ADMINISTRATION
// ****************************************************************************
// Condition pour l'administration du site
- } elseif ($_SESSION["src"] == "admin"
+ } elseif ($_SESSION["src"] == "admin"
&& isset($_SESSION["loggedIn"],
$_SESSION["userStatus"]
- )
+ )
&& $_SESSION["loggedIn"]
&& $_SESSION["userStatus"] == 0
&& (isset($_POST["delUserId"])