DjalimSimaila/MVC_Recettes
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make 'return_uri' parameter work

Browse Source
This commit is contained in:
Thomas Rubini 2023-01-24 19:57:34 +01:00
parent 0c1da18e72
commit 1abc40da4e
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controllers/UserController.php
View File

@ -7,7 +7,7 @@ ini_set("session.cookie_lifetime", $__SESSION_TIMEOUT);
final class UserController final class UserController
{ {
public function loginAction(Array $A_urlParams = null, Array $A_postParams = null) public function loginAction(Array $A_urlParams = null, Array $A_postParams = null, Array $A_getParams = null)
{ {
if (Session::is_login()) { if (Session::is_login()) {
header("Location: /user/view"); header("Location: /user/view");
@ -17,10 +17,22 @@ final class UserController
$S_errmsg = $_SESSION["errmsg"]; $S_errmsg = $_SESSION["errmsg"];
unset($_SESSION["errmsg"]); unset($_SESSION["errmsg"]);
} }
View::show("user/login", array("errmsg" => $S_errmsg));
$S_return_uri = "";
if (isset($A_getParams["return_uri"])) {
$S_return_uri = $A_getParams["return_uri"];
}
View::show("user/login", array("errmsg" => $S_errmsg, "return_uri" => $S_return_uri));
} }
} }
private function redirectToPreviousPage(Array $A_postParams = null){
if (isset($A_postParams["return_uri"])) {
header("Location: ".$A_postParams["return_uri"]);
} else {
header("Location: /");
}
}
public function signInAction(Array $A_urlParams = null, Array $A_postParams = null) public function signInAction(Array $A_urlParams = null, Array $A_postParams = null)
{ {
$S_email = Utils::getOrDie($A_postParams, "email"); $S_email = Utils::getOrDie($A_postParams, "email");
@ -43,8 +55,7 @@ final class UserController
Session::set_login($O_user->I_ID); Session::set_login($O_user->I_ID);
self::redirectToPreviousPage($A_postParams);
header("Location: /");
} }
public function signUpAction(Array $A_urlParams = null, Array $A_postParams = null) public function signUpAction(Array $A_urlParams = null, Array $A_postParams = null)
@ -72,7 +83,8 @@ final class UserController
$O_user = new UserModel($S_email, $S_username, $S_password_hash, null, date("Y-m-d"), 0, 0); $O_user = new UserModel($S_email, $S_username, $S_password_hash, null, date("Y-m-d"), 0, 0);
$O_user->insert(); $O_user->insert();
return header("Location: /");
self::redirectToPreviousPage($A_postParams);
} }

2
Views/user/login.php
View File

@ -10,6 +10,7 @@
<input type="email" name="email" id="email" placeholder="Email" required> <input type="email" name="email" id="email" placeholder="Email" required>
<label for="password">Entrez votre mot de passe</label> <label for="password">Entrez votre mot de passe</label>
<input type="password" name="password" id="password" placeholder="Mot de passe" required> <input type="password" name="password" id="password" placeholder="Mot de passe" required>
<input type="hidden" name="return_uri" value="<?= $A_view["return_uri"] ?>">
<input type="submit" value="Envoyer"> <input type="submit" value="Envoyer">
</form> </form>
</section> </section>
@ -24,6 +25,7 @@
<input type="password" name="password" id="password" placeholder="Mot de passe" required> <input type="password" name="password" id="password" placeholder="Mot de passe" required>
<label for="password_confirm">Confirmez le mot de passe</label> <label for="password_confirm">Confirmez le mot de passe</label>
<input type="password" name="password_confirm" id="password_confirm" placeholder="Confirmer le mot de passe" required> <input type="password" name="password_confirm" id="password_confirm" placeholder="Confirmer le mot de passe" required>
<input type="hidden" name="return_uri" value="<?= $A_view["return_uri"] ?>">
<input type="submit" value="Envoyer"> <input type="submit" value="Envoyer">
</form> </form>
</section> </section>