diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/debug.php | 50 | ||||
| -rw-r--r-- | includes/functions.php | 18 |
2 files changed, 52 insertions, 16 deletions
diff --git a/includes/debug.php b/includes/debug.php index c50e016..1a5dcb1 100644 --- a/includes/debug.php +++ b/includes/debug.php @@ -21,6 +21,7 @@ define("RUDI_DEBUG",true); define("RUDI_DEBUG_LEVEL",true); define('NO_REPEAT',false); define('REPEAT',true); +define('FORCE', true); static $last_message = NULL; static $last_message_count = 0; @@ -29,32 +30,44 @@ static $log_message_last = NULL; static $log_message_queue = array(); static $log_message_pos = 0; -function decho($message, $from = "GENERIC") +function decho($message, $force = false) { global $log_message_last, $log_message_queue, $log_message_pos, $config; - - if($config['debug']['enabled'] == false || + /* + if($force == false) + { + if($config['debug']['enabled'] == false || $config['debug']['show_messages'] == false) return; + } + */ date_default_timezone_set($config['logs']['timezone']); $timestamp = date('H:i:s T'); - $message = "[$timestamp]: $message"; + if(!is_array($message) && !is_object($message)) + $message = "[$timestamp]: $message"; + else + { + $message = $message; + } array_push($log_message_queue, $message); $log_message_pos++; } -function queuePrint($obj) +function queuePrint($obj, $force = false) { global $config; - if($config['debug']['enabled'] == false || + if($force == false) + { + if($config['debug']['enabled'] == false || $config['debug']['show_messages'] == false) return; - + } + if(is_array($obj)) { $array_dump = print_r($obj,true); - echo $array_dump . "<br/>\n"; + echo "<pre>" . $array_dump . "</pre><br/>\n"; //WriteLog($array_dump,BAYONET_LOG_INFO); } elseif(is_object($obj)) @@ -65,7 +78,7 @@ function queuePrint($obj) ob_end_clean(); //htmlentities($obj_dump,ENT_QUOTES); //WriteLog($obj_dump,BAYONET_LOG_INFO); - echo $obj_dump . "<br/>\n"; + echo "<pre>" . $obj_dump . "</pre><br/>\n"; } elseif(is_string($obj)) { @@ -75,11 +88,14 @@ function queuePrint($obj) } } -function logQueueFlush() +function logQueueFlush($force = false) { global $log_message_queue, $config; - if($config['debug']['show_messages'] == false) return; + if($force == false) + { + if($config['debug']['show_messages'] == false) return; + } $messageCount = 0; static $log_message_last_count = 0; @@ -91,8 +107,11 @@ function logQueueFlush() foreach($log_message_queue as $message) { if($message != $log_message_queue[$messageCount - 1]) - { - queuePrint($message); + { + if($force) + queuePrint($message, true); + else + queuePrint($message); } elseif($message == $log_message_queue[$messageCount - 1]) { @@ -100,7 +119,10 @@ function logQueueFlush() if($config['debug']['repeat_messages'] == true) { //echo "{$messageCount}: $message<br/>\n"; - queuePrint($message); + if($force) + queuePrint($message,true); + else + queuePrint($message); } if($config['debug']['repeat_messages'] == false) { diff --git a/includes/functions.php b/includes/functions.php index 4518fa8..6238ec4 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -175,13 +175,13 @@ function BBCode($Text) // Images // [img]pathtoimage[/img] - $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1">', $Text); + $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1" />', $Text); //[img=align]image source[/img] $Text = preg_replace("(\[img align\=(.+?)\](.+?)\[\/img\])is","<img src=\"$2\" align=\"$1\" />",$Text); // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1">', $Text); + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1" />', $Text); // Alignment // [align=type]text[/align] @@ -251,6 +251,20 @@ function LinkModule($module_name,$args = NULL,$link_name) } /** + * LinkModuleFile() + * + * Helper function to link to Bayonet internal module files. + * + * @param mixed $module_name + * @param mixed $link_name + * @return + */ + function LinkModuleFile($module_name, $file_name, $link_name) + { + return "<a href=\"?load={$module_name}&file={$file_name}\">{$link_name}</a>"; + } + +/** * LinkPage() * * Helper function to link to Bayonet pages. |