Feature 1255 :

- add postgres database engine
- change installation process to allow postgres or mysql database

git-svn-id: http://piwigo.org/svn/trunk@4410 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 113 insertions, 0 deletions

diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
new file mode 100644
index 000000000..1a657a874
--- /dev/null
+++ b/admin/include/functions_install.inc.php
@@ -0,0 +1,98 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/**
+ * loads an sql file and executes all queries
+ *
+ * Before executing a query, $replaced is... replaced by $replacing. This is
+ * useful when the SQL file contains generic words. Drop table queries are
+ * not executed.
+ *
+ * @param string filepath
+ * @param string replaced
+ * @param string replacing
+ * @return void
+ */
+function execute_sqlfile($filepath, $replaced, $replacing)
+{
+  $sql_lines = file($filepath);
+  $query = '';
+  foreach ($sql_lines as $sql_line)
+  {
+    $sql_line = trim($sql_line);
+    if (preg_match('/(^--|^$)/', $sql_line))
+    {
+      continue;
+    }
+    $query.= ' '.$sql_line;
+    // if we reached the end of query, we execute it and reinitialize the
+    // variable "query"
+    if (preg_match('/;$/', $sql_line))
+    {
+      $query = trim($query);
+      $query = str_replace($replaced, $replacing, $query);
+      // we don't execute "DROP TABLE" queries
+      if (!preg_match('/^DROP TABLE/i', $query))
+      {
+        global $install_charset_collate;
+        if ( !empty($install_charset_collate) )
+        {
+          if ( preg_match('/^(CREATE TABLE .*)[\s]*;[\s]*/im', $query, $matches) )
+          {
+            $query = $matches[1].' '.$install_charset_collate.';';
+          }
+        }
+        pwg_query($query);
+      }
+      $query = '';
+    }
+  }
+}
+
+/**
+ * Search for database engines available
+ *
+ * We search for functions_DATABASE_ENGINE.inc.php 
+ * and we check if the connect function for that database exists 
+ *
+ * @return array
+ */
+function available_engines()
+{
+  $engines = array();
+
+  $pattern = PHPWG_ROOT_PATH. 'include/dblayer/functions_%s.inc.php';
+  include_once PHPWG_ROOT_PATH. 'include/dblayer/dblayers.inc.php';
+
+  foreach ($dblayers as $engine_name => $engine)
+  {
+    if (file_exists(sprintf($pattern, $engine_name)) 
+	&& function_exists($engine['function_available']))
+    {
+      $engines[$engine_name] = $engine['engine'];
+    }
+  }
+  
+  return $engines;
+}
+?>
\ No newline at end of file
diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl
index bea1a3efe..27ab605a0 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/template/goto/install.tpl
@@ -84,6 +84,21 @@ TD {
     <tr class="throw">
       <th colspan="3">{'step1_title'|@translate}</th>
     </tr>
+    {if count($F_DB_ENGINES)>1}
+    <tr>
+      <td style="width: 30%;">{'step1_dbengine'|@translate}</td>
+      <td>
+	<select name="dblayer">
+	  {html_options options=$F_DB_ENGINES selected=$F_DB_LAYER}
+	</select>    
+      </td>
+      <td>{'step1_dbengine_info'|@translate}</td>
+    {else}
+    <td colspan="3">
+    <input type="hidden" name="dbengine" value="{$F_DB_LAYER}">
+    </td>
+    {/if}
+    </tr>
     <tr>
       <td style="width: 30%;">{'step1_host'|@translate}</td>
       <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}"></td>