diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 35371ea780..e3c8a9fc0d 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -222,7 +222,6 @@ class Application extends SilexApplication 'gs.binaries' => 'ghostscript_binary', 'ffmpeg.ffmpeg.binaries' => 'ffmpeg_binary', 'ffmpeg.ffprobe.binaries' => 'ffprobe_binary', - 'recess.binaries' => 'recess_binary', 'ffmpeg.ffmpeg.timeout' => 'ffmpeg_timeout', 'ffmpeg.ffprobe.timeout' => 'ffprobe_timeout', 'gs.timeout' => 'gs_timeout', @@ -672,7 +671,7 @@ class Application extends SilexApplication } /** - * Tells if a captcha is required for next authentication + * Returns true if a captcha is required for next authentication * * @return boolean */ @@ -688,7 +687,7 @@ class Application extends SilexApplication } /** - * Tells if guests are allowed + * Returns true if guest access is allowed. * * @return boolean */ @@ -704,7 +703,7 @@ class Application extends SilexApplication } /** - * Tells if application has terms of use + * Returns true if application has terms of use * * @return noolean */ diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index d51c9faa65..91dc729035 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -384,7 +384,7 @@ class Login implements ControllerProviderInterface return $app['twig']->render('login/register-classic.html.twig', array( 'form' => $form->createView(), 'home_title' => $app['phraseanet.registry']->get('GV_homeTitle'), - 'login' => new \login(), + 'recaptcha_display' => $app->isCaptchaRequired(), )); } @@ -562,7 +562,6 @@ class Login implements ControllerProviderInterface } return $app['twig']->render('login/renew-password.html.twig', array( - 'login' => new \login(), 'form' => $form->createView(), )); } @@ -620,7 +619,6 @@ class Login implements ControllerProviderInterface } return $app['twig']->render('login/forgot-password.html.twig', array( - 'login' => new \login(), 'form' => $form->createView(), )); } @@ -639,9 +637,7 @@ class Login implements ControllerProviderInterface } if (0 < count($app['authentication.providers'])) { - return $app['twig']->render('login/register.html.twig', array( - 'login' => new \login(), - )); + return $app['twig']->render('login/register.html.twig'); } else { return $app->redirectPath('login_register_classic'); } @@ -699,9 +695,9 @@ class Login implements ControllerProviderInterface return $app['twig']->render('login/index.html.twig', array( 'module_name' => _('Accueil'), 'redirect' => ltrim($request->query->get('redirect'), '/'), - 'login' => new \login(), 'feeds' => $feeds, 'form' => $form->createView(), + 'recaptcha_display' => $app->isCaptchaRequired(), )); } @@ -842,7 +838,6 @@ class Login implements ControllerProviderInterface public function authenticationCallback(PhraseaApplication $app, Request $request, $providerId) { - $login = new \login(); $provider = $this->findProvider($app, $providerId); // triggers what's necessary diff --git a/lib/classes/login.php b/lib/classes/login.php deleted file mode 100644 index 312066cd00..0000000000 --- a/lib/classes/login.php +++ /dev/null @@ -1,5 +0,0 @@ -