Changeset 4985 for trunk/admin/include/functions_install.inc.php

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

File:

• trunk/admin/include/functions_install.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;
 }