From cead5c727147faac362e742aa7bcecf07f68cd99 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 May 2006 17:24:42 -0400
Subject: [PATCH] Updated CHANGELOG
---
program/include/main.inc | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 67d596d..4186128 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -76,17 +76,15 @@
$DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
$DB->db_connect('w');
-
// we can use the database for storing session data
// session queries do not work with MDB2
if ($CONFIG['db_backend']!='mdb2' && !$DB->is_error())
include_once('include/session.inc');
-
// init session
session_start();
$sess_id = session_id();
-
+
// create session and set session vars
if (!$_SESSION['client_id'])
{
@@ -113,7 +111,6 @@
// set current task to session
$_SESSION['task'] = $task;
-
// create IMAP object
if ($task=='mail')
@@ -194,7 +191,6 @@
if (!empty($_SESSION['mbox']))
$IMAP->set_mailbox($_SESSION['mbox']);
-
if (isset($_SESSION['page']))
$IMAP->set_page($_SESSION['page']);
}
@@ -317,12 +313,19 @@
$javascript = "var $JS_OBJECT_NAME = new rcube_webmail();\n";
$javascript .= "$JS_OBJECT_NAME.set_env('comm_path', '$COMM_PATH');\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']))
$javascript .= "$JS_OBJECT_NAME.set_env('framed', true);\n";
$OUTPUT->add_script($javascript);
- $OUTPUT->include_script('program/js/common.js');
- $OUTPUT->include_script('program/js/app.js');
+ $OUTPUT->include_script('common.js');
+ $OUTPUT->include_script('app.js');
+ $OUTPUT->scripts_path = 'program/js/';
// set locale setting
rcmail_set_locale($sess_user_lang);
@@ -717,7 +720,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";
}
@@ -1189,14 +1192,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');
}
@@ -1224,7 +1229,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'];
@@ -1234,7 +1239,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