Merge pull request #1114 from nlegoff/fix-some384

[3.8.4] Fix some issues

lib/Alchemy/Phrasea/Controller/Api/V1.php

@@ -146,6 +146,9 @@ class V1 implements ControllerProviderInterface
          * Log occurs in after filter
          */
         $controllers->after(function (Request $request, Response $response) use ($app, $parseRoute) {
+            if (false !== stripos($request->headers->get('user-agent', ''), 'Phraseanet SDK Player')) {
+                return;
+            }
             $account = $app['token']->get_account();
             $pathInfo = $request->getPathInfo();
             $route = $parseRoute($pathInfo, $response);

lib/Alchemy/Phrasea/Controller/Prod/Push.php

@@ -217,7 +217,7 @@ class Push implements ControllerProviderInterface
                         'ssel_id' => $Basket->getId(),
                     );
 
-                    if (!$app['phraseanet.registry']->get('GV_force_push_authentication') || !$request->get('force_authentication')) {
+                    if (!$app['phraseanet.registry']->get('GV_enable_push_authentication') || !$request->get('force_authentication')) {
                         $arguments['LOG'] = $app['tokens']->getUrlToken(
                             \random::TYPE_VIEW,
                             $user_receiver->get_id(),

lib/conf.d/_GV_template.inc

@@ -267,11 +267,18 @@ return call_user_func_array(function(Application $app) {
             'vars'    => array(
                 array(
                     'type'    => \registry::TYPE_BOOLEAN,
-                    'name'    => 'GV_force_push_authentication',
+                    'name'    => 'GV_enable_push_authentication',
                     'comment' => _('Enable Forcing authentication to see push content'),
                     'help'      => _('Adds an option to the push form submission to restrict push recipient(s) to Phraseanet users only.'),
                     'default' => false
                 ),
+                array(
+                    'type'    => \registry::TYPE_BOOLEAN,
+                    'name'    => 'GV_force_push_authentication',
+                    'comment' => _('Set force authentication option to see push content as mandatory'),
+                    'help'      => _('Disallow the possibility for the end user to disable push authentication'),
+                    'default' => false
+                ),
                 array(
                     'type'    => \registry::TYPE_STRING,
                     'name'    => 'GV_adminMail',

locale/en_GB/LC_MESSAGES/phraseanet.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-14 14:10+0100\n"
-"PO-Revision-Date: 2014-06-04 17:03+0100\n"
+"PO-Revision-Date: 2014-06-25 12:08+0100\n"
 "Last-Translator: Anthony <acabot@alchemy.fr>\n"
 "Language-Team: \n"
 "Language: en_GB\n"
@@ -11501,6 +11501,9 @@ msgstr "Unable to create template, its given name is already used."
 msgid "Unable to create the user."
 msgstr "Unable to create the user."
 
+msgid "Set force authentication option to see push content as mandatory"
+msgstr "Set 'force authentication option' for push as mandatory"
+
 #~ msgid "Enable H264 stream mode"
 #~ msgstr "Enable H264 stream mode"
 

locale/fr_FR/LC_MESSAGES/phraseanet.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-14 14:10+0100\n"
-"PO-Revision-Date: 2014-06-04 17:02+0100\n"
+"PO-Revision-Date: 2014-06-25 12:07+0100\n"
 "Last-Translator: Anthony <acabot@alchemy.fr>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -11678,6 +11678,9 @@ msgstr "Impossible le créer ce modèle, le nom donné est déjà utilisé."
 msgid "Unable to create the user."
 msgstr "Impossible de créer cet utilisateur."
 
+msgid "Set force authentication option to see push content as mandatory"
+msgstr "Rendre obligatoire l'option d'authentification forcée"
+
 #~ msgid "Enable H264 stream mode"
 #~ msgstr "Activer H264 en mode flux continu (lecture en streaming)"
 

templates/web/prod/actions/Download/prepare.html.twig

@@ -94,6 +94,7 @@
 
     <div style="display:none">
         <form name="download" action="{{ path('document_download', {'token': token}) }}" method="post" target="file_frame">
+           <input type="hidden" name="type" value="{{ type }}" />
             {% if anonymous %}
                 <input type="hidden" name="anonymous" value="1" />
             {% endif%}

templates/web/prod/templates/push.html.twig

@@ -154,10 +154,11 @@
             {% trans %}Accuse de reception{% endtrans %}
         </label>
     </div>
-    {% if app['phraseanet.registry'].get('GV_force_push_authentication') %}
+    {% if app['phraseanet.registry'].get('GV_enable_push_authentication') %}
+        {% set force = app['phraseanet.registry'].get('GV_force_push_authentication', false)%}
         <div class="control-group">
-            <label for="PushForceAuthentication" class="checkbox">
+            <label for="PushForceAuthentication" class="checkbox" {% if force %}style="color:#8a8a8a"{% endif %}>
-                <input id="PushForceAuthentication" type="checkbox" checked="checked" name="force_authentication" value="1"/>
+                <input {% if force %}disabled="disabled"{% endif %} id="PushForceAuthentication" type="checkbox" checked="checked" name="force_authentication" value="1"/>
                 {% trans %}Force authentication{% endtrans %}
             </label>
         </div>

www/skins/prod/jquery.main-prod.js

@@ -398,7 +398,11 @@ function afterSearch() {
         delay: 0
     });
     $('.previewTips').tooltip({
-        fixable: true
+        fixable: true,
+        delay: 200,
+        top: 15,
+        left: 15,
+        outside: false
     });
     $('.thumb .rollovable').hover(
         function () {