summaryrefslogtreecommitdiff
path: root/Wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'Wrapper')
-rw-r--r--Wrapper/Functions/func_info.php16
-rw-r--r--Wrapper/Functions/func_login.php3
-rw-r--r--Wrapper/wrapper.php54
3 files changed, 43 insertions, 30 deletions
diff --git a/Wrapper/Functions/func_info.php b/Wrapper/Functions/func_info.php
index 97c12c5..b5013e2 100644
--- a/Wrapper/Functions/func_info.php
+++ b/Wrapper/Functions/func_info.php
@@ -2,13 +2,15 @@
// ****************************************************************************
// Description: Fonction de modifications des informations de l'utilisateur par ID
// ****************************************************************************
-function modify_user_info($lastname, $firstname, $job, $degree,
- $capabilty, $description, $phoneNumber,
- $adress, $zipCode, $city, $userId) {
- $dbuser = new DbUser;
- $dbuser->user_infos_update($lastname, $firstname, $job, $degree,
- $capabilty, $description, $phoneNumber,
- $adress, $zipCode, $city, $userId);
+function modify_user_info($userInfos, $userId, $isPro) {
+ $dbuser = new DbUser;
+ $dbsearch = new DbSearch;
+ if ($isPro) {
+ $userJobs = $dbsearch->get_pro_job_category($userId);
+ $dbuser->user_infos_update($userInfos, $userId, $isPro, $userJobs);
+ } else {
+ $dbuser->user_infos_update($userInfos, $userId, $isPro);
+ }
// Redirection vers message avec l'index du message à afficher.
$messageNumber = 2;
$_SESSION["messageNumber"] = $messageNumber;
diff --git a/Wrapper/Functions/func_login.php b/Wrapper/Functions/func_login.php
index 39cf931..488f592 100644
--- a/Wrapper/Functions/func_login.php
+++ b/Wrapper/Functions/func_login.php
@@ -4,8 +4,7 @@
// ou par un cookie dans lequel est stocké l'email et une chaine
// de caractère aléatoire valable pour une seule tentative.
// ****************************************************************************
-function login($cookie, $email = null, $pass = null, $remember = false) {
- print_r($email, $pass);
+function login($cookie, $email = null, $pass = null, $remember = 0) {
// Instanciation de la gestion de la BDD utilisateur.
$dbuser = new DbUser;
// On vérifie si la connection se fait via le formulaire de connection ou par cookie
diff --git a/Wrapper/wrapper.php b/Wrapper/wrapper.php
index 62077c2..13e0713 100644
--- a/Wrapper/wrapper.php
+++ b/Wrapper/wrapper.php
@@ -44,16 +44,16 @@ if (isset($_SESSION["src"])) {
&& $_POST["password"] !== ""
) {
if (isset($_POST["rememberMe"]) && $_POST["rememberMe"] == "on") {
- $_POST["rememberMe"] = true;
+ $_POST["rememberMe"] = 1;
} else {
- $_POST["rememberMe"] = false;
+ $_POST["rememberMe"] = 0;
}
login(0, $_POST["email"], $_POST["password"], $_POST["rememberMe"]);
// Condition pour une connection auto
} elseif ($_SESSION["src"] == "autoLogin"
&& isset($_COOKIE["autoLogin"])
- && $_SESSION["loggedIn"] == false
+ && $_SESSION["loggedIn"]
) {
// Si connection par cookie, on le décode avant de le passer à la fonction.
login(json_decode(base64_decode($_COOKIE["autoLogin"])));
@@ -61,7 +61,7 @@ if (isset($_SESSION["src"])) {
// Condition pour une déconnection
} elseif ($_SESSION["src"] == "logout"
&& isset($_SESSION["loggedIn"])
- && $_SESSION["loggedIn"] == true
+ && $_SESSION["loggedIn"]
) {
logout();
@@ -96,28 +96,39 @@ if (isset($_SESSION["src"])) {
);
// Condition pour une modification des infos
- } elseif ($_SESSION["src"] == "userInfo"
- && isset($_SESSION["loggedIn"], $_SESSION["userId"],
- $_POST["lastname"], $_POST["firstname"], $_POST["job"],
- $_POST["degree"], $_POST["capability"], $_POST["description"],
- $_POST["phoneNumber"], $_POST["adress"], $_POST["zipCode"], $_POST["city"]
- )
- && $_SESSION["loggedIn"] == true && $_SESSION["userId"] !== ""
- && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
+ } elseif ($_SESSION["src"] == "userInfo"
+ // Vérification des données si client
+ && (isset($_SESSION["loggedIn"], $_SESSION["userId"], $_SESSION["isClient"],
+ $_POST["lastname"], $_POST["firstname"], $_POST["phoneNumber"],
+ $_POST["adress"], $_POST["zipCode"], $_POST["city"]
+ )
+ && $_SESSION["isClient"]
+ && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
+ && $_POST["phoneNumber"] !== "" && $_POST["adress"] !== ""
+ && $_POST["zipCode"] !== "" && $_POST["city"] !== ""
+ // Ou si pro
+ || isset($_SESSION["loggedIn"], $_SESSION["userId"], $_SESSION["isPro"],
+ $_POST["lastname"], $_POST["firstname"], $_POST["phoneNumber"],
+ $_POST["adress"], $_POST["zipCode"], $_POST["city"], $_POST["jobs"],
+ $_POST["degree"], $_POST["capability"], $_POST["description"]
+ )
+ && $_SESSION["isPro"]
+ && $_POST["lastname"] !== "" && $_POST["firstname"] !== ""
+ && $_POST["phoneNumber"] !== "" && $_POST["adress"] !== ""
+ && $_POST["zipCode"] !== "" && $_POST["city"] !== ""
+ && $_POST["degree"] !== "" && $_POST["capability"] !== ""
+ && $_POST["description"] !== ""
+ )
) {
- modify_user_info($_POST["lastname"], $_POST["firstname"], $_POST["job"],
- $_POST["degree"], $_POST["capability"], $_POST["description"],
- $_POST["phoneNumber"], $_POST["adress"], $_POST["zipCode"],
- $_POST["city"], $_SESSION["userId"]
- );
+ modify_user_info($_POST, $_SESSION["userId"], $_SESSION["isPro"]);
// Condition pour l'administration du site
} elseif ($_SESSION["src"] == "admin"
&& isset($_SESSION["loggedIn"],
$_SESSION["isAdmin"],
)
- && $_SESSION["loggedIn"] == true
- && $_SESSION["isAdmin"] == true
+ && $_SESSION["loggedIn"]
+ && $_SESSION["isAdmin"]
&& (isset($_POST["userId"])
|| isset($_POST["addCategoryNameEn"],
$_POST["addCategoryNameFr"]
@@ -125,6 +136,7 @@ if (isset($_SESSION["src"])) {
|| isset($_POST["delCategoryId"])
)
) {
+ // Suppression d'un utilisateur
if (isset($_POST["userId"])
&& $_POST["userId"] !== ""
) {
@@ -149,8 +161,8 @@ if (isset($_SESSION["src"])) {
$_POST["subject"], $_POST["note"],
$_POST["review"], $_POST["proId"]
)
- && $_SESSION["loggedIn"] == true
- && $_SESSION["isClient"] == true
+ && $_SESSION["loggedIn"]
+ && $_SESSION["isClient"]
&& $_POST["subject"] !== ""
&& $_POST["note"] !== ""
&& $_POST["review"] !== ""