archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #411, auth keys details on notification forms

Browse source
This commit is contained in:
plegall 2016-01-29 11:47:30 +01:00
parent bc7316639f
commit 77888174cf
6 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
admin/album_notification.php
View file

@ -205,6 +205,19 @@ $template->assign(
)
);
if ($conf['auth_key_duration'] > 0)
{
$template->assign(
'auth_key_duration',
time_since(
strtotime('now -'.$conf['auth_key_duration'].' second'),
'second',
null,
false
)
);
}
// +-----------------------------------------------------------------------+
// | form construction |
// +-----------------------------------------------------------------------+

14
admin/notification_by_mail.php
View file

@ -719,6 +719,20 @@ switch ($page['mode'])
}
}
$template->assign($page['mode'], $tpl_var);
if ($conf['auth_key_duration'] > 0)
{
$template->assign(
'auth_key_duration',
time_since(
strtotime('now -'.$conf['auth_key_duration'].' second'),
'second',
null,
false
)
);
}
break;
}
}

7
admin/themes/default/template/album_notification.tpl
View file

@ -101,6 +101,13 @@ span.errors {
<textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea>
</p>
{if isset($auth_key_duration)}
<p>
{'Each email sent will contain its own automatic authentication key on links, valid for %s.'|translate:$auth_key_duration}
<br>{'For security reason, authentication keys do not work for administrators.'|translate}
</p>
{/if}
<p class="actionButtons">
<input class="submit" type="submit" value="{'Send'|@translate}" name="submitEmail">
<span class="errors" style="display:none">&#x2718; {'No recipient selected'|translate}</span>

10
admin/themes/default/template/notification_by_mail.tpl
View file

@ -127,6 +127,16 @@ jQuery(document).ready(function(){
</table>
</fieldset>
{if isset($auth_key_duration)}
<fieldset>
<legend>{'Informations'|@translate}</legend>
<p>
{'Each email sent will contain its own automatic authentication key on links, valid for %s.'|translate:$auth_key_duration}
<br>{'For security reason, authentication keys do not work for administrators.'|translate}
</p>
</fieldset>
{/if}
<p>
<input type="submit" value="{'Send'|@translate}" name="send_submit">
</p>

2
language/en_UK/admin.lang.php
View file

@ -988,3 +988,5 @@ $lang['Edit user'] = 'Edit user';
$lang['Recipients'] = 'Recipients';
$lang['No recipient selected'] = 'No recipient selected';
$lang['No user is permitted to see this private album'] = 'No user is permitted to see this private album';
$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Each email sent will contain its own automatic authentication key on links, valid for %s.';
$lang['For security reason, authentication keys do not work for administrators.'] = 'For security reason, authentication keys do not work for administrators.';

2
language/fr_FR/admin.lang.php
View file

@ -989,3 +989,5 @@ $lang['Edit user'] = 'Éditer l\'utilisateur';
$lang['Recipients'] = 'Destinataires';
$lang['No recipient selected'] = 'Choisissez un destinataire';
$lang['No user is permitted to see this private album'] = 'Aucun utilisateur n\'est autorisé à voir cet album privé';
$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Chaque email envoyé contiendra sa propre clef d\'identification automatique sur les liens, valide %s.';
$lang['For security reason, authentication keys do not work for administrators.'] = 'Par mesure de sécurité les clefs d\'identification ne fonctionnent pas pour les administrateurs.';