# Author: Nicolas Roudaire <nikrou77@gmail.com>
# Description : dbconfig-common deals with sqlite3 and
# Piwigo understand sqlite.

--- piwigo.orig/include/dblayer/functions_sqlite.inc.php
+++ piwigo/include/dblayer/functions_sqlite.inc.php
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-define('REQUIRED_SQLITE_VERSION', '3.0.0');
+define('REQUIRED_SQLITE3_VERSION', '3.0.0');
 define('DB_ENGINE', 'SQLite');
 
 define('DB_REGEX_OPERATOR', 'REGEXP');
@@ -37,7 +37,7 @@
 {
   global $conf;
 
-  $db_file = sprintf('%s/%s.db', $conf['local_data_dir'], $database);
+  $db_file = sprintf('%s/%s', $conf['local_data_dir'], $database);
 
   if (script_basename()=='install') 
   {
--- piwigo.orig/include/dblayer/dblayers.inc.php
+++ piwigo/include/dblayer/dblayers.inc.php
@@ -30,7 +30,7 @@
 			   'function_available' => 'pg_connect'
 			   );
 
-$dblayers['sqlite'] = array('engine' => 'SQLite',
+$dblayers['sqlite3'] = array('engine' => 'SQLite',
 			    'class_available' => 'SQLite3'
 			    );
 
--- piwigo.orig/admin/include/functions_install.inc.php
+++ piwigo/admin/include/functions_install.inc.php
@@ -103,13 +103,13 @@
     }
   }
 
-  if ($engines['sqlite']['available'] and !$engines['pdo-sqlite']['available'])
+  if ($engines['sqlite3']['available'] and !$engines['pdo-sqlite']['available'])
   {
     unset($engines['pdo-sqlite']);
   }
-  elseif ($engines['pdo-sqlite']['available'] and !$engines['sqlite']['available'])
+  elseif ($engines['pdo-sqlite']['available'] and !$engines['sqlite3']['available'])
   {
-    unset($engines['sqlite']);
+    unset($engines['sqlite3']);
   }
   elseif (DEFAULT_DB_SQLITE=='native')
   {
@@ -117,7 +117,7 @@
   }
   else
   {
-    unset($engines['sqlite']);
+    unset($engines['sqlite3']);
   }
 
   return $engines;
--- piwigo.orig/admin/themes/default/template/install.tpl
+++ piwigo/admin/themes/default/template/install.tpl
@@ -17,7 +17,7 @@
 <script type="text/javascript">
 $(function() {
     $option_selected = $('#dblayer option:selected').attr('value');
-    if ($option_selected=='sqlite' || $option_selected=='pdo-sqlite') {
+    if ($option_selected=='sqlite3' || $option_selected=='pdo-sqlite') {
        $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
     }
     if ($option_selected=='mysql') {
@@ -26,7 +26,7 @@
 
     $('#dblayer').change(function() {
         $db = this;
-        if ($db.value=='sqlite' || $db.value=='pdo-sqlite') {
+        if ($db.value=='sqlite3' || $db.value=='pdo-sqlite') {
            $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().hide();
         } else {
            $('input[name=dbhost],input[name=dbuser],input[name=dbpasswd]').parent().parent().show();
