From 1b199cf23930ce6089d45b645a18e0d9d6a394d1 Mon Sep 17 00:00:00 2001
From: Woody Gilk <woody.gilk@kohanaphp.com>
Date: Sun, 12 Jul 2009 10:04:54 -0500
Subject: [PATCH] Added several additional checks to install.php, fixes #31

---
 install.php | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/install.php b/install.php
index 3cd43cb..b6ef88a 100644
--- a/install.php
+++ b/install.php
@@ -80,6 +80,14 @@
 				<td class="pass">Pass</td>
 			<?php endif ?>
 		</tr>
+		<tr>
+			<th>SPL Enabled</th>
+			<?php if (function_exists('spl_autoload_register')): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">PHP <a href="http://www.php.net/spl">SPL</a> is either not loaded or not compiled in.</td>
+			<?php endif ?>
+		</tr>
 		<tr>
 			<th>Reflection Enabled</th>
 			<?php if (class_exists('ReflectionClass')): ?>
@@ -116,10 +124,10 @@
 		<?php endif ?>
 		<tr>
 			<th>URI Determination</th>
-			<?php if (isset($_SERVER['REQUEST_URI']) OR isset($_SERVER['PHP_SELF'])): ?>
+			<?php if (isset($_SERVER['REQUEST_URI']) OR isset($_SERVER['PHP_SELF']) OR isset($_SERVER['PATH_INFO'])): ?>
 				<td class="pass">Pass</td>
 			<?php else: $failed = TRUE ?>
-				<td class="fail">Neither <code>$_SERVER['REQUEST_URI']</code> or <code>$_SERVER['PHP_SELF']</code> is available.</td>
+				<td class="fail">Neither <code>$_SERVER['REQUEST_URI']</code>, <code>$_SERVER['PHP_SELF']</code>, or <code>$_SERVER['PATH_INFO']</code> is available.</td>
 			<?php endif ?>
 		</tr>
 	</table>
@@ -130,7 +138,7 @@
 		<p id="results" class="pass">✔ Your environment passed all requirements.<br />
 			Remove or rename the <code>install<?php echo EXT ?></code> file now.</p>
 	<?php endif ?>
-	
+
 	<h1>Optional Tests</h1>
 
 	<p>
@@ -143,7 +151,31 @@
 			<?php if (extension_loaded('curl')): ?>
 				<td class="pass">Pass</td>
 			<?php else: ?>
-				<td class="fail">Kohana requires cURL to make use of the remote helper.</td>
+				<td class="fail">Kohana requires <a href="http://php.net/curl">cURL</a> for the Remote class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>mcrypt Enabled</th>
+			<?php if (extension_loaded('mcrypt')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana requires <a href="http://php.net/mcrypt">mcrypt</a> for the Encrypt class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>GD Enabled</th>
+			<?php if (function_exists('gd_info')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana requires <a href="http://php.net/pdo">GD</a> v2 for the Image class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>PDO Enabled</th>
+			<?php if (class_exists('PDO')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana can use <a href="http://php.net/pdo">PDO</a> to support additional databases.</td>
 			<?php endif ?>
 		</tr>
 	</table>