diff --git a/composer.json b/composer.json index 7154a514c7..69720b6e71 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "neutron/recaptcha" : "~0.1.0", "neutron/temporary-filesystem" : "~2.0", "php-xpdf/php-xpdf" : "~0.2.1", - "phpexiftool/phpexiftool" : "~0.2, >=0.2.2", + "phpexiftool/phpexiftool" : "~0.3", "silex/silex" : "~1.0.0", "silex/web-profiler" : "~1.0.0", "swiftmailer/swiftmailer" : "~4.3.0", diff --git a/composer.lock b/composer.lock index d9a56d6f6e..788d7a7805 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "7f9f9a1dd0a8021cebb26a9a24e968c0", + "hash": "fc4798a0b0a28c7354853a650f70c071", "packages": [ { "name": "alchemy/binary-driver", @@ -46,7 +46,7 @@ "homepage": "http://www.lickmychip.com/" }, { - "name": "Nicolas Le Goff", + "name": "nlegoff", "email": "legoff.n@gmail.com" }, { @@ -372,7 +372,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -565,7 +565,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1216,7 +1216,7 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -2008,7 +2008,7 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -2062,41 +2062,46 @@ }, { "name": "phpexiftool/phpexiftool", - "version": "0.2.2", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/romainneutron/PHPExiftool.git", - "reference": "0.2.2" + "reference": "0.3.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/PHPExiftool/zipball/0.2.2", - "reference": "0.2.2", + "url": "https://api.github.com/repos/romainneutron/PHPExiftool/zipball/0.3.0", + "reference": "0.3.0", "shasum": "" }, "require": { - "doctrine/cache": ">=1.0,<2.0", - "doctrine/collections": ">=1.0,<2.0", - "monolog/monolog": ">=1.3,<2.0", + "doctrine/cache": "~1.0", + "doctrine/collections": "~1.0", + "monolog/monolog": "~1.3", "php": ">=5.3.3", "phpexiftool/exiftool": "9.15", - "symfony/process": ">=2.0,<3.0" + "symfony/process": "~2.0" }, "require-dev": { - "jms/serializer": ">=0.10.0,<1.0", - "sami/sami": "dev-master@dev", - "silex/silex": "1.0.x-dev@dev", - "symfony/console": ">=2.0,<3.0", - "symfony/css-selector": ">=2.0,<3.0", - "symfony/dom-crawler": ">=2.0,<3.0", - "symfony/finder": ">=2.0,<3.0", - "symfony/yaml": ">=2.0,<3.0" + "jms/serializer": "~0.10", + "sami/sami": "~1.0", + "silex/silex": "~1.0", + "symfony/console": "~2.0", + "symfony/css-selector": "~2.0", + "symfony/dom-crawler": "~2.0", + "symfony/finder": "~2.0", + "symfony/yaml": "~2.0" }, "suggest": { "jms/serializer": "To serialize tags", "symfony/yaml": "To serialize tags in Yaml format" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.3-dev" + } + }, "autoload": { "psr-0": { "PHPExiftool": "lib" @@ -2118,7 +2123,7 @@ "exiftool", "metadata" ], - "time": "2013-04-17 15:46:49" + "time": "2013-08-07 13:54:27" }, { "name": "phpoption/phpoption", @@ -2154,7 +2159,7 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -2422,7 +2427,7 @@ }, { "name": "Phraseanet Team", - "email": "support@alchemy.fr", + "email": "info@alchemy.fr", "homepage": "http://www.phraseanet.com/" } ], @@ -3431,7 +3436,7 @@ { "name": "Anthon Pang", "email": "apang@softwaredevelopment.ca", - "role": "Fork Maintainer" + "role": "developer" } ], "description": "PHP WebDriver for Selenium 2", diff --git a/lib/classes/task/period/subdef.php b/lib/classes/task/period/subdef.php index 484f107d6d..e5f8fa3f89 100644 --- a/lib/classes/task/period/subdef.php +++ b/lib/classes/task/period/subdef.php @@ -10,6 +10,8 @@ use Alchemy\Phrasea\Core\Configuration\Configuration; +use MediaAlchemyst\Transmuter\Image2Image; + class task_period_subdef extends task_databoxAbstract { const MINMEGS = 20; @@ -32,6 +34,8 @@ class task_period_subdef extends task_databoxAbstract */ protected $record_buffer_size; + protected $thumbnailExtraction; + /** * Return about text * @@ -54,6 +58,13 @@ class task_period_subdef extends task_databoxAbstract return(_('task::subdef:creation des sous definitions')); } + protected function loadSettings(SimpleXMLElement $sx_task_settings) + { + $this->thumbnailExtraction = (Boolean) trim($sx_task_settings->embedded); + + parent::loadSettings($sx_task_settings); + } + /** * must return the xml (text) version of the form * @@ -64,14 +75,14 @@ class task_period_subdef extends task_databoxAbstract { $request = http_request::getInstance(); - $parm2 = $request->get_parms('period', 'flush', 'maxrecs', 'maxmegs'); + $parm2 = $request->get_parms('period', 'flush', 'maxrecs', 'maxmegs', 'embedded'); $dom = new DOMDocument(); $dom->preserveWhiteSpace = false; $dom->formatOutput = true; if (@$dom->loadXML($oldxml)) { $xmlchanged = false; - foreach (array('str:period', 'str:flush', 'str:maxrecs', 'str:maxmegs') as $pname) { + foreach (array('str:period', 'str:flush', 'str:maxrecs', 'str:maxmegs', 'boo:embedded') as $pname) { $ptype = substr($pname, 0, 3); $pname = substr($pname, 4); $pvalue = $parm2[$pname]; @@ -137,6 +148,7 @@ class task_period_subdef extends task_databoxAbstract .flush.value = "flush, "js", '"') ?>"; .maxrecs.value = "maxrecs, "js", '"') ?>"; .maxmegs.value = "maxmegs, "js", '"') ?>"; + .embedded.value = embedded); ?>; Mo +
+ +
+ +
+
thumbnailExtraction; + $connbas = $databox->get_connection(); $sql = 'SELECT coll_id, record_id @@ -347,6 +368,7 @@ class task_period_subdef extends task_databoxAbstract %s %s %s + 0 ', min(max($period, self::MINPERIOD), self::MAXPERIOD), min(max($flush, self::MINFLUSH), self::MAXFLUSH), diff --git a/templates/web/admin/task.html.twig b/templates/web/admin/task.html.twig index 53035c9dd8..b1461d7ad2 100644 --- a/templates/web/admin/task.html.twig +++ b/templates/web/admin/task.html.twig @@ -115,7 +115,7 @@ } catch(e) { - alert("heu..."); + alert("{% trans "An error occured" %}"); console.log(e); context.acceptTab = false; } diff --git a/templates/web/email-template.html.twig b/templates/web/email-template.html.twig index 6bc7c3889a..250317cd0c 100644 --- a/templates/web/email-template.html.twig +++ b/templates/web/email-template.html.twig @@ -1,114 +1,137 @@ + {{ subject }} - - - + +
-
- - + + + +
+ Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur. +
+ + - - - - - -
- {% if logoUrl is not none %} - {{ logoText }} - {% else %} - {{ logoText }} - {% endif %} - - {{ subject }} -
- - - - - -
- - + - - {% if expiration is not none %} - - - - {% endif %} - {% if buttonText is not none and buttonUrl is not none %} - - + + +
+ + - - - -
- {% if senderName is not none and senderMail is not none %} - {{ senderName }} - - {{ senderMail }}
+ 		+ {% if logoUrl is not none %} + {{ logoText }} + {% else %} + {{ logoText }} {% endif %} -
- {{ messageText | nl2br }} -
- -
- Le lien suivant est valable jusque {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }} -
- - - - - - - - - {% endif %} -
- - {{ buttonText }} - + + + + + - - - -
+ {{ subject }}
- + + + + + + + {% if buttonText is not none and buttonUrl is not none %} + + + + {% endif %} + {% if expiration is not none %} + + + + {% endif %} +
+ + + + + + + + +
+ {% if senderName is not none and senderMail is not none %} + {{ senderName }} - + {{ senderMail }}
+ {% endif %} +
+ {{ messageText | nl2br }} +
+
+ +
+ + + + + + + + + + + +
+ + {{ buttonText }} + +
+ +
+ Ce lien est valable jusqu'au {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }} +
+
+ Le contenu de cet email est confidentiel, ne le divulguez pas.
- - - - - - - -
- Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur.
- Message automatique de Phraseanet - Pour gérer l'envoi d'email automatique, connectez-vous à - - {{ phraseanetTitle }} - -
- + +
+ Message automatique de Phraseanet
+ Pour gérer l'envoi d'email automatique, connectez-vous à + + {{ phraseanetTitle }} +
-