maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

make template-fallback work for overwriting themes partially

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-11-29 07:43:33 +01:00
parent d89f2c87e5
commit 60d48f2002
1 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/functions/output/function.getTemplate.php
View File

@@ -26,52 +26,43 @@
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
*/ */
function getTemplate($template, $noarea = 0) function getTemplate($template, $noarea = 0) {
{
global $templatecache, $theme; global $templatecache, $theme;
if(!isset($theme) || $theme == '') $fallback_theme = 'Sparkle';
{
$theme = 'Froxlor'; if (!isset($theme) || $theme == '') {
$theme = $fallback_theme;
} }
if($noarea != 1) if ($noarea != 1) {
{
$template = AREA . '/' . $template; $template = AREA . '/' . $template;
} }
if(!isset($templatecache[$theme][$template])) if (!isset($templatecache[$theme][$template])) {
{
$filename = './templates/' . $theme . '/' . $template . '.tpl'; $filename = './templates/' . $theme . '/' . $template . '.tpl';
if(file_exists($filename) // check the current selected theme for the template
&& is_readable($filename)) $templatefile = _checkAndParseTpl($filename);
{
$templatefile = addcslashes(file_get_contents($filename), '"\\');
// loop through template more than once in case we have an "if"-statement in another one if ($templatefile == false && $theme != $fallback_theme) {
// check fallback
$filename = './templates/' . $fallback_theme . '/' . $template . '.tpl';
$templatefile = _checkAndParseTpl($filename);
while(preg_match('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', $templatefile)) if ($templatefile == false) {
{ // check for old layout
$templatefile = preg_replace('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', '".( ($1) ? ("$2") : ("$4") )."', $templatefile); $filename = './templates/' . $template . '.tpl';
$templatefile = _checkAndParseTpl($filename);
if ($templatefile == false) {
// not found
$templatefile = 'TEMPLATE NOT FOUND: ' . $filename;
}
} }
} }
elseif(file_exists('./templates/' . $template . '.tpl') && is_readable('./templates/' . $template . '.tpl'))
{
$filename = './templates/' . $template . '.tpl';
$templatefile = addcslashes(file_get_contents($filename), '"\\');
// loop through template more than once in case we have an "if"-statement in another one
while(preg_match('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', $templatefile))
{
$templatefile = preg_replace('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', '".( ($1) ? ("$2") : ("$4") )."', $templatefile);
}
}
else
{
$templatefile = 'TEMPLATE NOT FOUND: ' . $filename;
}
$output = $templatefile; // Minify_HTML::minify($templatefile, array('cssMinifier', 'jsMinifier')); $output = $templatefile; // Minify_HTML::minify($templatefile, array('cssMinifier', 'jsMinifier'));
$templatecache[$theme][$template] = $output; $templatecache[$theme][$template] = $output;
@@ -79,3 +70,30 @@ function getTemplate($template, $noarea = 0)
return $templatecache[$theme][$template]; return $templatecache[$theme][$template];
} }
/**
* check whether a tpl file exists and if so, return it's content or else return false
*
* @param string $filename
*
* @return string|bool content on success, else false
*/
function _checkAndParseTpl($filename) {
$templatefile = "";
if (file_exists($filename)
&& is_readable($filename)
) {
$templatefile = addcslashes(file_get_contents($filename), '"\\');
// loop through template more than once in case we have an "if"-statement in another one
while (preg_match('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', $templatefile)) {
$templatefile = preg_replace('/<if[ \t]*(.*)>(.*)(<\/if>|<else>(.*)<\/if>)/Uis', '".( ($1) ? ("$2") : ("$4") )."', $templatefile);
}
return $templatefile;
}
return false;
}