From 0f39b4f4cdd60f4af5f85d656ed08698e86287ea Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 28 Jun 2013 16:27:30 -0400
Subject: [PATCH] Enable legacy mode: allow running with old config files and log warnings every no and then
---
program/lib/Roundcube/rcube_config.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index ff398bc..90bb853 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -76,11 +76,14 @@
// load main config file
if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'config.inc.php')) {
- $this->errors[] = 'config.inc.php was not found.';
-
// Old configuration files
- $this->load_from_file(RCUBE_CONFIG_DIR . 'main.inc.php');
- $this->load_from_file(RCUBE_CONFIG_DIR . 'db.inc.php');
+ if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'main.inc.php') ||
+ !$this->load_from_file(RCUBE_CONFIG_DIR . 'db.inc.php')) {
+ $this->errors[] = 'config.inc.php was not found.';
+ }
+ else if (rand(1,100) == 10) { // log warning on every 100th request (average)
+ trigger_error("config.inc.php was not found. Please migrate your config by running bin/update.sh", E_USER_WARNING);
+ }
}
// load host-specific configuration
--
Gitblit v1.9.1