Skip to content

Upgrade Smarty 5.4 #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stakovicz merged 2 commits into from
Feb 17, 2025
Merged

Upgrade Smarty 5.4 #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e95db
Upgrade Smarty 5.4
stakovicz Feb 14, 2025
ca14000
Code review
stakovicz Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"robmorgan/phinx": "^0.9.2",
"sabre/vobject": "^4.1",
"setasign/fpdf": "^1.8",
"smarty/smarty": "2.6.*",
"smarty/smarty": "^5.4",
"symfony/monolog-bundle": "*",
"symfony/phpunit-bridge": "^3.1",
"symfony/symfony": "^3.4",
Expand Down
52 changes: 35 additions & 17 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions htdocs/templates/administration/compta_balance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ <h2>Balance comptable</h2>
<td class="right aligned">{$ecriture.debit|floatval|number_format:2:',':' '}</td>
<td class="right aligned">{$ecriture.credit|floatval|number_format:2:',':' '}</td>
<td class="right aligned single line">
<a href="index.php?page=compta_balance&amp;action=lister&amp;details={$ecriture.idevenement}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_balance&amp;action=lister&amp;details={$ecriture.idevenement}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Voir sur la page courante"
data-position="left center"
class="compact ui icon button"
>
<i class="expand icon"></i>
</a>
<a href="index.php?page=compta_balance&amp;action=view&amp;details={$ecriture.idevenement}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_balance&amp;action=view&amp;details={$ecriture.idevenement}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Visualiser sur une autre page"
data-position="left center"
class="compact ui icon button"
Expand Down Expand Up @@ -157,7 +157,7 @@ <h2>Balance comptable</h2>
</table>
{elseif $action == 'view'}
<div class="ui menu">
<a href="index.php?page=compta_balance&amp;action=lister&id_periode={$smarty.get.id_periode}" class="item">
<a href="index.php?page=compta_balance&amp;action=lister&id_periode={$smarty.get.id_periode|default:''}" class="item">
<div data-tooltip="Retour balance" data-position="bottom left">
<i class="icon backward"></i>
Retour balance
Expand Down
4 changes: 2 additions & 2 deletions htdocs/templates/administration/compta_banque.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h2>Journal de banque</h2>

<div class="ui top attached tabular menu">
{foreach from=$listeComptes item=compte key=id}
<a class="{if $id == $compte_id }active{/if} item" href="index.php?id_periode={$smarty.get.id_periode}&amp;page=compta_banque&amp;compte={$id}&amp;action=lister">
<a class="{if $id == $compte_id }active{/if} item" href="index.php?id_periode={$smarty.get.id_periode|default:''}&amp;page=compta_banque&amp;compte={$id}&amp;action=lister">
{$compte}
</a>
{/foreach}
Expand Down Expand Up @@ -32,7 +32,7 @@ <h2>Journal de banque</h2>
</div>

<div class="ui menu">
<a href="index.php?id_periode={$smarty.get.id_periode}&amp;page=compta_banque&amp;compte={$compte_id}&amp;action=exporter" class="item">
<a href="index.php?id_periode={$smarty.get.id_periode|default:''}&amp;page=compta_banque&amp;compte={$compte_id}&amp;action=exporter" class="item">
<i class="icon file excel"></i>
Export XLSX
</a>
Expand Down
10 changes: 5 additions & 5 deletions htdocs/templates/administration/compta_bilan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ <h2>Bilan</h2>
<td>{$debits.evenement}</td>
<td class="right aligned">{$debits.montant|floatval|number_format:2:',':' '}</td>
<td class="right aligned single line">
<a href="index.php?page=compta_bilan&amp;action=modifier&amp;details={$debits.id}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_bilan&amp;action=modifier&amp;details={$debits.id}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Déplier les écritures de débit/crédit pour {$debits.evenement}"
data-position="left center"
class="compact ui icon button">
<i class="expand icon"></i>
</a>
<a href="index.php?page=compta_bilan&amp;action=view&amp;details={$debits.id}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_bilan&amp;action=view&amp;details={$debits.id}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Voir le détail des écritures de débit/crédit pour {$debits.evenement}"
data-position="left center"
class="compact ui icon button">
Expand Down Expand Up @@ -117,14 +117,14 @@ <h2>Bilan</h2>
<td>{$credits.evenement}</td>
<td class="right aligned">{$credits.montant|floatval|number_format:2:',':' '}</td>
<td class="right aligned single line">
<a href="index.php?page=compta_bilan&amp;action=modifier&amp;details={$credits.id}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_bilan&amp;action=modifier&amp;details={$credits.id}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Déplier les écritures de crédit/crédit pour {$debits.evenement}"
data-position="left center"
class="compact ui icon button"
>
<i class="expand icon"></i>
</a>
<a href="index.php?page=compta_bilan&amp;action=view&amp;details={$credits.id}&amp;id_periode={$smarty.get.id_periode}"
<a href="index.php?page=compta_bilan&amp;action=view&amp;details={$credits.id}&amp;id_periode={$smarty.get.id_periode|default:''}"
data-tooltip="Voir le détail des écritures de débit/crédit pour {$debits.evenement}"
data-position="left center"
class="compact ui icon button"
Expand Down Expand Up @@ -212,7 +212,7 @@ <h2>Bilan</h2>
{elseif $action == 'view'}

