From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 19 Mar 2016 18:40:29 +0000 (+0000)
Subject: Move EOL from nb, hangle empty msg
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=7cdac8b2d41dfb682eb8892a209c4b65b79fd57f;p=nb.git

Move EOL from nb, hangle empty msg
---

diff --git a/lib/php/nb.php b/lib/php/nb.php
index fe4c49f7..eb1534e1 100644
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -4,7 +4,6 @@ if (!defined('NB_ROOT')) define('NB_ROOT',realpath(dirname(__FILE__).'/../..'));
 #if (!defined('NB_EOL')) define('NB_EOL',empty($_REQUEST['prod']) ? "\n" : '');
 if (!defined('NB_EOL')) define('NB_EOL',defined('NB_PROD') ? '' : "\n");
 #if (!defined('NB_EOL')) define('NB_EOL',"\n");
-if (!defined('EOL')) define('EOL',NB_EOL);
 require_once(dirname(__FILE__).'/functions.php');
 #print_r(self::p());
 class nb {
@@ -241,28 +240,19 @@ class nb {
 	public static function debug_backtrace_msg($deep=NULL,$one_line=NULL,$preff='') {
 
     $msg = '';
-		if (isset($_REQUEST['_debug_backtrace_msg'])) $deep = $_REQUEST['_debug_backtrace_msg'];
+		if (self::p('_debug_backtrace_msg')) $deep = self::p('_debug_backtrace_msg');
     if ($deep < 0 or $deep === false) return $msg;
-    #$msg .= "[deep=$deep]";
 
-		#if ($deep===NULL or $deep===TRUE) {
+    $debug = debug_backtrace(); array_shift($debug);
 
-			#$msg .= "\n[";
+    $tot = count($debug);
+    foreach (array_reverse($debug) as $i=>$call_info) {
 
-      $debug = debug_backtrace(); array_shift($debug);
+      $msg .= ( $one_line ? ($preff !=='' ? $preff : ' | ') : "\n$preff " ) . self::debug_backtrace_info($call_info);
 
-      $tot = count($debug);
-			foreach (array_reverse($debug) as $i=>$call_info) {
-        $msg .= ( $one_line ? ($preff !=='' ? $preff : ' | ') : "\n$preff " ) . self::debug_backtrace_info($call_info);
-        if ($deep and ($tot-$i) <= $deep+1) break;
-      }
-
-			#$msg .= ($one_line ? "" : "\n")."]";
+      if ($deep and ($tot-$i) <= $deep+1) break;
 
-		#} elseif (isset($call_info[(int)$deep])) {
-      #$msg .= ' '.self::debug_backtrace_info($call_info[(int)$deep]);
-
-    #}
+    }
 
 		return $msg;
 	}