logauth
/
SMMP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: logauth:master
Branches Tags
logauth:master
logauth:nginx
logauth:dev
logauth:history-details
logauth:api-refactor
logauth:generic-view
logauth:session-guard
logauth:generic
logauth:kahlan
logauth:phpunit
logauth:feature/SATS/raspberry-clone
logauth:feature/SMMP/end-design
logauth:feature/sha512
logauth:origin/feature/sha512
logauth:feature/SATS/gpio-devices
logauth:upgrade-2.0
logauth:0.9-2
..
compare: logauth:history-details
Branches Tags
logauth:master
logauth:nginx
logauth:dev
logauth:history-details
logauth:api-refactor
logauth:generic-view
logauth:session-guard
logauth:generic
logauth:kahlan
logauth:phpunit
logauth:feature/SATS/raspberry-clone
logauth:feature/SMMP/end-design
logauth:feature/sha512
logauth:origin/feature/sha512
logauth:feature/SATS/gpio-devices
logauth:upgrade-2.0
logauth:0.9-2

No commits in common. "master" and "history-details" have entirely different histories.
master ... history-de

28 changed files with 398 additions and 480 deletions
Show Stats Expand all files Collapse all files

2
build/api/module/machineDefault.php
View File

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

19
build/generic/view/group/view/main.twig
View File

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

2
build/generic/view/machine/group/main.twig
View File

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

2
build/generic/view/settings/admin/create/main.twig
View File

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

2
build/generic/view/user/group/main.twig
View File

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

28
build/http/core/HttpRequest.php
View File

@ -42,7 +42,7 @@
/* [2] Define headers /* [2] Define headers
=========================================================*/ =========================================================*/
$this->headers = self::getallheaders_adapter(); $this->headers = \getallheaders();
/* [3] Define default datasets (GET, POST) /* [3] Define default datasets (GET, POST)
@ -201,30 +201,4 @@
public function HEADERS(){ return $this->headers; } public function HEADERS(){ return $this->headers; }
public function METHOD(){ return $this->method; } public function METHOD(){ return $this->method; }
public function URI(){ return $this->uri; } 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;
}
} }

2
build/orm/core/Rows.php
View File

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

4
build/router/core/Router.php
View File

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

14
build/token/core/TreeTokenNull.php
View File

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

387
composer.lock generated
View File

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

253
logauth.sql
View File

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

16
public_html/css/container.scss
View File

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

2
public_html/css/header.scss
View File

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

5
public_html/css/layout.scss
View File

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

4
public_html/css/min/constants.css
View File

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

18
public_html/css/min/container.css
View File

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

4
public_html/css/min/font.css
View File

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

4
public_html/css/min/global.css
View File

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

6
public_html/css/min/header.css
View File

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

10
public_html/css/min/layout.css
View File

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

4
public_html/css/min/menu-side.css
View File

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

4
public_html/css/min/reset.css
View File

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

4
public_html/css/min/submenu-side.css
View File

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

5
public_html/index.php
View File

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

20
public_html/js/lib/min/page-manager.js
View File

@ -1 +1,19 @@
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)}}

37
public_html/js/lib/page-manager.js
View File

@ -155,33 +155,26 @@ pageManagerClass.prototype = {
// si le fichier css existe // si le fichier css existe
this.ajax(this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css', function(e){ 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)'); console.warn('[loadDependencies_Error] - ('+this.root+this.path+'/'+this.cssPath+'/'+this.page+'.css)');
return; }.bind(this));
}
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 // si le fichier js existe
this.ajax(this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js', function(e){ 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)'); console.warn('[loadDependencies_Error] - ('+this.root+this.path+'/'+this.jsPath+'/'+this.page+'.js)');
return; }.bind(this));
}
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');
}, },
/* ======================================================================= /* =======================================================================

2
public_html/view/history.php
View File

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

16
public_html/view/js/history.js
View File

@ -43,22 +43,6 @@ if( section.view.element != null ){
/* (2) Gestion de la recherche instantannee */ /* (2) Gestion de la recherche instantannee */
section.view.search.func = function(){ 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 = { var search = {
path: 'historyDefault/search', path: 'historyDefault/search',
keywords: section.view.search.bar.value keywords: section.view.search.bar.value