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

Remove all old template control flow

Browse Source
This commit is contained in:
Clemens Schwaighofer
2019-05-28 11:21:04 +09:00
parent 593e8fa7b0
commit 1ecdd5f6d7
4 changed files with 101 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/lib/CoreLibs/Basic.inc
View File

@@ -184,7 +184,7 @@ class Basic
foreach (array(
'DS', 'DIR', 'BASE', 'ROOT', 'LIB', 'INCLUDES', 'LAYOUT', 'PICTURES', 'FLASH', 'VIDEOS', 'DOCUMENTS', 'PDFS', 'BINARIES', 'ICONS',
'UPLOADS', 'CSV', 'JS', 'CSS', 'TABLE_ARRAYS', 'SMARTY', 'LANG', 'CACHE', 'TMP', 'LOG', 'TEMPLATES', 'TEMPLATES_C',
'TEMPLATES_FRONTEND', 'DEFAULT_TEMPLATE', 'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
'DEFAULT_ACL_LEVEL', 'LOGOUT_TARGET', 'PASSWORD_CHANGE', 'AJAX_REQUEST_TYPE', 'USE_PROTOTYPE', 'USE_SCRIPTACULOUS', 'USE_JQUERY',
'PAGE_WIDTH', 'MASTER_TEMPLATE_NAME', 'PUBLIC_SCHEMA', 'TEST_SCHEMA', 'DEV_SCHEMA', 'LIVE_SCHEMA', 'LOGIN_DB', 'MAIN_DB', 'DB_SCHEMA',
'LOGIN_DB_SCHEMA', 'GLOBAL_DB_SCHEMA', 'TARGET', 'DEBUG', 'SHOW_ALL_ERRORS'

32
www/lib/CoreLibs/Language/L10n.inc
View File

@@ -35,7 +35,7 @@ class L10n extends \CoreLibs\Basic
private $input;
private $l10n;
public function __construct($lang = '', $path = DEFAULT_TEMPLATE)
public function __construct($lang = '', $path = '')
{
if (!$lang) {
$this->lang = 'en';
@@ -43,17 +43,9 @@ class L10n extends \CoreLibs\Basic
$this->lang = $lang;
}
if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
if (is_dir(LAYOUT.$path.LANG)) {
$path = LAYOUT.$path.LANG;
} elseif (!is_dir($path)) {
$path = '';
}
} else {
// override path check
if (!is_dir($path)) {
$path = INCLUDES.LANG.CONTENT_PATH;
}
// override path check
if (!is_dir($path)) {
$path = INCLUDES.LANG.CONTENT_PATH;
}
$this->mofile = $path.$this->lang.".mo";
@@ -68,7 +60,7 @@ class L10n extends \CoreLibs\Basic
}
// reloads the mofile, if the location of the lang file changes
public function l10nReloadMOfile($lang, $path = DEFAULT_TEMPLATE)
public function l10nReloadMOfile($lang, $path = '')
{
$success = false;
$old_mofile = $this->mofile;
@@ -76,17 +68,9 @@ class L10n extends \CoreLibs\Basic
$this->lang = $lang;
if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
if (is_dir(LAYOUT.$path.LANG)) {
$path = LAYOUT.$path.LANG;
} elseif (!is_dir($path)) {
$path = '';
}
} else {
// override path check
if (!is_dir($path)) {
$path = INCLUDES.LANG.CONTENT_PATH;
}
// override path check
if (!is_dir($path)) {
$path = INCLUDES.LANG.CONTENT_PATH;
}
$this->mofile = $path.$this->lang.".mo";