CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smarty Extended class update

Browse Source 
Move all smarty and path settings into the Smarty Extended class

the include files <admin|frontend>_set_paths.php and <admin|frontend>_smarty.php

are deprecated.

For special frontend smarty (which will be not used in future anyway) a
dedicated sub class to Smarty Extended with its own methods should be
created
This commit is contained in:
Clemens Schwaighofer
2019-11-15 14:15:12 +09:00
parent b5dd85bc75
commit e990d6b410
19 changed files with 677 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
www/includes/admin_header.php
View File

@@ -13,7 +13,7 @@ if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
include BASE.LIBS."Error.Handling.php";
}
// predefine vars
$lang = '';
$LANG = '';
$messages = array();
// import all POST vars
extract($_POST, EXTR_SKIP);
@@ -34,18 +34,18 @@ if (!isset($ZIP_STREAM)) {
$ZIP_STREAM = false;
}
// set encoding
if (!isset($encoding)) {
$encoding = DEFAULT_ENCODING;
if (!isset($ENCODING)) {
$ENCODING = DEFAULT_ENCODING;
}
// set the default lang, if not given
if (session_id() && $_SESSION['DEFAULT_LANG']) {
$lang = $_SESSION['DEFAULT_LANG'];
} elseif (!$lang) {
$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
if (session_id() && isset($_SESSION['DEFAULT_LANG']) && $_SESSION['DEFAULT_LANG']) {
$LANG = $_SESSION['DEFAULT_LANG'];
} else {
$LANG = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
}
// end the stop of the output flow, but only if we didn't request a csv file download
if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE) {
header("Content-type: text/html; charset=".$encoding);
header("Content-type: text/html; charset=".$ENCODING);
}
if ($AJAX_PAGE && !$ZIP_STREAM) {
header("Content-Type: application/json; charset=UTF-8");
@@ -54,21 +54,21 @@ if ($AJAX_PAGE && !$ZIP_STREAM) {
//------------------------------ class init start
// login & page access check
$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
$login = new CoreLibs\ACL\Login(DB_CONFIG, $LANG);
// post login lang check
if ($_SESSION['DEFAULT_LANG']) {
$lang = $_SESSION['DEFAULT_LANG'];
$LANG = $_SESSION['DEFAULT_LANG'];
}
// create smarty object
$smarty = new CoreLibs\Template\SmartyExtend($lang);
$smarty = new CoreLibs\Template\SmartyExtend($LANG);
// create new DB class
$cms = new CoreLibs\Admin\Backend(DB_CONFIG, $lang);
$cms = new CoreLibs\Admin\Backend(DB_CONFIG, $LANG);
// the menu show flag (what menu to show)
$cms->menu_show_flag = 'main';
// db nfo
$cms->dbInfo();
// set acl
$cms->acl = $login->acl;
$cms->setACL($login->acl);
// flush
ob_end_flush();
//------------------------------ class init end
@@ -89,12 +89,6 @@ if (!$login->login) {
}
//------------------------------ logging end
//------------------------------ page rights start
// flag if to show the edit access id drop down list
// check if we have more than one EA ID
$cms->DATA['show_ea_extra'] = isset($login->acl['show_ea_extra']) ? $login->acl['show_ea_extra'] : false;
//------------------------------ page rights ned
// automatic hide for DEBUG messages on live server
// can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
@@ -105,6 +99,6 @@ if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
$cms->echo_output_all = false;
$cms->print_output_all = false;
}
$cms->DATA['JS_DEBUG'] = DEBUG;
$smarty->DATA['JS_DEBUG'] = DEBUG;
// __END__