diff --git a/www/admin/smarty_test.php b/www/admin/smarty_test.php index dbf9a4c1..056328f4 100755 --- a/www/admin/smarty_test.php +++ b/www/admin/smarty_test.php @@ -10,26 +10,28 @@ define('USE_DATABASE', true); define('USE_HEADER', true); require 'config.php'; require BASE.INCLUDES.'admin_header.php'; -$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'; -} -$smarty->PAGE_WIDTH = '100%'; -// require BASE.INCLUDES.'admin_set_paths.php'; -$smarty->setSmartyPaths(); +if (is_object($smarty)) { + $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'; + } + $smarty->PAGE_WIDTH = '100%'; + // require BASE.INCLUDES.'admin_set_paths.php'; + $smarty->setSmartyPaths(); -// smarty test -$smarty->DATA['SMARTY_TEST'] = 'Test Data'; -$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?'); + // smarty test + $smarty->DATA['SMARTY_TEST'] = 'Test Data'; + $smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?'); +} // drop down test with optgroups $options = array ( @@ -48,8 +50,9 @@ $options = array ( ) ); -$smarty->DATA['drop_down_test'] = $options; - -// require BASE.INCLUDES.'admin_smarty.php'; -$smarty->setSmartyVarsAdmin(); +if (is_object($smarty)) { + $smarty->DATA['drop_down_test'] = $options; + // require BASE.INCLUDES.'admin_smarty.php'; + $smarty->setSmartyVarsAdmin(); +} require BASE.INCLUDES.'admin_footer.php'; diff --git a/www/lib/FileUpload/qqFileUploader.php b/www/lib/FileUpload/qqFileUploader.php index 265c9ca5..a65c888a 100755 --- a/www/lib/FileUpload/qqFileUploader.php +++ b/www/lib/FileUpload/qqFileUploader.php @@ -84,7 +84,7 @@ class qqFileUploader $pathinfo = pathinfo($this->file->getName()); $filename = $pathinfo['filename']; //$filename = md5(uniqid()); - $ext = $pathinfo['extension']; + $ext = $pathinfo['extension'] ?? ''; if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) { $these = implode(', ', $this->allowedExtensions);