diff --git a/4dev/bin/create_mo.sh b/4dev/bin/create_mo.sh index c874457c..2d3f8818 100755 --- a/4dev/bin/create_mo.sh +++ b/4dev/bin/create_mo.sh @@ -8,6 +8,9 @@ for file in $(ls -1 ${base_folder}../4dev/locale/*.po); do echo "Translate language ${file}"; locale=$(echo "${file}" | cut -d "-" -f 1); domain=$(echo "${file}" | cut -d "-" -f 2); + if [ ! -d "${base_folder}/includes/locale/${locale}/LC_MESSAGES/" ]; then + mkdir -p "${base_folder}/includes/locale/${locale}/LC_MESSAGES/"; + fi; msgfmt -o ${base_folder}/includes/locale/${locale}/LC_MESSAGES/${domain}.mo ${base_folder}../4dev/locale/${locale}-${domain}.po; done; diff --git a/www/admin/class_test.debug.php b/www/admin/class_test.debug.php index 3b88d090..a7834ca2 100644 --- a/www/admin/class_test.debug.php +++ b/www/admin/class_test.debug.php @@ -181,6 +181,10 @@ $debug->debug('TEST PER LEVEL', 'Per level test'); $debug->debug('()', 'Per level test: invalid chars'); $debug->setLogPer('level', false); +$ar = ['A', 1, ['B' => 'D']]; +$debug->debug('ARRAY', 'Array: ' . $debug->prAr($ar)); +$debug->debug('BOOL', 'True: ' . $debug->prBl(true) . ', False: ' . $debug->prBl(false)); + // error message // future DEPRECATED // $debug->debug('BASIC CLASS', 'Debug test'); diff --git a/www/includes/admin_header.php b/www/includes/admin_header.php index 9476b00b..2a56280e 100644 --- a/www/includes/admin_header.php +++ b/www/includes/admin_header.php @@ -19,15 +19,17 @@ if (!empty($DEBUG_ALL) && !empty($ENABLE_ERROR_HANDLING)) { //------------------------------ library include start // set output to quiet for load of classes & session settings ob_start(); -// set the session name -$SET_SESSION_NAME = EDIT_SESSION_NAME; -$LOG_FILE_ID = BASE_NAME . 'Admin'; //------------------------------ library include end //------------------------------ basic variable settings start +// set the session name +$SET_SESSION_NAME = EDIT_SESSION_NAME; +$LOG_FILE_ID = BASE_NAME . 'Admin'; +// ajax page flag if (!isset($AJAX_PAGE)) { $AJAX_PAGE = false; } +// zip download flag if (!isset($ZIP_STREAM)) { $ZIP_STREAM = false; } @@ -48,7 +50,7 @@ if ($AJAX_PAGE && !$ZIP_STREAM) { // start session $session = new \CoreLibs\Create\Session($SET_SESSION_NAME); // create logger -$log = new CoreLibs\Debug\Logging([ +$log = new \CoreLibs\Debug\Logging([ 'log_folder' => BASE . LOG, 'file_id' => $LOG_FILE_ID, 'print_file_date' => true, @@ -69,9 +71,9 @@ if ( } } // db config with logger -$db = new CoreLibs\DB\IO(DB_CONFIG, $log); +$db = new \CoreLibs\DB\IO(DB_CONFIG, $log); // login & page access check -$login = new CoreLibs\ACL\Login($db, $log, $session); +$login = new \CoreLibs\ACL\Login($db, $log, $session); // lang, path, domain // pre auto detect language after login $locale = \CoreLibs\Language\GetLocale::setLocale(); @@ -82,9 +84,9 @@ $l10n = new \CoreLibs\Language\L10n( $locale['path'], ); // create smarty object -$smarty = new CoreLibs\Template\SmartyExtend($l10n, $locale); +$smarty = new \CoreLibs\Template\SmartyExtend($l10n, $locale); // create new Backend class with db and loger attached -$cms = new CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale); +$cms = new \CoreLibs\Admin\Backend($db, $log, $session, $l10n, $locale); // the menu show flag (what menu to show) $cms->menu_show_flag = 'main'; // db info diff --git a/www/lib/CoreLibs/Debug/Logging.php b/www/lib/CoreLibs/Debug/Logging.php index 06b57424..b033f5f0 100644 --- a/www/lib/CoreLibs/Debug/Logging.php +++ b/www/lib/CoreLibs/Debug/Logging.php @@ -310,6 +310,7 @@ class Logging * Needs debug/echo/print ad target for which of the debug flag groups we check * also needs level string to check in the per level output flag check. * In case we have invalid target it will return false + * * @param string $target target group to check debug/echo/print * @param string $level level to check in detailed level flag * @return bool true on access allowed or false on no access @@ -332,6 +333,7 @@ class Logging /** * writes error msg data to file for current level + * * @param string $level the level to write * @param string $error_string error string to write * @return bool True if message written, FAlse if not @@ -412,6 +414,7 @@ class Logging /** * Temporary method to read all class variables for testing purpose + * * @param string $name what variable to return * @return mixed can be anything, bool, string, int, array */ @@ -425,6 +428,7 @@ class Logging * sets the internal log file prefix id * string must be a alphanumeric string * if non valid string is given it returns the previous set one only + * * @param string $string log file id string value * @return string returns the set log file id string * @deprecated Use $log->setLogId() @@ -438,6 +442,7 @@ class Logging * sets the internal log file prefix id * string must be a alphanumeric string * if non valid string is given it returns the previous set one only + * * @param string $string log file id string value * @return string returns the set log file id string */ @@ -460,6 +465,7 @@ class Logging /** * old name for setLogLevel + * * @param string $type debug, echo, print * @param string $flag on/off * array $array of levels to turn on/off debug @@ -475,6 +481,7 @@ class Logging /** * set log level settings for All types * if invalid type, skip + * * @param string $type Type to get: debug, echo, print * @param bool $set True or False * @return bool Return false if type invalid @@ -491,6 +498,7 @@ class Logging /** * get the current log level setting for All level blocks + * * @param string $type Type to get: debug, echo, print * @return bool False on failure, or the boolean flag from the all var */ @@ -506,6 +514,7 @@ class Logging /** * passes list of level names, to turn on debug * eg $foo->debugFor('print', 'on', ['LOG', 'DEBUG', 'INFO']); + * * @param string $type debug, echo, print * @param string $flag on/off * @param array $debug_on Array of levels to turn on/off debug @@ -541,6 +550,7 @@ class Logging /** * return the log level for the array type normal and not (disable) + * * @param string $type debug, echo, print * @param string $flag on/off * @param string|null $level if not null then check if this array entry is set @@ -572,6 +582,7 @@ class Logging * - class: split by class * - page: split per page called * - run: for each run + * * @param string $type Type to get: level, class, page, run * @param bool $set True or False * @return bool Return false if type invalid @@ -587,6 +598,7 @@ class Logging /** * return current set log per flag in bool + * * @param string $type Type to get: level, class, page, run * @return bool True of false for turned on or off */ @@ -601,6 +613,7 @@ class Logging /** * Set or get the log file date extension flag * if null or empty parameter gets current flag + * * @param boolean|null $set Set the date suffix for log files * If set to null return current set * @return boolean Current set flag @@ -615,6 +628,7 @@ class Logging /** * Return current set log file name + * * @return string Filename set set after the last time debug was called */ public function getLogFileName(): string @@ -628,6 +642,7 @@ class Logging * It uses some special code sets so we can convert that to pre flags * for echo output {##HTMLPRE##} ... {##/HTMLPRE##} * Do not use this without using it in a string in debug function + * * @param array $a Array to format * @return string print_r formated */ @@ -636,14 +651,32 @@ class Logging return '##HTMLPRE##' . print_r($a, true) . '##/HTMLPRE##'; } + /** + * Convert bool value to string value + * + * @param bool $bool Bool value to be transformed + * @param string $true Override default string 'true' + * @param string $false Override default string 'false' + * @return string $true or $false string for true/false bool + */ + public function prBl( + bool $bool, + string $true = 'true', + string $false = 'false' + ): string { + return $bool ? $true : $false; + } + /** * write debug data to error_msg array + * * @param string $level id for error message, groups messages together * @param string $string the actual error message * @param bool $strip default on false, if set to true, * all html tags will be stripped and
changed to \n * this is only used for debug output - * @param string $prefix Attach some block before $string. Will not be stripped even + * @param string $prefix Attach some block before $string. + * Will not be stripped even * when strip is true * if strip is false, recommended to add that to $string * @return bool True if logged, false if not logged @@ -729,6 +762,7 @@ class Logging /** * for ECHO ON only * returns error data as string so it can be echoed out + * * @param string $header_prefix prefix string for header * @return string error msg for all levels */ @@ -780,6 +814,7 @@ class Logging * unsests the error message array * can be used if writing is primary to file * if no level given resets all + * * @param string $level optional level * @return void has no return */ @@ -795,6 +830,7 @@ class Logging /** * for ECHO ON only * Get current error message array + * * @return array error messages collected */ public function getErrorMsg(): array @@ -806,6 +842,7 @@ class Logging * for ECHO ON only * merges the given error array with the one from this class * only merges visible ones + * * @param array $error_msg error array * @return void has no return */