Fix up the tests a bit

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

1 files changed, 33 insertions, 20 deletions

diff --git a/templates/show_test_table.inc.php b/templates/show_test_table.inc.php
index 6bcc5b03..ba22e717 100644
--- a/templates/show_test_table.inc.php
+++ b/templates/show_test_table.inc.php
@@ -23,27 +23,37 @@
 <tr>
     <td valign="top"><?php echo T_('PHP version'); ?></td>
     <td valign="top">[
-    <?php
-        if (!check_php_ver()) {
-            echo debug_result('',false);
-            if (function_exists('hash_algos')) { $algos = hash_algos(); }
-            $string = "<strong>" .  phpversion() . " " . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>";
-        }
-        else {
-            echo debug_result('',true);
-        }
-    ?>
+    <?php echo debug_result('', check_php_ver()); ?>
     ]
     </td>
     <td>
     <?php echo T_('This tests whether you are running at least the minimum version of PHP required by Ampache.'); ?>
-    <?php echo $string; ?>
+    </td>
+</tr>
+<tr>
+    <td valign="top"><?php echo T_('Hash extension'); ?></td>
+    <td valign="top">[
+    <?php echo debug_result('', function_exists('hash_algos')); ?>
+    ]
+    </td>
+    <td>
+    <?php echo T_('This tests whether you have the hash extension enabled. This extension is required by Ampache.'); ?>
+    </td>
+</tr>
+<tr>
+    <td valign="top"><?php echo T_('SHA256 Hash'); ?></td>
+    <td valign="top">[
+    <?php echo debug_result('', function_exists('hash_algos') ? in_array('sha256', hash_algos()) : false); ?>
+    ]
+    </td>
+    <td>
+    <?php echo T_('This tests whether the hash extension supports SHA256. This algorithm is required by Ampache.'); ?>
     </td>
 </tr>
 <tr>
     <td valign="top"><?php echo T_('PHP PDO'); ?></td>
     <td valign="top">[
-    <?php   echo debug_result('', check_pdo()); ?>
+    <?php echo debug_result('', check_pdo()); ?>
     ]
     </td>
     <td>
@@ -53,14 +63,7 @@
 <tr>
     <td valign="top"><?php echo T_('PHP session extension'); ?></td>
     <td valign="top">[
-    <?php
-        if (!check_php_session()) {
-            echo debug_result('',false);
-        }
-        else {
-            echo debug_result('',true);
-        }
-    ?>
+    <?php echo debug_result('', check_php_session()); ?>
     ]
     </td>
     <td>
@@ -84,6 +87,16 @@
     </td>
 </tr>
 <tr>
+    <td valign="top"><?php echo T_('JSON extension'); ?></td>
+    <td valign="top">[
+    <?php echo debug_result('', function_exists('json_encode')); ?>
+    ]
+    </td>
+    <td>
+    <?php echo T_('This tests whether you have the JSON extension enabled. This extension is required by Ampache.'); ?>
+    </td>
+</tr>
+<tr>
     <td valign="top"><?php echo T_('PHP safe mode disabled'); ?></td>
     <td valign="top">[
     <?php