Add getAuthenticator usage

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

View File

@@ -78,7 +78,7 @@
</div>
{% endmacro %}
{% if app['conf'].get(['registry', 'actions', 'auth-required-for-export']) and app['authentication'].getUser().isGuest() %}
{% if app['conf'].get(['registry', 'actions', 'auth-required-for-export']) and app.getAuthenticatedUser().isGuest() %}
<script type="text/javascript">
p4.Dialog.get(1).Close();
var $dialog = p4.Dialog.Create({
@@ -180,7 +180,7 @@
<div>
{{ 'export::mail: destinataire' | trans }}
<input type="text" value="" name="destmail" class="required span4">
{% set my_email = app['authentication'].getUser().getEmail() %}
{% set my_email = app.getAuthenticatedUser().getEmail() %}
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
@@ -311,9 +311,9 @@
<label class="control-label" for="sexe">{{ 'Civility' | trans }}</label>
<div class="controls">
<select name="sexe" id="sexe">
<option {% if app['authentication'].getUser().getGender == 0 %}selected="selected"{% endif %} value="0">{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if app['authentication'].getUser().getGender == 1 %}selected="selected"{% endif %} value="1">{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if app['authentication'].getUser().getGender == 2 %}selected="selected"{% endif %} value="2">{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
<option {% if app.getAuthenticatedUser().getGender == 0 %}selected="selected"{% endif %} value="0">{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if app.getAuthenticatedUser().getGender == 1 %}selected="selected"{% endif %} value="1">{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if app.getAuthenticatedUser().getGender == 2 %}selected="selected"{% endif %} value="2">{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
</select>
</div>
</div>
@@ -321,70 +321,70 @@
<div class="control-group">
<label class="control-label" for="usr_lastname">{{ 'admin::compte-utilisateur nom' | trans }}</label>
<div class="controls">
<input id='usr_lastname' type="text" name="usr_nom" class="required" value="{{ app['authentication'].getUser().getLastName() }}"/>
<input id='usr_lastname' type="text" name="usr_nom" class="required" value="{{ app.getAuthenticatedUser().getLastName() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_firstname">{{ 'admin::compte-utilisateur prenom' | trans }}</label>
<div class="controls">
<input type="text" name="usr_prenom" class="required" id="usr_firstname" value="{{ app['authentication'].getUser().getFirstName() }}"/>
<input type="text" name="usr_prenom" class="required" id="usr_firstname" value="{{ app.getAuthenticatedUser().getFirstName() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_mail"> {{ 'admin::compte-utilisateur email' | trans }}</label>
<div class="controls">
<input class="required" type="text" name="usr_mail" id="usr_mail" value="{{ app['authentication'].getUser().getEmail() }}"/>
<input class="required" type="text" name="usr_mail" id="usr_mail" value="{{ app.getAuthenticatedUser().getEmail() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_tel">{{ 'admin::compte-utilisateur telephone' | trans }}</label>
<div class="controls">
<input type="text" name="tel" id="usr_tel" value="{{ app['authentication'].getUser().getPhone() }}"/>
<input type="text" name="tel" id="usr_tel" value="{{ app.getAuthenticatedUser().getPhone() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_societe">{{ 'admin::compte-utilisateur societe' | trans }}</label>
<div class="controls">
<input type="text" name="societe" id="usr_societe" value="{{ app['authentication'].getUser().getCompany() }}"/>
<input type="text" name="societe" id="usr_societe" value="{{ app.getAuthenticatedUser().getCompany() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_function">{{ 'admin::compte-utilisateur poste' | trans }}</label>
<div class="controls">
<input type="text" name="fonction" id="usr_fonction" value="{{ app['authentication'].getUser().getJob() }}"/>
<input type="text" name="fonction" id="usr_fonction" value="{{ app.getAuthenticatedUser().getJob() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_address">{{ 'admin::compte-utilisateur adresse' | trans }}</label>
<div class="controls">
<input class="required" type="text" name="adresse" id="usr_adresse" value="{{ app['authentication'].getUser().getAddress() }}"/>
<input class="required" type="text" name="adresse" id="usr_adresse" value="{{ app.getAuthenticatedUser().getAddress() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_zip_code">{{ 'admin::compte-utilisateur code postal' | trans }}</label>
<div class="controls">
<input id="usr_zip_code" type="text" name="cpostal" name="cpostal" class="required" value="{{ app['authentication'].getUser().getZipCode() }}"/>
<input id="usr_zip_code" type="text" name="cpostal" name="cpostal" class="required" value="{{ app.getAuthenticatedUser().getZipCode() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="command_geoname_field">{{ 'admin::compte-utilisateur ville' | trans }}</label>
<div class="controls">
<input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" value="{{ app['authentication'].getUser().getGeonameId() }}" />
<input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" value="{{ app.getAuthenticatedUser().getGeonameId() }}" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_fax">{{ 'admin::compte-utilisateur fax' | trans }}</label>
<div class="controls">
<input type="text" id="usr_fax" name="fax" value="{{ app['authentication'].getUser().getFax() }}"/>
<input type="text" id="usr_fax" name="fax" value="{{ app.getAuthenticatedUser().getFax() }}"/>
</div>
</div>
@@ -666,7 +666,7 @@
$('input[name="obj[]"]:checked', $('#download')).each(function(i,n){
$('input[name="obj[]"][value="'+$(n).val()+'"]', $('#sendmail')).attr('checked', true);
});
$('input[name="destmail"]', $('#sendmail')).val("{{app['authentication'].getUser().getEmail()}}");
$('input[name="destmail"]', $('#sendmail')).val("{{app.getAuthenticatedUser().getEmail()}}");
var tabs = $('.tabs', dialog.getDomElement());
tabs.tabs("option", "active", 1);