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

Smarty test, Basic class debug function upate

Browse Source 
Write out debug data had two nested ifs that are combined into one if

Smarty test update with loop
This commit is contained in:
Clemens Schwaighofer
2020-07-01 07:12:06 +09:00
parent 9c242ed1b9
commit 803cbe8a2e
3 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/admin/smarty_test.php
View File

@@ -52,6 +52,7 @@ $options = array (
if (is_object($smarty)) { if (is_object($smarty)) {
$smarty->DATA['drop_down_test'] = $options; $smarty->DATA['drop_down_test'] = $options;
$smarty->DATA['loop_start'] = 2;
// require BASE.INCLUDES.'admin_smarty.php'; // require BASE.INCLUDES.'admin_smarty.php';
$smarty->setSmartyVarsAdmin(); $smarty->setSmartyVarsAdmin();
} }

8
www/includes/templates/admin/smarty_test.tpl
View File

@@ -12,13 +12,19 @@
<div class="jq-container"> <div class="jq-container">
<div id="jq-test" class="jp-test"> <div id="jq-test" class="jp-test">
<div id="test-div" class="test-div"> <div id="test-div" class="test-div">
Some content ehre or asdfasdfasf Some content here or asdfasdfasf
</div> </div>
<div id="translate-div"> <div id="translate-div">
TRANSLATION SMARTY: {t}I should be translated{/t} TRANSLATION SMARTY: {t}I should be translated{/t}
</div> </div>
</div> </div>
</div> </div>
<div class="loop-test">
<div>LOOP TEST</div>
{section name=page_list start=1 loop=$loop_start+1}
<div>LOOP OUTPUT: {$smarty.section.page_list.index}</div>
{/section}
</div>
{* progresss indicator *} {* progresss indicator *}
<div id="indicator"></div> <div id="indicator"></div>
{* the action confirm box *} {* the action confirm box *}

102
www/lib/CoreLibs/Basic.php
View File

@@ -866,64 +866,64 @@ class Basic
*/ */
private function writeErrorMsg(string $level, string $error_string): void private function writeErrorMsg(string $level, string $error_string): void
{ {
if ($this->doDebugTrigger('debug', $level)) { // only write if write is requested
// only write if write is requested if ($this->doDebugTrigger('debug', $level) &&
if ($this->doDebugTrigger('print', $level)) { $this->doDebugTrigger('print', $level)
// replace all html tags ) {
// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string); // replace all html tags
// $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string); // $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string);
// replace special line break tag // $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string);
// $error_string = str_replace('<!--#BR#-->', "\n", $error_string); // replace special line break tag
// $error_string = str_replace('<!--#BR#-->', "\n", $error_string);
// init output variable // init output variable
$output = $error_string; // output formated error string to output file $output = $error_string; // output formated error string to output file
// init base file path // init base file path
$fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext; $fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
// log ID prefix settings, if not valid, replace with empty // log ID prefix settings, if not valid, replace with empty
if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) { if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
$rpl_string = '_'.$this->log_file_id; $rpl_string = '_'.$this->log_file_id;
} else { } else {
$rpl_string = ''; $rpl_string = '';
}
$fn = str_replace('##LOGID##', $rpl_string, $fn); // log id (like a log file prefix)
if ($this->log_per_run) {
if (isset($GLOBALS['LOG_FILE_UNIQUE_ID'])) {
$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
} }
$fn = str_replace('##LOGID##', $rpl_string, $fn); // log id (like a log file prefix) if (!$this->log_file_unique_id) {
$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
if ($this->log_per_run) {
if (isset($GLOBALS['LOG_FILE_UNIQUE_ID'])) {
$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
}
if (!$this->log_file_unique_id) {
$GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
}
$rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
} else {
$rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d'); // add date to file
} }
$fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename $rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
} else {
$rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d'); // add date to file
}
$fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename
$rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file $rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file
$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename $fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
$rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', get_class($this)); // set sub class settings $rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', get_class($this)); // set sub class settings
$fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename $fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename
$rpl_string = !$this->log_per_page ? '' : '_'.$this->getPageName(1); // if request to write to one file $rpl_string = !$this->log_per_page ? '' : '_'.$this->getPageName(1); // if request to write to one file
$fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename $fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename
// write to file // write to file
// first check if max file size is is set and file is bigger // first check if max file size is is set and file is bigger
if ($this->log_max_filesize > 0 && ((filesize($fn) / 1024) > $this->log_max_filesize)) { if ($this->log_max_filesize > 0 && ((filesize($fn) / 1024) > $this->log_max_filesize)) {
// for easy purpose, rename file only to attach timestamp, nur sequence numbering // for easy purpose, rename file only to attach timestamp, nur sequence numbering
rename($fn, $fn.'.'.date("YmdHis")); rename($fn, $fn.'.'.date("YmdHis"));
} }
$fp = fopen($fn, 'a'); $fp = fopen($fn, 'a');
if ($fp !== false) { if ($fp !== false) {
fwrite($fp, $output); fwrite($fp, $output);
fclose($fp); fclose($fp);
} else { } else {
echo "<!-- could not open file: $fn //-->"; echo "<!-- could not open file: $fn //-->";
} }
} // do write to file } // do write to file
}
} }
/** /**