fix myaccountview

Project/php/controller/AdminController.php

@@ -104,9 +104,9 @@ class AdminController extends UserController
 
     public function addGroup(): void {
         try {
-            $num = Validation::filter_int($_GET['num'] ?? null);
+            $num = Validation::filter_int($_POST['num'] ?? null);
-            $year = Validation::filter_int($_GET['year'] ?? null);
+            $year = Validation::filter_int($_POST['year'] ?? null);
-            $sector = Validation::filter_str_simple($_GET['sector'] ?? null);
+            $sector = Validation::filter_str_simple($_POST['sector'] ?? null);
 
             $model = new MdlAdmin();
             $groupID = $model->addGroup($num, $year, $sector);

Project/php/controller/UserController.php

@@ -7,6 +7,7 @@ use Exception;
 use gateway\TranslationGateway;
 use gateway\VocabularyListGateway;
 use model\MdlStudent;
+use model\MdlUser;
 use model\VocabularyList;
 use model\Translation;
 
@@ -21,32 +22,29 @@ class UserController extends VisitorController
 
     public function modifyPassword(): void {
         try {
-            $userID = $_GET['user'];
+            global $user;
-            $currentPassword = Validation::val_password($_GET['currentPassword'] ?? null);
+            $currentPassword = Validation::val_password($_POST['currentPassword'] ?? null);
-            $newPassword = Validation::val_password($_GET['newPassword'] ?? null);
+            $newPassword = Validation::val_password($_POST['newPassword'] ?? null);
-            $confirmNewPassword = Validation::val_password($_GET['confirmNewPassword'] ?? null);
+            $confirmNewPassword = Validation::val_password($_POST['confirmNewPassword'] ?? null);
-            $mdl = new MdlStudent();
-            $user = $mdl->getUser($userID);
 
-            if ($user->getPassword() != $currentPassword || $newPassword != $confirmNewPassword)
+            if (!password_verify($currentPassword, $user->getPassword()) || $newPassword != $confirmNewPassword)
                 throw new Exception("");
 
-            $mdl->ModifyPassword($userID, $newPassword);
+            $mdl = new MdlUser();
-            $_GET['user'] = $userID;
+            $mdl->ModifyPassword($user->getId(), password_hash($newPassword, null));
             $this->showAccountInfos();
         }
         catch (Exception $e){
-            throw new Exception("invalid entries");
+            throw new Exception("invalid entries".$e->getLine());
         }
     }
 
     public function modifyNickname(): void {
         try {
-            $userID = Validation::filter_int($_GET['user'] ?? null);
+            global $user;
-            $newNickname = Validation::filter_str_nospecialchar($_GET['newNickname'] ?? null);
+            $newNickname = Validation::filter_str_nospecialchar($_POST['newNickname'] ?? null);
             $mdl = new MdlStudent();
-            $mdl->modifyNickname($userID, $newNickname);
+            $mdl->modifyNickname($user->getId(), $newNickname);
-            $_GET['user'] = $userID;
             $this->showAccountInfos();
         }
         catch (Exception $e){

Project/php/controller/VisitorController.php

@@ -6,6 +6,7 @@ use config\Validation;
 use gateway\TranslationGateway;
 use gateway\VocabularyListGateway;
 use model\MdlUser;
+use Exception;
 
 class VisitorController
 {

Project/php/model/AbsModel.php

@@ -6,16 +6,6 @@ use gateway\UserGateway;
 
 abstract class AbsModel
 {
-    private string $role;
-
-    /**
-     * @param string $role
-     */
-    public function __construct(string $role)
-    {
-        $this->role = $role;
-    }
-
     public function connection(string $login, string $password){
         $gtw = new UserGateway();
         $hash = $gtw->login($login) ?? null;

Project/php/model/MdlAdmin.php

@@ -7,10 +7,6 @@ use gateway\UserGateway;
 
 class MdlAdmin extends MdlUser
 {
-    public function __construct()
-    {
-        parent::__construct("admin");
-    }
 
     public function getAllUsers(): array {
         $gtw = new UserGateway();

Project/php/model/MdlStudent.php

@@ -8,12 +8,6 @@ use gateway\VocabularyListGateway;
 
 class MdlStudent extends MdlUser
 {
-
-    public function __construct()
-    {
-        parent::__construct("student");
-    }
-
     public function getAll():array{
         $gtw = new VocabularyListGateway();
         return  $gtw->findAll();

Project/php/model/MdlTeacher.php

@@ -9,12 +9,6 @@ use gateway\VocabularyListGateway;
 
 class MdlTeacher extends MdlUser
 {
-
-    public function __construct()
-    {
-        parent::__construct("teacher");
-    }
-
     public function getAll():array{
         $gtw = new VocabularyListGateway();
         return  $gtw->findAll();

Project/php/templates/home.html

@@ -34,7 +34,7 @@
                 <ul class="navbar-nav ms-auto">
                     <li class="nav-item"><a class="nav-link" href="#game">Game</a></li>
                     <li class="nav-item"><a class="nav-link" href="#download">Download</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{base}}/user/login">My account</a></li>
+                    <li class="nav-item"><a class="nav-link" href="{{base}}/visitor/login">My account</a></li>
                 </ul>
             </div>
         </div>

Project/php/templates/login.html

@@ -24,7 +24,7 @@
                                     <div class="center-wrap">
                                         <div class="section text-center">
                                             <h4 class="mb-4 pb-3">Log In</h4>
-                                            <form action="{{base}}/user/confirmLogin" method="POST">
+                                            <form action="{{base}}/visitor/confirmLogin" method="POST">
                                                 <div class="form-group">
                                                     <input type="email" name="logemail" class="form-style" placeholder="Your Email" id="logemail" autocomplete="off">
                                                     <i class="input-icon uil uil-at"></i>

Project/php/templates/modifyPasswordForm.twig

@@ -1,5 +1,4 @@
-<form action="{{base}}/user/modifyPassword" method="GET">
+<form action="{{base}}/{{ userRole[0] }}/{{userID}}/modifyPassword" method="POST">
-    <input type="hidden" name="user" value={{user.id}}>
     <input type="text" name="currentPassword" placeholder="current password" required>
     <input type="text" name="newPassword" placeholder="new password" required>
     <input type="text" name="confirmNewPassword" placeholder="confirm new password" required>

Project/php/templates/myAccountView.html

@@ -15,7 +15,7 @@
             href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"
             rel="stylesheet" />
     <!-- Core theme CSS (includes Bootstrap)-->
-    <link href="css/styles.css" rel="stylesheet" />
+    <link href="{{base}}/css/styles.css" rel="stylesheet" />
 </head>
 <style>
     section {
@@ -24,6 +24,8 @@
     }
 </style>
 <body>
+{% include 'navbar.twig' %}
+<div class="content">
     <section>
     <h1>My account</h1>
     {% if user is defined %}
@@ -32,8 +34,7 @@
             <tr><td>ID : </td><td>{{user.id}}</td></tr>
             <tr><td>Nickname : </td><td>{{user.nickname}}</td>
                 <td>
-                    <form action="{{base}}/user/modifyNickname" method="GET">
+                    <form action="{{base}}/{{ userRole[0] }}/{{userID}}/modifyNickname" method="POST">
-                        <input type="hidden" name="user" value={{user.id}}>
                         <input name="newNickname" type="text" placeholder="new nickname" required>
                         <input type="submit" value="Modify your nickname">
                     </form>
@@ -56,5 +57,6 @@
             {% include 'modifyPasswordForm.twig' %}
     </section>
     {% endif %}
+</div>
 </body>
 </html>