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

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

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

Modified Files:
	config_local.inc.php 
Log Message:
- Here be dragons and NO application logic!
- Add "probeDefault" flag, which will run $item['var'] through serendipity_probeInstallation() and set the returned value as $item['default']


Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config_local.inc.php	17 Jan 2005 17:00:18 -0000	1.7
+++ config_local.inc.php	17 Jan 2005 19:07:34 -0000	1.8
@@ -1,32 +1,6 @@
 <?php # $Id$
 
-    /* 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';
+    // Here be dragons and NO application logic!
 
     $res = array();
     $res['database'] =
@@ -36,8 +10,8 @@
                                           'title'       => INSTALL_DBTYPE,
                                           'description' => INSTALL_DBTYPE_DESC,
                                           'type'        => 'list',
-                                          'default'     => $config_local_tmp_databases,
-                                          'flags'       => array('nosave', 'simpleInstall')),
+                                          'default'     => array(),
+                                          'flags'       => array('nosave', 'simpleInstall', 'probeDefault')),
 
                                     array('var'         => 'dbHost',
                                           'title'       => INSTALL_DBHOST,
@@ -253,7 +227,8 @@
                                           'title'       => INSTALL_REWRITE,
                                           'description' => INSTALL_REWRITE_DESC,
                                           'type'        => 'list',
-                                          'default'     => $config_local_tmp_apache_modules),
+                                          'default'     => array(),
+                                          'flags'       => array('probeDefault')),
 
                                     array('var'         => 'serverOffsetHours',
                                           'title'       => INSTALL_OFFSET,