' . _('login::captcha: obtenir une autre captcha') . '
@@ -772,8 +771,8 @@ class Login implements ControllerProviderInterface
'module_name' => _('Accueil'),
'notice' => $notice,
'warning' => $warning,
- 'redirect' => $request->get('redirect'),
- 'logged_out' => $request->get('logged_out'),
+ 'redirect' => $request->query->get('redirect'),
+ 'logged_out' => $request->query->get('logged_out'),
'captcha_system' => $captchaSys,
'login' => new \login(),
'feeds' => $feeds,
@@ -796,11 +795,11 @@ class Login implements ControllerProviderInterface
$is_guest = false;
- if (null !== $request->get('nolog') && \phrasea::guest_allowed()) {
+ if (null !== $request->request->get('nolog') && \phrasea::guest_allowed()) {
$is_guest = true;
}
- if (((null !== $login = $request->get('login')) && (null !== $pwd = $request->get('pwd'))) || $is_guest) {
+ if (((null !== $login = $request->request->get('login')) && (null !== $pwd = $request->request->get('pwd'))) || $is_guest) {
/**
* @todo dispatch an event that can be used to tweak the authentication
@@ -817,8 +816,8 @@ class Login implements ControllerProviderInterface
if ($registry->get('GV_captchas')
&& '' !== $privateKey = trim($registry->get('GV_captcha_private_key'))
&& trim($registry->get('GV_captcha_public_key')) !== ''
- && null !== $challenge = $request->get("recaptcha_challenge_field")
- && null !== $captachResponse = $request->get("recaptcha_response_field")) {
+ && null !== $challenge = $request->request->get("recaptcha_challenge_field")
+ && null !== $captachResponse = $request->request->get("recaptcha_response_field")) {
include($registry->get('GV_RootPath') . 'lib/vendor/recaptcha/recaptchalib.php');
@@ -835,33 +834,33 @@ class Login implements ControllerProviderInterface
$session->authenticate($auth);
} catch (\Exception_Session_StorageClosed $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=session");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=session");
} catch (\Exception_Session_RequireCaptcha $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=captcha");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=captcha");
} catch (\Exception_Unauthorized $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=auth");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=auth");
} catch (\Exception_Session_MailLocked $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=mail-not-confirmed&usr=" . $e->get_usr_id());
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=mail-not-confirmed&usr=" . $e->get_usr_id());
} catch (\Exception_Session_WrongToken $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=token");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=token");
} catch (\Exception_InternalServerError $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=session");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=session");
} catch (\Exception_ServiceUnavailable $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=maintenance");
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=maintenance");
} catch (\Exception_Session_BadSalinity $e) {
$date = new \DateTime('5 minutes');
- $usr_id = \User_Adapter::get_usr_id_from_login($request->get('login'));
+ $usr_id = \User_Adapter::get_usr_id_from_login($request->request->get('login'));
$url = '/account/forgot-password/?token=' . \random::getUrlToken(\random::TYPE_PASSWORD, $usr_id, $date) . '&salt=1';
return $app->redirect($url);
} catch (\Exception $e) {
- return $app->redirect("/login/?redirect=" . $request->get('redirect') . "&error=" . _('An error occured'));
+ return $app->redirect("/login/?redirect=" . $request->request->get('redirect') . "&error=" . _('An error occured'));
}
if ($app['browser']->isMobile()) {
return $app->redirect("/lightbox/");
- } elseif ($request->get('redirect')) {
- return $app->redirect($request->get('redirect'));
+ } elseif ($request->request->get('redirect')) {
+ return $app->redirect($request->request->get('redirect'));
} elseif (true !== $app['browser']->isNewGeneration()) {
return $app->redirect('/client/');
} else {
diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
index d915722c13..ad2d0724e6 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
@@ -87,7 +87,7 @@ class RSSFeeds implements ControllerProviderInterface
$request = $app['request'];
- $page = (int) $request->get('page');
+ $page = (int) $request->query->get('page');
$page = $page < 1 ? 1 : $page;
return $display_feed($feed, $format, $page);
@@ -102,7 +102,7 @@ class RSSFeeds implements ControllerProviderInterface
}
$request = $app['request'];
- $page = (int) $request->get('page');
+ $page = (int) $request->query->get('page');
$page = $page < 1 ? 1 : $page;
return $display_feed($feed, $format, $page, $token->get_user());
@@ -118,7 +118,7 @@ class RSSFeeds implements ControllerProviderInterface
$request = $app['request'];
- $page = (int) $request->get('page');
+ $page = (int) $request->query->get('page');
$page = $page < 1 ? 1 : $page;
return $display_feed($feed, $format, $page, $token->get_user());
@@ -129,7 +129,7 @@ class RSSFeeds implements ControllerProviderInterface
$feed = $feeds->get_aggregate();
$request = $app['request'];
- $page = (int) $request->get('page');
+ $page = (int) $request->query->get('page');
$page = $page < 1 ? 1 : $page;
return $display_feed($feed, $format, $page);
@@ -140,7 +140,7 @@ class RSSFeeds implements ControllerProviderInterface
$feed = $feeds->get_aggregate();
$request = $app['request'];
- $page = (int) $request->get('page');
+ $page = (int) $request->query->get('page');
$page = $page < 1 ? 1 : $page;
return $display_feed($feed, \Feed_Adapter::FORMAT_COOLIRIS, $page);
diff --git a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
index aa3d10d57f..a5a28c9118 100644
--- a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
+++ b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php
@@ -129,7 +129,7 @@ class Installer implements ControllerProviderInterface
, 'version_number' => $app['phraseanet.core']['Version']->getNumber()
, 'version_name' => $app['phraseanet.core']['Version']->getName()
, 'warnings' => $warnings
- , 'error' => $request->get('error')
+ , 'error' => $request->query->get('error')
, 'current_servername' => $request->getScheme() . '://' . $request->getHttpHost() . '/'
, 'discovered_binaries' => \setup::discover_binaries()
, 'rootpath' => dirname(dirname(dirname(dirname(__DIR__)))) . '/'
@@ -145,13 +145,13 @@ class Installer implements ControllerProviderInterface
$conn = $connbas = null;
- $hostname = $request->get('ab_hostname');
- $port = $request->get('ab_port');
- $user_ab = $request->get('ab_user');
- $password = $request->get('ab_password');
+ $hostname = $request->request->get('ab_hostname');
+ $port = $request->request->get('ab_port');
+ $user_ab = $request->request->get('ab_user');
+ $password = $request->request->get('ab_password');
- $appbox_name = $request->get('ab_name');
- $databox_name = $request->get('db_name');
+ $appbox_name = $request->request->get('ab_name');
+ $databox_name = $request->request->get('db_name');
try {
$conn = new \connection_pdo('appbox', $hostname, $port, $user_ab, $password, $appbox_name, array(), $setupRegistry);
@@ -206,20 +206,20 @@ class Installer implements ControllerProviderInterface
$appbox->set_registry($registry);
- $registry->set('GV_base_datapath_noweb', \p4string::addEndSlash($request->get('datapath_noweb')), \registry::TYPE_STRING);
+ $registry->set('GV_base_datapath_noweb', \p4string::addEndSlash($request->request->get('datapath_noweb')), \registry::TYPE_STRING);
$registry->set('GV_ServerName', $servername, \registry::TYPE_STRING);
- $registry->set('GV_cli', $request->get('binary_php'), \registry::TYPE_STRING);
- $registry->set('GV_imagick', $request->get('binary_convert'), \registry::TYPE_STRING);
- $registry->set('GV_pathcomposite', $request->get('binary_composite'), \registry::TYPE_STRING);
- $registry->set('GV_swf_extract', $request->get('binary_swfextract'), \registry::TYPE_STRING);
- $registry->set('GV_pdf2swf', $request->get('binary_pdf2swf'), \registry::TYPE_STRING);
- $registry->set('GV_swf_render', $request->get('binary_swfrender'), \registry::TYPE_STRING);
- $registry->set('GV_unoconv', $request->get('binary_unoconv'), \registry::TYPE_STRING);
- $registry->set('GV_ffmpeg', $request->get('binary_ffmpeg'), \registry::TYPE_STRING);
- $registry->set('GV_mp4box', $request->get('binary_MP4Box'), \registry::TYPE_STRING);
- $registry->set('GV_pdftotext', $request->get('binary_xpdf'), \registry::TYPE_STRING);
+ $registry->set('GV_cli', $request->request->get('binary_php'), \registry::TYPE_STRING);
+ $registry->set('GV_imagick', $request->request->get('binary_convert'), \registry::TYPE_STRING);
+ $registry->set('GV_pathcomposite', $request->request->get('binary_composite'), \registry::TYPE_STRING);
+ $registry->set('GV_swf_extract', $request->request->get('binary_swfextract'), \registry::TYPE_STRING);
+ $registry->set('GV_pdf2swf', $request->request->get('binary_pdf2swf'), \registry::TYPE_STRING);
+ $registry->set('GV_swf_render', $request->request->get('binary_swfrender'), \registry::TYPE_STRING);
+ $registry->set('GV_unoconv', $request->request->get('binary_unoconv'), \registry::TYPE_STRING);
+ $registry->set('GV_ffmpeg', $request->request->get('binary_ffmpeg'), \registry::TYPE_STRING);
+ $registry->set('GV_mp4box', $request->request->get('binary_MP4Box'), \registry::TYPE_STRING);
+ $registry->set('GV_pdftotext', $request->request->get('binary_xpdf'), \registry::TYPE_STRING);
- $user = \User_Adapter::create($appbox, $request->get('email'), $request->get('password'), $request->get('email'), true);
+ $user = \User_Adapter::create($appbox, $request->request->get('email'), $request->request->get('password'), $request->query->get('email'), true);
\phrasea::start($app['phraseanet.core']);
@@ -228,7 +228,7 @@ class Installer implements ControllerProviderInterface
$appbox->get_session()->authenticate($auth);
if ($databox_name && ! \p4string::hasAccent($databox_name)) {
- $template = new \SplFileInfo(__DIR__ . '/../../../../conf.d/data_templates/' . $request->get('db_template') . '.xml');
+ $template = new \SplFileInfo(__DIR__ . '/../../../../conf.d/data_templates/' . $request->query->get('db_template') . '.xml');
$databox = \databox::create($appbox, $connbas, $template, $registry);
$user->ACL()
->give_access_to_sbas(array($databox->get_sbas_id()))
@@ -251,7 +251,7 @@ class Installer implements ControllerProviderInterface
)
);
- $tasks = $request->get('create_task', array());
+ $tasks = $request->request->get('create_task', array());
foreach ($tasks as $task) {
switch ($task) {
case 'cindexer';
@@ -267,7 +267,7 @@ class Installer implements ControllerProviderInterface
$password = $credentials['password'];
$settings = "\n
\n"
- . str_replace('/phraseanet_indexer', '', $request->get('binary_phraseanet_indexer'))
+ . str_replace('/phraseanet_indexer', '', $request->request->get('binary_phraseanet_indexer'))
. "" . $host . ""
. $port . ""
. $appbox_name . ""
diff --git a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
index d8deb11d3c..348ff2eab1 100644
--- a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
+++ b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
@@ -30,11 +30,11 @@ class ConnectionTest implements ControllerProviderInterface
require_once __DIR__ . '/../../../../classes/connection/pdo.class.php';
$request = $app['request'];
- $hostname = $request->get('hostname', '127.0.0.1');
- $port = (int) $request->get('port', 3306);
- $user = $request->get('user');
- $password = $request->get('password');
- $dbname = $request->get('dbname');
+ $hostname = $request->query->get('hostname', '127.0.0.1');
+ $port = (int) $request->query->get('port', 3306);
+ $user = $request->query->get('user');
+ $password = $request->query->get('password');
+ $dbname = $request->query->get('dbname');
$connection_ok = $db_ok = $is_databox = $is_appbox = $empty = false;
diff --git a/lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php b/lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
index 47e444ab0a..0b6e766977 100644
--- a/lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
+++ b/lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
@@ -30,18 +30,18 @@ class PathFileTest implements ControllerProviderInterface
$controllers->get('/path/', function(Application $app, Request $request) {
return $app->json(array(
- 'exists' => file_exists($request->get('path'))
- , 'file' => is_file($request->get('path'))
- , 'dir' => is_dir($request->get('path'))
- , 'readable' => is_readable($request->get('path'))
- , 'writeable' => is_writable($request->get('path'))
- , 'executable' => is_executable($request->get('path'))
+ 'exists' => file_exists($request->query->get('path'))
+ , 'file' => is_file($request->query->get('path'))
+ , 'dir' => is_dir($request->query->get('path'))
+ , 'readable' => is_readable($request->query->get('path'))
+ , 'writeable' => is_writable($request->query->get('path'))
+ , 'executable' => is_executable($request->query->get('path'))
));
});
$controllers->get('/url/', function(Application $app, Request $request) {
- return $app->json(array('code' => \http_query::getHttpCodeFromUrl($request->get('url'))));
+ return $app->json(array('code' => \http_query::getHttpCodeFromUrl($request->query->get('url'))));
});
return $controllers;