From 23d5161bfe23409d1577e1edc528ef5d374535ff Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Sat, 2 May 2020 18:12:43 +0200 Subject: [PATCH] Define base URL in page templates by using public_root_url parameter --- public_html/includes/class/class.LStemplate.php | 7 +++++++ public_html/templates/default/blank.tpl | 1 + public_html/templates/default/error_404.tpl | 1 + public_html/templates/default/fatal_error.tpl | 1 + public_html/templates/default/login.tpl | 1 + public_html/templates/default/recoverpassword.tpl | 1 + public_html/templates/default/redirect.tpl | 1 + public_html/templates/default/top.tpl | 1 + 8 files changed, 14 insertions(+) diff --git a/public_html/includes/class/class.LStemplate.php b/public_html/includes/class/class.LStemplate.php index 41b9d218..7bfd699a 100644 --- a/public_html/includes/class/class.LStemplate.php +++ b/public_html/includes/class/class.LStemplate.php @@ -130,6 +130,13 @@ class LStemplate { self :: registerFunction("css", "LStemplate_smarty_css"); self :: registerFunction("uniqid", "LStemplate_smarty_uniqid"); + // Define public root URL + $public_root_url = LSconfig :: get('public_root_url', '/', 'string'); + // Remove trailing slash + if (substr($public_root_url, -1) == '/') + $public_root_url = substr($public_root_url, 0, -1); + self :: assign('public_root_url', $public_root_url); + // Trigger started event self :: fireEvent('started'); diff --git a/public_html/templates/default/blank.tpl b/public_html/templates/default/blank.tpl index d2d94850..e570b4a7 100644 --- a/public_html/templates/default/blank.tpl +++ b/public_html/templates/default/blank.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + diff --git a/public_html/templates/default/error_404.tpl b/public_html/templates/default/error_404.tpl index 488a1df6..bafedfd6 100644 --- a/public_html/templates/default/error_404.tpl +++ b/public_html/templates/default/error_404.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + diff --git a/public_html/templates/default/fatal_error.tpl b/public_html/templates/default/fatal_error.tpl index afaf6414..f9430847 100644 --- a/public_html/templates/default/fatal_error.tpl +++ b/public_html/templates/default/fatal_error.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + diff --git a/public_html/templates/default/login.tpl b/public_html/templates/default/login.tpl index 60fdde57..436f6e63 100644 --- a/public_html/templates/default/login.tpl +++ b/public_html/templates/default/login.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + {$LSsession_css} diff --git a/public_html/templates/default/recoverpassword.tpl b/public_html/templates/default/recoverpassword.tpl index ce7df700..68f293ac 100644 --- a/public_html/templates/default/recoverpassword.tpl +++ b/public_html/templates/default/recoverpassword.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + {$LSsession_css} {$LSsession_js} diff --git a/public_html/templates/default/redirect.tpl b/public_html/templates/default/redirect.tpl index 3b85d889..b1efa80b 100644 --- a/public_html/templates/default/redirect.tpl +++ b/public_html/templates/default/redirect.tpl @@ -3,6 +3,7 @@ + LdapSaisie - Redirection diff --git a/public_html/templates/default/top.tpl b/public_html/templates/default/top.tpl index 2f4553ff..bf72970d 100644 --- a/public_html/templates/default/top.tpl +++ b/public_html/templates/default/top.tpl @@ -4,6 +4,7 @@ LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} +