From 9be2f43d02cd54340fc64c9b2cee9cfa94b49034 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 25 Nov 2012 17:35:53 +0100 Subject: Define more (uniquely prefixed) constants for Roundcube directories in order to enhance the interoperability of the Roundcube framework --- program/lib/Roundcube/rcube_output_html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/lib/Roundcube/rcube_output_html.php') diff --git a/program/lib/Roundcube/rcube_output_html.php b/program/lib/Roundcube/rcube_output_html.php index d751eb294..f5c639707 100644 --- a/program/lib/Roundcube/rcube_output_html.php +++ b/program/lib/Roundcube/rcube_output_html.php @@ -592,7 +592,7 @@ class rcube_output_html extends rcube_output $ERROR_CODE = $code; $ERROR_MESSAGE = $message; - include INSTALL_PATH . 'program/steps/utils/error.inc'; + include RCUBE_INSTALL_PATH . 'program/steps/utils/error.inc'; exit; } @@ -921,11 +921,11 @@ class rcube_output_html extends rcube_output } else if ($object == 'version') { $ver = (string)RCMAIL_VERSION; - if (is_file(INSTALL_PATH . '.svn/entries')) { + if (is_file(RCUBE_INSTALL_PATH . '.svn/entries')) { if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs)) $ver .= ' [SVN r'.$regs[1].']'; } - else if (is_file(INSTALL_PATH . '.git/index')) { + else if (is_file(RCUBE_INSTALL_PATH . '.git/index')) { if (preg_match('/Date:\s+([^\n]+)/', @shell_exec('git log -1'), $regs)) { if ($date = date('Ymd.Hi', strtotime($regs[1]))) { $ver .= ' [GIT '.$date.']'; @@ -1760,7 +1760,7 @@ class rcube_output_html extends rcube_output 'about.html', ); foreach ($filenames as $file) { - $fn = RCMAIL_CONFIG_DIR . '/' . $file; + $fn = RCUBE_CONFIG_DIR . '/' . $file; if (is_readable($fn)) { $content = file_get_contents($fn); $content = $this->parse_conditions($content); -- cgit v1.2.3