From 4caf4df7bd8a8597af5a0619a316db80322cfc93 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 9 Nov 2015 09:56:34 +0100
Subject: [PATCH] Commit mineur

---
 css/layout.css        | 10 +++++-----
 manager/modules.php   |  4 ++++
 manager/security.php  |  2 --
 src/userlist.json     | 19 -------------------
 test.php              |  9 +--------
 xdoc/exemple parcours | 25 +++++++++++++++++++++++++
 6 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 xdoc/exemple parcours

diff --git a/css/layout.css b/css/layout.css
index 036db39..08649c6 100755
--- a/css/layout.css
+++ b/css/layout.css
@@ -54,11 +54,11 @@ body{
 
 /* @blurred */
 *.blurred{
-	filter: blur(2px);
-	-moz-filter: blur(2px);
-	-webkit-filter: blur(2px);
-	-ms-filter: blur(2px);
-	-o-filter: blur(2px);
+	filter: blur(5px);
+	-moz-filter: blur(5px);
+	-webkit-filter: blur(5px);
+	-ms-filter: blur(5px);
+	-o-filter: blur(5px);
 }
 
 
diff --git a/manager/modules.php b/manager/modules.php
index 5619bc7..7df8920 100755
--- a/manager/modules.php
+++ b/manager/modules.php
@@ -45,6 +45,10 @@ require_once __ROOT__.'/manager/database.php';
 						$semestreCheck = $etudiantCheck && preg_match('/^[1-4]{1}$/i', $request->semestre);            // semestre (semestre) bon format
 						$anneeCheck    = $semestreCheck    && preg_match('/^[0-9]{4}$/i', $request->annee);           // semestre (annee) bon format
 					
+					// si c'est pas un admin et que l'année est définie manuellement (alors on met l'année courante)
+					if( !permission('admin') ) $request->annee = $_SESSION['annee'];
+
+
 					if( $anneeCheck ){ // si tout les paramètres sont bons
 						$UEList = DataBase::getInstance()->getModulesByUEByEtudiant($request->etudiant, $request->semestre, $request->annee);
 
diff --git a/manager/security.php b/manager/security.php
index 00bafb0..122447e 100755
--- a/manager/security.php
+++ b/manager/security.php
@@ -53,8 +53,6 @@
 		ini_set('display_startup_errors',1);
 		error_reporting(-1);
 	}
-
-
 	
 
 
diff --git a/src/userlist.json b/src/userlist.json
index b8667de..6bdad69 100755
--- a/src/userlist.json
+++ b/src/userlist.json
@@ -1,36 +1,17 @@
 {
-	"eleve1": {
-		"permissions": ["student"],
-		"password"   : "password"
-	},
-	
 	"mrd1609a": {
-		"permissions": ["student"],
 		"password"   : "password"
 	},
 	
 	"eleve2": {
-		"permissions": ["student"],
 		"password"   : "password"
 	},
 
 	"lbh1609a": {
-		"permissions": ["teacher"],
-		"password"   : "password"
-	},
-
-	"prof2": {
-		"permissions": ["master"],
 		"password"   : "password"
 	},
 
 	"admin": {
-		"permissions": ["admin"],
-		"password"   : "password"
-	},
-
-	"admin2": {
-		"permissions": ["admin"],
 		"password"   : "password"
 	}
 
diff --git a/test.php b/test.php
index 0480276..5375e5e 100755
--- a/test.php
+++ b/test.php
@@ -1,14 +1,7 @@
 <?php define('__ROOT__', dirname(__FILE__) );
 require_once __ROOT__.'/manager/security.php';
 
-	$annee = Date('Y', time());
-	$mois  = (int) Date('m', time());
-
-	$annee = 2015; $mois = 8;
-
-	if( $mois < 8 ) $annee--;
-
-	echo ($mois<8) ? Date('Y', time()) - 1 : Date('Y', time());
+	var_dump( $_SESSION['droits'] );
 
 /***************/
 /*** A FAIRE ***/
diff --git a/xdoc/exemple parcours b/xdoc/exemple parcours
new file mode 100644
index 0000000..c26e174
--- /dev/null
+++ b/xdoc/exemple parcours	
@@ -0,0 +1,25 @@
+*** [NORMAL] ***
+
+S1 - 1, 2000
+S2 - 2, 2000
+S3 - 3, 2000
+S4 - 4, 2000
+
+*** [S1/S2 RATE] ***
+
+S1 - 1, 2000
+S2 - 2, 2000
+S1 - 1, 2001
+S2 - 2, 2001
+S3 - 3, 2001
+S4 - 4, 2001
+
+
+*** [S3/S4 RATE] ***
+
+S1 - 1, 2000
+S2 - 2, 2000
+S3 - 3, 2000
+S4 - 4, 2000
+S3 - 3, 2001
+S4 - 4, 2001
\ No newline at end of file