diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php index b0575ab619..416bb41d73 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php @@ -92,6 +92,8 @@ class DoDownload implements ControllerProviderInterface */ public function prepareDownload(Application $app, Request $request, $token) { + + $datas = $app['tokens']->helloToken($token); if (false === $list = @unserialize((string) $datas['datas'])) { @@ -207,12 +209,12 @@ class DoDownload implements ControllerProviderInterface $app['session']->save(); ignore_user_abort(true); - \set_export::build_zip( - $app, - $token, - $list, - sprintf($app['root.path'] . '/tmp/download/%s.zip', $datas['value']) // Dest file - ); + if ($list['count'] > 1) { + \set_export::build_zip($app, $token, $list, sprintf($app['root.path'] . '/tmp/download/%s.zip', $datas['value'])); + } else { + $list['complete'] = true; + $app['tokens']->updateToken($token, serialize($list)); + } return $app->json(array( 'success' => true, diff --git a/lib/Alchemy/Phrasea/Controller/Report/Activity.php b/lib/Alchemy/Phrasea/Controller/Report/Activity.php index f258e92b43..a07e7d2291 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/Activity.php +++ b/lib/Alchemy/Phrasea/Controller/Report/Activity.php @@ -345,7 +345,7 @@ class Activity implements ControllerProviderInterface 'ddate' => array(_('report:: jour'), 0, 0, 0, 0), 'total' => array(_('report:: total des telechargements'), 0, 0, 0, 0), 'preview' => array(_('report:: preview'), 0, 0, 0, 0), - 'document' => array(_('report:: document original'), 0, 0, 0, 0) + 'document' => array(_('report:: document'), 0, 0, 0, 0) ); $activity = new \module_report_activity( diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php index 3077be9d7a..370ccfdf5a 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Account.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php @@ -145,7 +145,7 @@ class Account implements ControllerProviderInterface } $date = new \DateTime('1 day'); - $token = $app['tokens']->getUrlToken(\random::TYPE_EMAIL, $app['authentication']->getUser()->get_id(), $date, $app['authentication']->getUser()->get_email()); + $token = $app['tokens']->getUrlToken(\random::TYPE_EMAIL, $app['authentication']->getUser()->get_id(), $date, $email); $url = $app->url('account_reset_email', array('token' => $token)); try { diff --git a/templates/web/admin/connected-users.html.twig b/templates/web/admin/connected-users.html.twig index 2bef2def0e..d4bc7b8a55 100644 --- a/templates/web/admin/connected-users.html.twig +++ b/templates/web/admin/connected-users.html.twig @@ -67,12 +67,9 @@ {{ data['applications'][5] }} + {# module witj id 7 has been removed keep it for bc #} {{ 'admin::monitor: module comparateur' | trans }} - {{ data['applications'][6] }} - - - {{ 'admin::monitor: module validation' | trans }} - {{ data['applications'][7] }} + {{ data['applications'][6] + data['applications'][7] }} {% if data['applications'][0] != 0 %} diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index a6b1b1e518..82d0d59859 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -334,9 +334,9 @@ {% trans 'Trier par ' %}