Correction sociogram + avancement sur création de 'subject'

2016-04-18 22:45:55 +02:00 · 2016-04-18 22:45:55 +02:00 · ec88d69427
parent a457737e89
commit ec88d69427
14 changed files with 215 additions and 173 deletions
--- a/automate.php
+++ b/automate.php
@ -50,7 +50,13 @@
 			echo $num.' <> '.$name.'<br>';
 	}

-	parseCallLog();
+	// parseCallLog();
+
+	$username  = ' ';
+	$firstname = '';
+	$lastname  = '';
+
+	var_dump( !!strlen($username.$firstname.$lastname) ); // Pseudo, prénom, ou nom, au moins un n'est pas vide



--- a/config/modules.json
+++ b/config/modules.json
@ -52,7 +52,7 @@
 		"getById": {
 			"description": "Retourne les informations d'un utilisateur.",
 			"permissions": ["admin"],
-			"parameters": {
+			"parameters":  {
 				"id_user": { "description": "UID de l'utilisateur recherche.", "type": "id" }
 			}
 		},
@ -69,11 +69,11 @@
 			"description": "Creation d'un nouvel utilisateur.",
 			"permissions": ["admin"],
 			"parameters": {
-				"login"      : { "description": "Login de l'utilisateur, 30 caracteres maximum.",      "type": "varchar(3,30)" },
-				"password"   : { "description": "Mot de passe de l'utilisateur.",                      "type": "text"          },
-				"mail"       : { "description": "Adresse mail de l'utilisateur.",                      "type": "mail"          },
-				"reference"  : { "description": "UID d'une personne d'un sondage, peut etre vide.",    "type": "text"          },
-				"permission" : { "description": "Permissions de l'utilisateur : 'admin' ou 'subject'", "type": "varchar(5,7)"  }
+				"login":      { "description": "Login de l'utilisateur, 30 caracteres maximum.",      "type": "varchar(3,30)" },
+				"password":   { "description": "Mot de passe de l'utilisateur.",                      "type": "text"          },
+				"mail":       { "description": "Adresse mail de l'utilisateur.",                      "type": "mail"          },
+				"reference":  { "description": "UID d'une personne d'un sondage, peut etre vide.",    "type": "text"          },
+				"permission": { "description": "Permissions de l'utilisateur : 'admin' ou 'subject'", "type": "varchar(5,7)"  }
 			}
 		},

@ -132,7 +132,7 @@
 			"description": "Creation d'un token de nom et de duree donnee",
 			"permissions": ["admin"],
 			"parameters": {
-				"name"    : { "description": "Nom attribue au token", "type": "varchar(3,50)" },
+				"name":     { "description": "Nom attribue au token", "type": "varchar(3,50)" },
 				"duration": { "description": "Duree du token en nombre de jours", "type": "numeric" }
 			}
 		}
@ -160,11 +160,11 @@
 			"description": "Creation d'un nouveau sujet.",
 			"permissions": ["admin"],
 			"parameters": {
-				"username"   : { "description": "Pseudo du sujet, 30 caracteres maximum.",   "type": "varchar(3,30)"                  },
-				"firstname"  : { "description": "Prénom du sujet, 30 caracteres maximum.",   "type": "varchar(3,30)"                  },
-				"lastname"   : { "description": "Nom du sujet, 30 caracteres maximum.",      "type": "varchar(3,30)"                  },
+				"username"   : { "description": "Pseudo du sujet, 30 caracteres maximum.",   "type": "varchar(0,30)"                  },
+				"firstname"  : { "description": "Prénom du sujet, 30 caracteres maximum.",   "type": "varchar(0,30)"                  },
+				"lastname"   : { "description": "Nom du sujet, 30 caracteres maximum.",      "type": "varchar(0,30)"                  },
 				"id_facebook": { "description": "Id facebook du sujet (optionnel).",         "type": "id",           "optional": true },
-				"number"     : { "description": "Numéro de téléphone du sujet (optionnel).", "type": "text",         "optional": true }
+				"number"     : { "description": "Numéro de téléphone du sujet (optionnel).", "type": "number",       "optional": true }
 			}
 		},

