diff --git a/server_files/classes/User.php b/server_files/classes/User.php index 4a4845f..6af19d2 100644 --- a/server_files/classes/User.php +++ b/server_files/classes/User.php @@ -240,7 +240,7 @@ class User { global $DB; $this->receive_animath_mails = $receive_animath_mails; - $DB->prepare("UPDATE `users` SET `receive_animath_mails` = ? WHERE `id` = ?;")->execute([$receive_animath_mails, $this->getId()]); + $DB->prepare("UPDATE `users` SET `receive_animath_mails` = ? WHERE `id` = ?;")->execute([$receive_animath_mails ? 1 : 0, $this->getId()]); } public function getAllDocuments($problem) diff --git a/server_files/controllers/mon_compte.php b/server_files/controllers/mon_compte.php index a44755b..988600e 100644 --- a/server_files/controllers/mon_compte.php +++ b/server_files/controllers/mon_compte.php @@ -9,7 +9,7 @@ $user = $_SESSION["user"]; $has_error = false; $error_message = null; -if (isset($_POST["update_team"])) { +if (isset($_POST["update_account"])) { $my_account = new MyAccount($_POST); try { $my_account->makeVerifications(); @@ -21,7 +21,7 @@ if (isset($_POST["update_team"])) { } } -if (isset($_POST["submitted_password"])) { +if (isset($_POST["update_password"])) { $new_password = new NewPassword($_POST); try { $new_password->makeVerifications(); @@ -59,6 +59,8 @@ class MyAccount foreach ($keys as $key) $this->$key = $this->$key != null && $this->$key != "" ? $this->$key : $this->user->$key; + + $this->receive_animath_mails = $this->receive_animath_mails == "on"; } public function makeVerifications() diff --git a/server_files/views/ajouter_admin.php b/server_files/views/ajouter_admin.php index c702282..6adc058 100644 --- a/server_files/views/ajouter_admin.php +++ b/server_files/views/ajouter_admin.php @@ -1,7 +1,12 @@ -if (isset($admin) && !$has_error) { ?> +
+

Ajouter un administrateur

+
+ +
Organisateur ajouté avec succès ! Ses identifiants ont été transmis par mail.
diff --git a/server_files/views/ajouter_equipe.php b/server_files/views/ajouter_equipe.php index 4f56f71..b846252 100644 --- a/server_files/views/ajouter_equipe.php +++ b/server_files/views/ajouter_equipe.php @@ -10,14 +10,14 @@ if (isset($new_team) && !$has_error) { ?>
- +
@@ -25,7 +25,7 @@ if (isset($new_team) && !$has_error) { ?> @@ -33,7 +33,7 @@ if (isset($new_team) && !$has_error) { ?> diff --git a/server_files/views/commenter_echange.php b/server_files/views/commenter_echange.php index 7a8e6a5..89a7eb8 100644 --- a/server_files/views/commenter_echange.php +++ b/server_files/views/commenter_echange.php @@ -18,7 +18,7 @@ for ($i = 0; $i < 2; ++$i) { getLink()) ?>
Questions échangées :
-
- +
- +
- $i"; @@ -49,7 +49,7 @@ if (isset($new_team) && !$has_error) { ?>
- +
+
-
+
@@ -119,7 +119,7 @@ for ($i = 0; $i < 2; ++$i) { diff --git a/server_files/views/connexion.php b/server_files/views/connexion.php index 2efc132..f7aa659 100644 --- a/server_files/views/connexion.php +++ b/server_files/views/connexion.php @@ -21,7 +21,7 @@ if (isset($_GET["mdp_oublie"])) { ?>

Réinitialisation du mot de passe

- + @@ -31,11 +31,11 @@ if (isset($_GET["mdp_oublie"])) { ?> "/>
- +
- +
@@ -48,11 +48,11 @@ if (isset($_GET["mdp_oublie"])) { ?>
+ value="" required/>
- +
diff --git a/server_files/views/envoyer_video.php b/server_files/views/envoyer_video.php index f5bee89..7478d36 100644 --- a/server_files/views/envoyer_video.php +++ b/server_files/views/envoyer_video.php @@ -31,14 +31,14 @@ if ($video_validated != null && $video_validated->getId() != $video->getId()) { ?> -
- +
- +
+
@@ -53,7 +53,7 @@ if ($video_validated != null && $video_validated->getId() != $video->getId()) { diff --git a/server_files/views/equipe.php b/server_files/views/equipe.php index bdd274a..48bfe69 100644 --- a/server_files/views/equipe.php +++ b/server_files/views/equipe.php @@ -26,7 +26,7 @@ if ($_SESSION["role"] == Role::ADMIN) { ?>
- } ?> - + @@ -50,13 +50,13 @@ if ($_SESSION["role"] == Role::ADMIN) { ?> - + getValidationStatus() == ValidationStatus::WAITING && $_SESSION["role"] == Role::ADMIN) { ?>
- + +
+

Mon compte

+
+ + -

Votre compte a bien été mis à jour !

+
+ Votre compte a bien été mis à jour ! +
getEmail() != $my_account->email) { - echo "Votre adresse mail a bien été changée. Veuillez vérifier votre boîte mail pour valider votre nouvelle adresse, vous en aurez besoin pour vous reconnecter."; - } - ?> + if (isset($my_account) && $user->getEmail() != $my_account->email) { ?> +
+ Votre adresse mail a bien été changée. Veuillez vérifier votre boîte mail pour valider votre nouvelle + adresse, vous en aurez besoin pour vous reconnecter. +
+ - -
- +
- +
- - - - - - - - - - - - - - - - - - - - - + + +
+
+ + +
+ +
+ + +
+
+ +
+
+ + +
+
+ +
+ + doReceiveAnimathMails() ? "checked" : "" ?> /> +
+ getRole() == Role::PARTICIPANT) { ?> - - - - - - - - - - - +
+
+ + +
+ +
+ + +
+
+ - - - - + +
+ + +
+ - - - - - - -
getEmail() ?>
getSurname() ?>
getFirstName() ?>
getSchool() ?>
doReceiveAnimathMails() ? "checked" : "" ?> />
- -
+
+ +
+ -
- - - - - - - - - - - - - - - - - -
-
+
+ +
+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+ +
+
\ No newline at end of file diff --git a/server_files/views/mon_equipe.php b/server_files/views/mon_equipe.php index 9bcfa40..0e105a5 100644 --- a/server_files/views/mon_equipe.php +++ b/server_files/views/mon_equipe.php @@ -38,14 +38,14 @@ for ($i = 1; $i <= 5; ++$i) {
- +
@@ -53,7 +53,7 @@ for ($i = 1; $i <= 5; ++$i) { @@ -62,7 +62,7 @@ for ($i = 1; $i <= 5; ++$i) { @@ -94,30 +94,30 @@ for ($i = 1; $i <= 5; ++$i) {
-
- +
-
- getProblem() == $i ? "selected" : "") . ">$i\n"; @@ -72,7 +72,7 @@ for ($i = 1; $i <= 5; ++$i) {
- +
+
- +
- +
- +

- @@ -152,7 +152,7 @@ for ($i = 1; $i <= 5; ++$i) { $answer = Video::getVideo($asker->getVideoTeamIds()[0] == $team->getId() ? Reason::ANSWER1 : Reason::ANSWER2, $asker); ?>
Questions de l'équipe getName() ?> (getTrigram() ?>) :
-
- +
+
Vos questions :

-
+
-
+
">Question = 3 ? "(facultatif)" : "" ?> :">Ajouter une pièce jointe (facultatif) : @@ -55,7 +55,7 @@ for ($i = 0; $i < 2; ++$i) { diff --git a/server_files/views/rejoindre_equipe.php b/server_files/views/rejoindre_equipe.php index 03a0570..e8ab9a2 100644 --- a/server_files/views/rejoindre_equipe.php +++ b/server_files/views/rejoindre_equipe.php @@ -10,19 +10,19 @@ if (isset($join_team) && !$has_error) { ?> Erreur : " . $error_message . ""; ?> -
- +
- +
- +
+
diff --git a/server_files/views/repondre_questions.php b/server_files/views/repondre_questions.php index 0c76ed8..c2ca092 100644 --- a/server_files/views/repondre_questions.php +++ b/server_files/views/repondre_questions.php @@ -13,7 +13,7 @@ foreach ($questions as $questions_team) { ?> -
- +
- +
+
">Réponse :">Ajouter une pièce jointe (facultatif) : @@ -75,7 +75,7 @@ foreach ($questions as $questions_team) {
- +
- +
- +