fix

build/api/module/machineDefault.php

@@ -383,7 +383,7 @@
 			/* [3] Get history for the machine
 			=========================================================*/
 			/* (1) Write request */
-			$history_req = new Repo('history/getByIdMachine', [$id_machine]);
+			$history_req = new Repo('history/getByIdMachine', [$_SESSION['WAREHOUSE']['id'], $id_machine]);
 
 			/* (2) Manage error */
 			if( $history_req->error->get() != Err::Success )

build/generic/view/group/view/main.twig

@@ -1,12 +1,12 @@
 {% block search_bar %} <input type='text' class='searchbar' placeholder='Recherche'> {% endblock %}
 
-{% set noresult = true %}
+{% set count = 0 %}
 
-{% block user_cluster_list %}
+{# {% block user_cluster_list %} #}
 
 	{% for user_cluster in core.get_clusters(0) %}
 
-		{% set noresult = false %}
+		{% set count = count + 1 %}
 
 		{% set id_user_cluster = 'u' ~ user_cluster.id_user_cluster %}
 		{% set memlen = core.get_members(user_cluster.id_user_cluster,0) | length %}
@@ -58,15 +58,16 @@
 
 	{% endfor %}
 
-{% endblock %}
+{# {% endblock %} #}
 
 
 
-{% block machines_cluster_list %}
+{# {% block machines_cluster_list %} #}
 
 	{% for machine_cluster in core.get_clusters(1) %}
 
-		{% set noresult = false %}
+		{% set count = count + 1 %}
+
 
 		{% set id_machine_cluster = 'm' ~ machine_cluster.id_machine_cluster %}
 		{% set memlen = core.get_members(machine_cluster.id_machine_cluster,1) | length %}
@@ -132,16 +133,16 @@
 
 	{% endfor %}
 
-{% endblock %}
+{# {% endblock %} #}
 
 
 {# if no result #}
-{% if noresult %}
+{% if count <= 0 %}
 
 	{% block no_result %}
 
 		<article class='inline-box'>
-			<span>Aucun groupe trouvé</span>
+			<span>Aucun résultat {{ count }}</span>
 		</article>
 
 	{% endblock %}

build/generic/view/machine/group/main.twig

@@ -72,7 +72,7 @@
 		 {% block no_result %}
 
 			<article class='inline-box'>
-				<span>Aucun groupe trouvé.</span>
+				<span>Aucun groupe machine trouvé.</span>
 			</article>
 
 		{% endblock %}

build/generic/view/settings/admin/create/main.twig

@@ -12,7 +12,7 @@
 
 	{% block generated %}
 
-		<input id='admin_password' type='text' placeholder='Mot de passe généré...' disabled><br>
+		<input id='admin_password' type='text' placeholder='Mot de passe généré...'><br>
 
 	{% endblock %}
 

build/generic/view/user/group/main.twig

@@ -55,7 +55,7 @@
 		{% block no_result %}
 
 			<article class='inline-box'>
-				<span>Aucun groupe trouvé.</span>
+				<span>Aucun groupe utilisateur trouvé.</span>
 			</article>
 
 		{% endblock %}

build/http/core/HttpRequest.php

@@ -42,7 +42,7 @@
 
 			/* [2] Define headers
 			=========================================================*/
-			$this->headers = \getallheaders();
+			$this->headers = self::getallheaders_adapter();
 
 
 			/* [3] Define default datasets (GET, POST)
@@ -201,4 +201,30 @@
 		public function HEADERS(){ return $this->headers;  }
 		public function METHOD(){  return $this->method;   }
 		public function URI(){     return $this->uri;      }
+
+
+		private static function getallheaders_adapter(){
+			/* (1) If exists -> use it
+			---------------------------------------------------------*/
+			if( function_exists('getallheaders') )
+				return getallheaders();
+
+			/* (2) If does not (php-fpm)
+			---------------------------------------------------------*/
+			/* (1) init. variables */
+			$fetched_headers = [];
+
+			/* (2) Get all headers from $_SERVER */
+			foreach($_SERVER as $hname=>$hvalue ){
+
+				// {1} Store only if begins with 'HTTP_' //
+				if( substr($hname,0,5) == 'HTTP_' )
+					$fetched_headers[ str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($hname,5)))))] = $hvalue;
+
+			}
+
+			/* (3) Return created headers */
+			return $fetched_headers;
+
+		}
 	}

build/orm/core/Rows.php

@@ -237,7 +237,7 @@
 			/* [3] If `IN` condition
 			=========================================================*/
 			$defaultWhere = $this->where;
-			$inCond = count($args[0]) > 1 && is_array($args[0][0]) && $args[0][1] == self::COND_IN;
+			$inCond = is_array($args[0]) && count($args[0]) > 1 && is_array($args[0][0]) && $args[0][1] == self::COND_IN;
 
 			// erreur
 			if( is_array($args[0][0]) && !$inCond )

build/router/core/Router.php

@@ -18,6 +18,10 @@ class Router{
 	*
 	*/
 	public function __construct($url){
+		// Format URI (ne doit pas avoir le premier '/')
+		if( preg_match("@^/@", $url) )
+			$url = substr($url, 1);
+
 		$this->url = $url;
 
 		// On initialise les routes

build/token/core/TreeTokenNull.php

@@ -0,0 +1,14 @@
+<?php
+
+	namespace token\core;
+
+	class TreeTokenNull{
+
+		public function __construct(){}
+
+		public function init_parent(){ return true; }
+
+		public function init_child(){ return true; }
+
+
+	}

composer.lock

@@ -4,21 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a67d059eefe03511f76073ba76c61878",
     "content-hash": "98f631539238eb6dba4f74f1ae9e4744",
     "packages": [
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
+                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
                 "shasum": ""
             },
             "require": {
@@ -30,7 +29,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -64,7 +63,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-10-11 12:05:26"
+            "time": "2018-01-30T19:27:44+00:00"
         },
         {
             "name": "twig/twig",
@@ -130,22 +129,22 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-09-27 17:50:14"
+            "time": "2017-09-27T17:50:14+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "composer/ca-bundle",
-            "version": "1.0.8",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "9dd73a03951357922d8aee6cc084500de93e2343"
+                "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9dd73a03951357922d8aee6cc084500de93e2343",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288",
-                "reference": "9dd73a03951357922d8aee6cc084500de93e2343",
+                "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288",
                 "shasum": ""
             },
             "require": {
@@ -154,12 +153,9 @@
                 "php": "^5.3.2 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5",
+                "phpunit/phpunit": "^4.8.35",
                 "psr/log": "^1.0",
-                "symfony/process": "^2.5 || ^3.0"
+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
-            },
-            "suggest": {
-                "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
             },
             "type": "library",
             "extra": {
@@ -191,39 +187,39 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-09-11 07:24:36"
+            "time": "2017-11-29T09:37:33+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "1.5.2",
+            "version": "1.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "c639623fa2178b404ed4bab80f0d1263853fa4ae"
+                "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/c639623fa2178b404ed4bab80f0d1263853fa4ae",
+                "url": "https://api.github.com/repos/composer/composer/zipball/88a69fda0f2187ad8714cedffd7a8872dceaa4c2",
-                "reference": "c639623fa2178b404ed4bab80f0d1263853fa4ae",
+                "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2",
                 "shasum": ""
             },
             "require": {
                 "composer/ca-bundle": "^1.0",
                 "composer/semver": "^1.0",
-                "composer/spdx-licenses": "^1.0",
+                "composer/spdx-licenses": "^1.2",
                 "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
                 "php": "^5.3.2 || ^7.0",
                 "psr/log": "^1.0",
                 "seld/cli-prompt": "^1.0",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.7 || ^3.0",
+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-                "symfony/filesystem": "^2.7 || ^3.0",
+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-                "symfony/finder": "^2.7 || ^3.0",
+                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-                "symfony/process": "^2.7 || ^3.0"
+                "symfony/process": "^2.7 || ^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
                 "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
             },
             "suggest": {
@@ -237,7 +233,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -268,7 +264,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2017-09-11 14:59:26"
+            "time": "2018-01-31T15:28:18+00:00"
         },
         {
             "name": "composer/semver",
@@ -330,27 +326,27 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30 16:08:34"
+            "time": "2016-08-30T16:08:34+00:00"
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.1.6",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c"
+                "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30",
-                "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
+                "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
                 "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
             },
             "type": "library",
@@ -391,24 +387,24 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2017-04-03 19:08:52"
+            "time": "2018-01-31T13:17:27+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/coding-standard": "~0.1@dev",
@@ -458,26 +454,28 @@
                 "collections",
                 "iterator"
             ],
-            "time": "2017-01-03 10:49:41"
+            "time": "2017-07-22T10:37:32+00:00"
         },
         {
             "name": "gitonomy/gitlib",
-            "version": "v1.0.2",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gitonomy/gitlib.git",
-                "reference": "b4b916423a2e2da631cf3b3787beb9386a7b253c"
+                "reference": "1c2b0605115786613cb517798046c8ab57c17097"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/b4b916423a2e2da631cf3b3787beb9386a7b253c",
+                "url": "https://api.github.com/repos/gitonomy/gitlib/zipball/1c2b0605115786613cb517798046c8ab57c17097",
-                "reference": "b4b916423a2e2da631cf3b3787beb9386a7b253c",
+                "reference": "1c2b0605115786613cb517798046c8ab57c17097",
                 "shasum": ""
             },
             "require": {
-                "symfony/process": "^2.3|^3.0"
+                "php": "^5.3 || ^7.0",
+                "symfony/process": "^2.3|^3.0|^4.0"
             },
             "require-dev": {
+                "phpunit/phpunit": "^4.8.35|^5.7",
                 "psr/log": "^1.0"
             },
             "suggest": {
@@ -512,7 +510,7 @@
             ],
             "description": "Library for accessing git",
             "homepage": "http://gitonomy.com",
