Changeset 4985

Timestamp:

Feb 27, 2010, 9:00:00 PM (14 years ago)

Author:

nikrou

Message:

Feature 1460 : Customize form installation depending on database engine

• sqlite is proposed by default if severals

database engine are available (cf conf)

• sqlite is proposed before pdo-sqlite
• remove host, user and password for sqlite

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• admin/template/goto/include/install.inc.tpl (added)
• admin/template/goto/install.tpl (modified) (2 diffs)
• admin/template/goto/theme/roma/theme.css (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)

trunk/admin/include/functions_install.inc.php

@@ -87 +87 @@
   foreach ($dblayers as $engine_name => $engine)
   {
-    if (file_exists(sprintf($pattern, $engine_name)) 
-        && isset($engine['function_available'])
-        && function_exists($engine['function_available']))
+    if (file_exists(sprintf($pattern, $engine_name))) 
     {
-      $engines[$engine_name] = $engine['engine'];
-    }
-    elseif (file_exists(sprintf($pattern, $engine_name)) 
-            && isset($engine['class_available'])
-            && class_exists($engine['class_available']))
-    {
-      $engines[$engine_name] = $engine['engine'];
+      $engines[$engine_name]['label'] = $engine['engine'];
+      $engines[$engine_name]['available'] = 'disabled';
+
+      if (isset($engine['function_available'])
+          && function_exists($engine['function_available']))
+      {
+        $engines[$engine_name]['available'] = true;
+      }
+      elseif (isset($engine['class_available']) 
+              && class_exists($engine['class_available']))
+      {
+        $engines[$engine_name]['available'] = true;
+      } 
     }
   }
+
+  if (count($engines)>1)
+  {
+    $engines[$GLOBALS['conf']['dbengine_select_default']]['selected'] = true;
+  }
   
+  if ($engines['sqlite']['available'] && $engines['pdo-sqlite']['available'])
+  {
+    if ($GLOBALS['conf']['db_sqlite_default']=='native')
+    {
+      unset($engines['pdo-sqlite']);
+    }
+    else 
+    {
+      unset($engines['sqlite']);
+    }
+  }
+
   return $engines;
 }

trunk/admin/template/goto/install.tpl

@@ -10 +10 @@
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{include file="include/install.inc.tpl"}
 {literal}
 <style type="text/css">
@@ -89 +90 @@
       <td style="width: 30%;">{'step1_dbengine'|@translate}</td>
       <td>
-        <select name="dblayer">
-          {html_options options=$F_DB_ENGINES selected=$F_DB_LAYER}
+        <select name="dblayer" id="dblayer">
+          {foreach from=$F_DB_ENGINES key=k item=v}
+          <option value="{$k}"
+                  {if $k==$F_DB_LAYER or $v.selected} selected="selected"{/if}
+                  {if $v.available!=1} disabled="disabled"{/if}
+                  >{$v.label}</option>
+          {/foreach}
         </select>    
       </td>

trunk/admin/template/goto/theme/roma/theme.css

@@ -3 +3 @@
 input.rateButtonSelected /* <= why IE doesn't inherit this ? */ { color:#666; }
 INPUT, select, textarea { color:#999; background-color: #444; }  
+option[disabled] { background-color: #999; color: #444; }
 input[type="radio"], input[type="checkbox"] { background-color: transparent; }  
 /* INPUT[type="checkbox"], INPUT[type="radio"]

trunk/include/config_default.inc.php

@@ -520 +520 @@
   'email' => 'mail_address'
   );
+
+// database engine default choice between sqlite (native or via pdo)
+// if the twice are available.
+// $conf['db_sqlite_default'] = 'pdo'; 
+$conf['db_sqlite_default'] = 'native'; 
+
+// default database engine proposed if severals are available
+// choices : sqlite, mysql, pgsql, pdo-sqlite
+// see include/dblayer/dblayers.inc.php
+$conf['dbengine_select_default'] = 'sqlite'; 
 
 // pass_convert : function to crypt or hash the clear user password to store