bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-18 00:09:06 +01:00
Code Issues Projects Releases Wiki Activity

LStemplate: fix & improve handling loop detection displaying fatal error

Browse source
This commit is contained in:
Benjamin Renard 2021-10-25 19:04:06 +02:00
parent 74df3d2f61
commit 2d27a7049f
4 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/includes/class/class.LStemplate.php
View file

@ -429,6 +429,7 @@ class LStemplate extends LSlog_staticLoggerClass {
} }
try { try {
self :: $last_displayed_template = $template;
self :: assignCommonVars(); self :: assignCommonVars();
self :: $_smarty -> display("ls:$template"); self :: $_smarty -> display("ls:$template");
} }
@ -478,7 +479,7 @@ class LStemplate extends LSlog_staticLoggerClass {
} }
elseif (self :: $last_displayed_template == 'error.tpl') { elseif (self :: $last_displayed_template == 'error.tpl') {
// Detect & stop loop displaying error // Detect & stop loop displaying error
die(getFData(_('Loop detected displaying this error: %{error}.'), $error)); die(getFData(_('<h1>Loop detected displaying this error:</h1><pre>%{error}</pre>'), $error));
} }
else { else {
self :: assign('pagetitle', _("A fatal error occured.")); self :: assign('pagetitle', _("A fatal error occured."));

BIN
src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo
View file

Binary file not shown.

25
src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: LdapSaisie\n" "Project-Id-Version: LdapSaisie\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2021-10-25 18:53+0200\n" "PO-Revision-Date: 2021-10-25 19:04+0200\n"
"Last-Translator: Benjamin Renard <brenard@zionetrix.net>\n" "Last-Translator: Benjamin Renard <brenard@zionetrix.net>\n"
"Language-Team: LdapSaisie <ldapsaisie-users@lists.labs.libre-entreprise." "Language-Team: LdapSaisie <ldapsaisie-users@lists.labs.libre-entreprise."
"org>\n" "org>\n"
@ -872,35 +872,36 @@ msgstr ""
"LStemplate : Le fichier de template '%{tpl}' est maintenant déprécié. Merci " "LStemplate : Le fichier de template '%{tpl}' est maintenant déprécié. Merci "
"de mettre à jour vos templates en vous référant à la documentation." "de mettre à jour vos templates en vous référant à la documentation."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:436 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:437
msgid "Smarty - An exception occured displaying template '%{template}'" msgid "Smarty - An exception occured displaying template '%{template}'"
msgstr "" msgstr ""
"Smarty - Un erreur est survenue en affichant le modèle de page '%{template}'." "Smarty - Un erreur est survenue en affichant le modèle de page '%{template}'."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:456 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:457
msgid "Smarty - An exception occured fetching template '%{template}'" msgid "Smarty - An exception occured fetching template '%{template}'"
msgstr "Smarty - Un erreur est survenue en générant le modèle '%{template}'." msgstr "Smarty - Un erreur est survenue en générant le modèle '%{template}'."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:471 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:472
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:485 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:486
msgid "A fatal error occured. If problem persist, please contact support." msgid "A fatal error occured. If problem persist, please contact support."
msgstr "" msgstr ""
"Une erreur irrécupérable est survenue. Si le problème persiste, merci de " "Une erreur irrécupérable est survenue. Si le problème persiste, merci de "
"contacter le support." "contacter le support."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:481 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:482
msgid "Loop detected displaying this error: %{error}." msgid "<h1>Loop detected displaying this error:</h1><pre>%{error}</pre>"
msgstr "Boucle détectée en affichant cette erreur : %{error}." msgstr ""
"<h1>Boucle détectée en affichant cette erreur :</h1><pre>%{error}</pre>"
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:484 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:485
msgid "A fatal error occured." msgid "A fatal error occured."
msgstr "Une erreur fatale est survenue." msgstr "Une erreur fatale est survenue."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:684 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:685
msgid "LStemplate : Template %{file} not found." msgid "LStemplate : Template %{file} not found."
msgstr "LStemplate : le template %{file} est introuvable." msgstr "LStemplate : le template %{file} est introuvable."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:687 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:688
msgid "" msgid ""
"LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not "
"callable." "callable."
@ -908,7 +909,7 @@ msgstr ""
"LStemplate : Échec d'exécution du déclencheur %{callable} lors de événement " "LStemplate : Échec d'exécution du déclencheur %{callable} lors de événement "
"%{event} : il n'est pas un callable." "%{event} : il n'est pas un callable."
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:690 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:691
msgid "" msgid ""
"LStemplate : Error during the execution of the trigger %{callable} on event " "LStemplate : Error during the execution of the trigger %{callable} on event "
"%{event}." "%{event}."

20
src/lang/ldapsaisie.pot
View file

@ -755,38 +755,38 @@ msgid ""
"upgrade documentation to adapt your templates." "upgrade documentation to adapt your templates."
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:436 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:437
msgid "Smarty - An exception occured displaying template '%{template}'" msgid "Smarty - An exception occured displaying template '%{template}'"
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:456 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:457
msgid "Smarty - An exception occured fetching template '%{template}'" msgid "Smarty - An exception occured fetching template '%{template}'"
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:471 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:472
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:485 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:486
msgid "A fatal error occured. If problem persist, please contact support." msgid "A fatal error occured. If problem persist, please contact support."
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:481 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:482
msgid "Loop detected displaying this error: %{error}." msgid "<h1>Loop detected displaying this error:</h1><pre>%{error}</pre>"
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:484 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:485
msgid "A fatal error occured." msgid "A fatal error occured."
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:684 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:685
msgid "LStemplate : Template %{file} not found." msgid "LStemplate : Template %{file} not found."
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:687 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:688
msgid "" msgid ""
"LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not "
"callable." "callable."
msgstr "" msgstr ""
#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:690 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:691
msgid "" msgid ""
"LStemplate : Error during the execution of the trigger %{callable} on event " "LStemplate : Error during the execution of the trigger %{callable} on event "
"%{event}." "%{event}."