Fix up the tests a bit

The hash check shouldn't be mixed in with the version check, and we now
need JSON.

2 files changed, 5 insertions, 28 deletions

diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index f96c9ffa..d3fa035b 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -26,22 +26,11 @@
  * sure that it's good enough
  */
 function check_php_ver($level=0) {
-
     if (floatval(phpversion()) < 5.3) {
         return false;
     }
-
-    // Make sure that they have the sha256() algo installed
-    if (!function_exists('hash_algos')) { return false; }
-    $algos = hash_algos();
-
-    if (!in_array('sha256',$algos)) {
-        return false;
-    }
-
     return true;
-
-} // check_php_ver
+}
 
 /**
  * check_php_session
@@ -59,21 +48,6 @@ function check_php_session() {
 } // check_php_session
 
 /**
- * check_php_pcre
- * This makes sure they have pcre (preg_???) support
- * compiled into PHP this is required!
- */
-function check_php_pcre() {
-
-    if (!function_exists('preg_match')) {
-        return false;
-    }
-
-    return true;
-
-} // check_php_pcre
-
-/**
  * check_pdo
  *
  * Checks to make sure that PDO is available.
diff --git a/lib/init.php b/lib/init.php
index 8b8248f0..672f945e 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -53,7 +53,10 @@ else {
 
 // Verify that a few important but commonly disabled PHP functions exist and
 // that we're on a usable version
-if (!function_exists('hash') || !function_exists('inet_pton') || (floatval(phpversion()) < 5.3) || !class_exists('PDO')) {
+if (!function_exists('json_encode') ||
+    !function_exists('hash') ||
+    (floatval(phpversion()) < 5.3) ||
+    !class_exists('PDO')) {
     $link = $path . '/test.php';
 }