From e506b8f7f9b02dc3eccded47275d2798eff5b3ac Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 1 May 2014 02:47:56 +0200
Subject: [PATCH] Installer database adjustments

We can't say we officially support PostgreSQL, unfortunately. There
are too many database calls with MySQL specific syntax. This would be
desirable for a 2.0 release, but too much work while maintaining 1.x.

The main difficulty is that we're using PEAR::DB which is aging. If
that's exchanged, maybe we could use PDO or something.
---
 install.php       | 6 ++++--
 lib/installer.php | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/install.php b/install.php
index 352d5a143c..f9d69262e2 100644
--- a/install.php
+++ b/install.php
@@ -165,7 +165,9 @@ class WebInstaller extends Installer
                 } else {
                     $checked = '';
                 }
-                $dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n";
+                $dbRadios .= sprintf('<input type="radio" name="dbtype" id="dbtype-%1$s" value="%1$s" %2$s/>%3$s<br />',
+                                htmlspecialchars($type), $checked,
+                                htmlspecialchars($info['name']));
             }
         }
 
@@ -212,7 +214,7 @@ class WebInstaller extends Installer
                     </li>
                     <li>
                         <label for="dbtype">Type</label>
-                        $dbRadios
+                        {$dbRadios}
                         <p class="form_guide">Database type</p>
                     </li>
                     <li>
diff --git a/lib/installer.php b/lib/installer.php
index b649dc3e2c..5e483df82c 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -53,15 +53,15 @@ abstract class Installer
 
     public static $dbModules = array(
         'mysql' => array(
-            'name' => 'MySQL',
+            'name' => 'MariaDB (or MySQL 5.5+)',
             'check_module' => 'mysqli',
             'scheme' => 'mysqli', // DSN prefix for PEAR::DB
         ),
-        'pgsql' => array(
+/*        'pgsql' => array(
             'name' => 'PostgreSQL',
             'check_module' => 'pgsql',
             'scheme' => 'pgsql', // DSN prefix for PEAR::DB
-        ),
+        ),*/
     );
 
     /**
-- 
2.39.5