mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape
This commit is contained in:
aina-esokia
2
.gitignore
vendored
2
.gitignore
vendored
@@ -69,3 +69,5 @@ grammar/jison-*
|
||||
pimple.json
|
||||
playbook.retry
|
||||
npm-debug.log
|
||||
|
||||
/Phrasea_datas
|
||||
|
||||
5
Makefile
5
Makefile
@@ -8,18 +8,15 @@ install_composer:
|
||||
composer install --ignore-platform-reqs
|
||||
|
||||
install_asset_dependencies:
|
||||
yarn upgrade
|
||||
yarn install
|
||||
./node_modules/.bin/gulp build
|
||||
|
||||
install_assets:
|
||||
./node_modules/.bin/gulp install-assets
|
||||
|
||||
clean_assets:
|
||||
rm -rf ./node_modules
|
||||
rm -rf ./www/assets
|
||||
rm -Rf ./cache/*
|
||||
mkdir ./node_modules
|
||||
touch ./node_modules/.gitkeep
|
||||
|
||||
config:
|
||||
@php bin/console compile:configuration
|
||||
|
||||
@@ -78,7 +78,6 @@
|
||||
"hoa/router": "~2.0",
|
||||
"igorw/get-in": "~1.0",
|
||||
"imagine/imagine": "0.6.x-dev",
|
||||
"ircmaxell/random-lib": "~1.0",
|
||||
"jms/serializer": "~0.10",
|
||||
"jms/translation-bundle": "dev-rebase-2015-10-20",
|
||||
"justinrainbow/json-schema": "2.0.3 as 1.6.1",
|
||||
@@ -120,7 +119,8 @@
|
||||
"alchemy/queue-bundle": "^0.1.5",
|
||||
"google/recaptcha": "^1.1",
|
||||
"facebook/graph-sdk": "^5.6",
|
||||
"box/spout": "^2.7"
|
||||
"box/spout": "^2.7",
|
||||
"paragonie/random-lib": "^2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"mikey179/vfsStream": "~1.5",
|
||||
|
||||
207
composer.lock
generated
207
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "adf4074eb26ea80d414430d4f7b61311",
|
||||
"content-hash": "7dd755dbcbdcf15e87b4e2e8967c1314",
|
||||
"packages": [
|
||||
{
|
||||
"name": "alchemy-fr/tcpdf-clone",
|
||||
@@ -3742,61 +3742,6 @@
|
||||
],
|
||||
"time": "2014-11-20T16:49:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ircmaxell/random-lib",
|
||||
"version": "v1.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ircmaxell/RandomLib.git",
|
||||
"reference": "e9e0204f40e49fa4419946c677eccd3fa25b8cf4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ircmaxell/RandomLib/zipball/e9e0204f40e49fa4419946c677eccd3fa25b8cf4",
|
||||
"reference": "e9e0204f40e49fa4419946c677eccd3fa25b8cf4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ircmaxell/security-lib": "^1.1",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^1.11",
|
||||
"mikey179/vfsstream": "^1.6",
|
||||
"phpunit/phpunit": "^4.8|^5.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"RandomLib": "lib"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Anthony Ferrara",
|
||||
"email": "ircmaxell@ircmaxell.com",
|
||||
"homepage": "http://blog.ircmaxell.com"
|
||||
}
|
||||
],
|
||||
"description": "A Library For Generating Secure Random Numbers",
|
||||
"homepage": "https://github.com/ircmaxell/RandomLib",
|
||||
"keywords": [
|
||||
"cryptography",
|
||||
"random",
|
||||
"random-numbers",
|
||||
"random-strings"
|
||||
],
|
||||
"time": "2016-09-07T15:52:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ircmaxell/security-lib",
|
||||
"version": "v1.1.0",
|
||||
@@ -4956,6 +4901,68 @@
|
||||
],
|
||||
"time": "2016-11-28T09:17:04+00:00"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/random-lib",
|
||||
"version": "v2.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/RandomLib.git",
|
||||
"reference": "b73a1cb8eae7a346824ccee42298046dedbf2415"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/RandomLib/zipball/b73a1cb8eae7a346824ccee42298046dedbf2415",
|
||||
"reference": "b73a1cb8eae7a346824ccee42298046dedbf2415",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ircmaxell/security-lib": "^1.1",
|
||||
"paragonie/random_compat": "^2",
|
||||
"paragonie/sodium_compat": "^1.3",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^1.11",
|
||||
"mikey179/vfsstream": "^1.6",
|
||||
"phpunit/phpunit": "^4.8 || >=5.0.0 <5.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"RandomLib": "lib"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Anthony Ferrara",
|
||||
"email": "ircmaxell@ircmaxell.com",
|
||||
"homepage": "http://blog.ircmaxell.com"
|
||||
},
|
||||
{
|
||||
"name": "Paragon Initiative Enterprises",
|
||||
"email": "security@paragonie.com",
|
||||
"homepage": "https://paragonie.com"
|
||||
}
|
||||
],
|
||||
"description": "A Library For Generating Secure Random Numbers",
|
||||
"homepage": "https://github.com/ircmaxell/RandomLib",
|
||||
"keywords": [
|
||||
"cryptography",
|
||||
"random",
|
||||
"random-numbers",
|
||||
"random-strings"
|
||||
],
|
||||
"time": "2017-10-06T23:34:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/random_compat",
|
||||
"version": "v2.0.4",
|
||||
@@ -5004,6 +5011,88 @@
|
||||
],
|
||||
"time": "2016-11-07T23:38:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/sodium_compat",
|
||||
"version": "v1.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/sodium_compat.git",
|
||||
"reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
|
||||
"reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"paragonie/random_compat": ">=1",
|
||||
"php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^3|^4|^5"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
|
||||
"ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"autoload.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"ISC"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Paragon Initiative Enterprises",
|
||||
"email": "security@paragonie.com"
|
||||
},
|
||||
{
|
||||
"name": "Frank Denis",
|
||||
"email": "jedisct1@pureftpd.org"
|
||||
}
|
||||
],
|
||||
"description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
|
||||
"keywords": [
|
||||
"Authentication",
|
||||
"BLAKE2b",
|
||||
"ChaCha20",
|
||||
"ChaCha20-Poly1305",
|
||||
"Chapoly",
|
||||
"Curve25519",
|
||||
"Ed25519",
|
||||
"EdDSA",
|
||||
"Edwards-curve Digital Signature Algorithm",
|
||||
"Elliptic Curve Diffie-Hellman",
|
||||
"Poly1305",
|
||||
"Pure-PHP cryptography",
|
||||
"RFC 7748",
|
||||
"RFC 8032",
|
||||
"Salpoly",
|
||||
"Salsa20",
|
||||
"X25519",
|
||||
"XChaCha20-Poly1305",
|
||||
"XSalsa20-Poly1305",
|
||||
"Xchacha20",
|
||||
"Xsalsa20",
|
||||
"aead",
|
||||
"cryptography",
|
||||
"ecdh",
|
||||
"elliptic curve",
|
||||
"elliptic curve cryptography",
|
||||
"encryption",
|
||||
"libsodium",
|
||||
"php",
|
||||
"public-key cryptography",
|
||||
"secret-key cryptography",
|
||||
"side-channel resistant"
|
||||
],
|
||||
"time": "2019-03-20T17:19:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "php-ffmpeg/php-ffmpeg",
|
||||
"version": "0.5.1",
|
||||
@@ -5766,6 +5855,11 @@
|
||||
{
|
||||
"name": "roave/security-advisories",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Roave/SecurityAdvisories.git",
|
||||
"reference": "0698207bf8a9bed212fdde2d8c7cdc77085660c4"
|
||||
},
|
||||
"conflict": {
|
||||
"adodb/adodb-php": "<5.20.6",
|
||||
"amphp/artax": ">=2,<2.0.4|>0.7.1,<1.0.4",
|
||||
@@ -8342,6 +8436,7 @@
|
||||
"mock",
|
||||
"xunit"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2015-10-02T06:51:40+00:00"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -90,7 +90,9 @@ main:
|
||||
client_secret: null
|
||||
border-manager:
|
||||
enabled: true
|
||||
extension-mapping: { }
|
||||
extension-mapping:
|
||||
otc: application/vnd.oasis.opendocument.chart-template
|
||||
ttc: application/x-font-ttf
|
||||
checkers:
|
||||
-
|
||||
type: Checker\Sha256
|
||||
|
||||
@@ -319,7 +319,9 @@ class CollectionService
|
||||
|
||||
$result = $userQuery->on_base_ids([ $reference->getBaseId()] )
|
||||
->who_have_right([\ACL::ORDER_MASTER])
|
||||
->execute()->get_results();
|
||||
->include_templates(true)
|
||||
->execute()
|
||||
->get_results();
|
||||
|
||||
/** @var ACLProvider $acl */
|
||||
$acl = $this->app['acl'];
|
||||
|
||||
@@ -50,6 +50,7 @@ class CollectionController extends Controller
|
||||
$query = $this->createUserQuery();
|
||||
$admins = $query->on_base_ids([$bas_id])
|
||||
->who_have_right([\ACL::ORDER_MASTER])
|
||||
->include_templates(true)
|
||||
->execute()
|
||||
->get_results();
|
||||
}
|
||||
|
||||
@@ -233,6 +233,7 @@ class UserController extends Controller
|
||||
->who_have_right($have_right)
|
||||
->who_have_not_right($have_not_right)
|
||||
->on_base_ids($on_base)
|
||||
->include_templates(true)
|
||||
->execute()
|
||||
->get_results();
|
||||
|
||||
|
||||
@@ -88,9 +88,10 @@ use Alchemy\Phrasea\Status\StatusStructure;
|
||||
use Alchemy\Phrasea\TaskManager\LiveInformation;
|
||||
use Alchemy\Phrasea\Utilities\NullableDateTime;
|
||||
use Doctrine\ORM\EntityManager;
|
||||
use JMS\TranslationBundle\Annotation\Ignore;
|
||||
use Guzzle\Http\Client as Guzzle;
|
||||
use League\Fractal\Resource\Item;
|
||||
use media_subdef;
|
||||
use Neutron\TemporaryFilesystem\TemporaryFilesystemInterface;
|
||||
use Symfony\Component\Form\Form;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -905,19 +906,6 @@ class V1Controller extends Controller
|
||||
|
||||
public function addRecordAction(Request $request)
|
||||
{
|
||||
if (count($request->files->get('file')) == 0) {
|
||||
return $this->getBadRequestAction($request, 'Missing file parameter');
|
||||
}
|
||||
|
||||
$file = $request->files->get('file');
|
||||
if (!$file instanceof UploadedFile) {
|
||||
return $this->getBadRequestAction($request, 'You can upload one file at time');
|
||||
}
|
||||
|
||||
if (!$file->isValid()) {
|
||||
return $this->getBadRequestAction($request, 'Data corrupted, please try again');
|
||||
}
|
||||
|
||||
if (!$request->get('base_id')) {
|
||||
return $this->getBadRequestAction($request, 'Missing base_id parameter');
|
||||
}
|
||||
@@ -930,16 +918,54 @@ class V1Controller extends Controller
|
||||
))->createResponse();
|
||||
}
|
||||
|
||||
// Add file extension
|
||||
$uploadedFilename = $file->getRealPath();
|
||||
if (count($request->files->get('file')) == 0) {
|
||||
if(count($request->get('url')) == 0) {
|
||||
return $this->getBadRequestAction($request, 'Missing file parameter');
|
||||
}
|
||||
else {
|
||||
// upload via url
|
||||
$url = $request->get('url');
|
||||
$pi = pathinfo($url); // filename, extension
|
||||
|
||||
$renamedFilename = $file->getRealPath() . '.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
|
||||
/** @var TemporaryFilesystemInterface $tmpFs */
|
||||
$tmpFs = $this->app['temporary-filesystem'];
|
||||
$tempfile = $tmpFs->createTemporaryFile('download_', null, $pi['extension']);
|
||||
|
||||
$this->getFilesystem()->rename($uploadedFilename, $renamedFilename);
|
||||
try {
|
||||
$guzzle = new Guzzle($url);
|
||||
$res = $guzzle->get("", [], ['save_to' => $tempfile])->send();
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
return $this->getBadRequestAction($request, sprintf('Error "%s" downloading "%s"', $e->getMessage(), $url));
|
||||
}
|
||||
|
||||
$media = $this->app->getMediaFromUri($renamedFilename);
|
||||
if($res->getStatusCode() !== 200) {
|
||||
return $this->getBadRequestAction($request, sprintf('Error %s downloading "%s"', $res->getStatusCode(), $url));
|
||||
}
|
||||
|
||||
$Package = new File($this->app, $media, $collection, $file->getClientOriginalName());
|
||||
$originalName = $pi['filename'] . '.' . $pi['extension'];
|
||||
$newPathname = $tempfile;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// upload via file
|
||||
$file = $request->files->get('file');
|
||||
if (!$file instanceof UploadedFile) {
|
||||
return $this->getBadRequestAction($request, 'You can upload one file at time');
|
||||
}
|
||||
if (!$file->isValid()) {
|
||||
return $this->getBadRequestAction($request, 'Data corrupted, please try again');
|
||||
}
|
||||
$originalName = $file->getClientOriginalName();
|
||||
$newPathname = $file->getPathname() . '.' . $file->getClientOriginalExtension();
|
||||
if (false === rename($file->getPathname(), $newPathname)) {
|
||||
return Result::createError($request, 403, 'Error while renaming file')->createResponse();
|
||||
}
|
||||
}
|
||||
|
||||
$media = $this->app->getMediaFromUri($newPathname);
|
||||
|
||||
$Package = new File($this->app, $media, $collection, $originalName);
|
||||
|
||||
if ($request->get('status')) {
|
||||
$Package->addAttribute(new Status($this->app, $request->get('status')));
|
||||
|
||||
@@ -26,6 +26,7 @@ use Alchemy\Phrasea\Model\Entities\LazaretFile;
|
||||
use Alchemy\Phrasea\Model\Entities\LazaretSession;
|
||||
use DataURI\Exception\Exception as DataUriException;
|
||||
use DataURI\Parser;
|
||||
use Guzzle\Http\Client as Guzzle;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
@@ -76,6 +77,30 @@ class UploadController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function getHead(Request $request)
|
||||
{
|
||||
$response = [
|
||||
'content-type' => null,
|
||||
'content-length' => null,
|
||||
'basename' => null
|
||||
];
|
||||
try {
|
||||
$url = $request->get('url');
|
||||
$basename = pathinfo($url, PATHINFO_BASENAME);
|
||||
|
||||
$guzzle = new Guzzle($url);
|
||||
$res = $guzzle->head("")->send();
|
||||
$response['content-type'] = $res->getContentType();
|
||||
$response['content-length'] = $res->getContentLength();
|
||||
$response['basename'] = $basename;
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
// no-op : head will return no info but will not crash
|
||||
}
|
||||
|
||||
return $this->app->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload processus
|
||||
*
|
||||
@@ -98,7 +123,7 @@ class UploadController extends Controller
|
||||
'message' => '',
|
||||
'element' => '',
|
||||
'reasons' => [],
|
||||
'id' => '',
|
||||
'id' => '',
|
||||
];
|
||||
|
||||
if (null === $request->files->get('files')) {
|
||||
@@ -119,18 +144,44 @@ class UploadController extends Controller
|
||||
throw new AccessDeniedHttpException('User is not allowed to add record on this collection');
|
||||
}
|
||||
|
||||
/** @var UploadedFile $file */
|
||||
$file = current($request->files->get('files'));
|
||||
|
||||
if (!$file->isValid()) {
|
||||
throw new BadRequestHttpException('Uploaded file is invalid');
|
||||
}
|
||||
|
||||
try {
|
||||
if ($file->getClientOriginalName() === "blob" && $file->getClientMimeType() === "application/json") {
|
||||
|
||||
// a "upload by url" was done, we receive a tiny json that contains url.
|
||||
$json = json_decode(file_get_contents($file->getRealPath()), true);
|
||||
$url = $json['url'];
|
||||
$pi = pathinfo($url); // filename, extension
|
||||
|
||||
$tempfile = $this->getTemporaryFilesystem()->createTemporaryFile('download_', null, $pi['extension']);
|
||||
|
||||
try {
|
||||
$guzzle = new Guzzle($url);
|
||||
$res = $guzzle->get("", [], ['save_to' => $tempfile])->send();
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
throw new BadRequestHttpException(sprintf('Error "%s" downloading "%s"', $e->getMessage(), $url));
|
||||
}
|
||||
|
||||
if($res->getStatusCode() !== 200) {
|
||||
throw new BadRequestHttpException(sprintf('Error %s downloading "%s"', $res->getStatusCode(), $url));
|
||||
}
|
||||
|
||||
$uploadedFilename = $renamedFilename = $tempfile;
|
||||
|
||||
$originalName = $pi['filename'] . '.' . $pi['extension'];
|
||||
|
||||
} else {
|
||||
// Add file extension, so mediavorus can guess file type for octet-stream file
|
||||
$uploadedFilename = $file->getRealPath();
|
||||
$renamedFilename = null;
|
||||
|
||||
if(!empty($this->app['conf']->get(['main', 'storage', 'tmp_files']))){
|
||||
if(!empty($this->app['conf']->get(['main', 'storage', 'tmp_files']))) {
|
||||
$tmpStorage = \p4string::addEndSlash($this->app['conf']->get(['main', 'storage', 'tmp_files'])).'upload/';
|
||||
|
||||
if(!is_dir($tmpStorage)){
|
||||
@@ -139,12 +190,16 @@ class UploadController extends Controller
|
||||
|
||||
$renamedFilename = $tmpStorage. pathinfo($file->getRealPath(), PATHINFO_FILENAME) .'.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
|
||||
|
||||
}else{
|
||||
} else {
|
||||
$renamedFilename = $file->getRealPath() . '.' . pathinfo($file->getClientOriginalName(), PATHINFO_EXTENSION);
|
||||
}
|
||||
|
||||
$this->getFilesystem()->rename($uploadedFilename, $renamedFilename);
|
||||
|
||||
$originalName = $file->getClientOriginalName();
|
||||
}
|
||||
|
||||
try {
|
||||
$media = $this->app->getMediaFromUri($renamedFilename);
|
||||
$collection = \collection::getByBaseId($this->app, $base_id);
|
||||
|
||||
@@ -153,7 +208,7 @@ class UploadController extends Controller
|
||||
|
||||
$this->getEntityManager()->persist($lazaretSession);
|
||||
|
||||
$packageFile = new File($this->app, $media, $collection, $file->getClientOriginalName());
|
||||
$packageFile = new File($this->app, $media, $collection, $originalName);
|
||||
|
||||
$postStatus = $request->request->get('status');
|
||||
|
||||
@@ -184,7 +239,9 @@ class UploadController extends Controller
|
||||
|
||||
$code = $this->getBorderManager()->process( $lazaretSession, $packageFile, $callback, $forceBehavior);
|
||||
|
||||
$this->getFilesystem()->rename($renamedFilename, $uploadedFilename);
|
||||
if($renamedFilename !== $uploadedFilename) {
|
||||
$this->getFilesystem()->rename($renamedFilename, $uploadedFilename);
|
||||
}
|
||||
|
||||
if (!!$forceBehavior) {
|
||||
$reasons = [];
|
||||
|
||||
@@ -66,6 +66,9 @@ class Upload implements ControllerProviderInterface, ServiceProviderInterface
|
||||
$controllers->get('/html5-version/', 'controller.prod.upload:getHtml5UploadForm')
|
||||
->bind('upload_html5_form');
|
||||
|
||||
$controllers->get('/head/', 'controller.prod.upload:getHead')
|
||||
->bind('upload_head');
|
||||
|
||||
$controllers->post('/', 'controller.prod.upload:upload')
|
||||
->bind('upload');
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
|
||||
<file date="2018-12-11T12:17:04Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
|
||||
<file date="2019-03-18T12:30:15Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
|
||||
<header>
|
||||
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
|
||||
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
|
||||
@@ -9,9 +9,9 @@
|
||||
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
|
||||
<source>Please provide the same passwords.</source>
|
||||
<target state="translated">Bitte geben Sie diesselbe Passwörter ein.</target>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
<source>The token provided is not valid anymore</source>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
|
||||
<file date="2018-12-11T12:19:04Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
|
||||
<file date="2019-03-18T12:33:08Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
|
||||
<header>
|
||||
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
|
||||
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
|
||||
@@ -9,9 +9,9 @@
|
||||
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
|
||||
<source>Please provide the same passwords.</source>
|
||||
<target state="translated">Please provide the same passwords.</target>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
<source>The token provided is not valid anymore</source>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
|
||||
<file date="2018-12-11T12:20:50Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
|
||||
<file date="2019-03-18T12:36:07Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
|
||||
<header>
|
||||
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
|
||||
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
|
||||
@@ -9,9 +9,9 @@
|
||||
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
|
||||
<source>Please provide the same passwords.</source>
|
||||
<target state="translated">Veuillez indiquer des mots de passe identiques.</target>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
<source>The token provided is not valid anymore</source>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
|
||||
<file date="2018-12-11T12:22:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
|
||||
<file date="2019-03-18T12:39:09Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
|
||||
<header>
|
||||
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
|
||||
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
|
||||
@@ -9,9 +9,9 @@
|
||||
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
|
||||
<source>Please provide the same passwords.</source>
|
||||
<target state="new">Please provide the same passwords.</target>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
|
||||
<source>The token provided is not valid anymore</source>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -31,7 +31,10 @@
|
||||
<span>{{ 'Select files...' | trans }}</span>
|
||||
<input type="file" name="files[]" multiple>
|
||||
</span>
|
||||
<br />
|
||||
<br />
|
||||
<p class="or_upload">{{ "Or" | trans }}</p>
|
||||
<div class="url_upload"><input type="url" value="" id="add-url"><button class="add-url add_url_upload">{{ 'Add this url' | trans }}</button></div>
|
||||
<br/>
|
||||
<span class="comment">
|
||||
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
|
||||
</span>
|
||||
|
||||
Reference in New Issue
Block a user