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

Add getAuthenticator usage

Browse Source 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
This commit is contained in:
Benoît Burnichon
2015-06-30 19:51:02 +02:00
parent 3804eb5408
commit 4880f2bf5a
113 changed files with 437 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/mobile/api/auth/end_user_authorization.html.twig
View File

@@ -33,7 +33,7 @@
<h1 id="namePhr">{{home_title}}</h1>
</div>
{% if not app['authentication'].isAuthenticated() %}
{% if not app.getAuthenticator().isAuthenticated() %}
<div id="content-box" class="span6 offset3">
<form id="login-form" class="form-vertical" method="post">
{% for key,value in auth.getParams %}
@@ -54,8 +54,8 @@
</p>
</div>
{% else %}
{% if app['authentication'].getUser() is not none %}
{% set username = '<b>' ~ app['authentication'].getUser().getDisplayName() ~ '</b>' %}
{% if app.getAuthenticatedUser() is not none %}
{% set username = '<b>' ~ app.getAuthenticatedUser().getDisplayName() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans with {'%username%' : username} %}Hello %username%{% endtrans %}

4
templates/mobile/api/auth/native_app_access_token.html.twig
View File

@@ -37,8 +37,8 @@
<h1 id="namePhr">{{ app['conf'].get(['registry', 'general', 'title']) }}</h1>
</div>
{% if app['authentication'].getUser() is not none %}
{% set username = '<b>' ~ app['authentication'].getUser().getDisplayName() ~ '</b>' %}
{% if app.getAuthenticatedUser() is not none %}
{% set username = '<b>' ~ app.getAuthenticatedUser().getDisplayName() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans with {'%username%' : username} %}Hello %username%{% endtrans %}