fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Thursday release

Browse source
This commit is contained in:
nemunaire 2013-12-13 18:48:13 +01:00
parent bbec08ac4f
commit 505f3bcd63
7 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ onyx/config/root.xml
onyx/db/*.profile.php onyx/db/*.profile.php
onyx/tpl/*/*.html onyx/tpl/*/*.html
submission/* submission/*
misc/openssl.cnf

6
misc/openssl.cnf
View file

@ -39,7 +39,7 @@ default_ca = CA_default # The default ca section
#################################################################### ####################################################################
[ CA_default ] [ CA_default ]
dir = /srv/fic2014-server/misc//pki #DIR # Where everything is kept dir = /var/www/fic2014-server/misc//pki #DIR # Where everything is kept
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file. database = $dir/index.txt # database index file.
@ -147,7 +147,7 @@ organizationalUnitName = Organizational Unit Name (eg, section)
organizationalUnitName_default = SRS organizationalUnitName_default = SRS
commonName = Common Name (e.g. server FQDN or YOUR name) commonName = Common Name (e.g. server FQDN or YOUR name)
commonName_default = FIC2014 Server #COMMONNAME commonName_default = Groupe_8#COMMONNAME
commonName_max = 64 commonName_max = 64
emailAddress = Email Address emailAddress = Email Address
@ -176,7 +176,7 @@ basicConstraints=CA:FALSE
# the certificate can be used for anything *except* object signing. # the certificate can be used for anything *except* object signing.
# This is OK for an SSL server. # This is OK for an SSL server.
nsCertType = server #CERTTYPE nsCertType = client #CERTTYPE
# For an object signing certificate this would be used. # For an object signing certificate this would be used.
# nsCertType = objsign # nsCertType = objsign

15
onyx/include/common/Team.class.php
View file

@ -121,6 +121,10 @@ class Team
return $this->team_name; return $this->team_name;
} }
function get_name_url() {
return urlencode($this->team_name);
}
function get_auth_level() { function get_auth_level() {
return $this->auth_level; return $this->auth_level;
} }
@ -195,10 +199,10 @@ class Team
function get_rank() function get_rank()
{ {
$teams = Team::get_top(); $teams = Team::get_top();
for ($i = 0; $i < 10; $i++){ foreach($teams as $k => $t)
$tid = $teams[$i]->get_id(); {
if ($tid == $this->id) if ($t->get_id() == $this->id)
return $i; return $k + 1;
} }
return 0; return 0;
@ -232,9 +236,8 @@ class Team
$i = 0; $i = 0;
if ($ids) if ($ids)
{ {
foreach ($ids as $id){ foreach ($ids as $id)
$array[] = new Exercice($id['id_exercice']); $array[] = new Exercice($id['id_exercice']);
}
} }
return $array; return $array;

5
onyx/include/common/Theme.class.php
View file

@ -60,6 +60,11 @@ class Theme
return $this->name; return $this->name;
} }
function get_name_url()
{
return urlencode($this->name);
}
function get_id() function get_id()
{ {
return $this->id; return $this->id;

2
onyx/tpl/bootstrap/public/layout.tpl
View file

@ -54,7 +54,7 @@
$(document).ready(function() { $(document).ready(function() {
update_end(); update_end();
$('#carousel-team').carousel({ $('#carousel-team').carousel({
interval: 2000 }); interval: 5000 });
setInterval( function() { setInterval( function() {
update_end(); update_end();

2
onyx/tpl/bootstrap/summary.tpl
View file

@ -12,7 +12,7 @@
{$total=0} {$total=0}
{foreach from=$themes item=theme} {foreach from=$themes item=theme}
<tr> <tr>
<th>{$theme->get_name()}</th> <th style="padding: 0px">{$theme->get_name()}</th>
{$sum=0} {$sum=0}
{$cpt=0} {$cpt=0}
{$themeID=$theme->get_id()} {$themeID=$theme->get_id()}

1
onyx/tpl/bootstrap/teams/me.tpl
View file

@ -9,7 +9,6 @@
{if not empty($members)} {if not empty($members)}
<table class="table"> <table class="table">
<thead><tr> <thead><tr>
<th>#</th>
<th>Prénom</th> <th>Prénom</th>
<th>Nom</th> <th>Nom</th>
<th>Pseudonyme</th> <th>Pseudonyme</th>