diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 17:35:53 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 17:35:53 +0100 |
| commit | 9be2f43d02cd54340fc64c9b2cee9cfa94b49034 (patch) | |
| tree | 6972efcd24b6ac12643a93ae19fbcab5411938fd /program/lib/Roundcube/rcube.php | |
| parent | 5352b55779aadc8b4c665daf69c7a27767f17d78 (diff) | |
Define more (uniquely prefixed) constants for Roundcube directories in order to enhance the interoperability of the Roundcube framework
Diffstat (limited to 'program/lib/Roundcube/rcube.php')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 9c1a6d84a..0eed6cf67 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -596,8 +596,8 @@ class rcube ob_start(); // get english labels (these should be complete) - @include(INSTALL_PATH . 'program/localization/en_US/labels.inc'); - @include(INSTALL_PATH . 'program/localization/en_US/messages.inc'); + @include(RCUBE_LOCALIZATION_DIR . 'en_US/labels.inc'); + @include(RCUBE_LOCALIZATION_DIR . 'en_US/messages.inc'); if (is_array($labels)) $this->texts = $labels; @@ -605,9 +605,9 @@ class rcube $this->texts = array_merge($this->texts, $messages); // include user language files - if ($lang != 'en' && $lang != 'en_US' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { - include_once(INSTALL_PATH . 'program/localization/' . $lang . '/labels.inc'); - include_once(INSTALL_PATH . 'program/localization/' . $lang . '/messages.inc'); + if ($lang != 'en' && $lang != 'en_US' && is_dir(RCUBE_LOCALIZATION_DIR . $lang)) { + include_once(RCUBE_LOCALIZATION_DIR . $lang . '/labels.inc'); + include_once(RCUBE_LOCALIZATION_DIR . $lang . '/messages.inc'); if (is_array($labels)) $this->texts = array_merge($this->texts, $labels); @@ -645,7 +645,7 @@ class rcube } if (empty($rcube_languages)) { - @include(INSTALL_PATH . 'program/localization/index.inc'); + @include(RCUBE_LOCALIZATION_DIR . 'index.inc'); } // check if we have an alias for that language @@ -666,7 +666,7 @@ class rcube } } - if (!isset($rcube_languages[$lang]) || !is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { + if (!isset($rcube_languages[$lang]) || !is_dir(RCUBE_LOCALIZATION_DIR . $lang)) { $lang = 'en_US'; } @@ -684,11 +684,11 @@ class rcube static $sa_languages = array(); if (!sizeof($sa_languages)) { - @include(INSTALL_PATH . 'program/localization/index.inc'); + @include(RCUBE_LOCALIZATION_DIR . 'index.inc'); - if ($dh = @opendir(INSTALL_PATH . 'program/localization')) { + if ($dh = @opendir(RCUBE_LOCALIZATION_DIR)) { while (($name = readdir($dh)) !== false) { - if ($name[0] == '.' || !is_dir(INSTALL_PATH . 'program/localization/' . $name)) { + if ($name[0] == '.' || !is_dir(RCUBE_LOCALIZATION_DIR . $name)) { continue; } @@ -1017,7 +1017,7 @@ class rcube $log_dir = self::$instance ? self::$instance->config->get('log_dir') : null; if (empty($log_dir)) { - $log_dir = INSTALL_PATH . 'logs'; + $log_dir = RCUBE_INSTALL_PATH . 'logs'; } // try to open specific log file for writing |