diff --git a/server_files/classes/Tournament.php b/server_files/classes/Tournament.php index 8b2cff0..102fb10 100644 --- a/server_files/classes/Tournament.php +++ b/server_files/classes/Tournament.php @@ -289,7 +289,7 @@ class Tournament global $DB; $req = $DB->query("SELECT * FROM `documents` AS `t1` " - . "INNER JOIN (SELECT `user`, `type`, `tournament`, MAX(`uploaded_at`) AS `last_upload`, COUNT(`team`) AS `version` FROM `documents` GROUP BY `tournament`, `team`, `type`) `t2` " + . "INNER JOIN (SELECT `user`, `type`, `tournament`, MAX(`uploaded_at`) AS `last_upload`, COUNT(`team`) AS `version` FROM `documents` GROUP BY `tournament`, `team`, `type`, `user`) `t2` " . "ON `t1`.`user` = `t2`.`user` AND `t1`.`type` = `t2`.`type` AND `t1`.`tournament` = `t2`.`tournament` " . "WHERE `t1`.`uploaded_at` = `t2`.`last_upload` AND `t1`.`tournament` = $this->id " . ($team_id == -1 ? "" : "AND `t1`.`team` = $team_id") . " ORDER BY `t1`.`team`, `t1`.`type`;"); diff --git a/server_files/classes/User.php b/server_files/classes/User.php index 1852ea7..b037e12 100644 --- a/server_files/classes/User.php +++ b/server_files/classes/User.php @@ -364,7 +364,7 @@ class User { global $DB; $req = $DB->query("SELECT * FROM `documents` AS `t1` " - . "INNER JOIN (SELECT `user`, `type`, `tournament`, MAX(`uploaded_at`) AS `last_upload`, COUNT(`team`) AS `version` FROM `documents` GROUP BY `tournament`, `type`) `t2` " + . "INNER JOIN (SELECT `user`, `type`, `tournament`, MAX(`uploaded_at`) AS `last_upload`, COUNT(`team`) AS `version` FROM `documents` GROUP BY `tournament`, `type`, `user`) `t2` " . "ON `t1`.`user` = `t2`.`user` AND `t1`.`type` = `t2`.`type` AND `t1`.`tournament` = `t2`.`tournament` " . "WHERE `t1`.`uploaded_at` = `t2`.`last_upload` AND `t1`.`tournament` = $tournament_id AND `t1`.`user` = $this->id ORDER BY `t1`.`type`;"); diff --git a/server_files/controllers/inscription.php b/server_files/controllers/inscription.php index 1db055c..0d3f454 100644 --- a/server_files/controllers/inscription.php +++ b/server_files/controllers/inscription.php @@ -50,7 +50,7 @@ class NewUser ensure(filter_var($this->email, FILTER_VALIDATE_EMAIL), "L'adresse e-mail entrée est invalide."); $this->email = strtolower($this->email); - ensure(userExists($this->email), "Un compte existe déjà avec cette adresse e-mail."); + ensure(!userExists($this->email), "Un compte existe déjà avec cette adresse e-mail."); ensure(strlen($this->password) >= 8, "Le mot de passe doit comporter au moins 8 caractères."); ensure($this->password == $this->confirm_password, "Les deux mots de passe sont différents."); ensure($this->surname != "", "Le nom de famille est obligatoire."); diff --git a/server_files/model.php b/server_files/model.php index ed0005d..b0004c4 100644 --- a/server_files/model.php +++ b/server_files/model.php @@ -57,7 +57,7 @@ function quitTeam() { if ($role == Role::ADMIN || $role == Role::ORGANIZER) return; - for ($i = 1; $i <= ($role == Role::ENCADRANT ? 6 : 2); ++$i) + for ($i = 1; $i <= ($role == Role::ENCADRANT ? 2 : 6); ++$i) /** @noinspection SqlResolve */ $DB->exec("UPDATE `teams` SET `" . strtolower(Role::getName($role)) . "_$i` = NULL WHERE `" . strtolower(Role::getName($role)) . "_$i` = $user_id;"); $user->setTeamId(null);