mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-16 06:23:18 +00:00
Fix merge 3.8
This commit is contained in:
Nicolas Le Goff
476
composer.lock
generated
476
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "69bf40de460d2f7a3407f1b905dde913",
|
||||
"hash": "5f393b2cb9db049378e7b1533e749ae6",
|
||||
"packages": [
|
||||
{
|
||||
"name": "alchemy-fr/tcpdf-clone",
|
||||
@@ -479,16 +479,16 @@
|
||||
},
|
||||
{
|
||||
"name": "dailymotion/sdk",
|
||||
"version": "1.6",
|
||||
"version": "1.6.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/dailymotion/dailymotion-sdk-php.git",
|
||||
"reference": "670ce8c536077a17ac31096d4c61372c35caa713"
|
||||
"reference": "96b291b755e97906f54cafa60be4990ece624e83"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/670ce8c536077a17ac31096d4c61372c35caa713",
|
||||
"reference": "670ce8c536077a17ac31096d4c61372c35caa713",
|
||||
"url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/96b291b755e97906f54cafa60be4990ece624e83",
|
||||
"reference": "96b291b755e97906f54cafa60be4990ece624e83",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "library",
|
||||
@@ -508,7 +508,7 @@
|
||||
"dailymotion",
|
||||
"sdk"
|
||||
],
|
||||
"time": "2014-09-11 15:14:39"
|
||||
"time": "2014-11-03 16:53:45"
|
||||
},
|
||||
{
|
||||
"name": "data-uri/data-uri",
|
||||
@@ -840,30 +840,38 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/dbal",
|
||||
"version": "v2.4.2",
|
||||
"version": "v2.5.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/dbal.git",
|
||||
"reference": "fec965d330c958e175c39e61c3f6751955af32d0"
|
||||
"reference": "71140662c0a954602e81271667b6e03d9f53ea34"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/fec965d330c958e175c39e61c3f6751955af32d0",
|
||||
"reference": "fec965d330c958e175c39e61c3f6751955af32d0",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/71140662c0a954602e81271667b6e03d9f53ea34",
|
||||
"reference": "71140662c0a954602e81271667b6e03d9f53ea34",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/common": "~2.4",
|
||||
"doctrine/common": ">=2.4,<2.6-dev",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "3.7.*",
|
||||
"symfony/console": "~2.0"
|
||||
"phpunit/phpunit": "4.*",
|
||||
"symfony/console": "2.*"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/console": "Allows use of the command line interface"
|
||||
"symfony/console": "For helpful console commands such as SQL execution and import of files."
|
||||
},
|
||||
"bin": [
|
||||
"bin/doctrine-dbal"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.5.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Doctrine\\DBAL\\": "lib/"
|
||||
@@ -874,17 +882,6 @@
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jonathan Wage",
|
||||
"email": "jonwage@gmail.com",
|
||||
"homepage": "http://www.jwage.com/",
|
||||
"role": "Creator"
|
||||
},
|
||||
{
|
||||
"name": "Guilherme Blanco",
|
||||
"email": "guilhermeblanco@gmail.com",
|
||||
"homepage": "http://www.instaclick.com"
|
||||
},
|
||||
{
|
||||
"name": "Roman Borschel",
|
||||
"email": "roman@code-factory.org"
|
||||
@@ -892,6 +889,14 @@
|
||||
{
|
||||
"name": "Benjamin Eberlei",
|
||||
"email": "kontakt@beberlei.de"
|
||||
},
|
||||
{
|
||||
"name": "Guilherme Blanco",
|
||||
"email": "guilhermeblanco@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "Jonathan Wage",
|
||||
"email": "jonwage@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Database Abstraction Layer",
|
||||
@@ -902,7 +907,7 @@
|
||||
"persistence",
|
||||
"queryobject"
|
||||
],
|
||||
"time": "2014-01-01 16:43:57"
|
||||
"time": "2014-12-04 21:57:15"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/inflector",
|
||||
@@ -1026,12 +1031,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/migrations.git",
|
||||
"reference": "1a9dffa64e33fdc10f4b4c3f5d7230b74d4a1021"
|
||||
"reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/migrations/zipball/1a9dffa64e33fdc10f4b4c3f5d7230b74d4a1021",
|
||||
"reference": "1a9dffa64e33fdc10f4b4c3f5d7230b74d4a1021",
|
||||
"url": "https://api.github.com/repos/doctrine/migrations/zipball/f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
|
||||
"reference": "f4fe9d9cc21a711d89d91d29c4a4e7945289cdd0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1076,7 +1081,7 @@
|
||||
"database",
|
||||
"migrations"
|
||||
],
|
||||
"time": "2014-08-18 18:03:07"
|
||||
"time": "2014-10-30 14:49:25"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/orm",
|
||||
@@ -3279,16 +3284,16 @@
|
||||
},
|
||||
{
|
||||
"name": "rhumsaa/uuid",
|
||||
"version": "2.7.3",
|
||||
"version": "2.8.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ramsey/uuid.git",
|
||||
"reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a"
|
||||
"reference": "cca98c652cac412c9c2f109c69e5532f313435fc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ramsey/uuid/zipball/b976326ca5977d7333f34e3c828ae7c22a49a65a",
|
||||
"reference": "b976326ca5977d7333f34e3c828ae7c22a49a65a",
|
||||
"url": "https://api.github.com/repos/ramsey/uuid/zipball/cca98c652cac412c9c2f109c69e5532f313435fc",
|
||||
"reference": "cca98c652cac412c9c2f109c69e5532f313435fc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3312,7 +3317,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.7.x-dev"
|
||||
"dev-master": "2.8.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -3341,7 +3346,7 @@
|
||||
"identifier",
|
||||
"uuid"
|
||||
],
|
||||
"time": "2014-08-27 22:39:41"
|
||||
"time": "2014-11-09 18:42:56"
|
||||
},
|
||||
{
|
||||
"name": "silex/silex",
|
||||
@@ -3431,23 +3436,23 @@
|
||||
},
|
||||
{
|
||||
"name": "silex/web-profiler",
|
||||
"version": "dev-master",
|
||||
"version": "1.0.x-dev",
|
||||
"target-dir": "Silex/Provider",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silexphp/Silex-WebProfiler.git",
|
||||
"reference": "8c62046a16a7b8f229aff9147f842956a1e48a14"
|
||||
"reference": "dc371e211d1f3ee62cb822518f4f97b44d1c250a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/8c62046a16a7b8f229aff9147f842956a1e48a14",
|
||||
"reference": "8c62046a16a7b8f229aff9147f842956a1e48a14",
|
||||
"url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/dc371e211d1f3ee62cb822518f4f97b44d1c250a",
|
||||
"reference": "dc371e211d1f3ee62cb822518f4f97b44d1c250a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"silex/silex": "~1.0",
|
||||
"symfony/stopwatch": "~2.2",
|
||||
"symfony/web-profiler-bundle": "~2.2"
|
||||
"symfony/web-profiler-bundle": "~2.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -3467,14 +3472,12 @@
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com",
|
||||
"homepage": "http://fabien.potencier.org",
|
||||
"role": "Lead Developer"
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "A WebProfiler for Silex",
|
||||
"homepage": "http://silex.sensiolabs.org/",
|
||||
"time": "2014-06-04 21:14:30"
|
||||
"time": "2014-11-24 08:26:12"
|
||||
},
|
||||
{
|
||||
"name": "sorien/silex-dbal-profiler",
|
||||
@@ -3624,30 +3627,39 @@
|
||||
"time": "2013-04-11 10:22:09"
|
||||
},
|
||||
{
|
||||
"name": "symfony/icu",
|
||||
"version": "v1.2.2",
|
||||
"target-dir": "Symfony/Component/Icu",
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v2.4.10",
|
||||
"target-dir": "Symfony/Component/EventDispatcher",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Icu.git",
|
||||
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a"
|
||||
"url": "https://github.com/symfony/EventDispatcher.git",
|
||||
"reference": "7362304b252f9303e037ab47e6330f24d7ebbf50"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Icu/zipball/d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
|
||||
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7362304b252f9303e037ab47e6330f24d7ebbf50",
|
||||
"reference": "7362304b252f9303e037ab47e6330f24d7ebbf50",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-intl": "*",
|
||||
"lib-icu": ">=4.4",
|
||||
"php": ">=5.3.3",
|
||||
"symfony/intl": "~2.3"
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/dependency-injection": "~2.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/dependency-injection": "",
|
||||
"symfony/http-kernel": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Symfony\\Component\\Icu\\": ""
|
||||
"Symfony\\Component\\EventDispatcher\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@@ -3660,37 +3672,224 @@
|
||||
"homepage": "http://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Bernhard Schussek",
|
||||
"email": "bschussek@gmail.com"
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Contains an excerpt of the ICU data and classes to load it.",
|
||||
"description": "Symfony EventDispatcher Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"keywords": [
|
||||
"icu",
|
||||
"intl"
|
||||
],
|
||||
"time": "2014-07-25 09:58:17"
|
||||
"time": "2014-09-22 08:51:05"
|
||||
},
|
||||
{
|
||||
"name": "symfony/symfony",
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v2.4.10",
|
||||
"target-dir": "Symfony/Component/HttpFoundation",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/symfony.git",
|
||||
"reference": "daed178afd4700dd18f4fb0ea6b72dcfd9a4792a"
|
||||
"url": "https://github.com/symfony/HttpFoundation.git",
|
||||
"reference": "8e42d9536b5df05f37a9aae5761d3ee69ab95ddf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/daed178afd4700dd18f4fb0ea6b72dcfd9a4792a",
|
||||
"reference": "daed178afd4700dd18f4fb0ea6b72dcfd9a4792a",
|
||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8e42d9536b5df05f37a9aae5761d3ee69ab95ddf",
|
||||
"reference": "8e42d9536b5df05f37a9aae5761d3ee69ab95ddf",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/expression-language": "~2.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Symfony\\Component\\HttpFoundation\\": ""
|
||||
},
|
||||
"classmap": [
|
||||
"Symfony/Component/HttpFoundation/Resources/stubs"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "http://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-09-25 08:51:47"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v2.4.10",
|
||||
"target-dir": "Symfony/Component/HttpKernel",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/HttpKernel.git",
|
||||
"reference": "84b1bd5433bc78cf78c19808abdd155edb4f1937"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/84b1bd5433bc78cf78c19808abdd155edb4f1937",
|
||||
"reference": "84b1bd5433bc78cf78c19808abdd155edb4f1937",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3",
|
||||
"psr/log": "~1.0",
|
||||
"symfony/debug": "~2.3",
|
||||
"symfony/event-dispatcher": "~2.1",
|
||||
"symfony/http-foundation": "~2.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/browser-kit": "~2.2",
|
||||
"symfony/class-loader": "~2.1",
|
||||
"symfony/config": "~2.0",
|
||||
"symfony/console": "~2.2",
|
||||
"symfony/dependency-injection": "~2.0",
|
||||
"symfony/expression-language": "~2.4",
|
||||
"symfony/finder": "~2.0",
|
||||
"symfony/process": "~2.0",
|
||||
"symfony/routing": "~2.2",
|
||||
"symfony/stopwatch": "~2.2",
|
||||
"symfony/templating": "~2.2"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/browser-kit": "",
|
||||
"symfony/class-loader": "",
|
||||
"symfony/config": "",
|
||||
"symfony/console": "",
|
||||
"symfony/dependency-injection": "",
|
||||
"symfony/finder": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Symfony\\Component\\HttpKernel\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "http://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Symfony HttpKernel Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-09-28 17:03:37"
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v2.4.10",
|
||||
"target-dir": "Symfony/Component/Routing",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Routing.git",
|
||||
"reference": "0bd97a27cfd1ad2699ad045de2a744888318a228"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Routing/zipball/0bd97a27cfd1ad2699ad045de2a744888318a228",
|
||||
"reference": "0bd97a27cfd1ad2699ad045de2a744888318a228",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/annotations": "~1.0",
|
||||
"psr/log": "~1.0",
|
||||
"symfony/config": "~2.2",
|
||||
"symfony/expression-language": "~2.4",
|
||||
"symfony/http-foundation": "~2.3",
|
||||
"symfony/yaml": "~2.0"
|
||||
},
|
||||
"suggest": {
|
||||
"doctrine/annotations": "For using the annotation loader",
|
||||
"symfony/config": "For using the all-in-one router or any loader",
|
||||
"symfony/expression-language": "For using expression matching",
|
||||
"symfony/yaml": "For using the YAML loader"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Symfony\\Component\\Routing\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "http://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Routing Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"keywords": [
|
||||
"router",
|
||||
"routing",
|
||||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2014-09-22 15:28:09"
|
||||
},
|
||||
{
|
||||
"name": "symfony/symfony",
|
||||
"version": "v2.6.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/symfony.git",
|
||||
"reference": "645bb3248db50d653d18929eb0c92b131b4f35ad"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/645bb3248db50d653d18929eb0c92b131b4f35ad",
|
||||
"reference": "645bb3248db50d653d18929eb0c92b131b4f35ad",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/common": "~2.2",
|
||||
"php": ">=5.3.3",
|
||||
"psr/log": "~1.0",
|
||||
"symfony/icu": "~1.0",
|
||||
"twig/twig": "~1.12"
|
||||
},
|
||||
"replace": {
|
||||
@@ -3700,6 +3899,7 @@
|
||||
"symfony/console": "self.version",
|
||||
"symfony/css-selector": "self.version",
|
||||
"symfony/debug": "self.version",
|
||||
"symfony/debug-bundle": "self.version",
|
||||
"symfony/dependency-injection": "self.version",
|
||||
"symfony/doctrine-bridge": "self.version",
|
||||
"symfony/dom-crawler": "self.version",
|
||||
@@ -3734,22 +3934,25 @@
|
||||
"symfony/twig-bridge": "self.version",
|
||||
"symfony/twig-bundle": "self.version",
|
||||
"symfony/validator": "self.version",
|
||||
"symfony/var-dumper": "self.version",
|
||||
"symfony/web-profiler-bundle": "self.version",
|
||||
"symfony/yaml": "self.version"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/data-fixtures": "1.0.*",
|
||||
"doctrine/dbal": "~2.2",
|
||||
"doctrine/doctrine-bundle": "~1.2",
|
||||
"doctrine/orm": "~2.2,>=2.2.3",
|
||||
"egulias/email-validator": "~1.2",
|
||||
"ircmaxell/password-compat": "1.0.*",
|
||||
"monolog/monolog": "~1.3",
|
||||
"monolog/monolog": "~1.11",
|
||||
"ocramius/proxy-manager": ">=0.3.1,<0.6-dev",
|
||||
"propel/propel1": "1.6.*"
|
||||
"propel/propel1": "~1.6"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.4-dev"
|
||||
"dev-master": "2.6-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -3783,7 +3986,7 @@
|
||||
"keywords": [
|
||||
"framework"
|
||||
],
|
||||
"time": "2014-09-28 17:03:37"
|
||||
"time": "2014-11-28 15:59:01"
|
||||
},
|
||||
{
|
||||
"name": "themattharris/tmhoauth",
|
||||
@@ -3829,25 +4032,31 @@
|
||||
},
|
||||
{
|
||||
"name": "twig/extensions",
|
||||
"version": "v1.1.0",
|
||||
"version": "v1.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fabpot/Twig-extensions.git",
|
||||
"reference": "c0ab818595338dd5569369bfce2552d02cec5d50"
|
||||
"url": "https://github.com/twigphp/Twig-extensions.git",
|
||||
"reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50",
|
||||
"reference": "c0ab818595338dd5569369bfce2552d02cec5d50",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
|
||||
"reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"twig/twig": "~1.12"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/translation": "~2.3"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/translation": "Allow the time_diff output to be translated"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.1.x-dev"
|
||||
"dev-master": "1.2.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -3862,31 +4071,29 @@
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com",
|
||||
"homepage": "http://fabien.potencier.org",
|
||||
"role": "Lead Developer"
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Common additional features for Twig that do not directly belong in core",
|
||||
"homepage": "https://github.com/fabpot/Twig-extensions",
|
||||
"homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
|
||||
"keywords": [
|
||||
"i18n",
|
||||
"text"
|
||||
],
|
||||
"time": "2014-07-05 10:01:35"
|
||||
"time": "2014-10-30 14:30:03"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.16.0",
|
||||
"version": "v1.16.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fabpot/Twig.git",
|
||||
"reference": "8ce37115802e257a984a82d38254884085060024"
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024",
|
||||
"reference": "8ce37115802e257a984a82d38254884085060024",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
|
||||
"reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3930,7 +4137,7 @@
|
||||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2014-07-05 12:19:05"
|
||||
"time": "2014-10-17 12:53:44"
|
||||
},
|
||||
{
|
||||
"name": "vierbergenlars/php-semver",
|
||||
@@ -4471,12 +4678,12 @@
|
||||
"version": "v1.0.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fabpot/Goutte.git",
|
||||
"url": "https://github.com/FriendsOfPHP/Goutte.git",
|
||||
"reference": "794b196e76bdd37b5155cdecbad311f0a3b07625"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fabpot/Goutte/zipball/794b196e76bdd37b5155cdecbad311f0a3b07625",
|
||||
"url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/794b196e76bdd37b5155cdecbad311f0a3b07625",
|
||||
"reference": "794b196e76bdd37b5155cdecbad311f0a3b07625",
|
||||
"shasum": ""
|
||||
},
|
||||
@@ -4524,16 +4731,16 @@
|
||||
},
|
||||
{
|
||||
"name": "instaclick/php-webdriver",
|
||||
"version": "1.4.0",
|
||||
"version": "1.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/instaclick/php-webdriver.git",
|
||||
"reference": "3cf130283b054b50119f887e11b9b5a648d785a9"
|
||||
"reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/3cf130283b054b50119f887e11b9b5a648d785a9",
|
||||
"reference": "3cf130283b054b50119f887e11b9b5a648d785a9",
|
||||
"url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a57b2bcd9467e217134a2248b261b8b3a90ccea0",
|
||||
"reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4567,7 +4774,7 @@
|
||||
{
|
||||
"name": "Anthon Pang",
|
||||
"email": "apang@softwaredevelopment.ca",
|
||||
"role": "developer"
|
||||
"role": "Fork Maintainer"
|
||||
}
|
||||
],
|
||||
"description": "PHP WebDriver for Selenium 2",
|
||||
@@ -4578,7 +4785,7 @@
|
||||
"webdriver",
|
||||
"webtest"
|
||||
],
|
||||
"time": "2014-05-08 04:19:19"
|
||||
"time": "2014-05-12 21:03:05"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
@@ -4826,16 +5033,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "3.7.37",
|
||||
"version": "3.7.38",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc"
|
||||
"reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
|
||||
"reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6",
|
||||
"reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4895,7 +5102,7 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2014-04-30 12:24:19"
|
||||
"time": "2014-10-17 09:04:17"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit-mock-objects",
|
||||
@@ -4945,6 +5152,63 @@
|
||||
"xunit"
|
||||
],
|
||||
"time": "2013-01-13 10:24:48"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Console",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Console.git",
|
||||
"reference": "ef825fd9f809d275926547c9e57cbf14968793e8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8",
|
||||
"reference": "ef825fd9f809d275926547c9e57cbf14968793e8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"symfony/event-dispatcher": "~2.1",
|
||||
"symfony/process": "~2.1"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log": "For using the console logger",
|
||||
"symfony/event-dispatcher": "",
|
||||
"symfony/process": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.6-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Symfony\\Component\\Console\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "http://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-12-02 20:19:20"
|
||||
}
|
||||
],
|
||||
"aliases": [
|
||||
@@ -4966,8 +5230,8 @@
|
||||
"alchemy/task-manager": 20,
|
||||
"alchemy/zippy": 20,
|
||||
"imagine/imagine": 20,
|
||||
"neutron/process-manager": 20,
|
||||
"media-alchemyst/media-alchemyst": 20,
|
||||
"neutron/process-manager": 20,
|
||||
"phpexiftool/phpexiftool": 20,
|
||||
"silex/silex": 20,
|
||||
"silex/web-profiler": 20,
|
||||
|
||||
@@ -486,7 +486,7 @@ class Application extends SilexApplication
|
||||
$dispatcher->addSubscriber($app['phraseanet.maintenance-subscriber']);
|
||||
$dispatcher->addSubscriber($app['phraseanet.cookie-disabler-subscriber']);
|
||||
$dispatcher->addSubscriber($app['phraseanet.session-manager-subscriber']);
|
||||
<<<<<<< HEAD
|
||||
$dispatcher->addSubscriber($app['phraseanet.record-edit-subscriber']);
|
||||
$dispatcher->addSubscriber(new PhraseaInstallSubscriber($app));
|
||||
$dispatcher->addSubscriber(new FeedEntrySubscriber($app));
|
||||
$dispatcher->addSubscriber(new RegistrationSubscriber($app));
|
||||
@@ -496,9 +496,6 @@ class Application extends SilexApplication
|
||||
$dispatcher->addSubscriber(new BasketSubscriber($app));
|
||||
$dispatcher->addSubscriber(new LazaretSubscriber($app));
|
||||
$dispatcher->addSubscriber(new ValidationSubscriber($app));
|
||||
=======
|
||||
$dispatcher->addSubscriber($app['phraseanet.record-edit-subscriber']);
|
||||
>>>>>>> 3.8
|
||||
|
||||
return $dispatcher;
|
||||
})
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
namespace Alchemy\Phrasea\Application;
|
||||
|
||||
use Alchemy\Phrasea\Application as PhraseaApplication;
|
||||
use Alchemy\Phrasea\Controller\Minifier;
|
||||
use Alchemy\Phrasea\Controller\Permalink;
|
||||
use Alchemy\Phrasea\Controller\Datafiles;
|
||||
use Alchemy\Phrasea\Core\Event\Subscriber\ApiCorsSubscriber;
|
||||
use Alchemy\Phrasea\Core\PhraseaEvents;
|
||||
@@ -110,6 +112,8 @@ return call_user_func(function ($environment = PhraseaApplication::ENV_PROD) {
|
||||
$app->mount('/api/oauthv2', new Oauth2());
|
||||
$app->mount('/datafiles/', new Datafiles());
|
||||
$app->mount('/api/v1', new V1());
|
||||
$app->mount('/permalink/', new Permalink());
|
||||
$app->mount('/include/minify/', new Minifier());
|
||||
|
||||
$app['dispatcher'] = $app->share($app->extend('dispatcher', function ($dispatcher, PhraseaApplication $app) {
|
||||
$dispatcher->addSubscriber(new ApiOauth2ErrorsSubscriber($app['phraseanet.exception_handler'], $app['translator']));
|
||||
|
||||
@@ -53,7 +53,7 @@ class H264MappingGenerator extends Command
|
||||
'enabled' => $enabled,
|
||||
'type' => $type,
|
||||
'mapping' => $mode->getMapping(),
|
||||
);
|
||||
];
|
||||
|
||||
if ($input->getOption('write')) {
|
||||
$output->write("Writing configuration ...");
|
||||
|
||||
@@ -21,10 +21,6 @@ abstract class AbstractDelivery implements ControllerProviderInterface
|
||||
public function deliverContent(Request $request, \record_adapter $record, $subdef, $watermark, $stamp, Application $app)
|
||||
{
|
||||
$file = $record->get_subdef($subdef);
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 3.8
|
||||
$pathOut = $file->get_pathfile();
|
||||
|
||||
if ($watermark === true && $file->get_type() === \media_subdef::TYPE_IMAGE) {
|
||||
@@ -33,25 +29,6 @@ abstract class AbstractDelivery implements ControllerProviderInterface
|
||||
$pathOut = \recordutils_image::stamp($app, $file);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
$log_id = null;
|
||||
try {
|
||||
$logger = $app['phraseanet.logger']($record->get_databox());
|
||||
$log_id = $logger->get_id();
|
||||
|
||||
$referrer = 'NO REFERRER';
|
||||
|
||||
if (isset($_SERVER['HTTP_REFERER'])) {
|
||||
$referrer = $_SERVER['HTTP_REFERER'];
|
||||
}
|
||||
|
||||
$record->log_view($log_id, $referrer, $app['conf']->get(['main', 'key']));
|
||||
} catch (\Exception $e) {
|
||||
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 3.8
|
||||
$disposition = $request->query->get('download') ? DeliverDataInterface::DISPOSITION_ATTACHMENT : DeliverDataInterface::DISPOSITION_INLINE;
|
||||
|
||||
$response = $app['phraseanet.file-serve']->deliverFile($pathOut, $file->get_file(), $disposition, $file->get_mime());
|
||||
|
||||
@@ -42,6 +42,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
use Alchemy\Phrasea\Model\Repositories\BasketRepository;
|
||||
use Alchemy\Phrasea\Model\Entities\LazaretSession;
|
||||
use Alchemy\Phrasea\Core\Event\RecordEdit;
|
||||
|
||||
class V1 implements ControllerProviderInterface
|
||||
{
|
||||
@@ -559,6 +560,8 @@ class V1 implements ControllerProviderInterface
|
||||
$ret['entity'] = '0';
|
||||
$ret['url'] = '/records/' . $output->get_sbas_id() . '/' . $output->get_record_id() . '/';
|
||||
$app['phraseanet.SE']->addRecord($output);
|
||||
|
||||
$app['dispatcher']->dispatch(PhraseaEvents::RECORD_UPLOAD, new RecordEdit($output));
|
||||
}
|
||||
if ($output instanceof LazaretFile) {
|
||||
$ret['entity'] = '1';
|
||||
@@ -861,8 +864,11 @@ class V1 implements ControllerProviderInterface
|
||||
}
|
||||
|
||||
$record->set_binary_status(strrev($datas));
|
||||
|
||||
$app['phraseanet.SE']->updateRecord($record);
|
||||
|
||||
$this->app['dispatcher']->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($record));
|
||||
|
||||
$ret = ["status" => $this->list_record_status($databox, $record->get_status())];
|
||||
|
||||
return Result::create($request, $ret)->createResponse();
|
||||
@@ -1312,7 +1318,7 @@ class V1 implements ControllerProviderInterface
|
||||
|
||||
$ret = [];
|
||||
foreach ($databox->get_statusbits() as $bit => $status_datas) {
|
||||
$ret[] = ['bit' => $bit, 'state' => !!substr($status, ($bit - 1), 1)];
|
||||
$ret[] = ['bit' => $bit, 'state' => !!substr($status, ($bit), 1)];
|
||||
}
|
||||
|
||||
return $ret;
|
||||
|
||||
@@ -60,18 +60,10 @@ class DoDownload implements ControllerProviderInterface
|
||||
*/
|
||||
public function prepareDownload(Application $app, Request $request, Token $token)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (false === $list = @unserialize($token->getData())) {
|
||||
$app->abort(500, 'Invalid datas');
|
||||
}
|
||||
if (!is_array($list)) {
|
||||
=======
|
||||
|
||||
|
||||
$datas = $app['tokens']->helloToken($token);
|
||||
|
||||
if (false === $list = @unserialize((string) $datas['datas'])) {
|
||||
>>>>>>> 3.8
|
||||
$app->abort(500, 'Invalid datas');
|
||||
}
|
||||
|
||||
@@ -188,21 +180,19 @@ class DoDownload implements ControllerProviderInterface
|
||||
$app['session']->save();
|
||||
ignore_user_abort(true);
|
||||
|
||||
<<<<<<< HEAD
|
||||
if ($list['count'] > 1) {
|
||||
\set_export::build_zip(
|
||||
$app,
|
||||
$token,
|
||||
$list,
|
||||
sprintf($app['tmp.download.path'].'/%s.zip', $token->getValue()) // Dest file
|
||||
);
|
||||
=======
|
||||
if ($list['count'] > 1) {
|
||||
\set_export::build_zip($app, $token, $list, sprintf($app['root.path'] . '/tmp/download/%s.zip', $datas['value']));
|
||||
} else {
|
||||
$list['complete'] = true;
|
||||
$app['tokens']->updateToken($token, serialize($list));
|
||||
$token->setData(serialize($list));
|
||||
$app['em']->persist($token);
|
||||
$app['em']->flush();
|
||||
}
|
||||
>>>>>>> 3.8
|
||||
|
||||
return $app->json([
|
||||
'success' => true,
|
||||
|
||||
@@ -344,34 +344,6 @@ class Edit implements ControllerProviderInterface
|
||||
$record->set_metadatas($rec['metadatas']);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/**
|
||||
* todo : this should not work
|
||||
*/
|
||||
if ($write_edit_el instanceof \databox_field) {
|
||||
$fields = $record->get_caption()->get_fields([$write_edit_el->get_name()], true);
|
||||
$field = array_pop($fields);
|
||||
|
||||
$meta_id = null;
|
||||
|
||||
if ($field && !$field->is_multi()) {
|
||||
$values = $field->get_values();
|
||||
$meta_id = array_pop($values)->getId();
|
||||
}
|
||||
|
||||
$metas = [
|
||||
[
|
||||
'meta_struct_id' => $write_edit_el->get_id(),
|
||||
'meta_id' => $meta_id,
|
||||
'value' => $date_obj->format('Y-m-d h:i:s'),
|
||||
]
|
||||
];
|
||||
|
||||
$record->set_metadatas($metas, true);
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 3.8
|
||||
$newstat = $record->get_status();
|
||||
$statbits = ltrim($statbits, 'x');
|
||||
if (!in_array($statbits, ['', 'null'])) {
|
||||
|
||||
@@ -13,12 +13,9 @@ namespace Alchemy\Phrasea\Controller\Prod;
|
||||
|
||||
use Alchemy\Phrasea\Controller\Exception as ControllerException;
|
||||
use Alchemy\Phrasea\Controller\RecordsRequest;
|
||||
<<<<<<< HEAD
|
||||
use Alchemy\Phrasea\Model\Entities\StoryWZ;
|
||||
=======
|
||||
use Alchemy\Phrasea\Core\Event\RecordEdit;
|
||||
use Alchemy\Phrasea\Core\PhraseaEvents;
|
||||
>>>>>>> 3.8
|
||||
use Silex\Application;
|
||||
use Silex\ControllerProviderInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -137,13 +134,9 @@ class Story implements ControllerProviderInterface
|
||||
$n++;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
$data = [
|
||||
=======
|
||||
$app['dispatcher']->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($Story));
|
||||
|
||||
$data = array(
|
||||
>>>>>>> 3.8
|
||||
$data = [
|
||||
'success' => true
|
||||
, 'message' => $app->trans('%quantity% records added', ['%quantity%' => $n])
|
||||
];
|
||||
@@ -235,13 +228,9 @@ class Story implements ControllerProviderInterface
|
||||
|
||||
$stmt->closeCursor();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$ret = ['success' => true, 'message' => $app->trans('Story updated')];
|
||||
=======
|
||||
$app['dispatcher']->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($story));
|
||||
|
||||
$ret = array('success' => true, 'message' => _('Story updated'));
|
||||
>>>>>>> 3.8
|
||||
$app['dispatcher']->dispatch(PhraseaEvents::RECORD_EDIT, new RecordEdit($story));
|
||||
} catch (ControllerException $e) {
|
||||
$ret = ['success' => false, 'message' => $e->getMessage()];
|
||||
} catch (\Exception $e) {
|
||||
|
||||
@@ -13,12 +13,8 @@ namespace Alchemy\Phrasea\Controller\Prod;
|
||||
|
||||
use Alchemy\Phrasea\Border\File;
|
||||
use Alchemy\Phrasea\Border\Attribute\Status;
|
||||
<<<<<<< HEAD
|
||||
use Alchemy\Phrasea\Core\Event\LazaretEvent;
|
||||
=======
|
||||
use Alchemy\Phrasea\Core\Event\RecordEdit;
|
||||
>>>>>>> 3.8
|
||||
use Alchemy\Phrasea\Core\PhraseaEvents;
|
||||
use Alchemy\Phrasea\Core\Event\RecordEdit;use Alchemy\Phrasea\Core\PhraseaEvents;
|
||||
use DataURI\Parser;
|
||||
use DataURI\Exception\Exception as DataUriException;
|
||||
use Alchemy\Phrasea\Model\Entities\LazaretSession;
|
||||
|
||||
@@ -343,21 +343,12 @@ class Activity implements ControllerProviderInterface
|
||||
*/
|
||||
public function doReportSiteActiviyPerDays(Application $app, Request $request)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$conf = [
|
||||
'ddate' => [$app->trans('report:: jour'), 0, 0, 0, 0],
|
||||
'total' => [$app->trans('report:: total des telechargements'), 0, 0, 0, 0],
|
||||
'preview' => [$app->trans('report:: preview'), 0, 0, 0, 0],
|
||||
'document' => [$app->trans('report:: document original'), 0, 0, 0, 0]
|
||||
'document' => [$app->trans('report:: document'), 0, 0, 0, 0]
|
||||
];
|
||||
=======
|
||||
$conf = array(
|
||||
'ddate' => array(_('report:: jour'), 0, 0, 0, 0),
|
||||
'total' => array(_('report:: total des telechargements'), 0, 0, 0, 0),
|
||||
'preview' => array(_('report:: preview'), 0, 0, 0, 0),
|
||||
'document' => array(_('report:: document'), 0, 0, 0, 0)
|
||||
);
|
||||
>>>>>>> 3.8
|
||||
|
||||
$activity = new \module_report_activity(
|
||||
$app,
|
||||
|
||||
@@ -314,18 +314,9 @@ class Root implements ControllerProviderInterface
|
||||
$request->request->get('collection')
|
||||
);
|
||||
|
||||
<<<<<<< HEAD
|
||||
$conf_pref = [];
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
$conf_pref = array();
|
||||
>>>>>>> 3.8
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
foreach (\module_report::getPreff($app, $request->request->get('sbasid')) as $field) {
|
||||
<<<<<<< HEAD
|
||||
$conf_pref[strtolower($field)] = [$field, 0, 0, 0, 0];
|
||||
}
|
||||
|
||||
@@ -341,28 +332,6 @@ class Root implements ControllerProviderInterface
|
||||
'pays' => [$app->trans('report:: pays'), 1, 1, 1, 1],
|
||||
'societe' => [$app->trans('report:: societe'), 1, 1, 1, 1]
|
||||
], $conf_pref);
|
||||
=======
|
||||
// $conf_pref[strtolower($field)] = array($field, 0, 0, 0, 0);
|
||||
$conf_pref[$field] = array($field, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
$conf = array_merge(array(
|
||||
'user' => array(_('report:: utilisateurs'), 1, 1, 1, 1),
|
||||
'ddate' => array(_('report:: date'), 1, 0, 1, 1),
|
||||
'record_id' => array(_('report:: record id'), 1, 1, 1, 1),
|
||||
'final' => array(_('phrseanet:: sous definition'), 1, 0, 1, 1),
|
||||
'coll_id' => array(_('report:: collections'), 1, 0, 1, 1),
|
||||
'comment' => array(_('report:: commentaire'), 1, 0, 0, 0),
|
||||
'fonction' => array(_('report:: fonction'), 1, 1, 1, 1),
|
||||
'activite' => array(_('report:: activite'), 1, 1, 1, 1),
|
||||
'pays' => array(_('report:: pays'), 1, 1, 1, 1),
|
||||
'societe' => array(_('report:: societe'), 1, 1, 1, 1)
|
||||
), $conf_pref);
|
||||
>>>>>>> 3.8
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
if ($request->request->get('printcsv') == 'on') {
|
||||
$download->setHasLimit(false);
|
||||
@@ -390,15 +359,8 @@ class Root implements ControllerProviderInterface
|
||||
return $report;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
return $app->json([
|
||||
'rs' => $app['twig']->render('report/ajax_data_content.html.twig', [
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
return $app->json(array(
|
||||
'rs' => $app['twig']->render('report/ajax_data_content.html.twig', array(
|
||||
>>>>>>> 3.8
|
||||
'result' => isset($report['report']) ? $report['report'] : $report,
|
||||
'is_infouser' => false,
|
||||
'is_nav' => false,
|
||||
@@ -436,12 +398,7 @@ class Root implements ControllerProviderInterface
|
||||
$conf_pref = [];
|
||||
|
||||
foreach (\module_report::getPreff($app, $request->request->get('sbasid')) as $field) {
|
||||
<<<<<<< HEAD
|
||||
$conf_pref[strtolower($field)] = [$field, 0, 0, 0, 0];
|
||||
=======
|
||||
// $conf_pref[strtolower($field)] = array($field, 0, 0, 0, 0);
|
||||
$conf_pref[$field] = array($field, 0, 0, 0, 0);
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
$conf = array_merge([
|
||||
@@ -701,15 +658,8 @@ class Root implements ControllerProviderInterface
|
||||
$groupField = isset($conf[strtolower($groupby)]['title']) ? $conf[strtolower($groupby)]['title'] : '';
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
return $app->json([
|
||||
'rs' => $app['twig']->render('report/ajax_data_content.html.twig', [
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
return $app->json(array(
|
||||
'rs' => $app['twig']->render('report/ajax_data_content.html.twig', array(
|
||||
>>>>>>> 3.8
|
||||
'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray,
|
||||
'is_infouser' => false,
|
||||
'is_nav' => false,
|
||||
|
||||
@@ -139,14 +139,8 @@ class Account implements ControllerProviderInterface
|
||||
return $app->redirectPath('account_reset_email');
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
$token = $app['manipulator.token']->createResetEmailToken($app['authentication']->getUser(), $email);
|
||||
$url = $app->url('account_reset_email', ['token' => $token->getValue()]);
|
||||
=======
|
||||
$date = new \DateTime('1 day');
|
||||
$token = $app['tokens']->getUrlToken(\random::TYPE_EMAIL, $app['authentication']->getUser()->get_id(), $date, $email);
|
||||
$url = $app->url('account_reset_email', array('token' => $token));
|
||||
>>>>>>> 3.8
|
||||
|
||||
try {
|
||||
$receiver = Receiver::fromUser($app['authentication']->getUser());
|
||||
|
||||
@@ -29,23 +29,27 @@ final class PhraseaEvents
|
||||
const ORDER_CREATE = 'order.create';
|
||||
const ORDER_DELIVER = 'order.deliver';
|
||||
const ORDER_DENY = 'order.deny';
|
||||
|
||||
const COLLECTION_CREATE = 'collection.create';
|
||||
<<<<<<< HEAD
|
||||
|
||||
const FEED_ENTRY_CREATE = 'feed-entry.create';
|
||||
|
||||
const REGISTRATION_CREATE = 'registration.create';
|
||||
const REGISTRATION_AUTOREGISTER = 'registration.autoregister';
|
||||
|
||||
const BASKET_PUSH = 'basket.push';
|
||||
|
||||
const VALIDATION_CREATE = 'validation.create';
|
||||
const VALIDATION_DONE = 'validation.done';
|
||||
const VALIDATION_REMINDER = 'validation.reminder';
|
||||
|
||||
const LAZARET_CREATE = 'lazaret.create';
|
||||
|
||||
const BRIDGE_UPLOAD_FAILURE = 'bridge.upload-failure';
|
||||
|
||||
const EXPORT_MAIL_FAILURE = 'export.mail-failure';
|
||||
const EXPORT_CREATE = 'export.create';
|
||||
=======
|
||||
|
||||
const RECORD_EDIT = 'record.edit';
|
||||
const RECORD_UPLOAD = 'record.upload';
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
@@ -190,9 +190,9 @@ class WriteMetadataJob extends AbstractJob
|
||||
try {
|
||||
$app['exiftool.writer']->write($file, $metadata);
|
||||
|
||||
$this->log(sprintf('meta written for sbasid=%1$d - recordid=%2$d (%3$s)', $databox->get_sbas_id(), $record_id, $name), self::LOG_INFO);
|
||||
$this->log('info',sprintf('meta written for sbasid=%1$d - recordid=%2$d (%3$s)', $databox->get_sbas_id(), $record_id, $name));
|
||||
} catch (PHPExiftoolException $e) {
|
||||
$this->log(sprintf('meta NOT written for sbasid=%1$d - recordid=%2$d (%3$s) because "%s"', $databox->get_sbas_id(), $record_id, $name, $e->getMessage()), self::LOG_ERROR);
|
||||
$this->log('error',sprintf('meta NOT written for sbasid=%1$d - recordid=%2$d (%3$s) because "%s"', $databox->get_sbas_id(), $record_id, $name, $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -705,15 +705,8 @@ class databox extends base
|
||||
|
||||
$this->meta_struct = new databox_descriptionStructure();
|
||||
|
||||
<<<<<<< HEAD
|
||||
if ($metaStructData) {
|
||||
foreach ($metaStructData as $row) {
|
||||
$this->meta_struct->add_element(databox_field::get_instance($this->app, $this, $row['id']));
|
||||
}
|
||||
=======
|
||||
foreach ((array) $metaStructData as $row) {
|
||||
$this->meta_struct->add_element(databox_field::get_instance($this->app, $this, $row['id']));
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
return $this->meta_struct;
|
||||
|
||||
@@ -206,7 +206,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
|
||||
$this->mime = $row['mime'];
|
||||
$this->file = $row['file'];
|
||||
$this->path = p4string::addEndSlash($row['path']);
|
||||
$this->etag = $row['etag'] !== null ? $row['etag'] : sha1_file($this->get_pathfile());
|
||||
$this->etag = $row['etag'] !== null ? $row['etag'] : file_exists($this->get_pathfile()) ? sha1_file($this->get_pathfile()) : null;
|
||||
$this->is_substituted = ! ! $row['substit'];
|
||||
$this->subdef_id = (int) $row['subdef_id'];
|
||||
|
||||
@@ -753,11 +753,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
|
||||
|
||||
$this->url = Url::factory("/datafiles/" . $this->record->get_sbas_id()
|
||||
. "/" . $this->record->get_record_id() . "/"
|
||||
<<<<<<< HEAD
|
||||
. $this->get_name() . "/");
|
||||
=======
|
||||
. $this->get_name() . "/?etag=".$this->getEtag());
|
||||
>>>>>>> 3.8
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -233,12 +233,8 @@ class module_report
|
||||
/**
|
||||
*
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
protected $cor_query = [];
|
||||
=======
|
||||
protected $dateField = 'log.date';
|
||||
protected $cor_query = array();
|
||||
>>>>>>> 3.8
|
||||
protected $isInformative;
|
||||
|
||||
/**
|
||||
@@ -840,14 +836,8 @@ class module_report
|
||||
return $this->report;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
$conn = connection::getPDOConnection($this->app, $this->sbas_id);
|
||||
>>>>>>> 3.8
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
@@ -861,15 +851,7 @@ class module_report
|
||||
$stmt->execute($this->params);
|
||||
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
$stmt->closeCursor();
|
||||
<<<<<<< HEAD
|
||||
} catch (DBALException $e) {
|
||||
=======
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\ncount==%s\n\n", __FILE__, __LINE__, count($rs)), FILE_APPEND);
|
||||
|
||||
} catch (PDOException $e) {
|
||||
>>>>>>> 3.8
|
||||
echo $e->getMessage();
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -886,12 +868,7 @@ class module_report
|
||||
$this->buildResult($this->app, $rs);
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
//calculate prev and next page
|
||||
<<<<<<< HEAD
|
||||
$this->calculatePages();
|
||||
=======
|
||||
$this->calculatePages($rs);
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
>>>>>>> 3.8
|
||||
//do we display navigator ?
|
||||
$this->setDisplayNav();
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
|
||||
@@ -141,7 +141,6 @@ class module_report_activity extends module_report
|
||||
return $this->report;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/**
|
||||
* Get all questions by user
|
||||
*
|
||||
@@ -195,8 +194,6 @@ class module_report_activity extends module_report
|
||||
|
||||
return $this->result;
|
||||
}
|
||||
=======
|
||||
>>>>>>> 3.8
|
||||
|
||||
// ================== Site activity : Top questions (le second radio ...) ================
|
||||
/**
|
||||
@@ -334,13 +331,8 @@ class module_report_activity extends module_report
|
||||
*/
|
||||
public function getDownloadByBaseByDay($tab = false)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$this->title = $this->app->trans('report:: telechargements par jour');
|
||||
|
||||
=======
|
||||
$this->title = _('report:: telechargements par jour');
|
||||
$this->setDateField('log_docs.date');
|
||||
>>>>>>> 3.8
|
||||
$sqlBuilder = new module_report_sql($this->app, $this);
|
||||
$filter = $sqlBuilder->getFilters()->getReportFilter();
|
||||
$params = array_merge([], $filter['params']);
|
||||
@@ -410,9 +402,7 @@ class module_report_activity extends module_report
|
||||
$this->result[$nb_row]['preview'] = '<b>' . $total['tot_prev'] . '</b>';
|
||||
$this->result[$nb_row]['total'] = '<b>' . $total['tot_dl'] . '</b>';
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
$this->calculatePages();
|
||||
=======
|
||||
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, var_export($this->result, true)), FILE_APPEND);
|
||||
foreach($this->result as $k=>$row) {
|
||||
$_row = array();
|
||||
@@ -423,8 +413,7 @@ class module_report_activity extends module_report
|
||||
}
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, var_export($this->result, true)), FILE_APPEND);
|
||||
|
||||
$this->calculatePages($rs);
|
||||
>>>>>>> 3.8
|
||||
$this->calculatePages();
|
||||
$this->setDisplayNav();
|
||||
$this->setReport();
|
||||
|
||||
@@ -752,27 +741,15 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activity(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$res = [];
|
||||
$datefilter =
|
||||
module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter =
|
||||
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$res = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.id, HOUR(tt.heures) AS heures
|
||||
FROM (
|
||||
@@ -826,15 +803,9 @@ class module_report_activity extends module_report
|
||||
$res = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
|
||||
FROM (
|
||||
@@ -879,27 +850,13 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activityQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$result = [];
|
||||
$datefilter =
|
||||
module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter =
|
||||
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$result = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_search.date');
|
||||
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.usrid, tt.user, sum(1) AS nb
|
||||
FROM (
|
||||
@@ -944,27 +901,15 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activiteTopQuestion(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$result = [];
|
||||
$datefilter =
|
||||
module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter =
|
||||
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$result = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_search.date');
|
||||
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT TRIM(tt.search) AS question, tt.usrid, tt.user, SUM(1) AS nb
|
||||
FROM (
|
||||
@@ -1017,15 +962,11 @@ class module_report_activity extends module_report
|
||||
$result = [];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = [];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$params = array();
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
|
||||
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.referrer, SUM(1) AS nb_view
|
||||
FROM (
|
||||
@@ -1074,25 +1015,14 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activiteAddedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$result = [];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
|
||||
$params = [];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$result = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax,'log_docs.date');
|
||||
|
||||
$params = array();
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
|
||||
FROM (
|
||||
@@ -1134,25 +1064,14 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activiteEditedDocument(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$result = [];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
|
||||
$params = [];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$result = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
|
||||
|
||||
$params = array();
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.ddate, COUNT( DATE_FORMAT( tt.ddate, '%d' ) ) AS activity
|
||||
FROM (
|
||||
@@ -1194,25 +1113,14 @@ class module_report_activity extends module_report
|
||||
//============================= Dashboard =========================
|
||||
public static function activiteAddedTopTenUser(Application $app, $dmin, $dmax, $sbas_id, $list_coll_id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
$result = [];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
|
||||
$params = [];
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
|
||||
=======
|
||||
$conn = connection::getPDOConnection($app, $sbas_id);
|
||||
$result = array();
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
|
||||
|
||||
$params = array();
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
/*
|
||||
>>>>>>> 3.8
|
||||
$sql = "
|
||||
SELECT tt.usrid, tt.user, sum( 1 ) AS nb
|
||||
FROM (
|
||||
|
||||
@@ -38,14 +38,8 @@ class module_report_connexion extends module_report
|
||||
*/
|
||||
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, '');
|
||||
$this->title = $this->app->trans('report::Connexions');
|
||||
=======
|
||||
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
|
||||
$this->title = _('report::Connexions');
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,18 +140,10 @@ class module_report_connexion extends module_report
|
||||
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = array_merge([
|
||||
':site_id' => $app['conf']->get(['main', 'key'])
|
||||
],
|
||||
$datefilter['params'],
|
||||
$collfilter['params']
|
||||
=======
|
||||
$params = array_merge(array(
|
||||
':site_id' => $app['phraseanet.configuration']['main']['key']
|
||||
),
|
||||
$datefilter['params']
|
||||
>>>>>>> 3.8
|
||||
);
|
||||
|
||||
$finalfilter = $datefilter['sql'] . ' AND ';
|
||||
|
||||
@@ -43,14 +43,8 @@ class module_report_download extends module_report
|
||||
*/
|
||||
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, '');
|
||||
$this->title = $this->app->trans('report:: telechargements');
|
||||
=======
|
||||
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
|
||||
$this->title = _('report:: telechargements');
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -189,16 +183,9 @@ class module_report_download extends module_report
|
||||
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
=======
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
>>>>>>> 3.8
|
||||
|
||||
$finalfilter = $datefilter['sql'] . ' AND ';
|
||||
$finalfilter .= 'log.site = :site_id';
|
||||
@@ -242,16 +229,9 @@ class module_report_download extends module_report
|
||||
$databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
|
||||
$conn = $databox->get_connection();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
|
||||
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
|
||||
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
|
||||
=======
|
||||
$params = array(':site_id' => $app['phraseanet.configuration']['main']['key']);
|
||||
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax, 'log_docs.date');
|
||||
$params = array_merge($params, $datefilter['params']);
|
||||
>>>>>>> 3.8
|
||||
|
||||
$finalfilter = "";
|
||||
$array = [
|
||||
|
||||
@@ -450,13 +450,7 @@ class module_report_nav extends module_report
|
||||
WHERE (id = :value)';
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params2 = [':value' => $val];
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $sql), FILE_APPEND);
|
||||
|
||||
$params2 = array(':value' => $val);
|
||||
>>>>>>> 3.8
|
||||
$stmt = $conn->prepare($sql);
|
||||
$stmt->execute($params2);
|
||||
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
@@ -39,14 +39,8 @@ class module_report_question extends module_report
|
||||
*/
|
||||
public function __construct(Application $app, $arg1, $arg2, $sbas_id, $collist)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, '');
|
||||
$this->title = $this->app->trans('report:: question');
|
||||
=======
|
||||
// parent::__construct($app, $arg1, $arg2, $sbas_id, $collist);
|
||||
parent::__construct($app, $arg1, $arg2, $sbas_id, "");
|
||||
$this->title = _('report:: question');
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -89,12 +89,6 @@ class module_report_sqlconnexion extends module_report_sql implements module_rep
|
||||
WHERE (' . $filter['sql'] . ')
|
||||
) AS tt ORDER BY val ASC';
|
||||
|
||||
<<<<<<< HEAD
|
||||
return ['sql' => $this->sql, 'params' => $this->params];
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
|
||||
|
||||
return array('sql' => $this->sql, 'params' => $this->params);
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,12 +26,7 @@ class module_report_sqldownload extends module_report_sql implements module_repo
|
||||
|
||||
public function buildSql()
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
$customFieldMap = [];
|
||||
=======
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
|
||||
$customFieldMap = array();
|
||||
>>>>>>> 3.8
|
||||
|
||||
$filter = $this->filter->getReportFilter() ? : ['params' => [], 'sql' => false];
|
||||
$this->params = array_merge([], $filter['params']);
|
||||
@@ -82,12 +77,7 @@ class module_report_sqldownload extends module_report_sql implements module_repo
|
||||
'subdef.file' => 'tt.file',
|
||||
'subdef.mime' => 'tt.mime',
|
||||
'log_docs.final' => 'tt.final',
|
||||
<<<<<<< HEAD
|
||||
];
|
||||
=======
|
||||
);
|
||||
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
|
||||
>>>>>>> 3.8
|
||||
|
||||
} elseif ($this->on == 'DOC') {
|
||||
$this->sql = '
|
||||
|
||||
@@ -34,40 +34,12 @@ class module_report_sqlfilter
|
||||
|
||||
public static function constructDateFilter($dmin, $dmax, $dateField = 'log_date.date')
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
return [
|
||||
'sql' => ($dmin && $dmax ? ' log_date.date > :date_min AND log_date.date < :date_max ' : false)
|
||||
, 'params' => ($dmin && $dmax ? [':date_min' => $dmin, ':date_max' => $dmax] : [])
|
||||
];
|
||||
}
|
||||
|
||||
public static function constructCollectionFilter(Application $app, $list_coll_id)
|
||||
{
|
||||
$ret = ['sql' => '', 'params' => []];
|
||||
$coll_filter = [];
|
||||
foreach (array_filter(explode(',', $list_coll_id)) as $val) {
|
||||
$val = \phrasea::collFromBas($app, $val);
|
||||
if ($val) {
|
||||
$coll_filter[] = 'log_colls.coll_id = ' . $val;
|
||||
}
|
||||
}
|
||||
$collections = array_unique($coll_filter);
|
||||
|
||||
if (count($collections) > 0) {
|
||||
$ret['sql'] = ' (' . implode(' OR ', $collections) . ') ';
|
||||
}
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
=======
|
||||
return array(
|
||||
'sql' => ($dmin && $dmax ? ' '.$dateField.' > :date_min AND '.$dateField.' < :date_max ' : false)
|
||||
, 'params' => ($dmin && $dmax ? array(':date_min' => $dmin, ':date_max' => $dmax) : array())
|
||||
);
|
||||
}
|
||||
|
||||
>>>>>>> 3.8
|
||||
public function getCorFilter()
|
||||
{
|
||||
return $this->cor_query;
|
||||
@@ -77,12 +49,8 @@ class module_report_sqlfilter
|
||||
{
|
||||
$sql = '';
|
||||
|
||||
<<<<<<< HEAD
|
||||
$params = [':log_site' => $this->app['conf']->get(['main', 'key'])];
|
||||
|
||||
=======
|
||||
$params = array(':log_site' => $this->app['phraseanet.configuration']['main']['key']);
|
||||
>>>>>>> 3.8
|
||||
if ($this->filter['date'] && $this->filter['date']['sql'] !== '') {
|
||||
$sql .= $this->filter['date']['sql'] . ' AND ';
|
||||
$params = array_merge($params, $this->filter['date']['params']);
|
||||
@@ -92,13 +60,9 @@ class module_report_sqlfilter
|
||||
$params = array_merge($params, $this->filter['user']['params']);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
return ['sql' => $finalfilter, 'params' => $params];
|
||||
=======
|
||||
$sql .= ' log.site = :log_site';
|
||||
|
||||
return array('sql' => $sql, 'params' => $params);
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
public function getGvSitFilter()
|
||||
@@ -113,12 +77,7 @@ class module_report_sqlfilter
|
||||
|
||||
public function getUserIdFilter($id)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
return ['sql' => "log.usrid = :usr_id_filter", 'params' => [':usr_id_filter' => $id]];
|
||||
=======
|
||||
return array('sql' => "log.usrid = :usr_id_filter", 'params' => array(':usr_id_filter' => $id));
|
||||
// return array('sql' => "log.usrid=" . (int)$id, 'params' => array());
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
|
||||
public function getDateFilter()
|
||||
@@ -153,25 +112,6 @@ class module_report_sqlfilter
|
||||
private function dateFilter(module_report $report)
|
||||
{
|
||||
$this->filter['date'] = false;
|
||||
/*
|
||||
if ($report->getDmin() && $report->getDmax()) {
|
||||
$this->filter['date'] = [
|
||||
'sql' => ' (log.date > :date_min_f AND log.date < :date_max_f) '
|
||||
<<<<<<< HEAD
|
||||
, 'params' => [
|
||||
':date_min_f' => $report->getDmin()
|
||||
, ':date_max_f' => $report->getDmax()
|
||||
]
|
||||
];
|
||||
=======
|
||||
, 'params' => array(
|
||||
':date_min_f' => $report->getDmin()
|
||||
, ':date_max_f' => $report->getDmax()
|
||||
)
|
||||
);
|
||||
>>>>>>> 3.8
|
||||
}
|
||||
*/
|
||||
$sql = "";
|
||||
if($report->getDmin()) {
|
||||
$sql = $report->getDateField().">=" . $this->conn->quote($report->getDmin());
|
||||
@@ -225,39 +165,6 @@ class module_report_sqlfilter
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
private function collectionFilter(module_report $report)
|
||||
{
|
||||
$this->filter['collection'] = false;
|
||||
$coll_filter = [];
|
||||
|
||||
if ($report->getUserId() == '') {
|
||||
return;
|
||||
}
|
||||
|
||||
$tab = array_filter(explode(",", $report->getListCollId()));
|
||||
|
||||
if (count($tab) > 0) {
|
||||
foreach ($tab as $val) {
|
||||
$val = \phrasea::collFromBas($this->app, $val);
|
||||
if (!!$val) {
|
||||
$coll_filter[] = 'log_colls.coll_id = ' . $val;
|
||||
}
|
||||
}
|
||||
|
||||
$collections = array_unique($coll_filter);
|
||||
|
||||
if (count($collections) > 0) {
|
||||
$this->filter['collection'] = array('sql' => ' (' . implode(' OR ', array_unique($coll_filter)) . ') ', 'params' => array());
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 3.8
|
||||
private function recordFilter(module_report $report)
|
||||
{
|
||||
$this->filter['record'] = false;
|
||||
|
||||
@@ -67,9 +67,8 @@
|
||||
<td class="colValue" >{{ data['applications'][5] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
{# module witj id 7 has been removed keep it for bc #}
|
||||
<td class="colTitle" >{{ 'admin::monitor: module comparateur' | trans }}</td>
|
||||
<td class="colValue" >{{ data['applications'][6] + data['applications'][7] }}</td>
|
||||
<td class="colValue" >{{ data['applications'][6] }}</td>
|
||||
</tr>
|
||||
{% if data['applications'][0] != 0 %}
|
||||
<tr>
|
||||
|
||||
@@ -100,8 +100,8 @@
|
||||
background-color: #{{ app['settings'].getUserSetting(app['authentication'].getUser(), 'background-selection-disabled', '333333')}}};
|
||||
}*/
|
||||
.diapo.selected,#reorder_box .diapo.selected, #EDIT_ALL .diapo.selected, .list.selected, .list.selected .diapo {
|
||||
color: #{{app['settings'].getUserSetting(app['authentication'].getUser(), 'fontcolor-selection', 'FFFFFF')}};
|
||||
background-color: #{{app['settings'].getUserSetting(app['authentication'].getUser(), 'background-selection', '404040')}};
|
||||
color: {{"#" ~ app['settings'].getUserSetting(app['authentication'].getUser(), 'fontcolor-selection', 'FFFFFF')}};
|
||||
background-color: {{"#" ~ app['settings'].getUserSetting(app['authentication'].getUser(), 'background-selection', '404040')}};
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
@@ -117,7 +117,7 @@
|
||||
<div style="margin:0 10px 10px; font-family:Helvetica,Arial,sans-serif; font-size:18px; color:#1A1A1A; text-align:left;">Phraseanet</div>
|
||||
<div style="text-align:center;">{{ 'Chargement' | trans }}</div>
|
||||
<div style="width:220px; height:19px; margin:20px auto;">
|
||||
<div id="loader_bar" style="height:19px;width:10%;background-image:url(/skins/icons/main-loader.gif)"></div>
|
||||
<div id="loader_bar" style="height:19px;width:10%;background-image:url('/skins/icons/main-loader.gif')"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -340,11 +340,7 @@
|
||||
<select name="sort" class="input-small">
|
||||
<option value="" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected" class="default-selection"{% endif %}>{{ "No sort"|trans }}</option>
|
||||
{% for sort in search_datas['sort'] %}
|
||||
<<<<<<< HEAD
|
||||
<option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected default-selection"{% endif %}>{{ sort.fieldname }}</option>
|
||||
=======
|
||||
<option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected" class="default-selection"{% endif %}>{{ sort.fieldname }}</option>
|
||||
>>>>>>> 3.8
|
||||
{% endfor %}
|
||||
</select>
|
||||
<select name="ord" class="input-medium">
|
||||
|
||||
Reference in New Issue
Block a user