hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo login modification

Browse Source 
Undo login modification
This commit is contained in:
Nicolas Le Goff
2013-03-06 18:06:37 +01:00
committed by Romain Neutron
parent 5408bd28e2
commit f37c07e60c
1 changed files with 73 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
lib/Alchemy/Phrasea/Controller/Root/Login.php
View File

@@ -26,6 +26,7 @@ use Alchemy\Phrasea\Authentication\Exception\RequireCaptchaException;
use Alchemy\Phrasea\Authentication\Exception\AccountLockedException; use Alchemy\Phrasea\Authentication\Exception\AccountLockedException;
use Alchemy\Phrasea\Form\Login\PhraseaAuthenticationForm; use Alchemy\Phrasea\Form\Login\PhraseaAuthenticationForm;
use Alchemy\Phrasea\Form\Login\PhraseaForgotPasswordForm; use Alchemy\Phrasea\Form\Login\PhraseaForgotPasswordForm;
use Alchemy\Phrasea\Form\Login\PhraseaRenewPasswordForm;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\Cookie;
@@ -286,6 +287,19 @@ class Login implements ControllerProviderInterface
return $app['twig']->render('login/cgus.html.twig'); return $app['twig']->render('login/cgus.html.twig');
})->bind('login_cgus'); })->bind('login_cgus');
/**
*
*/
$controllers->get('/renew-password', function(PhraseaApplication $app, Request $request) {
$form = $app->form(new PhraseaRenewPasswordForm());
return $app['twig']->render('login/change-password.html.twig', array(
'form' => $form->createView(),
'login' => new \login(),
));
})->bind('login_renew_password');
/** /**
* Register classic form * Register classic form
*/ */
@@ -468,65 +482,69 @@ class Login implements ControllerProviderInterface
*/ */
public function displayForgotPasswordForm(PhraseaApplication $app, Request $request) public function displayForgotPasswordForm(PhraseaApplication $app, Request $request)
{ {
// $tokenize = false; $tokenize = false;
// $errorMsg = $request->query->get('error'); $errorMsg = $request->query->get('error');
// if (null !== $token = $request->query->get('token')) { if (null !== $token = $request->query->get('token')) {
// try { try {
// \random::helloToken($app, $token); \random::helloToken($app, $token);
// $tokenize = true; $tokenize = true;
// } catch (\Exception $e) { } catch (\Exception $e) {
// $errorMsg = 'token'; $errorMsg = 'token';
// } }
// } }
//
// if (null !== $errorMsg) { if (null !== $errorMsg) {
// switch ($errorMsg) { switch ($errorMsg) {
// case 'invalidmail': case 'invalidmail':
// $errorMsg = _('Invalid email address'); $errorMsg = _('Invalid email address');
// break; break;
// case 'mailserver': case 'mailserver':
// $errorMsg = _('phraseanet::erreur: Echec du serveur mail'); $errorMsg = _('phraseanet::erreur: Echec du serveur mail');
// break; break;
// case 'noaccount': case 'noaccount':
// $errorMsg = _('phraseanet::erreur: Le compte n\'a pas ete trouve'); $errorMsg = _('phraseanet::erreur: Le compte n\'a pas ete trouve');
// break; break;
// case 'mail': case 'mail':
// $errorMsg = _('phraseanet::erreur: Echec du serveur mail'); $errorMsg = _('phraseanet::erreur: Echec du serveur mail');
// break; break;
// case 'token': case 'token':
// $errorMsg = _('phraseanet::erreur: l\'url n\'est plus valide'); $errorMsg = _('phraseanet::erreur: l\'url n\'est plus valide');
// break; break;
// } }
// } }
//
// if (null !== $sentMsg = $request->query->get('sent')) { if (null !== $sentMsg = $request->query->get('sent')) {
// switch ($sentMsg) { switch ($sentMsg) {
// case 'ok': case 'ok':
// $sentMsg = _('phraseanet:: Un email vient de vous etre envoye'); $sentMsg = _('phraseanet:: Un email vient de vous etre envoye');
// break; break;
// } }
// } }
//
// if (null !== $passwordMsg = $request->query->get('pass-error')) { if (null !== $passwordMsg = $request->query->get('pass-error')) {
// switch ($passwordMsg) { switch ($passwordMsg) {
// case 'pass-match': case 'pass-match':
// $passwordMsg = _('forms::les mots de passe ne correspondent pas'); $passwordMsg = _('forms::les mots de passe ne correspondent pas');
// break; break;
// case 'pass-short': case 'pass-short':
// $passwordMsg = _('forms::la valeur donnee est trop courte'); $passwordMsg = _('forms::la valeur donnee est trop courte');
// break; break;
// case 'pass-invalid': case 'pass-invalid':
// $passwordMsg = _('forms::la valeur donnee contient des caracteres invalides'); $passwordMsg = _('forms::la valeur donnee contient des caracteres invalides');
// break; break;
// } }
// } }
$form = $app->form(new PhraseaForgotPasswordForm()); $form = $app->form(new PhraseaForgotPasswordForm());
return $app['twig']->render('login/forgot-password.html.twig', array( return $app['twig']->render('login/forgot-password.html.twig', array(
'form' => $form->createView(), 'login' => new \login(),
'login' => new \login 'form' => $form->createView(),
'tokenize' => $tokenize,
'passwordMsg' => $passwordMsg,
'errorMsg' => $errorMsg,
'sentMsg' => $sentMsg
)); ));
} }
@@ -907,7 +925,7 @@ class Login implements ControllerProviderInterface
$feeds = $public_feeds->get_feeds(); $feeds = $public_feeds->get_feeds();
array_unshift($feeds, $public_feeds->get_aggregate()); array_unshift($feeds, $public_feeds->get_aggregate());
$form = $app->form(new PhraseaAuthenticationForm(), array( $form = $app->form(new PhraseaAuthenticationForm(), null, array(
'disabled' => $app['phraseanet.registry']->get('GV_maintenance') 'disabled' => $app['phraseanet.registry']->get('GV_maintenance')
)); ));