ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-06-25 13:37:25 +02:00
Code Issues Releases Wiki Activity

Diverses corrections

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-01-16 22:04:29 +01:00
parent 606ad5886f
commit 95ab142702
10 changed files with 71 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server_files/controllers/ajouter_tournoi.php
View File

@ -8,7 +8,7 @@ $orgas_response = $DB->query("SELECT `id`, `surname`, `first_name` FROM `users`
$has_error = false;
$error_message = null;
if (isset($_POST["submitted"])) {
if (isset($_POST["add_tournament"])) {
$tournament = new NewTournament($_POST);
try {
$tournament->makeVerifications();

5
server_files/controllers/confirmer_mail.php
View File

@ -1,6 +1,7 @@
<?php
$token = $_GET["token"];
$alert = "danger";
if (isset($token)) {
$result = $DB->query("SELECT `email` FROM `users` WHERE `confirm_email` = '$token' AND `year` = '$YEAR';");
@ -9,11 +10,13 @@ if (isset($token)) {
else {
$DB->exec("UPDATE `users` SET `confirm_email` = NULL WHERE `confirm_email` = '$token';");
$error_message = "Votre adresse mail a été validée ! Vous pouvez désormais vous connecter.";
$alert = "success";
}
}
else {
$error_message = "Il n'y a pas de compte à valider !";
$alert = "warning";
}
require_once "server_files/views/header.php";
echo "<h2>$error_message</h2>";
echo "<div class=\"alert alert-$alert\"><h2>$error_message</h2></div>";
require_once "server_files/views/footer.php";

9
server_files/controllers/informations.php
View File

@ -95,6 +95,7 @@ class AttributeTeam
ensure($user->getConfirmEmailToken() == null, "Ce participant n'a pas encore validé son adresse e-mail.");
ensure($this->team_id != "no_team", "Vous n'avez pas choisi d'équipe.");
ensure($this->team != null, "Cette équipe n'existe pas.");
ensure($user->getTeamId() <= 0, "Cette personne est déjà dans une équipe !");
ensure($this->team->getValidationStatus() == ValidationStatus::NOT_READY, "Cette équipe est déjà validée ou en cours de validation.");
$role = $user->getRole();
@ -105,7 +106,7 @@ class AttributeTeam
$this->min_null_index = $i;
ensure($role == Role::PARTICIPANT && $this->min_null_index <= 5 || $role == Role::ENCADRANT && $this->min_null_index <= 2,
ensure($role == Role::PARTICIPANT && $this->min_null_index <= 6 || $role == Role::ENCADRANT && $this->min_null_index <= 2,
"Il n'y a plus de place pour vous dans l'équipe.");
}
@ -123,6 +124,12 @@ class AttributeTeam
Mailer::sendJoinTeamMail($user, $this->team, Tournament::fromId($this->team->getTournamentId()));
$team = $this->team;
global $documents, $payment, $tournament;
$documents = $user->getAllDocuments($team->getTournamentId());
$payment = $user->getPayment();
$tournament = Tournament::fromId($team->getTournamentId());
}
}

2
server_files/controllers/inscription.php
View File

@ -61,7 +61,7 @@ class NewUser
ensure(preg_match("#^[0-9]{4}[0-9]?$#", $this->postal_code) && intval($this->postal_code) >= 01000 && intval($this->postal_code) <= 95999, "Le code postal est invalide.");
if ($this->country == "")
$this->country = "France";
ensure(strlen($this->phone_number) >= 10, "Le numéro de téléphone est invalide.");
ensure(strlen($this->phone_number) >= 10 && strlen($this->phone_number) <= 20, "Le numéro de téléphone est invalide.");
$this->role = Role::fromName(strtoupper($this->role));
if ($this->role == Role::PARTICIPANT) {

18
server_files/controllers/mon_equipe.php
View File

@ -22,13 +22,6 @@ if (isset($_POST["team_edit"])) {
}
}
if (isset($_POST["request_validation"])) {
if (!canValidate($team, $tournament))
$error_message = "Votre équipe ne peut pas demander la validation : il manque soit des participants, soit des documents.";
else
$_SESSION["team"]->setValidationStatus(ValidationStatus::WAITING);
}
if (isset($_SESSION["user_id"]) && isset($_SESSION["team"]) && $_SESSION["team"] !== null) {
/**
* @var User $user
@ -38,13 +31,20 @@ if (isset($_SESSION["user_id"]) && isset($_SESSION["team"]) && $_SESSION["team"]
$team = $_SESSION["team"];
$tournament = Tournament::fromId($team->getTournamentId());
$documents = $user->getAllDocuments($team->getTournamentId());
$documents = $tournament->getAllDocuments($team->getId());
if ($team->isSelectedForFinal())
$documents_final = $user->getAllDocuments($FINAL->getId());
$documents_final = $FINAL->getAllDocuments($team->getId());
}
else
require_once "server_files/403.php";
if (isset($_POST["request_validation"])) {
if (!canValidate($team, $tournament))
$error_message = "Votre équipe ne peut pas demander la validation : il manque soit des participants, soit des documents.";
else
$team->setValidationStatus(ValidationStatus::WAITING);
}
class MyTeam
{
public $name;