added patch, redirect parm, translations

lib/Alchemy/Phrasea/Application.php

@@ -794,7 +794,7 @@ class Application extends SilexApplication
         $app = $this;
         $this->before(function(Request $request) use ($app) {
 
-            static $modulesIds = array(
+            $modulesIds = array(
                 "prod"      => 1,
                 "client"    => 2,
                 "admin"     => 3,
@@ -830,7 +830,7 @@ class Application extends SilexApplication
                     $r = new Response("End-Session", 403);
                 }
                 else {
-                    $r = new RedirectResponse($app["url_generator"]->generate("homepage"));
+                    $r = new RedirectResponse($app["url_generator"]->generate("homepage", array("redirect"=>'..' . $request->getPathInfo())));
                 }
                 $r->headers->set('X-Phraseanet-End-Session', '1');
                 
@@ -852,7 +852,7 @@ class Application extends SilexApplication
                     $r = new Response("End-Session", 403);
                 }
                 else {
-                    $r = new RedirectResponse($app["url_generator"]->generate("homepage"));
+                    $r = new RedirectResponse($app["url_generator"]->generate("homepage", array("redirect"=>'..' . $request->getPathInfo())));
                 }
                 $r->headers->set('X-Phraseanet-End-Session', '1');
                 

lib/Alchemy/Phrasea/Core/Version.php

@@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core;
  */
 class Version
 {
-    protected static $number = '3.8.4-alpha.3';
+    protected static $number = '3.8.4-alpha.4';
     protected static $name = 'Diplodocus';
 
     public static function getNumber()

lib/classes/patch/384alpha4a.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Filesystem\Filesystem;
+
+class patch_384alpha4a implements patchInterface
+{
+    /** @var string */
+    private $release = '3.8.4-alpha.4';
+
+    /** @var array */
+    private $concern = array(base::APPLICATION_BOX);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        $config = $app['phraseanet.configuration']->getConfig();
+
+        $config['session'] = array(
+            'idle' => 0,
+            'lifetime' => 604800,
+        );
+
+        $app['phraseanet.configuration']->setConfig($config);
+
+        return true;
+    }
+}

templates/web/thesaurus/thesaurus.html.twig

@@ -114,7 +114,7 @@
                     },
                     success: function(data){
                         if(data && typeof(data.status) && data.status == "disconnected") {
-                            alert("Session expirée");
+                            alert("{% trans 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' %}");
                             self.location.replace(self.location.href);
                         }
                         //if(manageSession(data))

www/include/jquery.common.js

@@ -417,7 +417,7 @@ function manageSession(data, showMessages) {
 
 
 function disconnected() {
-    showModal('disconnected', {title: 'Disconnection'});
+    showModal('disconnected', {title: language.serverDisconnected});
 }
 
 function showModal(cas, options) {
@@ -453,7 +453,7 @@ function showModal(cas, options) {
     }
 
     if(typeof(p4.Alerts) == "undefined") {
-        alert("disconnected");
+        alert(language.serverDisconnected);
         self.location.replace(self.location.href);
     }
     else {