From b068a07db2c519cde6bf1715e725cb70f2bbbc35 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 26 Jun 2006 14:38:03 -0400
Subject: [PATCH] Typos, Optimizations, Updates
---
program/include/main.inc | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 364bfd5..0a158dc 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -42,6 +42,10 @@
// load config file
include_once('config/main.inc.php');
$CONFIG = is_array($rcmail_config) ? $rcmail_config : array();
+
+ // load host-specific configuration
+ rcmail_load_host_config($CONFIG);
+
$CONFIG['skin_path'] = $CONFIG['skin_path'] ? preg_replace('/\/$/', '', $CONFIG['skin_path']) : 'skins/default';
// load db conf
@@ -78,7 +82,7 @@
// we can use the database for storing session data
// session queries do not work with MDB2
- if ($CONFIG['db_backend']!='mdb2' && !$DB->is_error())
+ if (!$DB->is_error())
include_once('include/session.inc');
// init session
@@ -125,6 +129,24 @@
register_shutdown_function('rcmail_shutdown');
+ }
+
+
+// load a host-specific config file if configured
+function rcmail_load_host_config(&$config)
+ {
+ $fname = NULL;
+
+ if (is_array($config['include_host_config']))
+ $fname = $config['include_host_config'][$_SERVER['HTTP_HOST']];
+ else if (!empty($config['include_host_config']))
+ $fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
+
+ if ($fname && is_file('config/'.$fname))
+ {
+ include('config/'.$fname);
+ $config = array_merge($config, $rcmail_config);
+ }
}
@@ -313,8 +335,10 @@
$javascript = "var $JS_OBJECT_NAME = new rcube_webmail();\n";
$javascript .= "$JS_OBJECT_NAME.set_env('comm_path', '$COMM_PATH');\n";
- foreach ($CONFIG['javascript_config'] as $js_config_var){
- $javascript .= "$JS_OBJECT_NAME.set_env('$js_config_var', '" . $CONFIG[$js_config_var] . "');\n";
+ if (isset($CONFIG['javascript_config'] )){
+ foreach ($CONFIG['javascript_config'] as $js_config_var){
+ $javascript .= "$JS_OBJECT_NAME.set_env('$js_config_var', '" . $CONFIG[$js_config_var] . "');\n";
+ }
}
if (!empty($GLOBALS['_framed']))
@@ -718,7 +742,7 @@
{
$s_header_sent = TRUE;
send_nocacheing_headers();
- header('Content-Type: application/x-javascript');
+ header('Content-Type: application/x-javascript; charset='.$CHARSET);
print '/** remote response ['.date('d/M/Y h:i:s O')."] **/\n";
}
@@ -1190,14 +1214,16 @@
$task = $GLOBALS['_task'];
$title = !empty($CONFIG['product_name']) ? $CONFIG['product_name'].' :: ' : '';
- if ($task=='mail' && isset($GLOBALS['MESSAGE']['subject']))
+ if ($task=='login')
+ $title = rcube_label(array('name' => 'welcome', 'vars' => array('product' => $CONFIG['product_name'])));
+ else if ($task=='mail' && isset($GLOBALS['MESSAGE']['subject']))
$title .= $GLOBALS['MESSAGE']['subject'];
else if (isset($GLOBALS['PAGE_TITLE']))
$title .= $GLOBALS['PAGE_TITLE'];
else if ($task=='mail' && ($mbox_name = $IMAP->get_mailbox_name()))
$title .= rcube_charset_convert($mbox_name, 'UTF-7', 'UTF-8');
else
- $title .= $task;
+ $title .= ucfirst($task);
return rep_specialchars_output($title, 'html', 'all');
}
@@ -1225,7 +1251,7 @@
if ($attrib['type'])
$attrib['type'] = strtolower($attrib['type']);
else
- $attrib['type'] = ($attrib['image'] || $attrib['imagepas'] || $arg['imagect']) ? 'image' : 'link';
+ $attrib['type'] = ($attrib['image'] || $attrib['imagepas'] || $arg['imageact']) ? 'image' : 'link';
$command = $attrib['command'];
@@ -1235,7 +1261,7 @@
$attrib = $sa_buttons[$attrib['name']];
// add button to button stack
- else if($attrib['image'] || $arg['imagect'] || $attrib['imagepas'] || $attrib['class'])
+ else if($attrib['image'] || $arg['imageact'] || $attrib['imagepas'] || $attrib['class'])
{
if(!$attrib['name'])
$attrib['name'] = $command;
--
Gitblit v1.9.1