Thomas Bruederli
2013-06-28 0f39b4f4cdd60f4af5f85d656ed08698e86287ea
Enable legacy mode: allow running with old config files and log warnings every no and then
1 files modified
11 ■■■■■ changed files
program/lib/Roundcube/rcube_config.php 11 ●●●●● patch | view | raw | blame | history
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