/opt/nb/lib/php/functions.php

diff --git a/lib/php/cache.php b/lib/php/cache.php
index 392fc9b62aa6c48460dc5868dd598481a1d94ff0..f7165c7d59d57acb0eea5c6903a6705c41b98dc0 100644 (file)
--- a/lib/php/cache.php
+++ b/lib/php/cache.php
@@ -1,5 +1,4 @@
 <?php
-require_once(realpath(dirname(__FILE__).'/functions.php'));
 if (!defined('CACHE_DIR')) define('CACHE_DIR',"/tmp/cache.php");
 if (!file_exists(CACHE_DIR)) mkdir(CACHE_DIR,7770);
 

diff --git a/lib/php/functions.php b/lib/php/functions.php
index d331a15689432e0d3d635d35ee49a69dd202c5fe..76a549ca4692952cbdd4bf293f2d730cbf9d1df9 100644 (file)
--- a/lib/php/functions.php
+++ b/lib/php/functions.php
@@ -29,27 +29,27 @@ function file_write($file,$data,$mode='w') {
 
 }
 
-function ar_first($ar) { return (is_array($ar) and count($ar)) ? $ar[0] : false; }
-
-function ar_map($return,$array,$as_hash=false) {
-  $map = array_map(function($a) use($return) { return($return); },$array);
-
-  if ($as_hash) {
-
-    $new = array();
-
-    foreach ($map as $k => $v) {
-      foreach ($v as $kk => $vv) {
-        $new[$kk] = $vv;
-      }
-    }
-
-    $map = $new;
-
-  }
-
-  return $map;
-}
+# NB 13.07.19 function ar_first($ar) { return (is_array($ar) and count($ar)) ? $ar[0] : false; }
+
+# NB 13.07.19 function ar_map($return,$array,$as_hash=false) {
+# NB 13.07.19   $map = array_map(function($a) use($return) { return($return); },$array);
+# NB 13.07.19 
+# NB 13.07.19   if ($as_hash) {
+# NB 13.07.19 
+# NB 13.07.19     $new = array();
+# NB 13.07.19 
+# NB 13.07.19     foreach ($map as $k => $v) {
+# NB 13.07.19       foreach ($v as $kk => $vv) {
+# NB 13.07.19         $new[$kk] = $vv;
+# NB 13.07.19       }
+# NB 13.07.19     }
+# NB 13.07.19 
+# NB 13.07.19     $map = $new;
+# NB 13.07.19 
+# NB 13.07.19   }
+# NB 13.07.19 
+# NB 13.07.19   return $map;
+# NB 13.07.19 }
 
 function txt2md($txt) {
 # NB 28.11.16: TODO rename as Nb::md2html 

diff --git a/lib/php/nb.php b/lib/php/nb.php
index d7a456bf7c33150b5332bee4079264caf073105c..546ff96c9059a89b13d98cc7ed9edabe24146e6f 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -210,7 +210,24 @@ class NB {
         * Does what it says
         */
        public static function ar_map($return,$array,$as_hash=false) {
-               return ar_map($return,$array,$as_hash);
+               #return ar_map($return,$array,$as_hash);
+       $map = array_map(function($a) use($return) { return($return); },$array);
+
+       if ($as_hash) {
+
+       $new = array();
+
+       foreach ($map as $k => $v) {
+       foreach ($v as $kk => $vv) {
+               $new[$kk] = $vv;
+       }
+       }
+
+       $map = $new;
+
+       }
+
+       return $map;
        }
 
        /*
@@ -927,7 +944,7 @@ class NB {
        }
 
        public static function encrypt($key,$value) {
-               return self::_encrypt($key,$value);
+               return base64_encode(self::_encrypt_decrypt_object($key)->encrypt($value));
                static $iv = null;
                if ($iv === null) {
                        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC);
@@ -937,7 +954,7 @@ class NB {
        }
 
        public static function decrypt($key,$value) {
-               return self::_decrypt($key,$value);
+               return self::_encrypt_decrypt_object($key)->decrypt(base64_decode($value));
                static $iv_size = null;
                if ($iv_size === null) {
                        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC);
@@ -957,17 +974,9 @@ class NB {
 # NB 31.01.19          return self::_encrypt_decrypt_object($key)->decrypt($value);
        }
 
-       public static function _decrypt($key,$value) {
-               debug($key);
-               return self::_encrypt_decrypt_object($key)->decrypt(base64_decode($value));
-       }
-
-       public static function _encrypt($key,$value) {
-               return base64_encode(self::_encrypt_decrypt_object($key)->encrypt($value));
-       }
-
        public static function is_vm() {
-               return file_exists('/proc/cpuinfo') && preg_match('/^flags.* hypervisor/m',file_get_contents('/proc/cpuinfo'));
+               require_once(NB_ROOT.'/lib/php/sys.php');
+               return Sys::is_vm();
        }
 
        public static function html2txt($txt) {

diff --git a/lib/php/sys.php b/lib/php/sys.php
new file mode 100644 (file)
index 0000000..cf50578
--- /dev/null
+++ b/lib/php/sys.php
@@ -0,0 +1,8 @@
+<?php
+# sys.php
+class Sys {
+       public static function is_vm() {
+               return file_exists('/proc/cpuinfo') && preg_match('/^flags.* hypervisor/m',file_get_contents('/proc/cpuinfo'));
+       }
+}
+?>