From db19b2058199a0393aee428b93769a017ebf4de5 Mon Sep 17 00:00:00 2001 From: Thibault Dockx <thibault.dockx@fusiondirectory.org> Date: Thu, 9 Jan 2025 11:35:48 +0000 Subject: [PATCH] :sparkles: Feat(smarty) - small adjustment for plugins inclusion Plugins inclusion in smarty 4 --- ihtml/themes/breezy/headers.tpl | 48 +++++++++++++++++---------------- include/php_setup.inc | 7 +++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/ihtml/themes/breezy/headers.tpl b/ihtml/themes/breezy/headers.tpl index 979c619fc..46e9e767b 100755 --- a/ihtml/themes/breezy/headers.tpl +++ b/ihtml/themes/breezy/headers.tpl @@ -1,33 +1,35 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" {if $lang}lang="{$lang}" xml:lang="{$lang}"{/if} {if $rtl}dir="rtl" class="rtl"{else}class="ltr"{/if}> +<html xmlns="http://www.w3.org/1999/xhtml" {if $lang}lang="{$lang}" + xml:lang="{$lang}"{/if} {if $rtl}dir="rtl" class="rtl"{else}class="ltr"{/if}> <head> - <title>FusionDirectory{if isset($title)} - {$title|escape}{elseif isset($headline)} - {$headline|escape}{/if}</title> + <title> + FusionDirectory{if isset($title)} - {$title|escape}{elseif isset($headline)} - {$headline|escape}{/if}</title> - <meta charset="utf-8"/> + <meta charset="utf-8"/> - <meta name="description" content="FusionDirectory - Your Infrastructure Manager"/> - <meta name="author" lang="en" content="FusionDirectory Project"/> - <meta name="viewport" content="width=device-width"/> + <meta name="description" content="FusionDirectory - Your Infrastructure Manager"/> + <meta name="author" lang="en" content="FusionDirectory Project"/> + <meta name="viewport" content="width=device-width"/> - {include file={filePath file="css.tpl"}} - <link rel="stylesheet" type="text/css" href="{filePath file="printer.css"}" media="print"/> + {include file={filePath file="css.tpl"}} + <link rel="stylesheet" type="text/css" href="{filePath file="printer.css"}" media="print"/> - <link rel="shortcut icon" href="favicon.ico"/> + <link rel="shortcut icon" href="favicon.ico"/> - <script src="include/prototype.js"></script> - <script src="include/fusiondirectory.js"></script> -{if $usePrototype == 'true'} - <script src="include/scriptaculous.js"></script> - <script src="include/builder.js"></script> - <script src="include/effects.js"></script> - <script src="include/dragdrop.js"></script> - <script src="include/controls.js"></script> - <script src="include/pulldown.js"></script> -{/if} - <script src="include/tsorter.js"></script> -{foreach from=$js_files item=file} - <script src="{$file}"></script> -{/foreach} + <script src="include/prototype.js"></script> + <script src="include/fusiondirectory.js"></script> + {if $usePrototype == 'true'} + <script src="include/scriptaculous.js"></script> + <script src="include/builder.js"></script> + <script src="include/effects.js"></script> + <script src="include/dragdrop.js"></script> + <script src="include/controls.js"></script> + <script src="include/pulldown.js"></script> + {/if} + <script src="include/tsorter.js"></script> + {foreach from=$js_files item=file} + <script src="{$file}"></script> + {/foreach} </head> diff --git a/include/php_setup.inc b/include/php_setup.inc index 843be0c5e..5091ecb53 100755 --- a/include/php_setup.inc +++ b/include/php_setup.inc @@ -329,11 +329,14 @@ $smarty->caching = Smarty::CACHING_OFF; $smarty->assign('css_files', []); $smarty->assign('js_files', []); +# This require registration as it is a base function of php. $smarty->registerPlugin('modifier', 'base64_encode', 'base64_encode'); +# It should not require registration as it is put in the plugins folder of smarty +#$smarty->registerPlugin('function', 'filePath', 'smarty_function_filePath'); + +# Deactivate php process within smarty template $smarty->allow_php = false; -# Remove with above in smarty 4 -# $smarty->php_handling = Smarty::PHP_REMOVE; /* Check for SSL connection */ $ssl = ''; -- GitLab