<div class="ui menu">
<a href="index.php?page=compta_bilan&amp;action=lister&id_periode={$smarty.get.id_periode}" class="item">
<a href="index.php?page=compta_bilan&amp;action=lister&id_periode={$smarty.get.id_periode|default:''}" class="item">
<div data-tooltip="Retour du bilan" data-position="bottom left">
<i class="icon backward"></i>
Retour au bilan
Expand Down
14 changes: 7 additions & 7 deletions htdocs/templates/administration/compta_journal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>Journal</h2>
<div class="ui segment">
<form method="GET" name="filtre" class="js-form-search">
<input type="hidden" name="page" value="compta_journal" />
<input type="hidden" name="id_periode" value="{$smarty.get.id_periode}" />
<input type="hidden" name="id_periode" value="{$smarty.get.id_periode|default:''}" />

<div class="ui form">
<div class="inline fields">
Expand All @@ -55,20 +55,20 @@ <h2>Journal</h2>
</div>

<div class="ui menu">
<a href="index.php?page=compta_journal&amp;action=export&id_periode={$smarty.get.id_periode}&also_display_classifed_entries={$also_display_classifed_entries}" class="item">
<a href="index.php?page=compta_journal&amp;action=export&id_periode={$smarty.get.id_periode|default:''}&also_display_classifed_entries={$also_display_classifed_entries}" class="item">
<i class="icon file"></i>
Exporter la période en CSV
</a>
<a href="index.php?page=compta_banque&amp;action=download_attachments&amp;id_periode={$smarty.get.id_periode}" class="item">
<a href="index.php?page=compta_banque&amp;action=download_attachments&amp;id_periode={$smarty.get.id_periode|default:''}" class="item">
<i class="icon file zip"></i>
Télécharger les justificatifs groupés par mois
</a>
</div>

<div class="ui top attached tabular menu">
<a class="item {if $action == 'lister'}active{/if}" href="index.php?page=compta_journal&amp;action=lister&id_periode={$smarty.get.id_periode}&also_display_classifed_entries={$also_display_classifed_entries}">Dépenses/Recettes</a>
<a class="item {if $action == 'debit'}active{/if}" href="index.php?page=compta_journal&amp;action=debit&id_periode={$smarty.get.id_periode}&also_display_classifed_entries={$also_display_classifed_entries}">Dépenses</a>
<a class="item {if $action == 'credit'}active{/if}" href="index.php?page=compta_journal&amp;action=credit&id_periode={$smarty.get.id_periode}&also_display_classifed_entries={$also_display_classifed_entries}">Recettes</a><br />
<a class="item {if $action == 'lister'}active{/if}" href="index.php?page=compta_journal&amp;action=lister&id_periode={$smarty.get.id_periode|default:''}&also_display_classifed_entries={$also_display_classifed_entries}">Dépenses/Recettes</a>
<a class="item {if $action == 'debit'}active{/if}" href="index.php?page=compta_journal&amp;action=debit&id_periode={$smarty.get.id_periode|default:''}&also_display_classifed_entries={$also_display_classifed_entries}">Dépenses</a>
<a class="item {if $action == 'credit'}active{/if}" href="index.php?page=compta_journal&amp;action=credit&id_periode={$smarty.get.id_periode|default:''}&also_display_classifed_entries={$also_display_classifed_entries}">Recettes</a><br />
</div>

<div class="ui bottom attached segment">
Expand Down Expand Up @@ -221,7 +221,7 @@ <h2>Journal</h2>
<div class="inline">
{if $also_display_classifed_entries }
{else}
<a class="ui button" href="index.php?page=compta_journal&amp;action={$action}&id_periode={$smarty.get.id_periode}&also_display_classifed_entries=1">Afficher aussi les entrées pointées</a>
<a class="ui button" href="index.php?page=compta_journal&amp;action={$action}&id_periode={$smarty.get.id_periode|default:''}&also_display_classifed_entries=1">Afficher aussi les entrées pointées</a>
{/if}

