diff options
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/config.php | 2 | ||||
| -rw-r--r-- | installer/index.php | 4 | ||||
| -rw-r--r-- | installer/rcube_install.php | 4 | ||||
| -rw-r--r-- | installer/test.php | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/installer/config.php b/installer/config.php index 12af1c660..53a4655ed 100644 --- a/installer/config.php +++ b/installer/config.php @@ -24,7 +24,7 @@ $_SESSION['allowinstaller'] = true; if (!empty($_POST['submit'])) { echo '<p class="notice">Copy or download the following configurations and save them in two files'; - echo ' (names above the text box) within the <tt>config/</tt> directory of your RoundCube installation.<br/>'; + echo ' (names above the text box) within the <tt>'.RCMAIL_CONFIG_DIR.'</tt> directory of your RoundCube installation.<br/>'; echo ' Make sure that there are no characters outside the <tt><?php ?></tt> brackets when saving the files.</p>'; $textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile")); diff --git a/installer/index.php b/installer/index.php index 4d0e6c448..ff31667f9 100644 --- a/installer/index.php +++ b/installer/index.php @@ -3,6 +3,8 @@ 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'); + $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; @@ -68,7 +70,7 @@ if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db')) if ($RCI->configured && !$RCI->getprop('enable_installer') && !$_SESSION['allowinstaller']) { // header("HTTP/1.0 404 Not Found"); echo '<h2 class="error">The installer is disabled!</h2>'; - echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in config/main.inc.php</p>'; + echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in '.RCMAIL_CONFIG_DIR.'/main.inc.php</p>'; echo '</div></body></html>'; exit; } diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 0c4544f5b..e528cfc1f 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -79,12 +79,12 @@ class rcube_install */ function _load_config($suffix) { - @include '../config/main.inc' . $suffix; + @include RCMAIL_CONFIG_DIR . '/main.inc' . $suffix; if (is_array($rcmail_config)) { $this->config += $rcmail_config; } - @include '../config/db.inc'. $suffix; + @include RCMAIL_CONFIG_DIR . '/db.inc'. $suffix; if (is_array($rcmail_config)) { $this->config += $rcmail_config; } diff --git a/installer/test.php b/installer/test.php index 0edfcc904..ca7c7add4 100644 --- a/installer/test.php +++ b/installer/test.php @@ -3,8 +3,8 @@ <h3>Check config files</h3> <?php -$read_main = is_readable(INSTALL_PATH.'config/main.inc.php'); -$read_db = is_readable(INSTALL_PATH.'config/db.inc.php'); +$read_main = is_readable(RCMAIL_CONFIG_DIR.'/main.inc.php'); +$read_db = is_readable(RCMAIL_CONFIG_DIR.'/db.inc.php'); if ($read_main && !empty($RCI->config)) { $RCI->pass('main.inc.php'); |