diff --git a/htdocs/css/main.css b/htdocs/css/main.css index 4a04e24d..c752d8b9 100644 --- a/htdocs/css/main.css +++ b/htdocs/css/main.css @@ -53,7 +53,7 @@ } samp { display: block; - overflow-x: scroll; + overflow-x: auto; text-overflow: ellipsis; } diff --git a/htdocs/index.php b/htdocs/index.php index f034b421..112709a6 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -140,7 +140,7 @@ else if ($n && $p[0] == SALT_USER) $page = "teams/list"; } - else if (empty($VAR["start_challenge"])) + else if (!empty($p[1]) && empty($VAR["start_challenge"])) { $TEAM = new Team($p[1]); $template->assign("my_team", $TEAM); @@ -150,7 +150,7 @@ else if ($n && $p[0] == SALT_USER) $page = "teams/lobby"; } - else if (time() > $VAR["end_challenge"]) + else if (!empty($p[1]) && time() > $VAR["end_challenge"]) { $TEAM = new Team($p[1]); $template->assign("my_team", $TEAM); diff --git a/onyx/include/admin/generation.php b/onyx/include/admin/generation.php index 85b4cc5b..0f63b4f9 100644 --- a/onyx/include/admin/generation.php +++ b/onyx/include/admin/generation.php @@ -39,7 +39,7 @@ if (count($p) > 2) break; case "team": - if (!empty($_POST["team"])) + if (isset($_POST["team"])) $ret = pipe_backend_scheduler("resetr:TEAM".intval($_POST["team"]).":SYNCS"); break; diff --git a/onyx/include/team/summary.php b/onyx/include/team/summary.php index 556a9298..2e1e36e6 100644 --- a/onyx/include/team/summary.php +++ b/onyx/include/team/summary.php @@ -19,5 +19,6 @@ if (!empty($themes)) $template->assign("themes", Theme::get_themes()); $template->assign("nbExoMax", Exercice::get_nb_exo_max()); $template->assign("percent", $percent); +$template->assign("rank", Team::get_top()); return "teams/summary"; diff --git a/onyx/tpl/bootstrap/teams/exercice.tpl b/onyx/tpl/bootstrap/teams/exercice.tpl index 662ff74b..875dae89 100644 --- a/onyx/tpl/bootstrap/teams/exercice.tpl +++ b/onyx/tpl/bootstrap/teams/exercice.tpl @@ -53,22 +53,13 @@
{if empty($my_team->id)} - Vérifiez votre solution parmi les algorithmes suivants : - - - - - - - - {foreach from=$cur_exercice->keys item=key} - - - - - {/foreach} - -
AlgorithmeHash
{$key.format}
{$key.value}
+ Vérifiez votre solution parmi les algorithmes suivants :

+
+ {foreach from=$cur_exercice->keys item=key} +
{$key.format}
+
{$key.value}
+ {/foreach} +
{else if $cur_exercice->has_solved($my_team)} Résolu à {$cur_exercice->has_solved($my_team)|date_format:"%H:%M:%S"} :) {else} diff --git a/onyx/tpl/bootstrap/teams/summary.tpl b/onyx/tpl/bootstrap/teams/summary.tpl index cf025cba..78479668 100644 --- a/onyx/tpl/bootstrap/teams/summary.tpl +++ b/onyx/tpl/bootstrap/teams/summary.tpl @@ -1,6 +1,18 @@ {extends file="teams/layout.tpl"} {block name=content} +{if empty($my_team->id)} +
+
+

Challenge forensic Épita 2015

+
+
+ Le challenge s'est déroulé le mardi 20 janvier 2015 lors du Forum International de la Cybercriminalité. Bravo à tous les participants !

+ Consultez la chaîne YouTube d'Épita pour visionner les vidéos de résolutions des exercices. +
+
+{include file="rank.tpl"} +{else} {if isset($percent)}
@@ -17,4 +29,5 @@
{/if} {include file="summary.tpl"} +{/if} {/block}