From a86ae3efc32fb6b1b7874c41f171782b09fa54dc Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Mon, 26 Jul 2021 16:09:51 +0900 Subject: [PATCH] DB IO updates for settings return, Smarty Extended update Update core template main body with better position for overlib init, pagename div id add, remove px from any size call (width) DB IO adds return for config settings, fix db async check to always return boolean only, add had error variable return method Some minor fixes in Smarty Extended for some legacy admin page variables needed. Update Error reporting to be self containing with defines --- www/admin/class_test.smarty.php | 1 + www/configs/config.master.php | 4 +-- www/configs/config.other.php | 2 +- www/includes/templates/admin/main_body.tpl | 10 +++--- www/lib/CoreLibs/DB/IO.php | 37 ++++++++++++++++++++-- www/lib/CoreLibs/Template/SmartyExtend.php | 11 ++++--- www/lib/Error.Handling.php | 28 ++++++++-------- www/lib/autoloader.php | 2 +- 8 files changed, 64 insertions(+), 31 deletions(-) diff --git a/www/admin/class_test.smarty.php b/www/admin/class_test.smarty.php index c82b6bd1..a5eb892a 100644 --- a/www/admin/class_test.smarty.php +++ b/www/admin/class_test.smarty.php @@ -84,6 +84,7 @@ $options = [ ]; $smarty->DATA['drop_down_test'] = $options; +$smarty->DATA['drop_down_test_selected'] = ''; $smarty->DATA['loop_start'] = 2; // require BASE.INCLUDES.'admin_smarty.php'; $smarty->setSmartyVarsAdmin(); diff --git a/www/configs/config.master.php b/www/configs/config.master.php index 923bc2f2..66e7d9bf 100644 --- a/www/configs/config.master.php +++ b/www/configs/config.master.php @@ -133,8 +133,8 @@ define('USE_SCRIPTACULOUS', false); define('USE_JQUERY', true); /************* LAYOUT WIDTHS *************/ -define('PAGE_WIDTH', 800); -define('CONTENT_WIDTH', 800); +define('PAGE_WIDTH', '100%'); +define('CONTENT_WIDTH', '100%'); // the default template name define('MASTER_TEMPLATE_NAME', 'main_body.tpl'); diff --git a/www/configs/config.other.php b/www/configs/config.other.php index 3626b48a..9d0dedaa 100755 --- a/www/configs/config.other.php +++ b/www/configs/config.other.php @@ -10,7 +10,7 @@ declare(strict_types=1); -// DEFINE('SOME_ID', ); +// define('SOME_ID', ); /************* CONVERT *******************/ // this only needed if the external thumbnail create is used diff --git a/www/includes/templates/admin/main_body.tpl b/www/includes/templates/admin/main_body.tpl index 21aac0ba..7a109118 100644 --- a/www/includes/templates/admin/main_body.tpl +++ b/www/includes/templates/admin/main_body.tpl @@ -100,10 +100,10 @@ {/if} - {popup_init src="`$js`/overlib/overlib.js"} -
+{popup_init src="`$js`/overlib/overlib.js"} +
{t 1=$USER_NAME|upper}Hello %1{/t}
@@ -127,13 +127,13 @@ {/if} {/foreach}
-
+
{$page_name}
{* error/warning *} {if $messages} -
+
{foreach from=$messages item=item key=key}
{$item.msg}
{/foreach} @@ -143,7 +143,7 @@ {* debug info *} {if $DEBUG} -
+
{$Id}
{$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
{$debug_error_msg} diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php index 626f5d89..d4bc4ee4 100644 --- a/www/lib/CoreLibs/DB/IO.php +++ b/www/lib/CoreLibs/DB/IO.php @@ -288,7 +288,7 @@ class IO extends \CoreLibs\Basic private $nbsp = ''; // used by print_array recursion function // error & warning id protected $error_id; - private $had_error; + private $had_error = 0; private $warning_id; private $had_warning; // error thrown on class init if we cannot connect to db @@ -1097,6 +1097,25 @@ class IO extends \CoreLibs\Basic case 'user': $setting = $this->db_user; break; + case 'encoding': + $setting = $this->db_encoding; + break; + case 'schema': + $setting = $this->db_schema; + break; + case 'host': + $setting = $this->db_host; + break; + case 'port': + $setting = $this->db_port; + break; + case 'ssl': + $setting = $this->db_ssl; + break; + // we return *** and never the actual password + case 'password': + $setting = '***'; + break; default: $setting = false; break; @@ -1439,9 +1458,10 @@ class IO extends \CoreLibs\Basic /** * checks a previous async query and returns data if finished * NEEDS : dbExecAsync - * @return bool true if the query is still running, false if an error occured or cursor of that query + * @return bool|resource cursor resource if the query is still running, + * false if an error occured or cursor of that query */ - public function dbCheckAsync(): bool + public function dbCheckAsync() { // if there is actually a async query there if ($this->async_running) { @@ -2376,6 +2396,17 @@ class IO extends \CoreLibs\Basic trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetNumRows()', E_USER_DEPRECATED); return $this->dbGetNumRows(); } + + /** + * Sets error number that was last + * So we always have the last error number stored even if a new one is created + * + * @return int last error number + */ + public function getHadError() + { + return $this->had_error; + } // end if db class } diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index d85825bf..531886b3 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -361,6 +361,11 @@ class SmartyExtend extends SmartyBC $this->HEADER['ENCODING'] = $this->encoding; $this->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING; + // form name + $this->DATA['FORM_NAME'] = !$this->FORM_NAME ? + str_replace('.php', '', $this->page_name) : + $this->FORM_NAME; + $this->DATA['FORM_ACTION'] = $this->FORM_ACTION; // special for admin if ($admin_call === true) { // set ACL extra show @@ -385,6 +390,7 @@ class SmartyExtend extends SmartyBC // the page name $this->DATA['page_name'] = $this->page_name; $this->DATA['table_width'] = $this->PAGE_WIDTH ?? PAGE_WIDTH; + $this->DATA['form_name'] = $this->DATA['FORM_NAME']; // for tinymce special $this->DATA['TINYMCE_LANG'] = $this->lang_short; // include flags @@ -404,11 +410,6 @@ class SmartyExtend extends SmartyBC // LANG $this->DATA['LANG'] = $this->lang; - // form name - $this->DATA['FORM_NAME'] = !$this->FORM_NAME ? - str_replace('.php', '', $this->page_name) : - $this->FORM_NAME; - $this->DATA['FORM_ACTION'] = $this->FORM_ACTION; // include flags $this->DATA['JS_DATEPICKR'] = $this->JS_DATEPICKR; $this->DATA['JS_FLATPICKR'] = $this->JS_FLATPICKR; diff --git a/www/lib/Error.Handling.php b/www/lib/Error.Handling.php index 43e69f76..c2e1db9b 100644 --- a/www/lib/Error.Handling.php +++ b/www/lib/Error.Handling.php @@ -1,24 +1,17 @@ -.log @@ -67,8 +60,15 @@ function MyErrorHandler(int $type, string $message, string $file, int $line, arr // : the php error message $output = '{' . array_pop($page_temp) . '} [' . $file . '] ' . '<' . $line . '> [' . $error_level[$type] . '|' . $type . ']: ' . $message; - # try to open file - $ROOT = CURRENT_WORKING_DIR; + // define the base working directory outside because in the function it might return undefined + // if we have config set BASE use this + $ROOT = ''; + if (defined('BASE')) { + $ROOT = BASE; + } else { + // else we set. We fully assuem that Error.Handling is where it should be, in lib dir + $ROOT = str_replace('lib', '', __DIR__); + } $LOG = 'log' . DIRECTORY_SEPARATOR; // if the log folder is not found, try to create it if (!is_dir($ROOT . $LOG) && !is_file($ROOT . LOG)) { diff --git a/www/lib/autoloader.php b/www/lib/autoloader.php index b6f64280..851abfcc 100644 --- a/www/lib/autoloader.php +++ b/www/lib/autoloader.php @@ -1,4 +1,4 @@ -