-            "time": "2016-05-11 08:25:40"
+            "time": "2018-01-10T11:34:47+00:00"
         },
         {
             "name": "jakub-onderka/php-parallel-lint",
@@ -559,7 +557,7 @@
             ],
             "description": "This tool check syntax of PHP files about 20x faster than serial check.",
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
-            "time": "2015-12-15 10:42:16"
+            "time": "2015-12-15T10:42:16+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -625,7 +623,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2017-10-21 13:15:38"
+            "time": "2017-10-21T13:15:38+00:00"
         },
         {
             "name": "kahlan/kahlan",
@@ -679,7 +677,7 @@
                 "testing",
                 "unit test"
             ],
-            "time": "2017-08-12 20:37:11"
+            "time": "2017-08-12T20:37:11+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -757,31 +755,31 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19 01:22:40"
+            "time": "2017-06-19T01:22:40+00:00"
         },
         {
             "name": "ocramius/package-versions",
-            "version": "1.1.3",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Ocramius/PackageVersions.git",
-                "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7"
+                "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7",
+                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/4489d5002c49d55576fa0ba786f42dbb009be46f",
-                "reference": "72b226d2957e9e6a9ed09aeaa29cabd840d1a3b7",
+                "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0",
+                "composer-plugin-api": "^1.0.0",
-                "php": "~7.0"
+                "php": "^7.1.0"
             },
             "require-dev": {
-                "composer/composer": "^1.3",
+                "composer/composer": "^1.6.3",
                 "ext-zip": "*",
-                "humbug/humbug": "dev-master",
+                "infection/infection": "^0.7.1",
-                "phpunit/phpunit": "^5.7.5"
+                "phpunit/phpunit": "^7.0.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -806,33 +804,37 @@
                 }
             ],
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "time": "2017-09-06 15:24:43"
+            "time": "2018-02-05T13:05:30+00:00"
         },
         {
             "name": "ocramius/proxy-manager",
-            "version": "2.0.4",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Ocramius/ProxyManager.git",
-                "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6"
+                "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/a55d08229f4f614bf335759ed0cf63378feeb2e6",
+                "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/e18ac876b2e4819c76349de8f78ccc8ef1554cd7",
-                "reference": "a55d08229f4f614bf335759ed0cf63378feeb2e6",
+                "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7",
                 "shasum": ""
             },
             "require": {
-                "ocramius/package-versions": "^1.0",
+                "ocramius/package-versions": "^1.1.1",
-                "php": "7.0.0 - 7.0.5 || ^7.0.7",
+                "php": "^7.1.0",
-                "zendframework/zend-code": "3.0.0 - 3.0.2 || ^3.0.4"
+                "zendframework/zend-code": "^3.1.0"
             },
             "require-dev": {
-                "couscous/couscous": "^1.4.0",
+                "couscous/couscous": "^1.5.2",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.11.2",
+                "humbug/humbug": "dev-master@DEV",
-                "phpunit/phpunit": "^5.4.6",
+                "nikic/php-parser": "^3.0.4",
-                "squizlabs/php_codesniffer": "^2.6.0"
+                "phpbench/phpbench": "^0.12.2",
+                "phpstan/phpstan": "^0.6.4",
+                "phpunit/phpunit": "^5.6.4",
+                "phpunit/phpunit-mock-objects": "^3.4.1",
+                "squizlabs/php_codesniffer": "^2.7.0"
             },
             "suggest": {
                 "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
@@ -871,7 +873,7 @@
                 "proxy pattern",
                 "service proxies"
             ],
-            "time": "2016-11-04 15:53:15"
+            "time": "2017-05-04T11:12:50+00:00"
         },
         {
             "name": "phpro/grumphp",
@@ -968,7 +970,7 @@
                 }
             ],
             "description": "A composer plugin that enables source code quality checks.",
-            "time": "2017-05-31 17:49:48"
+            "time": "2017-05-31T17:49:48+00:00"
         },
         {
             "name": "psr/container",
@@ -1017,7 +1019,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14 16:28:37"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
             "name": "psr/log",
@@ -1064,7 +1066,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -1112,27 +1114,27 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18 11:32:45"
+            "time": "2017-03-18T11:32:45+00:00"
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.6.1",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77"
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-                "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
+                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "bin": [
                 "bin/jsonlint"
@@ -1161,7 +1163,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2017-06-18 15:11:04"
+            "time": "2018-01-24T12:46:19+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -1205,34 +1207,34 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13 18:44:15"
+            "time": "2015-10-13T18:44:15+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd"
+                "reference": "72689b934d6c6ecf73eca874e98933bf055313c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd",
+                "url": "https://api.github.com/repos/symfony/config/zipball/72689b934d6c6ecf73eca874e98933bf055313c9",
-                "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd",
+                "reference": "72689b934d6c6ecf73eca874e98933bf055313c9",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0"
+                "symfony/filesystem": "~2.8|~3.0|~4.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.3",
                 "symfony/finder": "<3.3"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.3",
+                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/finder": "~3.3",
+                "symfony/finder": "~3.3|~4.0",
-                "symfony/yaml": "~3.0"
+                "symfony/yaml": "~3.0|~4.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -1240,7 +1242,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1267,48 +1269,49 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-04 18:56:58"
+            "time": "2018-01-21T19:05:02+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c"
+                "reference": "26b6f419edda16c19775211987651cb27baea7f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/116bc56e45a8e5572e51eb43ab58c769a352366c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1",
-                "reference": "116bc56e45a8e5572e51eb43ab58c769a352366c",
+                "reference": "26b6f419edda16c19775211987651cb27baea7f1",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0",
+                "symfony/debug": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3",
+                "symfony/config": "~3.3|~4.0",
-                "symfony/dependency-injection": "~3.3",
+                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/filesystem": "~2.8|~3.0",
+                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~2.8|~3.0"
+                "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
+                "symfony/lock": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1335,36 +1338,36 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-29T09:03:43+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.3.10",
+            "version": "v4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd"
+                "reference": "c77bb31d0f6310a2ac11e657475d396a92e5dc54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/c77bb31d0f6310a2ac11e657475d396a92e5dc54",
-                "reference": "eb95d9ce8f18dcc1b3dfff00cb624c402be78ffd",
+                "reference": "c77bb31d0f6310a2ac11e657475d396a92e5dc54",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "psr/log": "~1.0"
             },
             "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+                "symfony/http-kernel": "<3.4"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0"
+                "symfony/http-kernel": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -1391,20 +1394,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-18T22:19:33+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1"
+                "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8ebad929aee3ca185b05f55d9cc5521670821ad1",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d",
-                "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1",
+                "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d",
                 "shasum": ""
             },
             "require": {
@@ -1412,17 +1415,18 @@
                 "psr/container": "^1.0"
             },
             "conflict": {
-                "symfony/config": "<3.3.1",
+                "symfony/config": "<3.3.7",
                 "symfony/finder": "<3.3",
-                "symfony/yaml": "<3.3"
+                "symfony/proxy-manager-bridge": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "provide": {
                 "psr/container-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "~3.3",
+                "symfony/config": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/yaml": "~3.3"
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/config": "",
@@ -1434,7 +1438,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1461,20 +1465,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-04 17:15:30"
+            "time": "2018-01-29T09:16:57+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423"
+                "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d7ba037e4b8221956ab1e221c73c9e27e05dd423",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca",
-                "reference": "d7ba037e4b8221956ab1e221c73c9e27e05dd423",
+                "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca",
                 "shasum": ""
             },
             "require": {
@@ -1485,10 +1489,10 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
+                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "~3.3",
+                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0"
+                "symfony/stopwatch": "~2.8|~3.0|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -1497,7 +1501,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1524,20 +1528,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1"
+                "reference": "e078773ad6354af38169faf31c21df0f18ace03d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d",
-                "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1",
+                "reference": "e078773ad6354af38169faf31c21df0f18ace03d",
                 "shasum": ""
             },
             "require": {
@@ -1546,7 +1550,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1573,20 +1577,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-03 13:33:10"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "773e19a491d97926f236942484cb541560ce862d"
+                "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
-                "reference": "773e19a491d97926f236942484cb541560ce862d",
+                "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
                 "shasum": ""
             },
             "require": {
@@ -1595,7 +1599,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1622,20 +1626,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6"
+                "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ee4e22978fe885b54ee5da8c7964f0a5301abfb6",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f3109a6aedd20e35c3a33190e932c2b063b7b50e",
-                "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6",
+                "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e",
                 "shasum": ""
             },
             "require": {
@@ -1644,7 +1648,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1676,20 +1680,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2017-07-29 21:54:42"
+            "time": "2018-01-11T07:56:07+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "fdf89e57a723a29baf536e288d6e232c059697b1"
+                "reference": "09a5172057be8fc677840e591b17f385e58c7c0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d",
-                "reference": "fdf89e57a723a29baf536e288d6e232c059697b1",
+                "reference": "09a5172057be8fc677840e591b17f385e58c7c0d",
                 "shasum": ""
             },
             "require": {
@@ -1698,7 +1702,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1725,34 +1729,34 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-29T09:03:43+00:00"
         },
         {
             "name": "symfony/proxy-manager-bridge",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/proxy-manager-bridge.git",
-                "reference": "8c88403febb02a49e3f55512fced3c400c80cf28"
+                "reference": "ffb375b65cf112364b5374ed99059975ca84a6bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/8c88403febb02a49e3f55512fced3c400c80cf28",
+                "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/ffb375b65cf112364b5374ed99059975ca84a6bd",
-                "reference": "8c88403febb02a49e3f55512fced3c400c80cf28",
+                "reference": "ffb375b65cf112364b5374ed99059975ca84a6bd",
                 "shasum": ""
             },
             "require": {
                 "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/dependency-injection": "~2.8|~3.0"
+                "symfony/dependency-injection": "~3.4|~4.0"
             },
             "require-dev": {
-                "symfony/config": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0"
             },
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1779,27 +1783,30 @@
             ],
             "description": "Symfony ProxyManager Bridge",
             "homepage": "https://symfony.com",
