From fdb92b15fa6ce135e298e215d97af11640156692 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Sun, 21 Mar 2010 23:41:19 +0000
Subject: feature 1255: Move $conf['db_sqlite_default'] and
 $conf['dbengine_select_default'] in install.php (as constants). PDO::SQLite
 is now displayed as SQLite in install page. Always display unique SQLite
 engine.

git-svn-id: http://piwigo.org/svn/trunk@5239 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 install.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'install.php')

diff --git a/install.php b/install.php
index d722288f5..080b262e1 100644
--- a/install.php
+++ b/install.php
@@ -98,6 +98,15 @@ if( !@get_magic_quotes_gpc() )
 
 define('DEFAULT_PREFIX_TABLE', 'piwigo_');
 
+// default database engine proposed if severals are available
+// choices : sqlite, mysql, pgsql, pdo-sqlite
+// see include/dblayer/dblayers.inc.php
+define('DEFAULT_DB_ENGINE', 'mysql');
+
+// database engine default choice between sqlite (native or via pdo)
+// if the twice are available.
+define('DEFAULT_DB_SQLITE', 'native'); 
+
 if (isset($_POST['install']))
 {
   $prefixeTable = $_POST['prefix'];
@@ -115,7 +124,7 @@ $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
 $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : '';
 $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : '';
 $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : '';
-$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : $conf['dbengine_select_default'];
+$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : DEFAULT_DB_ENGINE;
 
 $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : '';
 $admin_pass1 = (!empty($_POST['admin_pass1'])) ? $_POST['admin_pass1'] : '';
-- 
cgit v1.2.3