X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftext.php;h=4d6aa8697ae650e57499d8dc5f24b6523084dc30;hb=660bd39efad52b1c69bd8dd0ca27141b81f84ca5;hp=d515f28ca64266fd26e4dbda30ad6544be06c456;hpb=807fc60d3e3e9b7bf55fb91b0a31cb8bcc2f14b9;p=friendica.git

diff --git a/include/text.php b/include/text.php
index d515f28ca6..4d6aa8697a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,13 +1,5 @@
 <?php
 
-// This is our template processor.
-// $s is the string requiring macro substitution.
-// $r is an array of key value pairs (search => replace)
-// returns substituted string.
-// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
-// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing, 
-// depending on the order in which they were declared in the array.
-
 require_once("include/template_processor.php");
 require_once("include/friendica_smarty.php");
 
@@ -661,6 +653,9 @@ function attribute_contains($attr,$s) {
 }}
 
 if(! function_exists('logger')) {
+/* setup int->string log level map */
+$LOGGER_LEVELS = array();
+	
 /**
  * log levels:
  * LOGGER_NORMAL (default)
@@ -678,9 +673,16 @@ function logger($msg,$level = 0) {
 	// turn off logger in install mode
 	global $a;
 	global $db;
-
+	global $LOGGER_LEVELS;
+	
 	if(($a->module == 'install') || (! ($db && $db->connected))) return;
 
+    if (count($LOGGER_LEVEL)==0){
+        foreach (get_defined_constants() as $k=>$v){
+            if (substr($k,0,7)=="LOGGER_") $LOGGER_LEVELS[$v] = substr($k,7,7);
+        }        
+    }
+    
 	$debugging = get_config('system','debugging');
 	$loglevel  = intval(get_config('system','loglevel'));
 	$logfile   = get_config('system','logfile');
@@ -688,8 +690,19 @@ function logger($msg,$level = 0) {
 	if((! $debugging) || (! $logfile) || ($level > $loglevel))
 		return;
 
+	$callers = debug_backtrace(); 
+	$logline =  sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", 
+				 datetime_convert(), 
+				 session_id(),
+				 $LOGGER_LEVELS[$level],
+				 basename($callers[0]['file']),
+				 $callers[0]['line'],
+				 $callers[1]['function'],
+				 $msg
+				);
+	
 	$stamp1 = microtime(true);
-	@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
+	@file_put_contents($logfile, $logline, FILE_APPEND);
 	$a->save_timestamp($stamp1, "file");
 	return;
 }}
@@ -1280,7 +1293,7 @@ if(! function_exists('prepare_body')) {
  * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
  * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
  */
-function prepare_body(&$item,$attach = false) {
+function prepare_body(&$item,$attach = false, $preview = false) {
 
 	$a = get_app();
 	call_hooks('prepare_body_init', $item);
@@ -1340,7 +1353,7 @@ function prepare_body(&$item,$attach = false) {
 	}
 
 
-	$prep_arr = array('item' => $item, 'html' => $s);
+	$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
 	call_hooks('prepare_body', $prep_arr);
 	$s = $prep_arr['html'];