-            "time": "2017-10-02 06:42:24"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.3.10",
+            "version": "v3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46"
+                "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
-                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
+                "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8"
             },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
             "require-dev": {
-                "symfony/console": "~2.8|~3.0"
+                "symfony/console": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -1807,7 +1814,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1834,31 +1841,31 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-10-05 14:43:42"
+            "time": "2018-01-21T19:05:02+00:00"
         },
         {
             "name": "zendframework/zend-code",
-            "version": "3.1.0",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-code.git",
-                "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27"
+                "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27",
+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d",
-                "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27",
+                "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6",
+                "php": "^7.1",
                 "zendframework/zend-eventmanager": "^2.6 || ^3.0"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^4.8.21",
+                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^2.5",
+                "zendframework/zend-coding-standard": "^1.0.0",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "suggest": {
@@ -1868,8 +1875,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev",
+                    "dev-master": "3.2-dev",
-                    "dev-develop": "3.2-dev"
+                    "dev-develop": "3.3-dev"
                 }
             },
             "autoload": {
@@ -1887,7 +1894,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2016-10-24 13:23:32"
+            "time": "2017-10-20T15:21:32+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -1941,7 +1948,7 @@
                 "events",
                 "zf2"
             ],
-            "time": "2017-07-11 19:17:22"
+            "time": "2017-07-11T19:17:22+00:00"
         }
     ],
     "aliases": [],

logauth.sql

@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Generation Time: Oct 12, 2017 at 09:32 PM
+-- Generation Time: Nov 13, 2017 at 08:18 AM
 -- Server version: 5.7.19-0ubuntu0.16.04.1
 -- PHP Version: 7.0.22-0ubuntu0.16.04.1
 
@@ -19,8 +19,6 @@ SET time_zone = "+00:00";
 --
 -- Database: `logauth`
 --
-CREATE DATABASE IF NOT EXISTS `logauth` DEFAULT CHARACTER SET latin1 COLLATE latin1_bin;
-USE `logauth`;
 
 -- --------------------------------------------------------
 
@@ -28,7 +26,6 @@ USE `logauth`;
 -- Table structure for table `action`
 --
 
