Changeset 5239

Timestamp:

Mar 22, 2010, 12:41:19 AM (14 years ago)

Author:

patdenice

Message:

feature 1255: Move $confdb_sqlite_default and $confdbengine_select_default in install.php (as constants).
PDO::SQLite is now displayed as SQLite in install page.
Always display unique SQLite engine.

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/dblayer/dblayers.inc.php (modified) (1 diff)
• install.php (modified) (2 diffs)

trunk/admin/include/functions_install.inc.php

@@ -105 +105 @@
   }
 
-  if ($engines['sqlite']['available'] && $engines['pdo-sqlite']['available'])
+  if ($engines['sqlite']['available'] and !$engines['pdo-sqlite']['available'])
   {
-    if ($GLOBALS['conf']['db_sqlite_default']=='native')
-    {
-      unset($engines['pdo-sqlite']);
-    }
-    else 
-    {
-      unset($engines['sqlite']);
-    }
+    unset($engines['pdo-sqlite']);
+  }
+  elseif ($engines['pdo-sqlite']['available'] and !$engines['sqlite']['available'])
+  {
+    unset($engines['sqlite']);
+  }
+  elseif (DEFAULT_DB_SQLITE=='native')
+  {
+    unset($engines['pdo-sqlite']);
+  }
+  else
+  {
+    unset($engines['sqlite']);
   }
 

trunk/include/config_default.inc.php

@@ -528 +528 @@
   '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'] = 'mysql'; 
 
 // pass_convert : function to crypt or hash the clear user password to store

trunk/include/dblayer/dblayers.inc.php

@@ -35 +35 @@
                             );
 
-$dblayers['pdo-sqlite'] = array('engine' => 'PDO::SQLite',
+$dblayers['pdo-sqlite'] = array('engine' => 'SQLite',
                                 'class_available' => 'PDO'
                                 );

trunk/install.php

@@ -99 +99 @@
 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']))
 {
@@ -116 +125 @@
 $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'] : '';