From 99fd9d7fe22a8aa81b3f54c2edbcabf95e2526d4 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Mon, 19 Sep 2011 13:35:23 -0400
Subject: Make debug and install tests friendlier

"PHP putenv support" had nothing to do with putenv.  Split it into
multiple tests and have the output actually correspond to what we're
checking.
---
 templates/show_install_check.inc.php | 24 +++++++++++-------------
 templates/show_test.inc.php          | 24 +++++++++++++++++++++---
 2 files changed, 32 insertions(+), 16 deletions(-)

(limited to 'templates')

diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php
index 42e5e51a..ecb820bc 100644
--- a/templates/show_install_check.inc.php
+++ b/templates/show_install_check.inc.php
@@ -132,19 +132,6 @@
 ?>
 </td>
 </tr><tr>
-<td><?php echo _('PHP putenv Support'); ?>:</td>
-<td>
-<?php
-	if (!check_putenv()) {
-		echo debug_result('',false);
-		Error::add('install', _('PHP putenv Support'));
-	}
-	else {
-		echo debug_result('',true);
-	}
-?>
-</td>
-</tr><tr>
 <th colspan="2"><h4><?php echo _('Optional'); ?></h4></th>
 </tr><tr>
 <td><?php echo _('PHP gettext Support'); ?>:</td>
@@ -171,6 +158,17 @@
 ?>
 </td>
 </tr><tr>
+<td><?php echo _('PHP Safe Mode'); ?>:</td>
+<?php
+	if (!check_safemode()) {
+		echo debug_result(_('Safe mode enabled'), false);
+	}
+	else {
+		echo debug_result(_('Safe mode not enabled'), true);
+	}
+?>
+</td>
+</tr><tr>
 <td><?php echo _('PHP Memory Limit'); ?>:</td>
 <td>
 <?php
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 480bee7d..fcc070bd 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -135,10 +135,10 @@
 	</td>
 </tr>
 <tr>
-	<td valign="top"><?php echo _('PHP PutENV Support'); ?></td>
+	<td valign="top"><?php echo _('PHP Safe Mode'); ?></td>
 	<td valign="top">[
 	<?php
-		if (!check_putenv()) {
+		if (!check_safemode()) {
 			echo debug_result('',false);
 		}
 		else {
@@ -147,9 +147,27 @@
 	?>]
 	</td>
 	<td>
-	<?php echo _('This test makes sure that PHP isn\'t running in SafeMode and that we are able to modify the memory limits. While not required, without these abilities some features of ampache may not work correctly'); ?>
+	<?php echo _("This test makes sure that PHP isn't running in safe mode.  Some features of Ampache may not work correctly in safe mode."); ?>
 	</td>
 </tr>
+<tr>
+	<td valign="top"><?php echo _('Override Memory Limit'); ?></td>
+	<td valign="top">[
+	<?php echo debug_result('', check_override_memory()); ?>]
+	</td>
+	<td>
+	<?php echo _('This tests whether Ampache can override the memory limit.  This is not strictly necessary, but may result in a better experience.'); ?>
+	</td>
+</tr>
+<tr>
+	<td valign="top"><?php echo _('Override Execution Limit'); ?></td>
+	<td valign="top">[
+	<?php echo debug_result('', check_override_exec_time()); ?>]
+	</td>
+	<td>
+	<?php echo _('This tests whether Ampache can override the limit on maximum execution time.  This is not strictly necessary, but may result in a better experience.'); ?>
+	</td>
+</tr>	
 <tr>
 	<td valign="top"><?php echo sprintf(_("%s is readable"),"ampache.cfg.php"); ?></td>
 	<td valign="top">[
-- 
cgit