-DROP TABLE IF EXISTS `action`;
 CREATE TABLE `action` (
   `id_action` int(11) NOT NULL,
   `name` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
@@ -55,7 +52,6 @@ INSERT INTO `action` (`id_action`, `name`, `timeout`, `required`, `action`) VALU
 -- Table structure for table `action_merge`
 --
 
-DROP TABLE IF EXISTS `action_merge`;
 CREATE TABLE `action_merge` (
   `id_action_merge` int(11) NOT NULL,
   `id_target` int(11) NOT NULL,
@@ -105,7 +101,6 @@ INSERT INTO `action_merge` (`id_action_merge`, `id_target`, `id_source`, `id_act
 -- Table structure for table `admin`
 --
 
-DROP TABLE IF EXISTS `admin`;
 CREATE TABLE `admin` (
   `id_admin` int(11) NOT NULL,
   `id_warehouse` int(11) NOT NULL,
@@ -121,8 +116,10 @@ CREATE TABLE `admin` (
 
 INSERT INTO `admin` (`id_admin`, `id_warehouse`, `username`, `mail`, `password`, `token`) VALUES
 (1, 7, 'adrien.marques', 'adminmail@gmail.com', 'eb35bccc794d3151b050285c3f6f6d084faadcc7345302b639fbb036cf623b7befcbf7ea08579c612f6201b22cdbc98d6d5d39354b3d31f51ba0426a5299371d', '434f3494ca228538463320eccf93ba67ca29e734073fbf7a9178ba7494b0e26365bb5ae2ead89428f515cdcb9ac75f0ec2200033c3911f4a49f133dfb6dd4aca'),
-(2, 8, 'alexandre.marques', 'admin2mail@gmail.com', 'b70896036f6d717f938ca09f531364c17910fc6a2011166e2c2bac6f505bda52e8d8993fefb7a6fdf13b1fd5368280f064ff87e01ae74aadf7e14f582dede676', '287361328d110cbc2e78464563e005dc82a6a0d501b84cba6770dd3d173b65eef0b226fcb8326cc14fb4ee9dec5df6622a11fd8e6e8a6e518a7eca055e67e8c5'),
+(4, 7, 'willy.fontaine', 'willy.fontaine@stef.com', '08678556fd8223eb5d6014deeec072b809df8ac1dd6e087150f2b9e3820640ed92e33db793b9a02f31615490cee7b01c659865a6322a9d784bf86747ec41d7aa', '728caa787cf2f567cfeacf682e64b36a6387955cc441dc62c59fc51df034760e76fccb934b82f4495cfe860c3092665811d93bd1549f7d286d0ad071ee45b6fd'),
-(4, 8, 'willy.fontaine', 'willy.fontaine@stef.com', '08678556fd8223eb5d6014deeec072b809df8ac1dd6e087150f2b9e3820640ed92e33db793b9a02f31615490cee7b01c659865a6322a9d784bf86747ec41d7aa', '728caa787cf2f567cfeacf682e64b36a6387955cc441dc62c59fc51df034760e76fccb934b82f4495cfe860c3092665811d93bd1549f7d286d0ad071ee45b6fd');
+(5, 8, 'willy.fontaine', 'willy.fontaine@stef.com', '08678556fd8223eb5d6014deeec072b809df8ac1dd6e087150f2b9e3820640ed92e33db793b9a02f31615490cee7b01c659865a6322a9d784bf86747ec41d7aa', '9e8d9632bde19a34e1d0cc953c4ad59f59ed6f8ce981e655fccc6083e8dc2dfbc754230277ec5aa2c5e884a4fd71ee229b2d9e49492ce283fb40c23a73e432f3'),
+(8, 8, 'patrick.letort', 'patrick.letort@stef.com', '2dae3e1c28554b77c2e1ec20fba4405937b159f7607802f8e88df8cefaa53a683f143edad0e1196dd13c58dc180e3bbd23e97ed320361ac33b99500e5f63071c', '8cfae3acc5917a8656e5603f7e7171265342c04af4d3a1c5ddb183905ab8bd0030edc64a4beee67b92bcbdfbbf5299625adfbbc48fb27f42a98e0a0b8afc4e09'),
+(9, 8, 'adrien.marques', 'marquesadri1@gmail.com', 'e8bf5e2e0fa92a3dabfa3563c49c55ad1741faf71783d86c3342cd3bd04b46c8b138cb4efeb078c98daa777856de7eccad2189fc5f4f6fe58ffb1dec2baf38b3', '395c9e06462072e0e724be228cddccbf5189ef1f52558241ae2f89cfdf83f825b3c718396f8002a097e4648199ab8094c1390e31f0b77dbc4004093a62115822');
 
 -- --------------------------------------------------------
 
@@ -130,7 +127,6 @@ INSERT INTO `admin` (`id_admin`, `id_warehouse`, `username`, `mail`, `password`,
 -- Table structure for table `chip`
 --
 
-DROP TABLE IF EXISTS `chip`;
 CREATE TABLE `chip` (
   `id_chip` int(11) NOT NULL,
   `id_module` int(11) DEFAULT NULL,
@@ -154,7 +150,6 @@ INSERT INTO `chip` (`id_chip`, `id_module`, `name`, `position`, `type`, `pins`)
 -- Table structure for table `etree`
 --
 
-DROP TABLE IF EXISTS `etree`;
 CREATE TABLE `etree` (
   `id_etree` int(11) NOT NULL,
   `id_module` int(11) NOT NULL,
@@ -177,7 +172,6 @@ INSERT INTO `etree` (`id_etree`, `id_module`, `daemon`) VALUES
 -- Table structure for table `global_state`
 --
 
-DROP TABLE IF EXISTS `global_state`;
 CREATE TABLE `global_state` (
   `id_global_state` int(11) NOT NULL,
   `global_state` varchar(20) COLLATE utf8_unicode_ci NOT NULL COMMENT 'started | signaled | locked',
@@ -200,7 +194,6 @@ INSERT INTO `global_state` (`id_global_state`, `global_state`, `chips`) VALUES
 -- Table structure for table `history`
 --
 
-DROP TABLE IF EXISTS `history`;
 CREATE TABLE `history` (
   `id_history` int(11) NOT NULL,
   `timestamp` int(11) NOT NULL,
@@ -214,68 +207,117 @@ CREATE TABLE `history` (
 --
 
 INSERT INTO `history` (`id_history`, `timestamp`, `id_user`, `id_machine`, `id_action`) VALUES
-(285, 1506950713, 215, 126, 1),
+(504, 1508073591, 210, 127, 1),
-(286, 1506950739, 215, 126, 5),
+(505, 1508073598, 210, 127, 5),
-(287, 1506950740, 215, 126, 1),
+(506, 1508073601, 210, 127, 1),
-(288, 1506950741, 215, 126, 5),
+(507, 1508073644, 210, 127, 5),
-(289, 1506950742, 215, 126, 1),
+(508, 1508073654, 210, 127, 1),
-(290, 1506950804, 215, 126, 5),
+(509, 1508073657, 210, 127, 2),
-(291, 1506950807, 215, 126, 2),
+(510, 1508073659, 210, 127, 3),
-(292, 1506950810, 215, 126, 5),
+(511, 1508073682, 218, 127, 4),
-(293, 1506950811, 215, 126, 1),
+(512, 1508073687, 210, 127, 1),
-(294, 1506950812, 215, 126, 5),
+(513, 1508129928, 210, 127, 5),
-(295, 1506950813, 215, 126, 1),
+(514, 1508129955, 210, 127, 1),
-(296, 1506950815, 210, 126, 6),
+(515, 1508129964, 210, 127, 5),
-(297, 1506950819, 215, 126, 5),
+(516, 1508129991, 210, 127, 1),
-(298, 1506950822, 215, 126, 2),
+(517, 1508130001, 210, 127, 5),
-(299, 1506950824, 215, 126, 3),
+(518, 1508130011, 210, 127, 1),
-(300, 1506950829, 210, 126, 4),
+(519, 1508130022, 210, 127, 5),
-(301, 1506950831, 215, 126, 1),
+(520, 1508130024, 210, 127, 1),
-(302, 1506951006, 215, 126, 5),
+(521, 1508130027, 210, 127, 2),
-(303, 1506951006, 215, 126, 1),
+(522, 1508130029, 210, 127, 3),
-(304, 1506951007, 215, 126, 5),
+(523, 1508130114, 218, 127, 4),
-(305, 1506951188, 215, 126, 1),
+(524, 1508130137, 210, 127, 1),
-(306, 1506951190, 215, 126, 5),
+(525, 1508130156, 210, 127, 5),
-(307, 1506951201, 215, 126, 1),
+(526, 1508130160, 210, 127, 1),
-(308, 1506951205, 215, 126, 5),
+(527, 1508130198, 210, 127, 5),
-(309, 1506951209, 215, 126, 1),
+(528, 1508130200, 210, 127, 1),
-(310, 1506951210, 215, 126, 5),
+(529, 1508130203, 210, 127, 2),
-(311, 1506951211, 215, 126, 1),
+(530, 1508130332, 218, 127, 6),
-(312, 1506951211, 215, 126, 5),
+(531, 1508130339, 210, 127, 5),
-(313, 1506951212, 215, 126, 1),
+(532, 1508130349, 210, 127, 1),
-(314, 1506951213, 215, 126, 5),
+(533, 1508130447, 210, 127, 5),
-(315, 1506951218, 215, 126, 1),
+(534, 1508130449, 210, 127, 1),
-(316, 1506951219, 215, 126, 5),
+(535, 1508130451, 210, 127, 5),
-(317, 1506951219, 215, 126, 1),
+(536, 1508130459, 210, 127, 1),
-(318, 1506951219, 215, 126, 5),
+(537, 1508130644, 210, 127, 5),
-(319, 1506951220, 215, 126, 1),
+(538, 1508130652, 210, 127, 1),
-(320, 1506951221, 215, 126, 5),
+(539, 1508130654, 210, 127, 5),
-(321, 1506951221, 215, 126, 1),
+(540, 1508130663, 210, 127, 1),
-(322, 1506951225, 215, 126, 5),
+(541, 1508130668, 210, 127, 5),
-(323, 1506951235, 215, 126, 1),
+(542, 1508131094, 210, 127, 1),
-(324, 1506951237, 215, 126, 5),
+(543, 1508131102, 210, 127, 5),
-(325, 1506951271, 215, 126, 1),
+(544, 1508131107, 210, 127, 1),
-(326, 1506951274, 215, 126, 2),
+(545, 1508131120, 210, 127, 5),
-(327, 1506951276, 215, 126, 3),
+(546, 1508131149, 210, 127, 1),
-(328, 1506951341, 210, 126, 4),
+(547, 1508131167, 210, 127, 5),
-(329, 1506951345, 215, 126, 1),
+(548, 1508131176, 210, 127, 1),
-(330, 1506951370, 215, 126, 5),
+(549, 1508131281, 210, 127, 5),
-(331, 1506951372, 215, 126, 1),
+(550, 1508131286, 210, 127, 1),
-(332, 1506951375, 215, 126, 2),
+(551, 1508131313, 210, 127, 5),
-(333, 1506951377, 215, 126, 3),
+(552, 1508131320, 210, 127, 1),
-(334, 1506951480, 210, 126, 4),
+(553, 1508131323, 210, 127, 5),
-(335, 1507815648, 215, 127, 1),
+(554, 1508136438, 210, 127, 1),
-(336, 1507815649, 215, 127, 5),
+(555, 1508136455, 210, 127, 5),
-(337, 1507816917, 215, 127, 1),
+(556, 1508136480, 210, 127, 1),
-(338, 1507820260, 215, 127, 5),
+(557, 1508136499, 210, 127, 5),
-(339, 1507820263, 215, 127, 2),
+(558, 1508137679, 210, 127, 1),
-(340, 1507830442, 215, 127, 5),
+(559, 1508137723, 210, 127, 5),
-(341, 1507830445, 215, 127, 1),
+(560, 1508137727, 210, 127, 1),
-(342, 1507830516, 215, 127, 5),
+(561, 1508137737, 210, 127, 5),
-(343, 1507830518, 215, 127, 1),
+(562, 1508137744, 210, 127, 1),
-(344, 1507830586, 215, 127, 5),
+(563, 1508152269, 210, 127, 5),
-(345, 1507830587, 215, 127, 1),
+(564, 1508153966, 210, 127, 1),
-(346, 1507830590, 210, 127, 6);
+(565, 1508163844, 210, 127, 5),
+(566, 1508163848, 210, 127, 1),
+(567, 1508163849, 210, 127, 5),
+(568, 1508163873, 210, 127, 1),
+(569, 1508163879, 210, 127, 5),
+(570, 1508220239, 210, 127, 1),
+(571, 1508220269, 210, 127, 5),
+(572, 1508220272, 210, 127, 1),
+(573, 1508220284, 210, 127, 5),
+(574, 1508220292, 210, 127, 1),
+(575, 1508226597, 210, 127, 5),
+(576, 1508227895, 210, 127, 1),
+(577, 1508233976, 210, 127, 5),
+(578, 1508236312, 210, 127, 1),
+(579, 1508248170, 210, 127, 5),
+(580, 1508249485, 210, 127, 1),
+(581, 1508253739, 210, 127, 5),
+(582, 1508296080, 210, 127, 1),
+(583, 1508296083, 210, 127, 5),
+(584, 1508296086, 210, 127, 1),
+(585, 1508296091, 210, 127, 5),
+(586, 1508296095, 210, 127, 1),
+(587, 1508296106, 210, 127, 5),
+(588, 1508296155, 210, 127, 1),
+(589, 1508296156, 210, 127, 5),
+(590, 1508296248, 210, 127, 1),
+(591, 1508296252, 210, 127, 5),
+(592, 1508306368, 210, 127, 1),
+(593, 1508325871, 210, 127, 5),
+(594, 1508387103, 210, 127, 1),
+(595, 1508389196, 210, 127, 5),
+(596, 1508389201, 210, 127, 1),
+(597, 1508389202, 210, 127, 5),
+(598, 1508389203, 210, 127, 1),
+(599, 1508389205, 210, 127, 5),
+(600, 1508389216, 210, 127, 1),
+(601, 1508389224, 210, 127, 5),
+(602, 1508389226, 210, 127, 1),
+(603, 1508389235, 210, 127, 5),
+(604, 1508534088, 210, 127, 1),
+(605, 1508534098, 210, 127, 5),
+(606, 1508534099, 210, 127, 1),
+(607, 1508534383, 210, 127, 5),
+(608, 1508650844, 210, 127, 1),
+(609, 1508659205, 210, 127, 5),
+(610, 1508659207, 210, 127, 1),
+(611, 1508665004, 210, 127, 5),
+(612, 1508665006, 210, 127, 1),
+(613, 1508665094, 210, 127, 5),
+(614, 1508667146, 210, 127, 1);
 
 -- --------------------------------------------------------
 
@@ -283,7 +325,6 @@ INSERT INTO `history` (`id_history`, `timestamp`, `id_user`, `id_machine`, `id_a
 -- Table structure for table `log`
 --
 
-DROP TABLE IF EXISTS `log`;
 CREATE TABLE `log` (
   `id_log` int(11) NOT NULL,
   `id_feature` int(11) NOT NULL,
@@ -298,7 +339,6 @@ CREATE TABLE `log` (
 -- Table structure for table `machine`
 --
 
-DROP TABLE IF EXISTS `machine`;
 CREATE TABLE `machine` (
   `id_machine` int(11) NOT NULL,
   `id_warehouse` int(11) NOT NULL,
@@ -423,12 +463,12 @@ INSERT INTO `machine` (`id_machine`, `id_warehouse`, `name`, `token`, `unlock_co
 (115, 7, 'sd', NULL, NULL, NULL, NULL),
 (116, 7, 'machine13', NULL, NULL, NULL, NULL),
 (121, 7, 'dsad', NULL, NULL, NULL, NULL),
-(122, 8, 'surgel1', NULL, '5f4769b43bba1ad8ee063b917a77a54569280cee4b04b65e251b3fa80a25867645356e99a1178830824be5ae4bd72196d2781d7324a6ca965406676f80e6c159', NULL, NULL),
+(122, 8, 'surgel1', '7853cb554aebb76640df3e066b67a099720939aa86e52b9c17bb236d090121936fb018b301fb1ab1b49d68e360a3ebbc0a2a9be99cfadf20f69facf058a1ad4a', NULL, '6452a1', '192.168.0.21'),
-(123, 8, 'surgel2', NULL, NULL, NULL, NULL),
+(123, 8, 'surgel2', NULL, '24d74a635267b26a587a9902ab19275f889c8c693538373ca4c9f85eb4fb75625a07fdef5289161b9fe78156c78a777185efef2bc249f6647538d5758f5b7210', NULL, NULL),
 (124, 8, 'surgel3', NULL, NULL, NULL, NULL),
 (125, 8, 'surgel4', NULL, NULL, NULL, NULL),
-(126, 8, 'lait1', 'd1607996880675c78ecdf3507540fdf6fbfb4a9fc10f350929e24e5c0b3cea03e444348f7aac7c77410a1fd61745c4f0a370a89621237174a575870d7108d8e4', NULL, '6452a1', '192.168.0.44'),
+(126, 8, 'lait1', NULL, NULL, NULL, NULL),
-(127, 8, 'lait2', '14e7f5ba1e789b622bdc1a9770452b71bb8959d694b48fc65610649fdf57d6113b0d4c89216b08633beec11f14764b8854ba7962eb8516d5b90466148f2b8871', NULL, '6452a1', '192.168.0.44'),
+(127, 8, 'lait2', '207a8ef6a121fbffbedd7affcdf1c4eccf3918941d186ef93ddc03b7eeebc721b58155c10e20d2b45e41de71428f49d51da8a4223284e19d52bea7a1df2f6807', NULL, '23c683', '192.168.1.100'),
 (128, 8, 'lait3', NULL, NULL, NULL, NULL),
 (129, 8, 'lait4', NULL, NULL, NULL, NULL);
 
@@ -438,7 +478,6 @@ INSERT INTO `machine` (`id_machine`, `id_warehouse`, `name`, `token`, `unlock_co
 -- Table structure for table `machine_cluster`
 --
 
-DROP TABLE IF EXISTS `machine_cluster`;
 CREATE TABLE `machine_cluster` (
   `id_machine_cluster` int(11) NOT NULL,
   `id_warehouse` int(11) NOT NULL,
@@ -462,7 +501,6 @@ INSERT INTO `machine_cluster` (`id_machine_cluster`, `id_warehouse`, `name`) VAL
 -- Table structure for table `machine_cluster_merge`
 --
 
-DROP TABLE IF EXISTS `machine_cluster_merge`;
 CREATE TABLE `machine_cluster_merge` (
   `id_machine_cluster_merge` int(11) NOT NULL,
   `id_machine_cluster` int(11) NOT NULL,
@@ -477,14 +515,15 @@ INSERT INTO `machine_cluster_merge` (`id_machine_cluster_merge`, `id_machine_clu
 (3, 1, 58),
 (4, 2, 75),
 (5, 3, 6),
-(6, 2, 58),
-(9, 4, 122),
 (10, 4, 123),
 (11, 4, 124),
 (12, 4, 125),
 (13, 5, 126),
-(14, 5, 127),
+(16, 5, 129),
-(16, 5, 129);
+(18, 5, 127),
+(19, 4, 122),
+(20, 5, 128),
+(22, 3, 58);
 
 -- --------------------------------------------------------
 
@@ -492,7 +531,6 @@ INSERT INTO `machine_cluster_merge` (`id_machine_cluster_merge`, `id_machine_clu
 -- Table structure for table `module`
 --
 
-DROP TABLE IF EXISTS `module`;
 CREATE TABLE `module` (
   `id_module` int(11) NOT NULL,
   `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL
@@ -514,7 +552,6 @@ INSERT INTO `module` (`id_module`, `name`) VALUES
 -- Table structure for table `module_availability`
 --
 
-DROP TABLE IF EXISTS `module_availability`;
 CREATE TABLE `module_availability` (
   `id_warehouse` int(11) NOT NULL,
   `id_module` int(11) NOT NULL
@@ -537,7 +574,6 @@ INSERT INTO `module_availability` (`id_warehouse`, `id_module`) VALUES
 -- Table structure for table `module_merge`
 --
 
-DROP TABLE IF EXISTS `module_merge`;
 CREATE TABLE `module_merge` (
   `id_module_merge` int(11) NOT NULL,
   `id_machine_cluster` int(11) NOT NULL,
@@ -563,20 +599,26 @@ INSERT INTO `module_merge` (`id_module_merge`, `id_machine_cluster`, `id_etree`,
 -- Table structure for table `motheure`
 --
 
-DROP TABLE IF EXISTS `motheure`;
 CREATE TABLE `motheure` (
   `id_motheure` int(11) NOT NULL,
   `id_machine` int(11) NOT NULL,
-  `count` int(11) NOT NULL
+  `count` bigint(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;
 
+--
+-- Dumping data for table `motheure`
+--
+
+INSERT INTO `motheure` (`id_motheure`, `id_machine`, `count`) VALUES
+(3, 122, 13),
+(6, 127, 2890);
+
 -- --------------------------------------------------------
 
 --
 -- Table structure for table `state`
 --
 
-DROP TABLE IF EXISTS `state`;
 CREATE TABLE `state` (
   `id_state` int(11) NOT NULL,
   `id_chip` int(11) NOT NULL,
@@ -602,7 +644,6 @@ INSERT INTO `state` (`id_state`, `id_chip`, `state`, `value`) VALUES
 -- Table structure for table `user`
 --
 
-DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user` (
   `id_user` int(11) NOT NULL,
   `id_warehouse` int(11) NOT NULL,
@@ -710,7 +751,7 @@ INSERT INTO `user` (`id_user`, `id_warehouse`, `code`, `username`, `firstname`,
 (215, 8, 'F9-7D-5D-9E', 'Pass-A', 'Pass', 'A-1', 'passA@logauth.xdrm.io'),
 (216, 8, 'D2-E2-CA-12', 'Card-D', 'Carte', 'D-3', 'cardD@logauth.xdrm.io'),
 (217, 8, 'D4-34-E8-AB', 'Pass-E', 'Pass', 'E-4', 'passE@logauth.xdrm.io'),
-(218, 8, 'A9-5B-5D-9E', 'Pass-F', 'Pass', 'F-5', 'passF@logauth.xdrm.io');
+(218, 8, 'A9-05-5D-9E', 'Pass-F', 'Pass', 'F-5', 'passF@logauth.xdrm.io');
 
 -- --------------------------------------------------------
 
@@ -718,7 +759,6 @@ INSERT INTO `user` (`id_user`, `id_warehouse`, `code`, `username`, `firstname`,
 -- Table structure for table `user_cluster`
 --
 
-DROP TABLE IF EXISTS `user_cluster`;
 CREATE TABLE `user_cluster` (
   `id_user_cluster` int(11) NOT NULL,
   `id_warehouse` int(11) NOT NULL,
@@ -743,7 +783,6 @@ INSERT INTO `user_cluster` (`id_user_cluster`, `id_warehouse`, `name`) VALUES
 -- Table structure for table `user_cluster_merge`
 --
 
-DROP TABLE IF EXISTS `user_cluster_merge`;
 CREATE TABLE `user_cluster_merge` (
   `id_user_cluster_merge` int(11) NOT NULL,
   `id_user_cluster` int(11) NOT NULL,
@@ -769,7 +808,8 @@ INSERT INTO `user_cluster_merge` (`id_user_cluster_merge`, `id_user_cluster`, `i
 (91, 5, 210),
 (92, 7, 216),
 (94, 6, 218),
-(99, 8, 217);
+(99, 8, 217),
+(100, 5, 216);
 
 -- --------------------------------------------------------
 
@@ -777,7 +817,6 @@ INSERT INTO `user_cluster_merge` (`id_user_cluster_merge`, `id_user_cluster`, `i
 -- Table structure for table `warehouse`
 --
 
-DROP TABLE IF EXISTS `warehouse`;
 CREATE TABLE `warehouse` (
   `id_warehouse` int(11) NOT NULL,
   `name` varchar(30) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
@@ -792,7 +831,7 @@ CREATE TABLE `warehouse` (
 
 INSERT INTO `warehouse` (`id_warehouse`, `name`, `theme`, `password`, `token`) VALUES
 (7, 'stef-montauban', '3091DB', '53859350c1eb59e301d8fe747f4d1c96d3ec31d95cd1bc72c81d72800edbc6ab45da0d5b6208080fb2e519b1f9848ce0a1289775800912068f32e390f5e1bb6c', '2046c66738b4f1f1e6460537f11970ec5b2cfa65f295b2ca0d2036609dcd3f8ccb6ec271e15440933d3b24ae27eba71423a4545583ab6f3736a5d4f7c8f8c53e'),
-(8, 'stef-toulouse', 'DB554E', '273bd225482d20c061620c80e3bb87528d9e178bd572acd47feb58eee7e8a3847cb308b287d9d94c7a292b33d4c766cdb7c95c2828f53b97bbc0f80fa44aeb83', '52131065a906de90e26da0732e58400edd6739cfa03fc658e7593abef4a4504e18e66e1a8fe9da374a8e8f753603463e4777789262b3ee945d4bf72dd8d6399c');
+(8, 'stef-montbartier', 'DB554E', '034a8313428d9780e4c5bc4bc25ae3985d1d987f4c6928f888e61685ec3f183f7ec0c83f691da2eeb64f27d916fb44aafdef66113892dbc800218b3b512e316e', '52131065a906de90e26da0732e58400edd6739cfa03fc658e7593abef4a4504e18e66e1a8fe9da374a8e8f753603463e4777789262b3ee945d4bf72dd8d6399c');
 
 --
 -- Indexes for dumped tables
@@ -962,7 +1001,7 @@ ALTER TABLE `action_merge`
 -- AUTO_INCREMENT for table `admin`
 --
 ALTER TABLE `admin`
-  MODIFY `id_admin` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
+  MODIFY `id_admin` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=10;
 --
 -- AUTO_INCREMENT for table `chip`
 --
@@ -982,7 +1021,7 @@ ALTER TABLE `global_state`
 -- AUTO_INCREMENT for table `history`
 --
 ALTER TABLE `history`
-  MODIFY `id_history` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=347;
+  MODIFY `id_history` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=615;
 --
 -- AUTO_INCREMENT for table `log`
 --
@@ -1002,7 +1041,7 @@ ALTER TABLE `machine_cluster`
 -- AUTO_INCREMENT for table `machine_cluster_merge`
 --
 ALTER TABLE `machine_cluster_merge`
-  MODIFY `id_machine_cluster_merge` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=19;
+  MODIFY `id_machine_cluster_merge` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=25;
 --
 -- AUTO_INCREMENT for table `module`
 --
@@ -1017,7 +1056,7 @@ ALTER TABLE `module_merge`
 -- AUTO_INCREMENT for table `motheure`
 --
 ALTER TABLE `motheure`
-  MODIFY `id_motheure` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `id_motheure` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
 --
 -- AUTO_INCREMENT for table `state`
 --
@@ -1037,7 +1076,7 @@ ALTER TABLE `user_cluster`
 -- AUTO_INCREMENT for table `user_cluster_merge`
 --
 ALTER TABLE `user_cluster_merge`
-  MODIFY `id_user_cluster_merge` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=100;
+  MODIFY `id_user_cluster_merge` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=101;
 --
 -- AUTO_INCREMENT for table `warehouse`
 --
@@ -1122,12 +1161,6 @@ ALTER TABLE `module_merge`
   ADD CONSTRAINT `fk_module_merge_id_machine_cluster` FOREIGN KEY (`id_machine_cluster`) REFERENCES `machine_cluster` (`id_machine_cluster`) ON DELETE CASCADE ON UPDATE CASCADE,
   ADD CONSTRAINT `fk_module_merge_id_warehouse` FOREIGN KEY (`id_warehouse`) REFERENCES `warehouse` (`id_warehouse`) ON DELETE CASCADE ON UPDATE CASCADE;
 
---
--- Constraints for table `motheure`
---
-ALTER TABLE `motheure`
-  ADD CONSTRAINT `fk_motheure_id_machine` FOREIGN KEY (`id_machine`) REFERENCES `machine` (`id_machine`) ON DELETE CASCADE ON UPDATE CASCADE;
-
 --
 -- Constraints for table `state`
 --

public_html/css/container.scss

@@ -13,10 +13,11 @@
 	// @active + .list
 	& > section.active{
 		display: flex;
-		flex-direction: row;
+		flex-flow:       row wrap;
-		align-items: flex-start;
+
 		justify-content: flex-start;
-		flex-wrap: wrap;
+		align-items:     stretch;
+		align-content:   flex-start;
 
 		&.contain-check-table{
 			flex-direction: column;
@@ -25,11 +26,13 @@
 		}
 
 		.inline-box{
-			flex: 0 0 1;
+			flex: 1 1 20%;
+			height: auto;
+			min-height: 10em;
 		}
 
 		.inline-row{
-			flex: 3em 0 0;
+			flex: 0 0 2.3em;
 		}
 
 		// Barre de recherche
@@ -62,7 +65,7 @@
 		.error, .in-dev{
 			display: inline-block;
 			position: relative;
-				width: calc( 100% - 2*1em - 2*1em );
+				// width: calc( 100% - 2*1em - 2*1em );
 				height: 1em;
 			margin: 1em;
 			padding: 1em;
@@ -96,6 +99,7 @@
 		position: relative;
 			// width: calc( 50% - 2*1em - 2*1em );
 			flex: calc( 50% - 2*1em - 2*1em );
+			height: auto;
 			margin: 1em;
 			padding: 1em;
 

public_html/css/header.scss

@@ -9,7 +9,7 @@
 			top: 0;
 			left: 0;
 			width: $menu-side-width;
-			height: $menu-side-width;
+			height: calc( #{$menu-side-width} - 1px );
 
 		background-color: darken($theme-color, 10);
 		background-image: url('/src/static/iconv3.svg');

public_html/css/layout.scss

@@ -100,8 +100,11 @@
 
 		z-index: 101;
 
+		flex-flow: column nowrap;
+		justify-content: space-between;
+
 		&.active{
-			display: block;
+			display: flex;
 		}
 
 

public_html/css/min/constants.css

@@ -3,6 +3,4 @@
 /* COULEUR DES ERREURS */
 /* FORMULAIRES */
 /* GESTION DES LONGUEURS */
- 
+/*# sourceMappingURL=constants.css.map */
-
- /*# sourceMappingURL= constants.css.map */

public_html/css/min/container.css

@@ -20,18 +20,20 @@
     flex-grow: 1; }
   #WRAPPER > #CONTAINER > section.active {
     display: flex;
-    flex-direction: row;
+    flex-flow: row wrap;
-    align-items: flex-start;
     justify-content: flex-start;
-    flex-wrap: wrap; }
+    align-items: stretch;
+    align-content: flex-start; }
     #WRAPPER > #CONTAINER > section.active.contain-check-table {
       flex-direction: column;
       flex-wrap: nowrap;
       align-items: center; }
     #WRAPPER > #CONTAINER > section.active .inline-box {
-      flex: 0 0 1; }
+      flex: 1 1 20%;
+      height: auto;
+      min-height: 10em; }
     #WRAPPER > #CONTAINER > section.active .inline-row {
-      flex: 3em 0 0; }
+      flex: 0 0 2.3em; }
     #WRAPPER > #CONTAINER > section.active .searchbar {
       display: inline-block;
       position: relative;
@@ -49,7 +51,6 @@
     #WRAPPER > #CONTAINER > section.active .error, #WRAPPER > #CONTAINER > section.active .in-dev {
       display: inline-block;
       position: relative;
-      width: calc( 100% - 2*1em - 2*1em);
       height: 1em;
       margin: 1em;
       padding: 1em;
@@ -67,6 +68,7 @@
     display: inline-block;
     position: relative;
     flex: calc( 50% - 2*1em - 2*1em);
+    height: auto;
     margin: 1em;
     padding: 1em;
     border-radius: 3px;
@@ -665,6 +667,4 @@
       color: #444; }
       #WRAPPER > #CONTAINER article.timeline.container div.timeline.infobox.active {
         display: block; }
- 
+/*# sourceMappingURL=container.css.map */
-
- /*# sourceMappingURL= container.css.map */

public_html/css/min/font.css

@@ -39,6 +39,4 @@
   src: url("/css/font/Open Sans/Li.ttf");
   font-weight: 100;
   font-style: italic; }
- 
+/*# sourceMappingURL=font.css.map */
-
- /*# sourceMappingURL= font.css.map */

public_html/css/min/global.css

@@ -272,6 +272,4 @@ hr.OR.search {
   .search > hr.OR:before,
   hr.OR.search:before {
     color: #5630ed; }
- 
+/*# sourceMappingURL=global.css.map */
-
- /*# sourceMappingURL= global.css.map */

public_html/css/min/header.css

@@ -11,7 +11,7 @@
     top: 0;
     left: 0;
     width: 4em;
-    height: 4em;
+    height: calc( 4em - 1px);
     background-color: #c23f05;
     background-image: url("/src/static/iconv3.svg");
     background-position: center center;
@@ -34,6 +34,4 @@
     cursor: pointer; }
     #WRAPPER > #HEADER > .logout-icon:hover {
       background-image: url("/src/static/logout@ffffff.svg"); }
- 
+/*# sourceMappingURL=header.css.map */
-
- /*# sourceMappingURL= header.css.map */

public_html/css/min/layout.css

@@ -68,9 +68,11 @@
     box-shadow: -10px 10px 0 rgba(26, 33, 40, 0.8);
     -webkit-transform: translateX(-50%) translateY(-50%);
     transform: translateX(-50%) translateY(-50%);
-    z-index: 101; }
+    z-index: 101;
+    flex-flow: column nowrap;
+    justify-content: space-between; }
     #WRAPPER > #POPUP.active {
-      display: block; }
+      display: flex; }
     #WRAPPER > #POPUP > .header {
       display: block;
       position: relative;
@@ -114,6 +116,4 @@
     z-index: 100; }
   #WRAPPER #POPUP.active ~ #POPUP-BG {
     display: block; }
- 
+/*# sourceMappingURL=layout.css.map */
-
- /*# sourceMappingURL= layout.css.map */

public_html/css/min/menu-side.css

@@ -57,6 +57,4 @@
       fill: #000 !important; }
     #WRAPPER > #MENU-SIDE > span[data-link]:hover svg #stroke-stylisable, #WRAPPER > #MENU-SIDE > span[data-link].active svg #stroke-stylisable {
       stroke: #000 !important; }
- 
+/*# sourceMappingURL=menu-side.css.map */
-
- /*# sourceMappingURL= menu-side.css.map */

public_html/css/min/reset.css

@@ -370,6 +370,4 @@ table {
 td,
 th {
   padding: 0; }
- 
+/*# sourceMappingURL=reset.css.map */
-
- /*# sourceMappingURL= reset.css.map */

public_html/css/min/submenu-side.css

@@ -38,6 +38,4 @@
         fill: #121213 !important; }
   #CONTAINER > .sub-menu-side > span[data-sublink]:nth-child(1) {
     margin-top: 1em; }
- 
+/*# sourceMappingURL=submenu-side.css.map */
-
- /*# sourceMappingURL= submenu-side.css.map */

public_html/index.php

@@ -8,12 +8,11 @@
 	use \api\core\Response;
 	use \database\core\DatabaseDriver;
 	use \api\core\AuthSystemDefault;
-	use \token\core\TreeToken;
+	use \token\core\TreeTokenNull;
 	use \log\core\Log;
 
 	$page_log      = Log::get('router');
-	$session_guard = new TreeToken(1000);
+	$session_guard = new TreeTokenNull(1000);
-
 
 
 	/*******************************************/

public_html/js/lib/min/page-manager.js

@@ -1,19 +1 @@
-/***************************************/
+function pageManagerClass(){}var ptrPageManagerClass;pageManagerClass.prototype={loaded:null,depJS:null,depCSS:null,xhr:[],activeXHR:null,page:null,vars:[],root:"",path:"",jsPath:"js",cssPath:"css",pagelist:null,container:null,refresher:function(){},ajax:function(t,e,s,i){var h;h=this.xhr.push(window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHttpRequest"))-1,this.activeXHR=this.xhr[h],this.xhr[h].addEventListener("readystatechange",function(t){if(void 0!=this.xhr[t]&&4===this.xhr[t].readyState){[0,200].indexOf(this.xhr[t].status)>-1?e(this.xhr[t].responseText):e(),this.xhr[t]=null;for(var s=!0,t=0;t<this.xhr.length;t++)if(null!==this.xhr[t]){s=!1;break}s&&(this.xhr=[])}}.bind(this,h),!1);var n="string"==typeof s&&/^POST|GET$/i.test(s)?s.toUpperCase():"POST",a="POST"==n&&"object"==typeof i&&i instanceof FormData?i:null;return this.xhr[h].open(n,t,!0),this.xhr[h].send(a),this},explodeURL:function(t){if(t=arguments.length>=1?t:document.URL,null!=this.pagelist&&/^(?:(?:https?:\/\/)?[^\/]+)\/([a-z0-9_]+)(?:\/|((?:\/\w+)+)\/?)?(#.*)?$/i.test(t)){var e=RegExp.$2.split("/").slice(1);return this.pagelist.indexOf(RegExp.$1)>-1?{page:RegExp.$1,var:e}:null}return null},loadDependencies:function(){"object"==typeof this.depCSS&&this.depCSS instanceof Element&&this.depCSS.parentNode==document.head&&document.head.removeChild(this.depCSS),"object"==typeof this.depJS&&this.depJS instanceof Element&&this.depJS.parentNode==document.head&&document.head.removeChild(this.depJS),this.ajax(this.root+this.path+"/"+this.cssPath+"/"+this.page+".css",function(t){return null==t?void console.warn("[loadDependencies_Error] - ("+this.root+this.path+"/"+this.cssPath+"/"+this.page+".css)"):(this.depCSS=document.createElement("link"),this.depCSS.rel="stylesheet",this.depCSS.type="text/css",this.depCSS.innerHTML=t,void document.head.appendChild(this.depCSS))}.bind(this),"GET"),this.ajax(this.root+this.path+"/"+this.jsPath+"/"+this.page+".js",function(t){return null==t?void console.warn("[loadDependencies_Error] - ("+this.root+this.path+"/"+this.jsPath+"/"+this.page+".js)"):(this.depJS=document.createElement("script"),this.depJS.type="text/javascript",this.depJS.innerHTML=t,void document.head.appendChild(this.depJS))}.bind(this),"GET")},updateURL:function(){this.vars.length>0?window.history.pushState(this.page,this.page,this.root+"/"+this.page+"/"+this.vars.join("/")+"/"):window.history.pushState(this.page,this.page,this.root+"/"+this.page+"/")},setPage:function(t,e,s,i,h){var n="object"==typeof i&&i instanceof Array?i:null;if(null!=n)for(var a=0;a<n.length&&(n="string"==typeof n[a]&&/^[a-z0-9_]+$/i.test(n[a])?n:null,null!=n);a++);if(this.pagelist=null!=n?n:this.pagelist,this.root="string"==typeof h?h:this.root,this.path="string"==typeof e?e:this.path,this.container="object"==typeof s&&s instanceof Element?s:this.container,this.pagelist&&this.container){if(t===!0){for(var r=new FormData,a=0;a<this.vars.length;a++)r.append(this.vars[a],null);return this.updateURL(),this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies(),this.refresher.apply(this),this.updateURL()}.bind(this),"POST",r),this}if("string"==typeof t&&this.pagelist.indexOf(t)>-1){this.page=t;for(var r=new FormData,a=0;a<this.vars.length;a++)r.append(this.vars[a],null);this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies()}.bind(this),"POST",r),this.updateURL()}else{var o=this.explodeURL();if(null!=o){var r=new FormData;this.vars.length=0;for(var a=0;a<o.var.length;a++)this.vars[a]=o.var[a],r.append(this.vars[a],null);if(o.page==this.page)return this;this.page=o.page,this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies()}.bind(this),"POST",r),this.updateURL()}else this.setPage(this.pagelist[0])}}else console.warn("pagelist et container manquant");return this},refresh:function(t){return t instanceof Function?void(this.refresher=t):this.setPage(!0)}};
-function pageManagerClass(){}var ptrPageManagerClass
-pageManagerClass.prototype={loaded:null,depJS:null,depCSS:null,xhr:[],activeXHR:null,page:null,vars:[],root:"",path:"",jsPath:"js",cssPath:"css",pagelist:null,container:null,refresher:function(){},ajax:function(t,e,s,i){var h
-h=this.xhr.push(window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHttpRequest"))-1,this.activeXHR=this.xhr[h],this.xhr[h].addEventListener("readystatechange",function(t){if(void 0!=this.xhr[t]&&4===this.xhr[t].readyState){[0,200].indexOf(this.xhr[t].status)>-1?e(this.xhr[t].responseText):e(),this.xhr[t]=null
-for(var s=!0,t=0;t<this.xhr.length;t++)if(null!==this.xhr[t]){s=!1
-break}s&&(this.xhr=[])}}.bind(this,h),!1)
-var n="string"==typeof s&&/^POST|GET$/i.test(s)?s.toUpperCase():"POST",a="POST"==n&&"object"==typeof i&&i instanceof FormData?i:null
-return this.xhr[h].open(n,t,!0),this.xhr[h].send(a),this},explodeURL:function(t){if(t=arguments.length>=1?t:document.URL,null!=this.pagelist&&/^(?:(?:https?:\/\/)?[^\/]+)\/([a-z0-9_]+)(?:\/|((?:\/\w+)+)\/?)?(#.*)?$/i.test(t)){var e=RegExp.$2.split("/").slice(1)
-return this.pagelist.indexOf(RegExp.$1)>-1?{page:RegExp.$1,var:e}:null}return null},loadDependencies:function(){"object"==typeof this.depCSS&&this.depCSS instanceof Element&&this.depCSS.parentNode==document.head&&document.head.removeChild(this.depCSS),"object"==typeof this.depJS&&this.depJS instanceof Element&&this.depJS.parentNode==document.head&&document.head.removeChild(this.depJS),this.ajax(this.root+this.path+"/"+this.cssPath+"/"+this.page+".css",function(t){null!=t?(this.depCSS=document.createElement("link"),this.depCSS.rel="stylesheet",this.depCSS.type="text/css",this.depCSS.href=this.root+this.path+"/"+this.cssPath+"/"+this.page+".css",document.head.appendChild(this.depCSS)):console.warn("[loadDependencies_Error] - ("+this.root+this.path+"/"+this.cssPath+"/"+this.page+".css)")}.bind(this)),this.ajax(this.root+this.path+"/"+this.jsPath+"/"+this.page+".js",function(t){null!=t?(this.depJS=document.createElement("script"),this.depJS.type="text/javascript",this.depJS.src=this.root+this.path+"/"+this.jsPath+"/"+this.page+".js",document.head.appendChild(this.depJS)):console.warn("[loadDependencies_Error] - ("+this.root+this.path+"/"+this.jsPath+"/"+this.page+".js)")}.bind(this))},updateURL:function(){this.vars.length>0?window.history.pushState(this.page,this.page,this.root+"/"+this.page+"/"+this.vars.join("/")+"/"):window.history.pushState(this.page,this.page,this.root+"/"+this.page+"/")},setPage:function(t,e,s,i,h){var n="object"==typeof i&&i instanceof Array?i:null
-if(null!=n)for(var a=0;a<n.length&&(n="string"==typeof n[a]&&/^[a-z0-9_]+$/i.test(n[a])?n:null,null!=n);a++);if(this.pagelist=null!=n?n:this.pagelist,this.root="string"==typeof h?h:this.root,this.path="string"==typeof e?e:this.path,this.container="object"==typeof s&&s instanceof Element?s:this.container,this.pagelist&&this.container){if(t===!0){for(var r=new FormData,a=0;a<this.vars.length;a++)r.append(this.vars[a],null)
-return this.updateURL(),this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies(),this.refresher.apply(this),this.updateURL()}.bind(this),"POST",r),this}if("string"==typeof t&&this.pagelist.indexOf(t)>-1){this.page=t
-for(var r=new FormData,a=0;a<this.vars.length;a++)r.append(this.vars[a],null)
-this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies()}.bind(this),"POST",r),this.updateURL()}else{var p=this.explodeURL()
-if(null!=p){var r=new FormData
-this.vars.length=0
-for(var a=0;a<p.var.length;a++)this.vars[a]=p.var[a],r.append(this.vars[a],null)
-if(p.page==this.page)return this
-this.page=p.page,this.ajax(this.root+this.path+"/"+this.page+".php",function(t){this.container.innerHTML=t,this.loadDependencies()}.bind(this),"POST",r),this.updateURL()}else this.setPage(this.pagelist[0])}}else console.warn("pagelist et container manquant")
-return this},refresh:function(t){return t instanceof Function?void(this.refresher=t):this.setPage(!0)}}

public_html/js/lib/page-manager.js

@@ -155,26 +155,33 @@ pageManagerClass.prototype = {
 
 		// si le fichier css existe
 		this.ajax(this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css', function(e){
-			if( e != null ){ // on charge la dépendance CSS si le fichier existe
+			if( e == null ){ // on charge la dépendance CSS si le fichier existe
-				this.depCSS = document.createElement('link');
-				this.depCSS.rel = 'stylesheet';
-				this.depCSS.type = 'text/css';
-				this.depCSS.href = this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css';
-				document.head.appendChild(this.depCSS);
-			}else
 				console.warn('[loadDependencies_Error] - ('+this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css)');
-		}.bind(this));
+				return;
+			}
+
+			this.depCSS = document.createElement('link');
+			this.depCSS.rel = 'stylesheet';
+			this.depCSS.type = 'text/css';
+			// this.depCSS.href = this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css';
+			this.depCSS.innerHTML = e;
+			document.head.appendChild(this.depCSS);
+		}.bind(this), 'GET');
 
 		// si le fichier js existe
 		this.ajax(this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js', function(e){
-			if( e != null ){ // on charge la dépendance JS si le fichier existe
+			if( e == null ){ // on charge la dépendance JS si le fichier existe
-				this.depJS = document.createElement('script');
-				this.depJS.type = 'text/javascript';
-				this.depJS.src = this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js';
-				document.head.appendChild(this.depJS);
-			}else
 				console.warn('[loadDependencies_Error] - ('+this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js)');
-		}.bind(this));
+				return;
+			}
+
+			this.depJS      = document.createElement('script');
+			this.depJS.type = 'text/javascript';
+			// this.depJS.src = this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js';
+			this.depJS.innerHTML = e;
+			document.head.appendChild(this.depJS);
+
+		}.bind(this), 'GET');
 	},
 
 	/* =======================================================================
@@ -240,7 +247,7 @@ pageManagerClass.prototype = {
 					fd.append(this.vars[i], null);
 
 				this.updateURL(); // could be useful for content or dep
-				
+
 				this.ajax(this.root+this.path+'/'+this.page+'.php', function(e){
 					this.container.innerHTML = e;
 					this.loadDependencies();

public_html/view/history.php

@@ -72,7 +72,7 @@
 	/* [3] Archive -> Archivage des logs
 	=========================================================*/
 
-	echo "<section data-sublink='archive' class='fstart'>";
+	echo "<section data-sublink='archive'>";
 
 		$view = View::load('history.archive');
 		echo $view->render();

public_html/view/js/history.js

@@ -43,6 +43,22 @@ if( section.view.element != null ){
 
     /* (2) Gestion de la recherche instantannee */
     section.view.search.func = function(){
+
+		// if no keyword -> show all
+		if( section.view.search.bar.value.length == 0 ){
+
+			// On recupere la liste des elements correspondants aux utilisateurs
+			var history_list = document.querySelectorAll(section.view.text + '> article.inline-row[id]');
+
+			// Affiche chaque carte
+			for( var i = 0 ; i < history_list.length ; i++ )
+				history_list[i].remClass('hidden');
+
+			return;
+
+		}
+
+
         var search = {
 			path: 'historyDefault/search',
 			keywords: section.view.search.bar.value