[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.34,1.35

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv30576

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
* Fixed bug: Clicking "toggle all" only expands the first two categories
* Added check during installation for non-apache servers
* Added check during installation for non-supported PHP version


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin_installer.inc.php	2 Sep 2003 16:50:27 -0000	1.34
+++ serendipity_admin_installer.inc.php	2 Sep 2003 17:31:41 -0000	1.35
@@ -149,7 +149,7 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     $el_count = 0;
@@ -470,10 +470,21 @@
         break;
 
     default:
+        /*  Is serendipity already installed=  */
         if ( file_exists('./serendipity_config_local.inc.php') ) {
             $from = &$serendipity;
-        }
-        else {
+        } else {
+            /* Do check for non-apache servers */
+            if ( !eregi('apache', $_SERVER['SERVER_SOFTWARE']) ) {
+                echo '<br /><font color="#FF000">WARNING!<br />You are about to attempt to install Serendipity on a non-apache webserver.<br />Serendipity requires the Apache Werbserver to function correctly!</font>';
+            }
+            
+            define('VERSION_REQUIRED', '4.3.0');
+            
+            /* Do check for required PHP version */
+            if ( version_compare(PHP_VERSION, VERSION_REQUIRED) == -1 ) {
+                echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';
+            }
             $from = false;
         }