#154: error handling $template_to_use

This commit is contained in:
Ulrich Block 2013-10-23 20:39:44 +02:00
parent c82c636473
commit ba3621e96f
3 changed files with 30 additions and 7 deletions

View File

@ -55,8 +55,17 @@ if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui-
unset($dbConnect);
$template_file = 'admin_home.tpl';
}
if (!isset($template_to_use) or !isset($template_to_use) ) {
$template_to_use = 'default';
}
if (!isset($template_file) or !is_string($template_file) ) {
$template_file = '';
}
include(IncludeTemplate($template_to_use, 'admin_header.tpl'));
include(IncludeTemplate($template_to_use, (isset($template_file) and preg_match('/^(.*)\.[\w]{1,}$/',$template_file)) ? $template_file : 'general.tpl'));
include(IncludeTemplate($template_to_use, (preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'general.tpl'));
include(IncludeTemplate($template_to_use, 'admin_footer.tpl'));
$sql = null;

View File

@ -63,9 +63,19 @@ if (isset ($page_active) and $page_active == 'Y') {
$template_file = 'page_home.tpl';
}
unset($dbConnect);
if (!isset($template_to_use) or !isset($template_to_use) ) {
$template_to_use = 'default';
}
if (!isset($template_file) or !is_string($template_file) ) {
$template_file = '';
}
include(IncludeTemplate($template_to_use,'page_header.tpl'));
include(IncludeTemplate($template_to_use,(isset($template_file) and preg_match('/^(.*)\.[\w]{1,}$/',$template_file)) ? $template_file : 'page_general.tpl'));
include(IncludeTemplate($template_to_use,(preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'page_general.tpl'));
include(IncludeTemplate($template_to_use,'page_footer.tpl'));
} else {
redirect('login.php');
}

View File

@ -58,12 +58,16 @@ if (isset($what_to_be_included_array[$w])) {
$template_file = 'userpanel_home.tpl';
}
include(IncludeTemplate($template_to_use, 'userpanel_header.tpl'));
if (isset($template_file) and preg_match('/^(.*)\.tpl$/', $template_file)) {
include(IncludeTemplate($template_to_use, $template_file));
} else {
include(IncludeTemplate($template_to_use, 'general.tpl'));
if (!isset($template_to_use) or !isset($template_to_use) ) {
$template_to_use = 'default';
}
if (!isset($template_file) or !is_string($template_file) ) {
$template_file = '';
}
include(IncludeTemplate($template_to_use, 'userpanel_header.tpl'));
include(IncludeTemplate($template_to_use, (preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'general.tpl'));
include(IncludeTemplate($template_to_use, 'userpanel_footer.tpl'));
$sql = null;