Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* optimize template load code (less file_exists checks)

Browse Source
This commit is contained in:
slawkens 2018-06-03 17:07:44 +02:00
parent e6b052f8e9
commit 45a387000d
2 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
index.php
View File

@ -407,19 +407,7 @@ if($config['backward_support']) {
}
$title_full = (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName'];
if(file_exists($template_path . '/index.php'))
require $template_path . '/index.php';
else if(file_exists($template_path . '/template.php')) // deprecated
require $template_path . '/template.php';
else if($config['backward_support'] && file_exists($template_path . '/layout.php'))
{
require $template_path . '/layout.php';
}
else
{
// TODO: save more info to log file
die('ERROR: Cannot load template.');
}
require $template_path . '/' . $template_index;
echo base64_decode('PCEtLSBQb3dlcmVkIGJ5IE15QUFDIDo6IGh0dHBzOi8vd3d3Lm15LWFhYy5vcmcvIC0tPg==') . PHP_EOL;
if(superAdmin()) {
@ -434,5 +422,4 @@ if(superAdmin()) {
}
}
$hooks->trigger(HOOK_FINISH);
?>
$hooks->trigger(HOOK_FINISH);

64
system/template.php
View File

@ -33,40 +33,46 @@ if($config['template_allow_change'])
}
$template_path = 'templates/' . $template_name;
if(!file_exists(BASE . $template_path . '/index.php') &&
!file_exists(BASE . $template_path . '/template.php') &&
!file_exists(BASE . $template_path . '/layout.php'))
{
if(file_exists(BASE . $template_path . '/index.php')) {
$template_index = 'index.php';
}
elseif(file_exists(BASE . $template_path . '/template.php')) {
$template_index = 'template.php';
}
elseif($config['backward_support'] && file_exists(BASE . $template_path . '/layout.php')) {
$template_index = 'layout.php';
}
else {
$template_name = 'kathrine';
$template_path = 'templates/' . $template_name;
$template_index = 'template.php';
}
$file = BASE . $template_path . '/config.ini';
$exists = file_exists($file);
if($exists || ($config['backward_support'] && file_exists(BASE . $template_path . '/layout_config.ini')))
{
if(!$exists)
$file = BASE . $template_path . '/layout_config.ini';
if($cache->enabled())
{
$tmp = '';
if($cache->fetch('template_ini_' . $template_name, $tmp))
$template_ini = unserialize($tmp);
else
{
$template_ini = parse_ini_file($file);
$cache->set('template_ini_' . $template_name, serialize($template_ini));
}
}
else
$template_ini = parse_ini_file($file);
foreach($template_ini as $key => $value)
$config[$key] = $value;
}
else if(file_exists(BASE . $template_path . '/config.php'))
if(file_exists(BASE . $template_path . '/config.php')) {
require BASE . $template_path . '/config.php';
}
else {
$file = BASE . $template_path . '/config.ini';
$exists = file_exists($file);
if ($exists || ($config['backward_support'] && file_exists(BASE . $template_path . '/layout_config.ini'))) {
if (!$exists)
$file = BASE . $template_path . '/layout_config.ini';
if ($cache->enabled()) {
$tmp = '';
if ($cache->fetch('template_ini_' . $template_name, $tmp))
$template_ini = unserialize($tmp);
else {
$template_ini = parse_ini_file($file);
$cache->set('template_ini_' . $template_name, serialize($template_ini));
}
} else
$template_ini = parse_ini_file($file);
foreach ($template_ini as $key => $value)
$config[$key] = $value;
}
}
$template = array();
$template['link_account_manage'] = getLink('account/manage');