From d87033d57d4fdebd7e7e44e4a14666254cf2bad2 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 28 Jun 2019 10:13:40 +0900 Subject: [PATCH] Update include files for more cleaner work --- www/configs/config.inc | 4 ++++ www/includes/admin_set_paths.inc | 40 ++++++++++++++++++++++++++++---- www/includes/admin_smarty.inc | 34 ++++----------------------- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/www/configs/config.inc b/www/configs/config.inc index db1dc3f9..874f821c 100644 --- a/www/configs/config.inc +++ b/www/configs/config.inc @@ -132,6 +132,10 @@ DEFINE('SESSION_NAME', 'SESSION_NAME'.SERVER_NAME_HASH); // SET_SESSION_NAME should be set in the header if a special session name is needed // DEFINE('SET_SESSION_NAME', SESSION_NAME); +/************* CACHE/COMPILE IDS *************/ +DEFINE('CACHE_ID', 'CACHE_'.SERVER_NAME_HASH); +DEFINE('COMPILE_ID', 'COMPILE_'.SERVER_NAME_HASH); + /************* LANGUAGE / ENCODING *******/ DEFINE('DEFAULT_LANG', 'en_utf8'); // default web page encoding setting diff --git a/www/includes/admin_set_paths.inc b/www/includes/admin_set_paths.inc index 1911d561..141616d7 100644 --- a/www/includes/admin_set_paths.inc +++ b/www/includes/admin_set_paths.inc @@ -48,6 +48,9 @@ $cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE); $cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME; // special JS file $cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME; +// compile & cache id +$cms->CACHE_ID = isset($CACHE_ID) ? $CACHE_ID : CACHE_ID; +$cms->COMPILE_ID = isset($COMPILE_ID) ? $COMPILE_ID : CACHE_ID; // set basic template path (tmp) $cms->includes = BASE.INCLUDES; // no longer in templates, only global @@ -68,12 +71,41 @@ $cms->cache_pictures_root = ROOT.$cms->cache_pictures; if (!is_dir($cms->cache_pictures_root)) { mkdir($cms->cache_pictures_root); } -// check for template include -if (isset($USE_INCLUDE_TEMPLATE) && $USE_INCLUDE_TEMPLATE === true && !isset($TEMPLATE_NAME)) { - $TEMPLATE_NAME = $CONTENT_INCLUDE; +// check if we have an external file with the template name +if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && + is_file($cms->includes.$cms->INC_TEMPLATE_NAME) +) { + include($cms->includes.$cms->INC_TEMPLATE_NAME); } - +// only CSS/JS/etc include stuff if we have non AJAX page if (!$AJAX_PAGE) { + // check for template include + if (isset($USE_INCLUDE_TEMPLATE) && $USE_INCLUDE_TEMPLATE === true && !isset($TEMPLATE_NAME)) { + $TEMPLATE_NAME = $CONTENT_INCLUDE; + // add to cache & compile id + $cms->COMPILE_ID .= '_'.$TEMPLATE_NAME; + $cms->CACHE_ID .= '_'.$TEMPLATE_NAME; + } + // additional per page Javascript include + $cms->JS_INCLUDE = ''; + if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) { + $cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME; + } + // per page css file + $cms->CSS_INCLUDE = ''; + if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) { + $cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME; + } + // optional CSS file + $cms->CSS_SPECIAL_INCLUDE = ''; + if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) { + $cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME; + } + // optional JS file + $cms->JS_SPECIAL_INCLUDE = ''; + if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) { + $cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME; + } // check if template names exist if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) { // abort if master template could not be found diff --git a/www/includes/admin_smarty.inc b/www/includes/admin_smarty.inc index 17d638d8..809a8872 100644 --- a/www/includes/admin_smarty.inc +++ b/www/includes/admin_smarty.inc @@ -16,34 +16,6 @@ if ($cms->HEADER['USE_PROTOTYPE']) { // jquery and prototype should not be used together $cms->HEADER['USE_JQUERY'] = isset($USE_JQUERY) ? $USE_JQUERY : USE_JQUERY; // don't use either of those two together -// set basic template path (tmp) -// paths are set in the 'set_paths.inc' file - -// check if we have an external file with the template name -if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && is_file($cms->includes.$cms->INC_TEMPLATE_NAME)) { - include($cms->includes.$cms->INC_TEMPLATE_NAME); -} -// additional per page Javascript include -$cms->JS_INCLUDE = ''; -if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) { - $cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME; -} -// per page css file -$cms->CSS_INCLUDE = ''; -if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) { - $cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME; -} -// optional CSS file -$cms->CSS_SPECIAL_INCLUDE = ''; -if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) { - $cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME; -} -// optional JS file -$cms->JS_SPECIAL_INCLUDE = ''; -if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) { - $cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME; -} - // the actual include files for javascript (per page) $cms->HEADER['JS_INCLUDE'] = $cms->JS_INCLUDE; $cms->HEADER['CSS_INCLUDE'] = $cms->CSS_INCLUDE; @@ -99,6 +71,10 @@ if (is_dir(BASE.TEMPLATES_C)) { if (is_dir(BASE.CACHE)) { $smarty->setCacheDir(BASE.CACHE); } -$smarty->display($MASTER_TEMPLATE_NAME, $CACHE_ID.($CACHE_ID ? '_' : '').$lang, $COMPILE_ID.($COMPILE_ID ? '_' : '').$lang); +$smarty->display( + $MASTER_TEMPLATE_NAME, + $cms->CACHE_ID.($cms->CACHE_ID ? '_' : '').$lang, + $cms->COMPILE_ID.($cms->COMPILE_ID ? '_' : '').$lang +); // __END__