</div>
Expand Down
6 changes: 3 additions & 3 deletions htdocs/templates/administration/forum_facturation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ <h2>Factures d'évènement</h2>
<div class="ui segment">
<form method="GET" name="filtre">
<input type="hidden" name="page" value="forum_facturation" />
<input type="hidden" name="tri" value="{$smarty.get.tri}" />
<input type="hidden" name="sens" value="{$smarty.get.sens}" />
<input type="hidden" name="tri" value="{$smarty.get.tri|default:''}" />
<input type="hidden" name="sens" value="{$smarty.get.sens|default:''}" />
<input type="hidden" name="id_forum" value="{$id_forum}" />
<div class="ui form">
<div class="inline fields">
<div class="field">
<label>Recherche</label>
<input type="text" name="filtre" value="{if $smarty.get.filtre}{$smarty.get.filtre|stripslashes}{/if}">
<input type="text" name="filtre" value="{$smarty.get.filtre|default:''|stripslashes}">
</div>
<div class="field">
<input type="submit" value="Filtrer" class="ui button" name="submit_filtre" />
Expand Down
22 changes: 11 additions & 11 deletions htdocs/templates/administration/forum_inscriptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ <h2>Inscriptions</h2>
</thead>
<tbody>
{foreach from=$forum_tarifs item=forum_tarif key=forum_tarif_key}
{assign var=inscrits value=`$statistiques.types_inscriptions.inscrits[$forum_tarif_key]`}
{assign var=confirmes value=`$statistiques.types_inscriptions.confirmes[$forum_tarif_key]`}
{assign var=payants value=`$statistiques.types_inscriptions.payants[$forum_tarif_key]`}
{assign var=montant value=`$statistiques.types_inscriptions.payants[$forum_tarif_key]*$forum_tarif`}
{assign var=inscrits_total value=`$inscrits_total+$inscrits`}
{assign var=confirmes_total value=`$confirmes_total+$confirmes`}
{assign var=payants_total value=`$payants_total+$payants`}
{assign var=montant_total value=`$montant_total+$montant`}
{assign var=inscrits value=$statistiques.types_inscriptions.inscrits[$forum_tarif_key]}
{assign var=confirmes value=$statistiques.types_inscriptions.confirmes[$forum_tarif_key]}
{assign var=payants value=$statistiques.types_inscriptions.payants[$forum_tarif_key]}
{assign var=montant value=$statistiques.types_inscriptions.payants[$forum_tarif_key]*$forum_tarif}
{assign var=inscrits_total value=$inscrits_total+$inscrits}
{assign var=confirmes_total value=$confirmes_total+$confirmes}
{assign var=payants_total value=$payants_total+$payants}
{assign var=montant_total value=$montant_total+$montant}
{if $inscrits != ''}
<tr>
<td>
Expand Down Expand Up @@ -123,15 +123,15 @@ <h2>Inscriptions</h2>
<form method="GET" name="filtre">

<input type="hidden" name="page" value="forum_inscriptions" />
<input type="hidden" name="tri" value="{$smarty.get.tri}" />
<input type="hidden" name="sens" value="{$smarty.get.sens}" />
<input type="hidden" name="tri" value="{$smarty.get.tri|default:''}" />
<input type="hidden" name="sens" value="{$smarty.get.sens|default:''}" />
<input type="hidden" name="id_forum" value="{$id_forum}" />

<div class="ui form">
<div class="inline fields">
<div class="field">
<label>Recherche</label>
<input type="text" name="filtre" value="{if $smarty.get.filtre}{$smarty.get.filtre|stripslashes}{/if}">
<input type="text" name="filtre" value="{$smarty.get.filtre|default:''|stripslashes}">
</div>
<div class="field">
<input type="submit" value="Filtrer" name="submit_filtre" class="ui button">
Expand Down
6 changes: 3 additions & 3 deletions htdocs/templates/administration/forum_sessions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ <h2>Conférences</h2>
<div class="ui segment">
<form method="GET" name="filtre">
<input type="hidden" name="page" value="forum_sessions" />
<input type="hidden" name="tri" value="{$smarty.get.tri}" />
<input type="hidden" name="sens" value="{$smarty.get.sens}" />
<input type="hidden" name="tri" value="{$smarty.get.tri|default:''}" />
<input type="hidden" name="sens" value="{$smarty.get.sens|default:''}" />
<input type="hidden" name="id_forum" value="{$id_forum}" />
<div class="ui form">
<div class="inline fields">
<div class="field">
<label>Titre</label>
<input type="text" name="filtre" value="{if $smarty.get.filtre}{$smarty.get.filtre|stripslashes}{/if}">
<input type="text" name="filtre" value="{$smarty.get.filtre|default:''|stripslashes}">
</div>
<div class="field">
<div class="ui checkbox">
Expand Down
Loading