diff --git a/4dev/lang/admin/messages_ja_utf8.po b/4dev/lang/admin/messages_ja_utf8.po index 1cf27e48..08b7000f 100644 --- a/4dev/lang/admin/messages_ja_utf8.po +++ b/4dev/lang/admin/messages_ja_utf8.po @@ -64,3 +64,14 @@ msgstr "日" msgid "INPUT TEST" msgstr "OUTPUT TEST JA" + +# login string +msgid "Hello %s" +msgstr "こにちは %s" + +msgid "I should be translated" +msgstr "「スマーティー」これは正しいです" + +msgid "Are we translated?" +msgstr "「クラス」これは翻訳です？" + diff --git a/www/admin/class_test.php b/www/admin/class_test.php index e1cb12c4..28c2841e 100644 --- a/www/admin/class_test.php +++ b/www/admin/class_test.php @@ -259,27 +259,38 @@ echo "FOUND ELEMENTS [input]: ".$basic->printAr($basic->arraySearchRecursive('em // image thumbnail $images = array( // height bigger - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture.jpg', - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture.png', + // 'no_picture.jpg', + // 'no_picture.png', // width bigger - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_width_bigger.jpg', - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_width_bigger.png', + // 'no_picture_width_bigger.jpg', + // 'no_picture_width_bigger.png', // square - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_square.jpg', - // BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_square.png', + // 'no_picture_square.jpg', + // 'no_picture_square.png', // other sample images - BASE.LAYOUT.CONTENT_PATH.IMAGES.'5c501af48da6c.jpg' + // '5c501af48da6c.jpg', + // Apple HEIC files + // 'img_2145.heic', + // Photoshop + 'photoshop_test.psd', ); echo "
"; $thumb_width = 250; -$thumb_height = 250; +$thumb_height = 300; +// return mime type ala mimetype +$finfo = new finfo(FILEINFO_MIME_TYPE); foreach ($images as $image) { + $image = BASE.LAYOUT.CONTENT_PATH.IMAGES.$image; + list ($height, $width, $img_type) = getimagesize($image); + echo "
IMAGE INFO: ".$height."x".$width.", TYPE: ".$img_type." [".$finfo->file($image)."]
"; // rotate image first $basic->correctImageOrientation($image); // thumbnail tests echo "
".basename($image).": WIDTH: $thumb_width
"; echo "
".basename($image).": HEIGHT: $thumb_height
"; echo "
".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height
"; + // test with dummy + echo "
".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)
"; echo "
"; } diff --git a/www/admin/smarty_test.php b/www/admin/smarty_test.php index a2483348..3bc3fedb 100755 --- a/www/admin/smarty_test.php +++ b/www/admin/smarty_test.php @@ -10,24 +10,26 @@ define('USE_DATABASE', true); define('USE_HEADER', true); require 'config.php'; require BASE.INCLUDES.'admin_header.php'; -$MASTER_TEMPLATE_NAME = 'main_body.tpl'; -$TEMPLATE_NAME = 'smarty_test.tpl'; -$CSS_NAME = 'smart_test.css'; -$USE_PROTOTYPE = false; -$USE_JQUERY = true; -$JS_DATEPICKR = false; -if ($USE_PROTOTYPE) { - $ADMIN_JAVASCRIPT = 'edit.pt.js'; - $JS_NAME = 'prototype.test.js'; -} elseif ($USE_JQUERY) { - $ADMIN_JAVASCRIPT = 'edit.jq.js'; - $JS_NAME = 'jquery.test.js'; +$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl'; +$smarty->TEMPLATE_NAME = 'smarty_test.tpl'; +$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css'; +$smarty->USE_PROTOTYPE = false; +$smarty->USE_JQUERY = true; +$smarty->JS_DATEPICKR = false; +if ($smarty->USE_PROTOTYPE) { + $smarty->ADMIN_JAVASCRIPT = 'edit.pt.js'; + $smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js'; +} elseif ($smarty->USE_JQUERY) { + $smarty->ADMIN_JAVASCRIPT = 'edit.jq.js'; + $smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js'; } -$PAGE_WIDTH = "100%"; -require BASE.INCLUDES.'admin_set_paths.php'; +$smarty->PAGE_WIDTH = "100%"; +// require BASE.INCLUDES.'admin_set_paths.php'; +$smarty->setSmartyPaths(); // smarty test -$cms->DATA['SMARTY_TEST'] = 'Test Data'; +$smarty->DATA['SMARTY_TEST'] = 'Test Data'; +$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?'); // drop down test with optgroups $options = array ( @@ -46,7 +48,8 @@ $options = array ( ) ); -$cms->DATA['drop_down_test'] = $options; +$smarty->DATA['drop_down_test'] = $options; -require BASE.INCLUDES.'admin_smarty.php'; +// require BASE.INCLUDES.'admin_smarty.php'; +$smarty->setSmartyVarsAdmin(); require BASE.INCLUDES.'admin_footer.php'; diff --git a/www/configs/config.master.php b/www/configs/config.master.php index 1d2cd022..5b751ebb 100644 --- a/www/configs/config.master.php +++ b/www/configs/config.master.php @@ -274,6 +274,7 @@ foreach ($paths as $path) { DEFINE('CONVERT', $path.DS.'convert'); } } +unset($paths); /************* DEBUG *******************/ // turn off debug if debug flag is OFF diff --git a/www/includes/admin_header.php b/www/includes/admin_header.php index c1895de2..5c8dabfc 100644 --- a/www/includes/admin_header.php +++ b/www/includes/admin_header.php @@ -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__ diff --git a/www/includes/admin_set_paths.php b/www/includes/admin_set_paths.php index 25dabf07..760c725f 100644 --- a/www/includes/admin_set_paths.php +++ b/www/includes/admin_set_paths.php @@ -7,161 +7,13 @@ * HISTORY: *********************************************************************/ -// master template -if (!isset($MASTER_TEMPLATE_NAME)) { - $MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME; -} - -// just emergency fallback for language -// set encoding -if (isset($_SESSION['DEFAULT_CHARSET'])) { - $encoding = $_SESSION['DEFAULT_CHARSET']; -} elseif (!isset($encoding)) { - $encoding = DEFAULT_ENCODING; -} -// just emergency fallback for language -if (isset($_SESSION['DEFAULT_LANG'])) { - $lang = $_SESSION['DEFAULT_LANG']; -} elseif (!isset($lang)) { - $lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG; -} -// create the char lang encoding -$lang_short = substr($lang, 0, 2); - -// set include & template names -$PAGE_FILE_NAME = str_replace('.php', '', $cms->page_name); -// set include & template names -if (!isset($CONTENT_INCLUDE)) { - $CONTENT_INCLUDE = $PAGE_FILE_NAME.'.tpl'; -} -$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace('.php', '', $cms->page_name) : $FORM_NAME; -// set local page title -$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).(defined(G_TITLE) ? ' - '.G_TITLE : ''); -// strip tpl and replace it with php -// php include file per page -$cms->INC_TEMPLATE_NAME = str_replace('.tpl', '.php', $CONTENT_INCLUDE); -// javascript include per page -$cms->JS_TEMPLATE_NAME = str_replace('.tpl', '.js', $CONTENT_INCLUDE); -// css per page -$cms->CSS_TEMPLATE_NAME = str_replace('.tpl', '.css', $CONTENT_INCLUDE); -// special CSS file -$cms->CSS_SPECIAL_TEMPLATE_NAME = isset($CSS_NAME) ? $CSS_NAME : ''; -// special JS file -$cms->JS_SPECIAL_TEMPLATE_NAME = isset($JS_NAME) ? $JS_NAME : ''; -// compile & cache id -$cms->CACHE_ID = isset($CACHE_ID) ? $CACHE_ID : CACHE_ID; -$cms->COMPILE_ID = isset($COMPILE_ID) ? $COMPILE_ID : CACHE_ID; - -// set basic template path (tmp) -$cms->includes = BASE.INCLUDES; // no longer in templates, only global -$cms->template_path = BASE.INCLUDES.TEMPLATES.CONTENT_PATH; +/****** +NOTE THAT THIS INCLUDE IS OBSOLETE +USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF +*******/ +trigger_error('admin_set_paths.php is deprecated. Use SmartyExtended->setSmartyPaths();', E_USER_DEPRECATED); if ($smarty) { - $smarty->setTemplateDir($cms->template_path); -} -if (isset($LANGUAGE_FOLDER)) { - $cms->lang_dir = $LANGUAGE_FOLDER; -} else { - $cms->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH; // no outside -} -$cms->javascript = LAYOUT.JS; -$cms->css = LAYOUT.CSS; -$cms->pictures = LAYOUT.IMAGES; -$cms->cache_pictures = LAYOUT.CACHE; -$cms->cache_pictures_root = ROOT.$cms->cache_pictures; -if (!is_dir($cms->cache_pictures_root)) { - mkdir($cms->cache_pictures_root); -} -// check if we have an external file with the template name -if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && - is_file($cms->includes.$cms->INC_TEMPLATE_NAME) -) { - include($cms->includes.$cms->INC_TEMPLATE_NAME); -} -// only CSS/JS/etc include stuff if we have non AJAX page -if (isset($AJAX_PAGE) && !$AJAX_PAGE) { - // check for template include - if (isset($USE_INCLUDE_TEMPLATE) && $USE_INCLUDE_TEMPLATE === true && !isset($TEMPLATE_NAME)) { - $TEMPLATE_NAME = $CONTENT_INCLUDE; - // add to cache & compile id - $cms->COMPILE_ID .= '_'.$TEMPLATE_NAME; - $cms->CACHE_ID .= '_'.$TEMPLATE_NAME; - } - // additional per page Javascript include - $cms->JS_INCLUDE = ''; - if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) { - $cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME; - } - // per page css file - $cms->CSS_INCLUDE = ''; - if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) { - $cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME; - } - // optional CSS file - $cms->CSS_SPECIAL_INCLUDE = ''; - if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) { - $cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME; - } - // optional JS file - $cms->JS_SPECIAL_INCLUDE = ''; - if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) { - $cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME; - } - if ($smarty) { - // check if template names exist - if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) { - // abort if master template could not be found - exit('MASTER TEMPLATE: '.$MASTER_TEMPLATE_NAME.' could not be found'); - } - if (isset($TEMPLATE_NAME) && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) { - exit('INCLUDE TEMPLATE: '.$TEMPLATE_NAME.' could not be found'); - } - } -} - -// if the lang folder is different to the default one -// if the default lang is not like the lang given, switch lang -/** @phan-suppress-next-line PhanParamSuspiciousOrder */ -if (false === strstr(BASE.INCLUDES.LANG.CONTENT_PATH, $cms->lang_dir) || - strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang) -) { - $cms->debug('LANG', 'Orig: '.BASE.INCLUDES.LANG.CONTENT_PATH.', New: '.$cms->lang_dir.' | Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang); - $cms->l->l10nReloadMOfile($lang, $cms->lang_dir); - // if we have login class - if ($login) { - $login->l->l10nReloadMOfile($lang, $cms->lang_dir); - } - // if we have smarty template class - if ($smarty) { - $smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir); - } -} - -if (isset($AJAX_PAGE) && !$AJAX_PAGE) { - // javascript translate data as template for auto translate - if (empty($TEMPLATE_TRANSLATE)) { - $TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl'; - $cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE); - } else { - // we assume we have some fixed set - // we must add _<$lang> - // if .tpl, put before .tpl - // if not .tpl, add _<$lang>.tpl - if (strpos($TEMPLATE_TRANSLATE, '.tpl')) { - $TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE); - } else { - $TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl'; - } - } - // if we can't find it, dump it - if ($smarty && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) { - unset($TEMPLATE_TRANSLATE); - } -} - -// $cms->debug("LANGUAGE", "L: $lang | ".$cms->lang_dir." | MO File: ".$cms->l->mofile); -$cms->debug("LANGUAGE", "SL: ".$_SESSION['DEFAULT_CHARSET']." | ".$_SESSION['LANG']." | ".$_SESSION['DEFAULT_LANG']); -if ($smarty) { - $cms->debug("TEMPLATE", "P: ".$smarty->getTemplateDir()[0]); + $smarty->setSmartyPaths(); } // __END__ diff --git a/www/includes/admin_smarty.php b/www/includes/admin_smarty.php index 26cd267a..08b6cd86 100644 --- a/www/includes/admin_smarty.php +++ b/www/includes/admin_smarty.php @@ -7,109 +7,11 @@ * HISTORY: *********************************************************************/ -// trigger flags -$cms->HEADER['USE_PROTOTYPE'] = isset($USE_PROTOTYPE) ? $USE_PROTOTYPE : USE_PROTOTYPE; -// scriptacolous, can only be used with prototype -if ($cms->HEADER['USE_PROTOTYPE']) { - $cms->HEADER['USE_SCRIPTACULOUS'] = isset($USE_SCRIPTACULOUS) ? $USE_SCRIPTACULOUS : USE_SCRIPTACULOUS; -} -// jquery and prototype should not be used together -$cms->HEADER['USE_JQUERY'] = isset($USE_JQUERY) ? $USE_JQUERY : USE_JQUERY; // don't use either of those two together - -// check if we have an external file with the template name -if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && is_file($cms->includes.$cms->INC_TEMPLATE_NAME)) { - include($cms->includes.$cms->INC_TEMPLATE_NAME); -} -// additional per page Javascript include -$cms->JS_INCLUDE = ''; -if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) { - $cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME; -} -// per page css file -$cms->CSS_INCLUDE = ''; -if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) { - $cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME; -} -// optional CSS file -$cms->CSS_SPECIAL_INCLUDE = ''; -if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) { - $cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME; -} -// optional JS file -$cms->JS_SPECIAL_INCLUDE = ''; -if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) { - $cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME; -} - -// the actual include files for javascript (per page) -$cms->HEADER['JS_INCLUDE'] = $cms->JS_INCLUDE; -$cms->HEADER['CSS_INCLUDE'] = $cms->CSS_INCLUDE; -$cms->HEADER['CSS_SPECIAL_INCLUDE'] = $cms->CSS_SPECIAL_INCLUDE; -$cms->HEADER['JS_SPECIAL_INCLUDE'] = $cms->JS_SPECIAL_INCLUDE; -// paths to the files -$cms->DATA['includes'] = $cms->includes; -$cms->DATA['js'] = $cms->javascript; -$cms->DATA['css'] = $cms->css; -$cms->DATA['pictures'] = $cms->pictures; - -// default CMS settings -// define all needed smarty stuff for the general HTML/page building -$cms->HEADER['CSS'] = CSS; -$cms->HEADER['JS'] = JS; -$cms->HEADER['ENCODING'] = $encoding; -$cms->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING; -$cms->HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET; -$cms->HEADER['JAVASCRIPT'] = isset($ADMIN_JAVASCRIPT) ? $ADMIN_JAVASCRIPT : ADMIN_JAVASCRIPT; -// html title -$cms->HEADER['HTML_TITLE'] = isset($L_TITLE) ? $cms->l->__($L_TITLE) : $cms->l->__(G_TITLE); -$cms->DATA['table_width'] = isset($PAGE_WIDTH) ? $PAGE_WIDTH : PAGE_WIDTH; - -// messages = array('msg' =>, 'class' => 'error/warning/...') -$cms->DATA['messages'] = $cms->messages; - -// top menu -$cms->DATA['nav_menu'] = $cms->adbTopMenu(); -$cms->DATA['nav_menu_count'] = is_array($cms->DATA['nav_menu']) ? count($cms->DATA['nav_menu']) : 0; -// the page name -$cms->DATA['page_name'] = $cms->page_name; -// user name -$cms->DATA['USER_NAME'] = $_SESSION['USER_NAME']; -$cms->DATA['ADMIN'] = $login->acl['admin']; -// the template part to include into the body -$cms->DATA['TEMPLATE_NAME'] = $TEMPLATE_NAME; -$cms->DATA['CONTENT_INCLUDE'] = $CONTENT_INCLUDE; -$cms->DATA['TEMPLATE_TRANSLATE'] = isset($TEMPLATE_TRANSLATE) ? $TEMPLATE_TRANSLATE : null; -$cms->DATA['PAGE_FILE_NAME'] = $PAGE_FILE_NAME; -// LANG -$cms->DATA['LANG'] = $lang; -$cms->DATA['TINYMCE_LANG'] = $lang_short; -// form name -$cms->DATA['FORM_NAME'] = $FORM_NAME; -// include flags -$cms->DATA['USE_TINY_MCE'] = isset($USE_TINY_MCE) ? $USE_TINY_MCE : false; -$cms->DATA['JS_DATEPICKR'] = isset($JS_DATEPICKR) ? $JS_DATEPICKR : false; -$cms->DATA['JS_FLATPICKR'] = isset($JS_FLATPICKR) ? $JS_FLATPICKR : false; - -// debug data, if DEBUG flag is on, this data is print out -$cms->DEBUG_DATA['debug_error_msg'] = $cms->runningTime(); -$cms->DEBUG_DATA['DEBUG'] = @$DEBUG_TMPL; - -// create main data array -$cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA); -// data is 1:1 mapping (all vars, values, etc) -foreach ($cms->CONTENT_DATA as $key => $value) { - $smarty->assign($key, $value); -} -if (is_dir(BASE.TEMPLATES_C)) { - $smarty->setCompileDir(BASE.TEMPLATES_C); -} -if (is_dir(BASE.CACHE)) { - $smarty->setCacheDir(BASE.CACHE); -} -$smarty->display( - $MASTER_TEMPLATE_NAME, - $cms->CACHE_ID.($cms->CACHE_ID ? '_' : '').$lang, - $cms->COMPILE_ID.($cms->COMPILE_ID ? '_' : '').$lang -); +/****** +NOTE THAT THIS INCLUDE IS OBSOLETE +USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF +*******/ +trigger_error('admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();', E_USER_DEPRECATED); +$smarty->setSmartyVarsAdmin(); // __END__ diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo index 67fd6ed9..a12a2bdf 100644 Binary files a/www/includes/lang/admin/ja_utf8.mo and b/www/includes/lang/admin/ja_utf8.mo differ diff --git a/www/includes/templates/admin/main_content.tpl b/www/includes/templates/admin/main_content.tpl deleted file mode 100644 index 2662b2c3..00000000 --- a/www/includes/templates/admin/main_content.tpl +++ /dev/null @@ -1,113 +0,0 @@ -{* - ******************************************************************** - * AUTHOR: Clemens Schwaighofer - * DATE: 2007/10/18 - * DESCRIPTION: - * content main part (buttons, load, etc) - * HISTORY: - ******************************************************************** -*} - - -
- -
-
- {* menu button *} - {if !$hide_menu} -
- -
- {/if} - {* save, delete commands *} -
-
- - - {if $show_delete_button && !$show_undelete_button} - - {/if} - {if $show_delete_button && $show_undelete_button} - - {/if} -
-
- {* status messages *} - - {* main grouping *} -
- {include file=$CONTENT_INCLUDE} -
- - {* save, delete commands *} -
-
- - - {if $show_delete_button && !$show_undelete_button} - - {/if} - {if $show_delete_button && $show_undelete_button} - - {/if} -
-
- {* hidden group *} - - {* action var set *} - - - - - - - - -
-
-
diff --git a/www/includes/templates/admin/main_content_blank.tpl b/www/includes/templates/admin/main_content_blank.tpl deleted file mode 100644 index 1b5e432c..00000000 --- a/www/includes/templates/admin/main_content_blank.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* - ******************************************************************** - * AUTHOR: Clemens Schwaighofer - * DATE: 2007/10/18 - * DESCRIPTION: - * content main part (buttons, load, etc) - * HISTORY: - ******************************************************************** -*} - - - -
-
- {* save, delete commands *} -
- {include file=cms_buttons.tpl} -
- {include file=$CONTENT_INCLUDE} - {* save, delete commands *} -
- {include file=cms_buttons.tpl} -
- {* hidden group *} - - {* action var set *} - - - - - - - - -
-
diff --git a/www/includes/templates/admin/main_content_index.tpl b/www/includes/templates/admin/main_content_index.tpl deleted file mode 100644 index 298303aa..00000000 --- a/www/includes/templates/admin/main_content_index.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{* - ******************************************************************** - * AUTHOR: Clemens Schwaighofer - * DATE: 2007/10/18 - * DESCRIPTION: - * content main part (buttons, load, etc) - * HISTORY: - ******************************************************************** -*} - - - -{include file=$CONTENT_INCLUDE} diff --git a/www/includes/templates/admin/main_content_special.tpl b/www/includes/templates/admin/main_content_special.tpl deleted file mode 100644 index b0db450f..00000000 --- a/www/includes/templates/admin/main_content_special.tpl +++ /dev/null @@ -1,91 +0,0 @@ -{* - ******************************************************************** - * AUTHOR: Clemens Schwaighofer - * DATE: 2008/04/11 - * DESCRIPTION: - * special content main part (buttons, load, etc) - * HISTORY: - ******************************************************************** -*} - - - -
-
-
- {* save, delete commands *} -
-
- - - {if $show_delete_button && !$show_undelete_button} - - {/if} - {if $show_delete_button && $show_undelete_button} - - {/if} - -
-
- {* status messages *} - - {* main grouping *} -
-
- - -
- {* START CONTENT *} - {include file="$CONTENT_INCLUDE"} - {* END CONTENT *} -
-
- {* END MENU / CONTENT BLOCK *} -
- - {* save, delete commands *} -
-
- - - {if $show_delete_button && !$show_undelete_button} - - {/if} - {if $show_delete_button && $show_undelete_button} - - {/if} -
-
- {* hidden group *} - - {* action var set *} - - - - - - - - -
-
-
diff --git a/www/includes/templates/admin/smarty_test.tpl b/www/includes/templates/admin/smarty_test.tpl index a52e0fa5..4b864299 100755 --- a/www/includes/templates/admin/smarty_test.tpl +++ b/www/includes/templates/admin/smarty_test.tpl @@ -1,6 +1,9 @@
{$SMARTY_TEST}
+
+ TRANSLATION CLASS: {$TRANSLATE_TEST} +