1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-06-25 07:40:32 +02:00

Modifications mineures

This commit is contained in:
Yohann D'ANELLO
2020-01-21 12:43:13 +01:00
parent cd70de049a
commit 6fe398d965
10 changed files with 43 additions and 36 deletions

View File

@ -3,8 +3,6 @@
if (!isset($_SESSION["role"]) || $_SESSION["role"] != Role::ADMIN)
require_once "server_files/403.php";
$orgas_response = $DB->query("SELECT `id`, `surname`, `first_name` FROM `users` WHERE (`role` = 'ORGANIZER' OR `role` = 'ADMIN') AND `year` = '$YEAR';");
$has_error = false;
$error_message = null;

View File

@ -5,17 +5,20 @@ if (!isset($_SESSION["role"]))
$id = $_GET["id"];
$user = User::fromId($id);
$team = Team::fromId($user->getTeamId());
if ($_SESSION["role"] != Role::ADMIN) {
if ($user->getId() != $_SESSION["user_id"])
if ($_SESSION["role"] == Role::ORGANIZER) {
if (($user->getRole() == Role::PARTICIPANT || $user->getRole() == Role::PARTICIPANT) && ($team == null || $team->getTournamentId() == null || !Tournament::fromId($team->getTournamentId())->organize($_SESSION["user_id"])))
require_once "server_files/403.php";
}
elseif ($user->getId() != $_SESSION["user_id"])
require_once "server_files/403.php";
}
if ($user === null)
require_once "server_files/404.php";
$team = Team::fromId($user->getTeamId());
if ($team != null) {
$documents = $user->getAllDocuments($team->getTournamentId());
$payment = $user->getPayment();

View File

@ -1,6 +1,6 @@
<?php
if ($_SESSION["role"] != Role::ADMIN)
if ($_SESSION["role"] != Role::ADMIN && $_SESSION["role"] != Role::ORGANIZER)
require_once "server_files/403.php";
$organizers = User::getOrganizers();

View File

@ -25,7 +25,6 @@ if (isset($_POST["edit_tournament"])) {
$orgas = $tournament->getOrganizers();
$teams = $tournament->getAllTeams();
$orgas_response = $DB->query("SELECT `id`, `surname`, `first_name` FROM `users` WHERE (`role` = 'ORGANIZER' OR `role` = 'ADMIN') AND `year` = '$YEAR';");
class UpdateTournament
{
@ -106,6 +105,7 @@ class UpdateTournament
$tournament->setInscriptionDate("$this->date_inscription $this->time_inscription");
$tournament->setSolutionsDate("$this->date_solutions $this->time_solutions");
$tournament->setSynthesesDate("$this->date_syntheses $this->time_syntheses");
$tournament->setDescription($this->description);
foreach ($this->organizers as $organizer) {
if (!$tournament->organize($organizer->getId()))