diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index 65b1a24d6..166ed6b7d 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -86,20 +86,41 @@ function available_engines() 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; } ?> \ No newline at end of file diff --git a/admin/template/goto/include/install.inc.tpl b/admin/template/goto/include/install.inc.tpl new file mode 100644 index 000000000..b153f0f30 --- /dev/null +++ b/admin/template/goto/include/install.inc.tpl @@ -0,0 +1,19 @@ + +{literal} + +{/literal} diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl index 6976d8ccc..2b83d3bf4 100644 --- a/admin/template/goto/install.tpl +++ b/admin/template/goto/install.tpl @@ -9,6 +9,7 @@ +{include file="include/install.inc.tpl"} {literal}