diff --git a/composer.json b/composer.json index d92f4e399..2c7eb2eb3 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index 7c7ba66d4..04b508a7d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "48fe53083063b2b6e6bc0ab4d0a6501d", + "content-hash": "944cf166c0d3508556fbd3190eff658b", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -5149,28 +5149,39 @@ }, { "name": "smarty/smarty", - "version": "v2.6.33", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "533fa2abe308dcc009c7bdab977d530b32408346" + "reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/533fa2abe308dcc009c7bdab977d530b32408346", - "reference": "533fa2abe308dcc009c7bdab977d530b32408346", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c6bff5795081ca5e60aabda59fb87daa511acd1e", + "reference": "c6bff5795081ca5e60aabda59fb87daa511acd1e", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "^7.2 || ^8.0", + "symfony/polyfill-mbstring": "^1.27" + }, + "require-dev": { + "phpunit/phpunit": "^8.5 || ^7.5", + "smarty/smarty-lexer": "^4.0.2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, "autoload": { - "classmap": [ - "libs/Smarty.class.php", - "libs/Smarty_Compiler.class.php", - "libs/Config_File.class.php" - ] + "files": [ + "src/functions.php" + ], + "psr-4": { + "Smarty\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5184,20 +5195,27 @@ { "name": "Uwe Tews", "email": "uwe.tews@googlemail.com" + }, + { + "name": "Rodney Rehm", + "email": "rodney.rehm@medialize.de" + }, + { + "name": "Simon Wisselink", + "homepage": "https://www.iwink.nl/" } ], "description": "Smarty - the compiling PHP template engine", - "homepage": "http://www.smarty.net", + "homepage": "https://smarty-php.github.io/smarty/", "keywords": [ "templating" ], "support": { - "forum": "http://www.smarty.net/forums/", - "irc": "irc://irc.freenode.org/smarty", - "issues": "http://code.google.com/p/smarty-php/issues/list", - "source": "https://github.com/smarty-php/smarty/tree/v2.6.33" + "forum": "https://github.com/smarty-php/smarty/discussions", + "issues": "https://github.com/smarty-php/smarty/issues", + "source": "https://github.com/smarty-php/smarty/tree/v5.4.3" }, - "time": "2021-10-23T12:46:52+00:00" + "time": "2024-12-23T00:38:44+00:00" }, { "name": "symfony/monolog-bundle", diff --git a/htdocs/templates/administration/compta_balance.html b/htdocs/templates/administration/compta_balance.html index 1112bc547..e014c3529 100644 --- a/htdocs/templates/administration/compta_balance.html +++ b/htdocs/templates/administration/compta_balance.html @@ -35,14 +35,14 @@

Balance comptable

{$ecriture.debit|floatval|number_format:2:',':' '} {$ecriture.credit|floatval|number_format:2:',':' '} - - Balance comptable {elseif $action == 'view'}
- +
Retour balance diff --git a/htdocs/templates/administration/compta_banque.html b/htdocs/templates/administration/compta_banque.html index 35c8af527..4742a7a89 100644 --- a/htdocs/templates/administration/compta_banque.html +++ b/htdocs/templates/administration/compta_banque.html @@ -3,7 +3,7 @@

Journal de banque

{foreach from=$listeComptes item=compte key=id} - + {$compte} {/foreach} @@ -32,7 +32,7 @@

Journal de banque

- + Export XLSX diff --git a/htdocs/templates/administration/compta_bilan.html b/htdocs/templates/administration/compta_bilan.html index b8b00f091..a7a76ff52 100644 --- a/htdocs/templates/administration/compta_bilan.html +++ b/htdocs/templates/administration/compta_bilan.html @@ -43,13 +43,13 @@

Bilan

{$debits.evenement} {$debits.montant|floatval|number_format:2:',':' '} - - @@ -117,14 +117,14 @@

Bilan

{$credits.evenement} {$credits.montant|floatval|number_format:2:',':' '} - - Bilan {elseif $action == 'view'}
- +
Retour au bilan diff --git a/htdocs/templates/administration/compta_journal.html b/htdocs/templates/administration/compta_journal.html index e73750ee3..ba4adf820 100644 --- a/htdocs/templates/administration/compta_journal.html +++ b/htdocs/templates/administration/compta_journal.html @@ -36,7 +36,7 @@

Journal

- +
@@ -55,20 +55,20 @@

Journal

- + Exporter la période en CSV - + Télécharger les justificatifs groupés par mois
- Dépenses/Recettes - Dépenses - Recettes
+ Dépenses/Recettes + Dépenses + Recettes
@@ -221,7 +221,7 @@

Journal

{if $also_display_classifed_entries } {else} - Afficher aussi les entrées pointées + Afficher aussi les entrées pointées {/if}
diff --git a/htdocs/templates/administration/forum_facturation.html b/htdocs/templates/administration/forum_facturation.html index a19b60cfb..8b786208f 100644 --- a/htdocs/templates/administration/forum_facturation.html +++ b/htdocs/templates/administration/forum_facturation.html @@ -22,14 +22,14 @@

Factures d'évènement

- - + +
- +
diff --git a/htdocs/templates/administration/forum_inscriptions.html b/htdocs/templates/administration/forum_inscriptions.html index ee00d6214..d61532564 100644 --- a/htdocs/templates/administration/forum_inscriptions.html +++ b/htdocs/templates/administration/forum_inscriptions.html @@ -54,14 +54,14 @@

Inscriptions

{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 != ''} @@ -123,15 +123,15 @@

Inscriptions

- - + +
- +
diff --git a/htdocs/templates/administration/forum_sessions.html b/htdocs/templates/administration/forum_sessions.html index 9b11c2295..af5f1eece 100644 --- a/htdocs/templates/administration/forum_sessions.html +++ b/htdocs/templates/administration/forum_sessions.html @@ -51,14 +51,14 @@

Conférences

- - + +
- +
diff --git a/htdocs/templates/administration/personnes_morales.html b/htdocs/templates/administration/personnes_morales.html index 2ecbbcf87..5fc34c54b 100644 --- a/htdocs/templates/administration/personnes_morales.html +++ b/htdocs/templates/administration/personnes_morales.html @@ -13,13 +13,13 @@

Liste des personnes morales

- - + +
- +
diff --git a/htdocs/templates/administration/site_articles.html b/htdocs/templates/administration/site_articles.html index c34849346..ab4c7c029 100755 --- a/htdocs/templates/administration/site_articles.html +++ b/htdocs/templates/administration/site_articles.html @@ -13,14 +13,14 @@

Liste des articles

- - + +
- +
diff --git a/sources/Afup/Bootstrap/Http.php b/sources/Afup/Bootstrap/Http.php index dc3fdceec..b9f4529d1 100644 --- a/sources/Afup/Bootstrap/Http.php +++ b/sources/Afup/Bootstrap/Http.php @@ -23,6 +23,7 @@ // chargement des paramétrages génériques / multi-contextuels de l'application use Afup\Site\Corporate\Site; +use Smarty\Smarty; require_once __DIR__ . '/_Common.php'; @@ -59,18 +60,19 @@ // initialisation de Smarty, le moteur de template (html) -$smarty = new Smarty; -$smarty->template_dir = [ +$smarty = new Smarty(); +$smarty->setTemplateDir([ AFUP_CHEMIN_RACINE . 'templates/' . $sous_site . '/', AFUP_CHEMIN_RACINE . 'templates/commun/', -]; -$smarty->compile_dir = AFUP_CHEMIN_RACINE . 'cache/templates'; +]); +$smarty->setCompileDir(AFUP_CHEMIN_RACINE . 'cache/templates'); $smarty->compile_id = $sous_site; $smarty->use_sub_dirs = true; $smarty->compile_check = true; -$smarty->php_handling = SMARTY_PHP_ALLOW; +$smarty->registerPlugin("modifier","stripslashes", "stripslashes"); +$smarty->registerPlugin("modifier","floatval", "floatval"); -$smarty->assign('url_base', 'http://' . $_SERVER['HTTP_HOST'] . '/'); +$smarty->assign('url_base', 'https://' . $_SERVER['HTTP_HOST'] . '/'); $smarty->assign('chemin_template', $serveur . Site::WEB_PATH . 'templates/' . $sous_site . '/'); $smarty->assign('chemin_javascript', $serveur . Site::WEB_PATH . 'javascript/'); diff --git a/sources/AppBundle/Controller/LegacyController.php b/sources/AppBundle/Controller/LegacyController.php index bcf536e58..1ceb59f09 100644 --- a/sources/AppBundle/Controller/LegacyController.php +++ b/sources/AppBundle/Controller/LegacyController.php @@ -68,7 +68,13 @@ public function backOffice() unset($_SESSION['flash']); // Récupération du contenu de la page généré par smarty $content = $smarty->fetch($_GET['page'] . '.html'); - $js = $smarty->fetch($_GET['page'] . '.js.html'); + + $file = $_GET['page'] . '.js.html'; + $js = ''; + if ($smarty->templateExists($file)) { + $js = $smarty->fetch($file); + } + return $this->render('admin/base_with_header.html.twig', [ 'title' => obtenirTitre($pages, $_GET['page']), 'page' => $_GET['page'],