hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

adressed @romainneutron's comments

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-10 19:54:52 +02:00
parent 8f401377df
commit 77961f5636
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/Application.php
View File

@@ -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
*/

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

@@ -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

5
lib/classes/login.php
View File

@@ -1,5 +0,0 @@
<?php
class login
{
}