[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.6,1.7

[Sebastian N. <no...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28283/include/tpl

Modified Files:
	config_local.inc.php 
Log Message:
enhancing usability

Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config_local.inc.php	11 Dec 2004 15:24:42 -0000	1.6
+++ config_local.inc.php	17 Jan 2005 17:00:18 -0000	1.7
@@ -1,6 +1,32 @@
 <?php # $Id$
 
-// Here be dragons and NO application logic!
+    /* I really don't know, where else to implement this and honestly
+     * I don't care. The code quality can't be reduced anymore. Even
+     * more honestly, I think, this is the right place for THIS
+     * application logic.
+     */
+
+    // Determine installed database extensions and offer only these
+    $config_local_tmp_databases =  array();
+
+    if (extension_loaded('mysql')) {
+      $config_local_tmp_databases['mysql'] = 'MySQL';
+    }
+    if (extension_loaded('postgres')) {
+      $config_local_tmp_databases['postgres'] = 'PostgreSQL';
+    }
+    if (extension_loaded('mysqli')) {
+      $config_local_tmp_databases['mysqli'] = 'MySQLi';
+    }
+    if (extension_loaded('sqlite')) {
+      $config_local_tmp_databases['sqlite'] = 'SQLite';
+    }
+
+    // Determine available rewrite methods   
+    $config_local_tmp_apache_modules = array('none' => 'Disable URL Rewriting',
+                                             'errordocs' => 'Use Apache errorhandling');
+    if(in_array('mod_rewrite', apache_get_modules()))
+      $config_local_tmp_apache_modules['rewrite'] = 'Use Apache mod_rewrite';
 
     $res = array();
     $res['database'] =
@@ -10,10 +36,7 @@
                                           'title'       => INSTALL_DBTYPE,
                                           'description' => INSTALL_DBTYPE_DESC,
                                           'type'        => 'list',
-                                          'default'     => array('mysql'    => 'MySQL',
-                                                                 'postgres' => 'PostgreSQL',
-                                                                 'mysqli'   => 'MySQLi',
-                                                                 'sqlite'   => 'SQLite'),
+                                          'default'     => $config_local_tmp_databases,
                                           'flags'       => array('nosave', 'simpleInstall')),
 
                                     array('var'         => 'dbHost',
@@ -230,9 +253,7 @@
                                           'title'       => INSTALL_REWRITE,
                                           'description' => INSTALL_REWRITE_DESC,
                                           'type'        => 'list',
-                                          'default'     => array('none'      => 'Disable URL Rewriting',
-                                                                 'errordocs' => 'Use Apache errorhandling',
-                                                                 'rewrite'   => 'Use Apache mod_rewrite')),
+                                          'default'     => $config_local_tmp_apache_modules),
 
                                     array('var'         => 'serverOffsetHours',
                                           'title'       => INSTALL_OFFSET,