From 807d17a4bedae6d2ebc2eda3236fe1740422b3ba Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 3 Mar 2008 21:32:15 +0000
Subject: Make rcube_install class PHP4 compatible + add warning for MDB2 on
 PHP4 + set MDB2 as default

---
 config/db.inc.php.dist      | 2 +-
 installer/rcube_install.php | 4 ++--
 installer/test.php          | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index b1cd37ed1..442ef6ed4 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -27,7 +27,7 @@ $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 $rcmail_config['db_dsnr'] = '';
 
 // database backend to use (only db or mdb2 are supported)
-$rcmail_config['db_backend'] = 'db';
+$rcmail_config['db_backend'] = 'mdb2';
 
 // maximum length of a query in bytes
 $rcmail_config['db_max_length'] = 512000;  // 500K
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 79d003cdf..8caa79d02 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -103,7 +103,7 @@ class rcube_install
     $value = $this->is_post && (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_POST["_$name"] : $this->config[$name];
     
     if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
-      $value = self::random_key(24);
+      $value = rcube_install::random_key(24);
     
     return $value !== null && $value !== '' ? $value : $default;
   }
@@ -143,7 +143,7 @@ class rcube_install
         $value = '';
       }
       else if ($prop == 'default_host' && is_array($value)) {
-        $value = self::_clean_array($value);
+        $value = rcube_install::_clean_array($value);
         if (count($value) <= 1)
           $value = $value[0];
       }
diff --git a/installer/test.php b/installer/test.php
index d83534bb3..7e9903991 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -55,6 +55,8 @@ if (!empty($RCI->config)) {
             $RCI->fail('DSN (write)', $db_error_msg);
             echo '<p class="hint">Make sure that the configured database extists and that the user as write privileges<br />';
             echo 'DSN: ' . $RCI->config['db_dsnw'] . '</p>';
+            if ($RCI->config['db_backend'] == 'mdb2')
+              echo '<p class="hint">There are known problems with MDB2 running on PHP 4. Try setting <tt>db_backend</tt> to \'db\' instead</p>';
         }
     }
     else {
-- 
cgit v1.2.3