diff --git a/installer/index.php b/installer/index.php index bb1b1ba..572ef80 100644 --- a/installer/index.php +++ b/installer/index.php @@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE); ini_set('display_errors', 1); define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR; diff --git a/program/include/iniset.php b/program/include/iniset.php index f223b0d..630001f 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -46,15 +46,12 @@ define('RCMAIL_VERSION', '0.8.1'); define('RCMAIL_CHARSET', 'UTF-8'); define('JS_OBJECT_NAME', 'rcmail'); define('RCMAIL_START', microtime(true)); +define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); if (!defined('INSTALL_PATH')) { define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); } -if (!defined('RCMAIL_CONFIG_DIR')) { - define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -} - // make sure path_separator is defined if (!defined('PATH_SEPARATOR')) { define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');