ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-11-04 03:42:11 +01:00
Code Issues Releases Wiki Activity

Merge branch '2-add-a-home-page'

Browse Source 
# Conflicts:
#	docker-compose.yml
#	server_files/config.php
#	server_files/views/connexion.php
#	setup/create_database.sql
This commit is contained in:
Yohann D'ANELLO
2019-10-31 15:13:45 +01:00
parent bf83e6534d 7c935d067c
commit a368dfbead
17 changed files with 481 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server_files/views/tournoi.php
View File

@@ -15,7 +15,7 @@ foreach ($orgas as $orga) {
$orga_id = $orga->getId();
$orga_name = $orga->getFirstName() . " " . $orga->getSurname();
if ($_SESSION["role"] == Role::ORGANIZER || $_SESSION["role"] == Role::ADMIN)
$s .= "<a href=\"$URL_BASE/informations/$orga_id/$orga_name\">$orga_name</a>";
$s .= "<a href=\"/informations/$orga_id/$orga_name\">$orga_name</a>";
else
$s .= $orga_name;
$s .= ", ";
@@ -37,7 +37,7 @@ if ($tournament->isFinal())
?>
<?php if (!isset($_GET["modifier"]) && ($_SESSION["role"] == Role::ADMIN || $_SESSION["role"] == Role::ORGANIZER && $tournament->organize($_SESSION["user_id"]))) { ?>
<a href="<?= $URL_BASE ?>/tournoi/<?= $tournament->getName() ?>/modifier">Éditer le tournoi</a>
<a href="/tournoi/<?= $tournament->getName() ?>/modifier">Éditer le tournoi</a>
<?php } ?>
@@ -72,7 +72,7 @@ if ($tournament->isFinal())
<td style="border: 1px solid black; text-align: center">
<?php
if (isset($_SESSION["role"]) && ($_SESSION["role"] == Role::ADMIN || ($_SESSION["role"] == Role::ORGANIZER && $tournament->organize($_SESSION["user_id"]))))
echo "<a href=\"$URL_BASE/equipe/" . $team->getTrigram() . "\">" . $team->getName(). "</a>";
echo "<a href=\"/equipe/" . $team->getTrigram() . "\">" . $team->getName(). "</a>";
else
echo $team->getName();
?>