Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php

lib/classes/patch/383alpha3a.php

@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2013 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_383alpha3a implements patchInterface
+{
+    /** @var string */
+    private $release = '3.8.3-alpha.3';
+
+    /** @var array */
+    private $concern = [base::APPLICATION_BOX];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDoctrineMigrations()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        $sql = 'SELECT base_id, ord, sbas_id
+                FROM  `bas`
+                ORDER BY sbas_id, ord';
+        $stmt = $appbox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        $sbasData = [];
+        $sbas_id = null;
+        $reorder = [];
+        foreach ($rs as $row) {
+            $sbasData[$row['sbas_id']][] = ['base_id' => $row['base_id']];
+            if ($sbas_id !== $row['sbas_id']) {
+                $orders = [];
+            }
+            $sbas_id = $row['sbas_id'];
+            if (in_array($row['ord'], $orders, true)) {
+                $reorder[] = $row['sbas_id'];
+            }
+            $orders[] = $row['ord'];
+        }
+        $reorder = array_unique($reorder);
+
+        if (count($reorder) > 0) {
+            $sql = 'UPDATE bas SET ord = :ord WHERE base_id = :base_id';
+            $stmt = $appbox->get_connection()->prepare($sql);
+            foreach ($reorder as $sbas_id) {
+                $i = 1;
+                foreach ($sbasData[$sbas_id] as $data) {
+                    $stmt->execute(['base_id' => $data['base_id'], 'ord' => $i++]);
+                }
+            }
+            $stmt->closeCursor();
+        }
+
+        return true;
+    }
+}