--- a/js/includes/sociogram.js
+++ b/js/includes/sociogram.js
@ -14,7 +14,7 @@
 */

 /* [1] Récupération du conteneur
-=========================================================*/
+======================================*/
 function sociogramClass(container){
 	this.container = container;
 	this.log('sociogram created');
@ -23,7 +23,7 @@ function sociogramClass(container){


 /* [2] Construction de la classe
-=========================================================*/
+======================================*/
 sociogramClass.prototype = {
 	container: this.container,
 	sigma: null,
@ -122,7 +122,7 @@ sociogramClass.prototype.load = function(){
 		thisPtr.log(response);

 		// Si erreur, on quitte
-		if( response.ModuleError !== 0 ) return;
+		if( response.ModuleError != 0 ) return;

 		// On enregistre la réponse
 		thisPtr.response = response;
@ -206,7 +206,7 @@ sociogramClass.prototype.nodeAt = function(x, y){
 	var minDistance = null;
 	for( var nodeId in nodes ){
 		var distance = Math.sqrt( Math.pow(x-nodes[nodeId].x, 2) + Math.pow(y-nodes[nodeId].y, 2) );
-		if( minDistance === null || distance < minDistance )
+		if( minDistance == null || distance < minDistance )
 			minDistance = distance;
 	}

@ -231,9 +231,9 @@ sociogramClass.prototype.arrange = function(nodeId, pos, alone){
 	var node = this.sigma.graph.nodes(nodeId);

 	// Si le noeud est deja place, on ne fais rien
-	if( node.x !== 0 || node.y !== 0 ) return;
+	if( node.x != 0 || node.y != 0 ) return;

-	pos = (pos===null) ? {x: node.x, y: node.y} : pos;        // On recupere la position
+	pos = (pos==null) ? {x: node.x, y: node.y} : pos;        // On recupere la position

 	// Tant que le noeud est trop proche d'un autre, on l'eloigne
 	// UNIQUEMENT si alone n'est pas NULL
@ -278,7 +278,7 @@ sociogramClass.prototype.arrange = function(nodeId, pos, alone){
 	for( neighborId in neighbors ){
 		var current = this.sigma.graph.nodes(neighborId);
 		// Si n'est pas deja positionne
-		if( current.x === 0 && current.y === 0 ){
+		if( current.x == 0 && current.y == 0 ){
 			// On cherche un angle tant qu'il est pas trop pres d'un deja pris
 			var angle, alreadyUsed = false;
 			do{
@ -328,7 +328,7 @@ sociogramClass.prototype.overload.nodeNeighbors = function(nodeId){
 		var subneighbors = this.allNeighborsIndex[stack[0]];
 		for( var subId in subneighbors )
 			// Si le voisin est pas deja dans la liste/pile, on l'ajoute a la liste des voisins
-			if( neighbors[subId] === null ){
+			if( neighbors[subId] == null ){
 				stack.push(subId); // On ajoute a la pile
 				neighbors[subId] = subneighbors[subId]; // On ajoute a la liste complete
 			}
@ -455,7 +455,7 @@ sociogramClass.prototype.bindings.clickNode = function(thisPtr, e){
 	neighborNodes[nodeId] = e.data.node; // on ajoute le noeud clique

 	thisPtr.sigma.graph.nodes().forEach(function(n) {
-		if( neighborNodes[n.id] !== null ) n.color = n.originalColor;
+		if( neighborNodes[n.id] != null ) n.color = n.originalColor;
 		else                              n.color = '#eee';
    });

--- a/manager/Database.php
+++ b/manager/Database.php
@ -262,6 +262,32 @@
 		}


+
+
+
+		/* FONCTION QUI FORMATTE UN NUMÉRO DE TÉLÉPHONE
+		*
+		* @number<String> 										Numéro de téléphone en +336/336/06/0336/00336
+		*
+		* @return formatted<String> 							Numéro formatté (06), on FALSE si erreur
+		*
+		*/
+		public static function formatNumber($number){
+			// On met en <string> quel que soit le type
+			$number = (string) $number;
+
+			// On supprime tous les espaces
+			$number = str_replace(' ', '', $number);
+
+			// On formatte le numéro
+			if( preg_match("/^(?:\+33|0?0?33|0)(.+)/", $number, $m) )
+				$number = '0'.$m[1];
+
+			// On retourne le numéro formatté
+			return $number;
+		}
+
+
 		////////////////////////////////////
 		//      _       _
 		//   __| | __ _| |_ ___  ___
--- a/manager/module/call_log.php
+++ b/manager/module/call_log.php
@ -9,34 +9,6 @@
 	class call_log{


-		/* FONCTION QUI FORMATTE UN NUMÉRO DE TÉLÉPHONE
-		*
-		* @number<String> 										Numéro de téléphone en +336/336/06
-		*
-		* @return formatted<String> 							Numéro formatté (06), on FALSE si erreur
-		*
-		*/
-		private static function formatNumber($number){
-			// On met en <string> quel que soit le type
-			$number = (string) $number;
-
-			// On supprime tous les espaces
-			$number = str_replace(' ', '', $number);
-
-			// On formatte le numéro
-			if( preg_match("/^(?:\+33|0?0?33|0)(.+)/", $number, $m) )
-				$number = '0'.$m[1];
-
-			// On retourne le numéro formatté
-			return $number;
-		}
-
-
-
-
-
-
-
 		/* DESERIALISATION D'UN JOURNAL D'APPEL
 		*
 		* @content<String>	     								Le contenu du journal d'appel a deserialiser
@ -51,7 +23,7 @@
 			extract($params);

 			// On formatte le numéro de téléphone
-			$phone_number = self::formatNumber($phone_number);
+			$phone_number = Database::formatNumber($phone_number);

 			/* [1] On parse/récupère le xml
 			=========================================================*/
@ -68,7 +40,7 @@

 			foreach($xml->Item as $log){
 				/* (1) On formatte le numéro */
-				$number = self::formatNumber($log['Number']);
+				$number = Database::formatNumber($log['Number']);

 				/* (2) On enregistre le contact dans l'annuaire s'il y est pas déjà */
 				if( !isset($phone_directory[$number]) )
@ -76,8 +48,8 @@

 				/* (3) On complète le log */
 				$phone_log = array(
-					'source'   => ($log['Direction']=='INCOMING') ? $number : self::formatNumber($phone_number),
-					'target'   => ($log['Direction']=='INCOMING') ? self::formatNumber($phone_number) : $number,
+					'source'   => ($log['Direction']=='INCOMING') ? $number : Database::formatNumber($phone_number),
+					'target'   => ($log['Direction']=='INCOMING') ? Database::formatNumber($phone_number) : $number,
 					'type'     => strtolower($log['Type']),
 					'date'     => strtotime($log['Date']),
 					'duration' => (int) $log['Duration']
--- a/manager/module/subject.php
+++ b/manager/module/subject.php
@ -68,29 +68,26 @@

 		/* CREATION D'UN SUJET
 		*
-		* @login<String> 									Login (identifiant) du sujet
-		* @password<String>									Password du sujet
-		* @mail<String>										Adresse mail du sujet
-		* @reference<int>									Reference vers une Personne (sinon NULL)
-		* @permissions<String>								Liste des permissions du sujet
+		* @username<String> 									Pseudo du sujet
+		* @firstname<String>									Prénom du sujet
+		* @lastname<String>										Nom du sujet
+		* @id_facebook<int>										Id facebook du sujet (optionnel)
+		* @number<String>										Numéro de téléphone du sujet (optionnel)
 		*
 		* @return id_subject<int> 								Renvoie l'id du sujet cree
 		*
 		*/
 		public static function create($params){
-			var_dump($params);
 			extract($params);

 			/* [0] Verification et formattage des INPUT
 			=========================================================*/
-			$password    = sessionManager::sha1($password);
-			$reference   = (is_numeric($reference)) ? (int) $reference : null;
-			$permission  = ($permission=='admin') ? 'admin' : 'subject';
-
+			$id_facebook = !is_null($id_facebook) ? (int) $id_facebook              : null;
+			$number      = !is_null($number)      ? Database::formatNumber($number) : null;

 			/* [1] Creation du sujet
 			=========================================================*/
-			$create = new Repo('subject/create', array($login, $password, $mail, $reference, $permission));
+			$create = new Repo('subject/create', array($username, $firstname, $lastname, $id_facebook, $number));
 			$created_id = $create->answer();

 			// Si erreur de creation, on retourne une erreur
@ -100,7 +97,7 @@
 			=========================================================*/
 			return array(
 				'ModuleError' => ManagerError::Success,
-				'id_subject'     => $created_id
+				'id_subject'  => $created_id
 			);
 		}

--- a/manager/repo/subject.php
+++ b/manager/repo/subject.php
@ -71,47 +71,41 @@

 		/* CREE UN SUJET
 		*
-		* @login<String> 									Login (identifiant) du sujet
-		* @password<String>									Password du sujet
-		* @mail<String>										Adresse mail du sujet
-		* @reference<int>									Reference vers une Personne (sinon NULL)
-		* @permissions<Array>								Liste des permissions du sujet
+		* @username<String> 									Pseudo du sujet
+		* @firstname<String>									Prénom du sujet
+		* @lastname<String>										Nom du sujet
+		* @id_facebook<int>										Id facebook du sujet (optionnel)
+		* @number<String>										Numéro de téléphone du sujet (optionnel)
 		*
 		* @return id_subject<int> 								Renvoie l'id du sujet cree ou FALSE si erreur
 		*
 		*/
-		public static function create($login, $password, $mail, $reference, $permission){
+		public static function create($username, $firstname, $lastname, $id_facebook, $number){
 			/* [0] Verification et formattage des INPUT
 			=========================================================*/
-			$checkInput = Database::check('sha1', $password);
-			$checkInput = $checkInput && ( Database::check('id', $reference) || $reference === null );
-			$checkInput = $checkInput && in_array($permission, array('admin', 'subject'));
+			$checkInput =                Database::check('varchar(0,30)', $username);
+			$checkInput = $checkInput && Database::check('varchar(0,30)', $firstname);
+			$checkInput = $checkInput && Database::check('varchar(0,30)', $lastname);
+			$checkInput = $checkInput && !!strlen($username.$firstname.$lastname);     // Pseudo, prénom, ou nom, au moins un n'est pas vide
+			$checkInput = $checkInput && ( Database::check('id', $id_facebook) || is_null($id_facebook) );
+			$checkInput = $checkInput && ( Database::check('number', $number) || is_null($number) );

 			// Si erreur en entree, on retourne FAUX
 			if( !$checkInput ) return false;

-
-			/* [1] On verifie que le login/mail et reference sont uniques
+			/* [1] On écrit la requête
 			=========================================================*/
-			$checkUnique = Database::getPDO()->prepare("SELECT id_subject
-				FROM subjects
-				WHERE login = :login
-				OR    mail  = :mail
-				OR    ( reference = :reference AND reference is not NULL )");
-			$checkUnique->execute(array(
-				':login'     => $login,
-				':mail'      => $mail,
-				':reference' => $reference
-			));
-			$unique = $checkUnique->fetch() === false;
+			$request_create = 'INSERT INTO Personnes(idPersonne, pseudo, nom, prenom, id_facebook, telephone) ';
+			$request_create .= 'VALUES (';
+				$request_create .= 'DEFAULT, ';                                        // idPersone
+				$request_create .= strlen($username)      ? ':pseudo, '      : 'NULL, '; // pseudo
+				$request_create .= strlen($lastname)      ? ':nom, '         : 'NULL, '; // nom
+				$request_create .= strlen($firstname)     ? ':prenom, '      : 'NULL, '; // prenom
+				$request_create .= !is_null($id_facebook) ? ':id_facebook, ' : 'NULL, '; // Id facebook
+				$request_create .= !is_null($number)      ? ':number, '      : 'NULL, '; // Numéro de tél
+			$request_create .= ')';

-			// Si un sujet a le meme LOGIN/MAIL ou REFERENCE, on retourne une erreur
-			if( !$unique ) return false;
-
-
-			/* [2] Creation du sujet
-			=========================================================*/
-			/* (1) Si reference NULL */
+			/* (1) Si id_facebook NULL */
 			if( $reference == null ){

 				$create = Database::getPDO()->prepare("INSERT INTO subjects(id_subject, login, password, mail, reference, permission)
--- a/manager/repo/user.php
+++ b/manager/repo/user.php
@ -126,7 +126,7 @@
 			/* [0] Verification et formattage des INPUT
 			=========================================================*/
 			$checkInput = Database::check('sha1', $password);
-			$checkInput = $checkInput && ( Database::check('id', $reference) || $reference === null );
+			$checkInput = $checkInput && ( Database::check('id', $reference) || is_null($reference) );
 			$checkInput = $checkInput && in_array($permission, array('admin', 'subject'));

 			// Si erreur en entree, on retourne FAUX
--- a/phpunit/coverage/Database.php.html
+++ b/phpunit/coverage/Database.php.html
@ -51,22 +51,22 @@
      <td class="danger small"><div align="right">0.00%</div></td>
      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
      <td class="danger big">       <div class="progress">
-         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="37.50" aria-valuemin="0" aria-valuemax="100" style="width: 37.50%">
+           <span class="sr-only">37.50% covered (danger)</span>
         </div>
       </div>
 </td>
-      <td class="danger small"><div align="right">42.86%</div></td>
-      <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
+      <td class="danger small"><div align="right">37.50%</div></td>
+      <td class="danger small"><div align="right">3&nbsp;/&nbsp;8</div></td>
      <td class="danger small"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></td>
      <td class="warning big">       <div class="progress">
-         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="83.33" aria-valuemin="0" aria-valuemax="100" style="width: 83.33%">
-           <span class="sr-only">83.33% covered (warning)</span>
+         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="78.65" aria-valuemin="0" aria-valuemax="100" style="width: 78.65%">
+           <span class="sr-only">78.65% covered (warning)</span>
         </div>
       </div>
 </td>
-      <td class="warning small"><div align="right">83.33%</div></td>
-      <td class="warning small"><div align="right">70&nbsp;/&nbsp;84</div></td>
+      <td class="warning small"><div align="right">78.65%</div></td>
+      <td class="warning small"><div align="right">70&nbsp;/&nbsp;89</div></td>
     </tr>

     <tr>
@ -80,22 +80,22 @@
      <td class="danger small"><div align="right">0.00%</div></td>
      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
      <td class="danger big">       <div class="progress">
-         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="37.50" aria-valuemin="0" aria-valuemax="100" style="width: 37.50%">
+           <span class="sr-only">37.50% covered (danger)</span>
         </div>
       </div>
 </td>
-      <td class="danger small"><div align="right">42.86%</div></td>
-      <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
-      <td class="danger small">63.04</td>
+      <td class="danger small"><div align="right">37.50%</div></td>
+      <td class="danger small"><div align="right">3&nbsp;/&nbsp;8</div></td>
+      <td class="danger small">80.33</td>
      <td class="warning big">       <div class="progress">
-         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="83.33" aria-valuemin="0" aria-valuemax="100" style="width: 83.33%">
-           <span class="sr-only">83.33% covered (warning)</span>
+         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="78.65" aria-valuemin="0" aria-valuemax="100" style="width: 78.65%">
+           <span class="sr-only">78.65% covered (warning)</span>
         </div>
       </div>
 </td>
-      <td class="warning small"><div align="right">83.33%</div></td>
-      <td class="warning small"><div align="right">70&nbsp;/&nbsp;84</div></td>
+      <td class="warning small"><div align="right">78.65%</div></td>
+      <td class="warning small"><div align="right">70&nbsp;/&nbsp;89</div></td>
     </tr>

     <tr>
@ -225,7 +225,28 @@
     </tr>

     <tr>
-      <td class="danger" colspan="4">&nbsp;<a href="#274"><abbr title="frDate($date)">frDate</abbr></a></td>
+      <td class="danger" colspan="4">&nbsp;<a href="#275"><abbr title="formatNumber($number)">formatNumber</abbr></a></td>
+      <td class="danger big">       <div class="progress">
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
+         </div>
+       </div>
+</td>
+      <td class="danger small"><div align="right">0.00%</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;1</div></td>
+      <td class="danger small">6</td>
+      <td class="danger big">       <div class="progress">
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
+           <span class="sr-only">0.00% covered (danger)</span>
+         </div>
+       </div>
+</td>
+      <td class="danger small"><div align="right">0.00%</div></td>
+      <td class="danger small"><div align="right">0&nbsp;/&nbsp;5</div></td>
+     </tr>
+
+     <tr>
+      <td class="danger" colspan="4">&nbsp;<a href="#300"><abbr title="frDate($date)">frDate</abbr></a></td>
      <td class="danger big">       <div class="progress">
         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
           <span class="sr-only">0.00% covered (danger)</span>
@ -514,45 +535,71 @@
     <tr class="warning"><td><div align="right"><a name="262"></a><a href="#262">262</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
     <tr><td><div align="right"><a name="263"></a><a href="#263">263</a></div></td><td class="codeLine"></td></tr>
     <tr><td><div align="right"><a name="264"></a><a href="#264">264</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="265"></a><a href="#265">265</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">////////////////////////////////////</span></td></tr>
-     <tr><td><div align="right"><a name="266"></a><a href="#266">266</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_</span></td></tr>
-     <tr><td><div align="right"><a name="267"></a><a href="#267">267</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;&nbsp;__|&nbsp;|&nbsp;__&nbsp;_|&nbsp;|_&nbsp;___&nbsp;&nbsp;___</span></td></tr>
-     <tr><td><div align="right"><a name="268"></a><a href="#268">268</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;/&nbsp;_`&nbsp;|/&nbsp;_`&nbsp;|&nbsp;__/&nbsp;_&nbsp;\/&nbsp;__|</span></td></tr>
-     <tr><td><div align="right"><a name="269"></a><a href="#269">269</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;|&nbsp;(_|&nbsp;|&nbsp;(_|&nbsp;|&nbsp;||&nbsp;&nbsp;__/\__&nbsp;\</span></td></tr>
-     <tr><td><div align="right"><a name="270"></a><a href="#270">270</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;\__,_|\__,_|\__\___||___/</span></td></tr>
-     <tr><td><div align="right"><a name="271"></a><a href="#271">271</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//</span></td></tr>
-     <tr><td><div align="right"><a name="272"></a><a href="#272">272</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">////////////////////////////////////</span></td></tr>
-     <tr><td><div align="right"><a name="273"></a><a href="#273">273</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;1)&nbsp;Convertis&nbsp;une&nbsp;date&nbsp;en&nbsp;en&nbsp;francais&nbsp;explicite</span></td></tr>
-     <tr><td><div align="right"><a name="274"></a><a href="#274">274</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">public</span><span class="default">&nbsp;</span><span class="keyword">static</span><span class="default">&nbsp;</span><span class="keyword">function</span><span class="default">&nbsp;</span><span class="default">frDate</span><span class="keyword">(</span><span class="default">$date</span><span class="keyword">)</span><span class="keyword">{</span></td></tr>
-     <tr><td><div align="right"><a name="275"></a><a href="#275">275</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[1]&nbsp;On&nbsp;definit&nbsp;les&nbsp;traductions</span></td></tr>
-     <tr><td><div align="right"><a name="276"></a><a href="#276">276</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
-     <tr><td><div align="right"><a name="277"></a><a href="#277">277</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;Jours&nbsp;de&nbsp;la&nbsp;semaine</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="278"></a><a href="#278">278</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$days</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span><span class="default">&quot;Lundi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mardi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mercredi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Jeudi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Vendredi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Samedi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Dimanche&quot;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
-     <tr><td><div align="right"><a name="279"></a><a href="#279">279</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;Mois&nbsp;de&nbsp;l'annee</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="280"></a><a href="#280">280</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$months</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span><span class="default">&quot;Janvier&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Février&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mars&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Avril&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mai&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Juin&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Juillet&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Août&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Septembre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Octobre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Novembre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Décembre&quot;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="265"></a><a href="#265">265</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="266"></a><a href="#266">266</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="267"></a><a href="#267">267</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="268"></a><a href="#268">268</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;FONCTION&nbsp;QUI&nbsp;FORMATTE&nbsp;UN&nbsp;NUMÉRO&nbsp;DE&nbsp;TÉLÉPHONE</span></td></tr>
+     <tr><td><div align="right"><a name="269"></a><a href="#269">269</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*</span></td></tr>
+     <tr><td><div align="right"><a name="270"></a><a href="#270">270</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;@number&lt;String&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Numéro&nbsp;de&nbsp;téléphone&nbsp;en&nbsp;+336/336/06/0336/00336</span></td></tr>
+     <tr><td><div align="right"><a name="271"></a><a href="#271">271</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*</span></td></tr>
+     <tr><td><div align="right"><a name="272"></a><a href="#272">272</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;@return&nbsp;formatted&lt;String&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Numéro&nbsp;formatté&nbsp;(06),&nbsp;on&nbsp;FALSE&nbsp;si&nbsp;erreur</span></td></tr>
+     <tr><td><div align="right"><a name="273"></a><a href="#273">273</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*</span></td></tr>
+     <tr><td><div align="right"><a name="274"></a><a href="#274">274</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*/</span></td></tr>
+     <tr><td><div align="right"><a name="275"></a><a href="#275">275</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">public</span><span class="default">&nbsp;</span><span class="keyword">static</span><span class="default">&nbsp;</span><span class="keyword">function</span><span class="default">&nbsp;</span><span class="default">formatNumber</span><span class="keyword">(</span><span class="default">$number</span><span class="keyword">)</span><span class="keyword">{</span></td></tr>
+     <tr><td><div align="right"><a name="276"></a><a href="#276">276</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;On&nbsp;met&nbsp;en&nbsp;&lt;string&gt;&nbsp;quel&nbsp;que&nbsp;soit&nbsp;le&nbsp;type</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="277"></a><a href="#277">277</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$number</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">(string)</span><span class="default">&nbsp;</span><span class="default">$number</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="278"></a><a href="#278">278</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="279"></a><a href="#279">279</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;On&nbsp;supprime&nbsp;tous&nbsp;les&nbsp;espaces</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="280"></a><a href="#280">280</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$number</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">str_replace</span><span class="keyword">(</span><span class="default">'&nbsp;'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">''</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$number</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
     <tr><td><div align="right"><a name="281"></a><a href="#281">281</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="282"></a><a href="#282">282</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[2]&nbsp;On&nbsp;recupere&nbsp;le&nbsp;timestamp&nbsp;et&nbsp;les&nbsp;indices</span></td></tr>
-     <tr><td><div align="right"><a name="283"></a><a href="#283">283</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="284"></a><a href="#284">284</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$time</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">strtotime</span><span class="keyword">(</span><span class="default">$date</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;timestamp</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="285"></a><a href="#285">285</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$daynum</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">intval</span><span class="keyword">(</span><span class="default">&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'N'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">-</span><span class="default">1</span><span class="default">&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;jour&nbsp;dans&nbsp;la&nbsp;semaine</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="286"></a><a href="#286">286</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$monthnum</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">intval</span><span class="keyword">(</span><span class="default">&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'n'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">-</span><span class="default">1</span><span class="default">&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;numero&nbsp;du&nbsp;mois&nbsp;dans&nbsp;l'annee</span></td></tr>
-     <tr><td><div align="right"><a name="287"></a><a href="#287">287</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="288"></a><a href="#288">288</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="289"></a><a href="#289">289</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[3]&nbsp;On&nbsp;recupere&nbsp;les&nbsp;infos&nbsp;independemment</span></td></tr>
-     <tr><td><div align="right"><a name="290"></a><a href="#290">290</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
-     <tr><td><div align="right"><a name="291"></a><a href="#291">291</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$result</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="292"></a><a href="#292">292</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$days</span><span class="keyword">[</span><span class="default">$daynum</span><span class="keyword">]</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;nom&nbsp;de&nbsp;jour</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="293"></a><a href="#293">293</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'j'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;jour&nbsp;du&nbsp;mois</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="294"></a><a href="#294">294</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$months</span><span class="keyword">[</span><span class="default">$monthnum</span><span class="keyword">]</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;nom&nbsp;du&nbsp;mois</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="295"></a><a href="#295">295</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'Y'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;annee</span></td></tr>
-     <tr class="danger"><td><div align="right"><a name="296"></a><a href="#296">296</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
-     <tr><td><div align="right"><a name="297"></a><a href="#297">297</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="298"></a><a href="#298">298</a></div></td><td class="codeLine"></td></tr>
-     <tr class="danger"><td><div align="right"><a name="299"></a><a href="#299">299</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">return</span><span class="default">&nbsp;</span><span class="default">implode</span><span class="keyword">(</span><span class="default">&quot;&nbsp;&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$result</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
-     <tr class="warning"><td><div align="right"><a name="300"></a><a href="#300">300</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
-     <tr><td><div align="right"><a name="301"></a><a href="#301">301</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="302"></a><a href="#302">302</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
-     <tr><td><div align="right"><a name="303"></a><a href="#303">303</a></div></td><td class="codeLine"><span class="default">?&gt;</span></td></tr>
+     <tr><td><div align="right"><a name="282"></a><a href="#282">282</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;On&nbsp;formatte&nbsp;le&nbsp;numéro</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="283"></a><a href="#283">283</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">if</span><span class="keyword">(</span><span class="default">&nbsp;</span><span class="default">preg_match</span><span class="keyword">(</span><span class="default">&quot;/^(?:\+33|0?0?33|0)(.+)/&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$number</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$m</span><span class="keyword">)</span><span class="default">&nbsp;</span><span class="keyword">)</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="284"></a><a href="#284">284</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$number</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">'0'</span><span class="keyword">.</span><span class="default">$m</span><span class="keyword">[</span><span class="default">1</span><span class="keyword">]</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="285"></a><a href="#285">285</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="286"></a><a href="#286">286</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;On&nbsp;retourne&nbsp;le&nbsp;numéro&nbsp;formatté</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="287"></a><a href="#287">287</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">return</span><span class="default">&nbsp;</span><span class="default">$number</span><span class="keyword">;</span></td></tr>
+     <tr class="warning"><td><div align="right"><a name="288"></a><a href="#288">288</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
+     <tr><td><div align="right"><a name="289"></a><a href="#289">289</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="290"></a><a href="#290">290</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="291"></a><a href="#291">291</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">////////////////////////////////////</span></td></tr>
+     <tr><td><div align="right"><a name="292"></a><a href="#292">292</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_</span></td></tr>
+     <tr><td><div align="right"><a name="293"></a><a href="#293">293</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;&nbsp;__|&nbsp;|&nbsp;__&nbsp;_|&nbsp;|_&nbsp;___&nbsp;&nbsp;___</span></td></tr>
+     <tr><td><div align="right"><a name="294"></a><a href="#294">294</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;/&nbsp;_`&nbsp;|/&nbsp;_`&nbsp;|&nbsp;__/&nbsp;_&nbsp;\/&nbsp;__|</span></td></tr>
+     <tr><td><div align="right"><a name="295"></a><a href="#295">295</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;|&nbsp;(_|&nbsp;|&nbsp;(_|&nbsp;|&nbsp;||&nbsp;&nbsp;__/\__&nbsp;\</span></td></tr>
+     <tr><td><div align="right"><a name="296"></a><a href="#296">296</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;&nbsp;\__,_|\__,_|\__\___||___/</span></td></tr>
+     <tr><td><div align="right"><a name="297"></a><a href="#297">297</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//</span></td></tr>
+     <tr><td><div align="right"><a name="298"></a><a href="#298">298</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">////////////////////////////////////</span></td></tr>
+     <tr><td><div align="right"><a name="299"></a><a href="#299">299</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;1)&nbsp;Convertis&nbsp;une&nbsp;date&nbsp;en&nbsp;en&nbsp;francais&nbsp;explicite</span></td></tr>
+     <tr><td><div align="right"><a name="300"></a><a href="#300">300</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">public</span><span class="default">&nbsp;</span><span class="keyword">static</span><span class="default">&nbsp;</span><span class="keyword">function</span><span class="default">&nbsp;</span><span class="default">frDate</span><span class="keyword">(</span><span class="default">$date</span><span class="keyword">)</span><span class="keyword">{</span></td></tr>
+     <tr><td><div align="right"><a name="301"></a><a href="#301">301</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[1]&nbsp;On&nbsp;definit&nbsp;les&nbsp;traductions</span></td></tr>
+     <tr><td><div align="right"><a name="302"></a><a href="#302">302</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
+     <tr><td><div align="right"><a name="303"></a><a href="#303">303</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;Jours&nbsp;de&nbsp;la&nbsp;semaine</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="304"></a><a href="#304">304</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$days</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span><span class="default">&quot;Lundi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mardi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mercredi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Jeudi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Vendredi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Samedi&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Dimanche&quot;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="305"></a><a href="#305">305</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;Mois&nbsp;de&nbsp;l'annee</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="306"></a><a href="#306">306</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$months</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span><span class="default">&quot;Janvier&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Février&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mars&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Avril&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Mai&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Juin&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Juillet&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Août&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Septembre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Octobre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Novembre&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">&quot;Décembre&quot;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="307"></a><a href="#307">307</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="308"></a><a href="#308">308</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[2]&nbsp;On&nbsp;recupere&nbsp;le&nbsp;timestamp&nbsp;et&nbsp;les&nbsp;indices</span></td></tr>
+     <tr><td><div align="right"><a name="309"></a><a href="#309">309</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="310"></a><a href="#310">310</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$time</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">strtotime</span><span class="keyword">(</span><span class="default">$date</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;timestamp</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="311"></a><a href="#311">311</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$daynum</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">intval</span><span class="keyword">(</span><span class="default">&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'N'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">-</span><span class="default">1</span><span class="default">&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;jour&nbsp;dans&nbsp;la&nbsp;semaine</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="312"></a><a href="#312">312</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$monthnum</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">intval</span><span class="keyword">(</span><span class="default">&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'n'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">-</span><span class="default">1</span><span class="default">&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;numero&nbsp;du&nbsp;mois&nbsp;dans&nbsp;l'annee</span></td></tr>
+     <tr><td><div align="right"><a name="313"></a><a href="#313">313</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="314"></a><a href="#314">314</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="315"></a><a href="#315">315</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">/*&nbsp;[3]&nbsp;On&nbsp;recupere&nbsp;les&nbsp;infos&nbsp;independemment</span></td></tr>
+     <tr><td><div align="right"><a name="316"></a><a href="#316">316</a></div></td><td class="codeLine"><span class="comment">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=========================================================*/</span></td></tr>
+     <tr><td><div align="right"><a name="317"></a><a href="#317">317</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$result</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="keyword">array</span><span class="keyword">(</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="318"></a><a href="#318">318</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$days</span><span class="keyword">[</span><span class="default">$daynum</span><span class="keyword">]</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;nom&nbsp;de&nbsp;jour</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="319"></a><a href="#319">319</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'j'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;jour&nbsp;du&nbsp;mois</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="320"></a><a href="#320">320</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$months</span><span class="keyword">[</span><span class="default">$monthnum</span><span class="keyword">]</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="comment">//&nbsp;nom&nbsp;du&nbsp;mois</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="321"></a><a href="#321">321</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">date</span><span class="keyword">(</span><span class="default">'Y'</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$time</span><span class="keyword">)</span><span class="keyword">,</span><span class="default">&nbsp;&nbsp;&nbsp;</span><span class="comment">//&nbsp;annee</span></td></tr>
+     <tr class="danger"><td><div align="right"><a name="322"></a><a href="#322">322</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
+     <tr><td><div align="right"><a name="323"></a><a href="#323">323</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="324"></a><a href="#324">324</a></div></td><td class="codeLine"></td></tr>
+     <tr class="danger"><td><div align="right"><a name="325"></a><a href="#325">325</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">return</span><span class="default">&nbsp;</span><span class="default">implode</span><span class="keyword">(</span><span class="default">&quot;&nbsp;&quot;</span><span class="keyword">,</span><span class="default">&nbsp;</span><span class="default">$result</span><span class="keyword">)</span><span class="keyword">;</span></td></tr>
+     <tr class="warning"><td><div align="right"><a name="326"></a><a href="#326">326</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
+     <tr><td><div align="right"><a name="327"></a><a href="#327">327</a></div></td><td class="codeLine"></td></tr>
+     <tr><td><div align="right"><a name="328"></a><a href="#328">328</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
+     <tr><td><div align="right"><a name="329"></a><a href="#329">329</a></div></td><td class="codeLine"><span class="default">?&gt;</span></td></tr>

    </tbody>
   </table>
@ -565,7 +612,7 @@
     <span class="warning"><strong>Dead Code</strong></span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
   </footer>
--- a/phpunit/coverage/ManagerError.php.html
+++ b/phpunit/coverage/ManagerError.php.html
@ -247,7 +247,7 @@
     <span class="warning"><strong>Dead Code</strong></span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
   </footer>
--- a/phpunit/coverage/ResourceDispatcher.php.html
+++ b/phpunit/coverage/ResourceDispatcher.php.html
@ -517,7 +517,7 @@
     <span class="warning"><strong>Dead Code</strong></span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
   </footer>
--- a/phpunit/coverage/autoloader.php.html
+++ b/phpunit/coverage/autoloader.php.html
@ -214,7 +214,7 @@
     <span class="warning"><strong>Dead Code</strong></span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
   </footer>
--- a/phpunit/coverage/index.html
+++ b/phpunit/coverage/index.html
@ -43,21 +43,21 @@
     <tr>
      <td class="warning">Total</td>
      <td class="warning big">       <div class="progress">
-         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="67.67" aria-valuemin="0" aria-valuemax="100" style="width: 67.67%">
-           <span class="sr-only">67.67% covered (warning)</span>
+         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="66.83" aria-valuemin="0" aria-valuemax="100" style="width: 66.83%">
+           <span class="sr-only">66.83% covered (warning)</span>
         </div>
       </div>
 </td>
-      <td class="warning small"><div align="right">67.67%</div></td>
-      <td class="warning small"><div align="right">270&nbsp;/&nbsp;399</div></td>
+      <td class="warning small"><div align="right">66.83%</div></td>
+      <td class="warning small"><div align="right">270&nbsp;/&nbsp;404</div></td>
      <td class="danger big">       <div class="progress">
-         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="45.45" aria-valuemin="0" aria-valuemax="100" style="width: 45.45%">
-           <span class="sr-only">45.45% covered (danger)</span>
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="44.44" aria-valuemin="0" aria-valuemax="100" style="width: 44.44%">
+           <span class="sr-only">44.44% covered (danger)</span>
         </div>
       </div>
 </td>
-      <td class="danger small"><div align="right">45.45%</div></td>
-      <td class="danger small"><div align="right">20&nbsp;/&nbsp;44</div></td>
+      <td class="danger small"><div align="right">44.44%</div></td>
+      <td class="danger small"><div align="right">20&nbsp;/&nbsp;45</div></td>
      <td class="danger big">       <div class="progress">
         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="11.11" aria-valuemin="0" aria-valuemax="100" style="width: 11.11%">
           <span class="sr-only">11.11% covered (danger)</span>
@ -127,21 +127,21 @@
     <tr>
      <td class="warning"><span class="glyphicon glyphicon-file"></span> <a href="Database.php.html">Database.php</a></td>
      <td class="warning big">       <div class="progress">
-         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="83.33" aria-valuemin="0" aria-valuemax="100" style="width: 83.33%">
-           <span class="sr-only">83.33% covered (warning)</span>
+         <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="78.65" aria-valuemin="0" aria-valuemax="100" style="width: 78.65%">
+           <span class="sr-only">78.65% covered (warning)</span>
         </div>
       </div>
 </td>
-      <td class="warning small"><div align="right">83.33%</div></td>
-      <td class="warning small"><div align="right">70&nbsp;/&nbsp;84</div></td>
+      <td class="warning small"><div align="right">78.65%</div></td>
+      <td class="warning small"><div align="right">70&nbsp;/&nbsp;89</div></td>
      <td class="danger big">       <div class="progress">
-         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="42.86" aria-valuemin="0" aria-valuemax="100" style="width: 42.86%">
-           <span class="sr-only">42.86% covered (danger)</span>
+         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="37.50" aria-valuemin="0" aria-valuemax="100" style="width: 37.50%">
+           <span class="sr-only">37.50% covered (danger)</span>
         </div>
       </div>
 </td>
-      <td class="danger small"><div align="right">42.86%</div></td>
-      <td class="danger small"><div align="right">3&nbsp;/&nbsp;7</div></td>
+      <td class="danger small"><div align="right">37.50%</div></td>
+      <td class="danger small"><div align="right">3&nbsp;/&nbsp;8</div></td>
      <td class="danger big">       <div class="progress">
         <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
           <span class="sr-only">0.00% covered (danger)</span>
@ -350,7 +350,7 @@
     <span class="success"><strong>High</strong>: 90% to 100%</span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
   </footer>
  </div>
--- a/phpunit/coverage/sessionManager.php.html
+++ b/phpunit/coverage/sessionManager.php.html
@ -315,7 +315,7 @@
     <span class="warning"><strong>Dead Code</strong></span>
    </p>
    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 17:06:21 UTC 2016.</small>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage 2.1.7</a> using <a href="http://php.net/" target="_top">PHP 5.6.11-1ubuntu3.1</a> and <a href="http://phpunit.de/">PHPUnit 4.7.6</a> at Mon Apr 18 20:36:30 UTC 2016.</small>
    </p>
    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
   </footer>