diff --git a/dispatcher.php b/dispatcher.php index cf5e91b..10eb7da 100644 --- a/dispatcher.php +++ b/dispatcher.php @@ -30,9 +30,9 @@ $ROUTES["^(|accueil|index|accueil\.php|accueil\.html|accueil\.py|index\.php|inde $ROUTES["^ajouter_equipe$"] = ["server_files/controllers/ajouter_equipe.php"]; $ROUTES["^ajouter_admin$"] = ["server_files/controllers/ajouter_admin.php"]; $ROUTES["^calendrier$"] = ["server_files/controllers/calendrier.php"]; -$ROUTES["^confirmer_mail/([a-z0-9]*)/?$"] = ["server_files/controllers/confirmer_mail.php", "token"]; +$ROUTES["^confirmer-mail/([a-z0-9]*)/?$"] = ["server_files/controllers/confirmer_mail.php", "token"]; $ROUTES["^connexion/(confirmation-mail)/?$"] = ["server_files/controllers/connexion.php", "confirmation-mail"]; -$ROUTES["^connexion/(mdp_oublie)/?$"] = ["server_files/controllers/connexion.php", "mdp_oublie"]; +$ROUTES["^connexion/(mdp-oublie)/?$"] = ["server_files/controllers/connexion.php", "mdp_oublie"]; $ROUTES["^connexion/(reinitialiser_mdp)/(.*)/?$"] = ["server_files/controllers/connexion.php", "reset_password", "token"]; $ROUTES["^connexion/?$"] = ["server_files/controllers/connexion.php"]; $ROUTES["^deconnexion/?$"] = ["server_files/controllers/deconnexion.php"]; @@ -41,12 +41,13 @@ $ROUTES["^equipe/([A-Z]{3})/?$"] = ["server_files/controllers/equipe.php", "trig $ROUTES["^file/([a-z0-9]{64})/?$"] = ["server_files/controllers/view_file.php", "file_id"]; $ROUTES["^informations/([0-9]*)/.*?$"] = ["server_files/controllers/informations.php", "id"]; $ROUTES["^inscription/?$"] = ["server_files/controllers/inscription.php"]; -$ROUTES["^mon_compte/?$"] = ["server_files/controllers/mon_compte.php"]; -$ROUTES["^mon_equipe/(modifier)/?$"] = ["server_files/controllers/mon_equipe.php", "modifier"]; -$ROUTES["^mon_equipe/?$"] = ["server_files/controllers/mon_equipe.php"]; +$ROUTES["^mon-compte/?$"] = ["server_files/controllers/mon_compte.php"]; +$ROUTES["^mon-equipe/(modifier)/?$"] = ["server_files/controllers/mon_equipe.php", "modifier"]; +$ROUTES["^mon-equipe/?$"] = ["server_files/controllers/mon_equipe.php"]; $ROUTES["^probleme/([1-4])/?$"] = ["server_files/controllers/probleme.php", "probleme"]; $ROUTES["^problemes/?$"] = ["server_files/controllers/problemes.php"]; $ROUTES["^rejoindre_equipe/?$"] = ["server_files/controllers/rejoindre_equipe.php"]; +$ROUTES["^videos-solutions/?$"] = ["server_files/controllers/videos_solutions.php"]; # Assets files diff --git a/server_files/controllers/mon_equipe.php b/server_files/controllers/mon_equipe.php index d7ff562..6048694 100644 --- a/server_files/controllers/mon_equipe.php +++ b/server_files/controllers/mon_equipe.php @@ -127,7 +127,7 @@ class MyTeam $this->team->setTrigram($this->trigram); $this->team->setProblem($this->problem); - header("Location: $URL_BASE/mon_equipe"); + header("Location: $URL_BASE/mon-equipe"); } } diff --git a/server_files/controllers/videos_solutions.php b/server_files/controllers/videos_solutions.php new file mode 100644 index 0000000..242b203 --- /dev/null +++ b/server_files/controllers/videos_solutions.php @@ -0,0 +1,11 @@ +
Vous venez de changer votre adresse e-mail. Veuillez désormais la confirmer en cliquant ici : {URL_BASE}/confirmer_mail/{TOKEN}
+ href="{URL_BASE}/confirmer-mail/{TOKEN}">{URL_BASE}/confirmer-mail/{TOKEN}

Le comité d'organisation des Correspondances des Jeunes Mathématicien·ne·s diff --git a/server_files/services/mail_templates/confirm_email.html b/server_files/services/mail_templates/confirm_email.html index 34c7c6a..471323f 100644 --- a/server_files/services/mail_templates/confirm_email.html +++ b/server_files/services/mail_templates/confirm_email.html @@ -9,7 +9,7 @@ Bonjour {FIRST_NAME} {SURNAME},

Vous êtes inscrit aux Correspondances des Jeunes Mathématicien·ne·s {YEAR} et nous vous en remercions.
-Pour valider votre adresse e-mail, veuillez cliquer sur le lien : {URL_BASE}/confirmer_mail/{TOKEN}
+Pour valider votre adresse e-mail, veuillez cliquer sur le lien : {URL_BASE}/confirmer-mail/{TOKEN}

Cordialement,

diff --git a/server_files/services/mail_templates/register.html b/server_files/services/mail_templates/register.html index 82b514c..ab699c9 100644 --- a/server_files/services/mail_templates/register.html +++ b/server_files/services/mail_templates/register.html @@ -9,7 +9,7 @@ Bonjour {FIRST_NAME} {SURNAME},

Vous venez de vous inscrire aux Correspondances des Jeunes Mathématicien·ne·s {YEAR} et nous vous en remercions.
-Pour valider votre adresse e-mail, veuillez cliquer sur le lien : {URL_BASE}/confirmer_mail/{TOKEN}
+Pour valider votre adresse e-mail, veuillez cliquer sur le lien : {URL_BASE}/confirmer-mail/{TOKEN}

Le comité d'organisation des Correspondances des Jeunes Mathématicien·ne·s diff --git a/server_files/views/connexion.php b/server_files/views/connexion.php index bad0faf..eb017a4 100644 --- a/server_files/views/connexion.php +++ b/server_files/views/connexion.php @@ -18,7 +18,7 @@ else { require_once "footer.php"; } } -if (isset($_GET["mdp_oublie"])) { ?> +if (isset($_GET["mdp-oublie"])) { ?>
@@ -87,7 +87,7 @@ if (isset($_GET["mdp_oublie"])) { ?> diff --git a/server_files/views/envoyer_video.php b/server_files/views/envoyer_video.php index 9686249..ee43da7 100644 --- a/server_files/views/envoyer_video.php +++ b/server_files/views/envoyer_video.php @@ -11,10 +11,10 @@ elseif (isset($new_video)) getLink(); - echo "Lien de la vidéo déjà envoyée : $link (version " . $video->getVersion() . ")
"; + echo "Lien de la vidéo déjà envoyée : $link (version " . $video->getVersion() . ")
\n"; if (preg_match("#(https?\://|)(www\.|)youtube\.com\/watch\?v=(.*)#", $link, $matches)) { $code = $matches[3]; - echo "

"; + echo "

\n"; } } ?> diff --git a/server_files/views/header.php b/server_files/views/header.php index b2e1495..7b26692 100644 --- a/server_files/views/header.php +++ b/server_files/views/header.php @@ -32,7 +32,7 @@
  • Inscription
    • -
  • Mon compte
    • +
  • Mon compte
    • getInscriptionDate()) { ?> @@ -40,7 +40,7 @@
  • Rejoindre une équipe
    • -
  • Mon équipe
    • +
  • Mon équipe
    • getValidationStatus() == ValidationStatus::VALIDATED) { switch (Phase::getCurrentPhase()) { case Phase::PHASE1: ?> @@ -52,6 +52,7 @@
  • Ajouter un administrateur
    • +
  • Vidéos des solutions
  • Déconnexion
    • diff --git a/server_files/views/mon_equipe.php b/server_files/views/mon_equipe.php index b360917..7e83818 100644 --- a/server_files/views/mon_equipe.php +++ b/server_files/views/mon_equipe.php @@ -81,7 +81,7 @@ for ($i = 1; $i <= 5; ++$i) { - Modifier mon équipe + Modifier mon équipe

    Autorisation de droit à l'image

    diff --git a/server_files/views/videos_solutions.php b/server_files/views/videos_solutions.php new file mode 100644 index 0000000..dfe5c4e --- /dev/null +++ b/server_files/views/videos_solutions.php @@ -0,0 +1,21 @@ +Vidéos pour le problème $problem\n"; + /** @var Video $video */ + foreach ($videos[$problem - 1] as $video) { + $link = $video->getLink(); + $team = Team::fromId($video->getTeam()); + $version = $video->getVersion(); + echo "Vidéo de présentation de l'équipe « " . $team->getName() . " » (" . $team->getTrigram() . "), version $version : $link\n"; + if (preg_match("#(https?\://|)(www\.|)youtube\.com\/watch\?v=(.*)#", $link, $matches)) { + $code = $matches[3]; + echo "

    \n"; + } + } + echo "
    \n"; +} + +require_once "footer.php"; \ No newline at end of file
    - Mot de passe oublié ? + Mot de passe oublié ?