lib/php/functions.php

diff --git a/lib/php/functions.php b/lib/php/functions.php
index cefd795a08e39ec510161c0ad961e482c7c6245d..9737a503bcb2d41f6950c3072543d73f70d5c775 100644 (file)
--- a/lib/php/functions.php
+++ b/lib/php/functions.php
@@ -69,49 +69,57 @@ function warn ($msg) {
 }
 
 function err($msg='__err__',$preff='err',$backtrace_deep=0) {
-  $msg = is_scalar($msg) ? $msg : print_r($msg,true);
-  $preff_msg = $preff ? strtoupper($preff).': ' : '';
-
-  if ($msg !== '__err__' and $backtrace_deep !== false) {
-    $msg = trim($preff_msg.$msg).' '
-      .nb::debug_backtrace_msg(1+$backtrace_deep,NULL,$preff_msg)
-      #.nb::debug_backtrace_msg(1+$backtrace_deep,NULL)
-    ;
-
-  } else { 
-    $msg = $preff_msg.$msg;
-
-  }
-
-  #nb::msg( !nb::php_cli()
-  nb::msg( nb::client_header('Accept','ml')
-    ? '<pre'
-        .' class="err'. ( ($preff and $preff!='err') ? " $preff" : '' ).'"'
-      .'>'.$msg.'</pre>'.NB_EOL
-    : $msg
-  ).NB_EOL;
-
+  return nb::err($msg,$preff,$backtrace_deep);
 }
 
-function debug($msg,$level=0) {
-  if ($level and $level>nb::p('debug')) return;
-  #$msg = is_scalar($msg) ? $msg : print_r($msg,true);
-  $msg = is_scalar($msg) ? $msg : print_r($msg,true);
-
-  if (nb::client_header('Accept','ml')) {
-    $msg = '<pre class="debug">'
-      .(isset($_SERVER['HTTP_HOST']) ? htmlentities($msg) : $msg)
-# NB 16.12.15       .(isset($_SERVER['HTTP_HOST']) ? htmlspecialchars($msg) : $msg)
-    .'</pre>'.NB_EOL;
-
-  } else {
-    $msg = "DEBUG: $msg\n";
-
-  }
-  nb::msg($msg);
+# NB 15.11.17 function err($msg='__err__',$preff='err',$backtrace_deep=0) {
+# NB 15.11.17   $msg = is_scalar($msg) ? $msg : print_r($msg,true);
+# NB 15.11.17   $preff_msg = $preff ? strtoupper($preff).': ' : '';
+# NB 15.11.17 
+# NB 15.11.17   if ($msg !== '__err__' and $backtrace_deep !== false) {
+# NB 15.11.17     $msg = trim($preff_msg.$msg).' '
+# NB 15.11.17       .nb::debug_backtrace_msg(1+$backtrace_deep,NULL,$preff_msg)
+# NB 15.11.17       #.nb::debug_backtrace_msg(1+$backtrace_deep,NULL)
+# NB 15.11.17     ;
+# NB 15.11.17 
+# NB 15.11.17   } else { 
+# NB 15.11.17     $msg = $preff_msg.$msg;
+# NB 15.11.17 
+# NB 15.11.17   }
+# NB 15.11.17 
+# NB 15.11.17   #nb::msg( !nb::php_cli()
+# NB 15.11.17   nb::msg( nb::client_header('Accept','ml')
+# NB 15.11.17     ? '<pre'
+# NB 15.11.17         .' class="err'. ( ($preff and $preff!='err') ? " $preff" : '' ).'"'
+# NB 15.11.17       .'>'.$msg.'</pre>'.NB_EOL
+# NB 15.11.17     : $msg
+# NB 15.11.17   ).NB_EOL;
+# NB 15.11.17 
+# NB 15.11.17 }
 
+function debug($msg,$level=0) {
+  return nb::debug($msg,$level);
 }
 
+# NB 15.11.17 function debug($msg,$level=0) {
+# NB 15.11.17   if ($level and $level>nb::p('debug')) return;
+# NB 15.11.17   #$msg = is_scalar($msg) ? $msg : print_r($msg,true);
+# NB 15.11.17   $msg = is_scalar($msg) ? $msg : print_r($msg,true);
+# NB 15.11.17 
+# NB 15.11.17   if (nb::client_header('Accept','ml')) {
+# NB 15.11.17     $msg = '<pre class="debug">'
+# NB 15.11.17       .(isset($_SERVER['HTTP_HOST']) ? htmlentities($msg) : $msg)
+# NB 15.11.17       #.(isset($_SERVER['HTTP_HOST']) ? htmlspecialchars($msg) : $msg)
+# NB 15.11.17     .'</pre>'.NB_EOL;
+# NB 15.11.17 
+# NB 15.11.17   } else {
+# NB 15.11.17     $msg = "DEBUG: $msg\n";
+# NB 15.11.17 
+# NB 15.11.17   }
+# NB 15.11.17   nb::msg($msg);
+# NB 15.11.17 
+# NB 15.11.17 }
+
 function prettyText($text) {
   $replace = array(
     '/(\w)(,)(\w)/' => '$1$2 $3',

diff --git a/lib/php/nb.php b/lib/php/nb.php
index 0ee772095a66bf7ed0b11cafe26d1f0d36bfa177..a46eb7d2ab25a9dd5967c1393ae25a732d22773b 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -164,12 +164,55 @@ class NB {
     #die("Can't exit from BYE!!!");
   }
 
+  public static function err($msg='__err__',$preff='err',$backtrace_deep=0) {
+    $msg = is_scalar($msg) ? $msg : print_r($msg,true);
+    $preff_msg = $preff ? strtoupper($preff).': ' : '';
+
+    if ($msg !== '__err__' and $backtrace_deep !== false) {
+      $msg = trim($preff_msg.$msg).' '
+        .self::debug_backtrace_msg(1+$backtrace_deep,NULL,$preff_msg)
+        #.self::debug_backtrace_msg(1+$backtrace_deep,NULL)
+      ;
+
+    } else { 
+      $msg = $preff_msg.$msg;
+
+    }
+
+    #self::msg( !self::php_cli()
+    self::msg( self::client_header('Accept','ml')
+      ? '<pre'
+          .' class="err'. ( ($preff and $preff!='err') ? " $preff" : '' ).'"'
+        .'>'.$msg.'</pre>'.NB_EOL
+      : $msg
+    ).NB_EOL;
+
+  }
+
   /*
    * Function: debug
    * Does what it says
    */
+# NB 15.11.17   public static function debug($msg,$level=0) {
+# NB 15.11.17     return debug($msg,$level);
+# NB 15.11.17   }
   public static function debug($msg,$level=0) {
-    return debug($msg,$level);
+    if ($level and $level>self::p('debug')) return;
+    #$msg = is_scalar($msg) ? $msg : print_r($msg,true);
+    $msg = is_scalar($msg) ? $msg : print_r($msg,true);
+
+    if (self::client_header('Accept','ml')) {
+      $msg = '<pre class="debug">'
+        .(isset($_SERVER['HTTP_HOST']) ? htmlentities($msg) : $msg)
+  # NB 16.12.15       .(isset($_SERVER['HTTP_HOST']) ? htmlspecialchars($msg) : $msg)
+      .'</pre>'.NB_EOL;
+
+    } else {
+      $msg = "DEBUG: $msg\n";
+
+    }
+    self::msg($msg);
+
   }
 
   /*