From b2fb950fb58971a05d1c4d090132ab67afe6a6bd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 28 May 2007 15:08:36 -0400
Subject: [PATCH] Prevent default events on subject link; fixed typo in smtp script
---
program/js/list.js | 16 +++++++++++-----
CHANGELOG | 7 +++++++
program/steps/mail/func.inc | 4 ++--
program/include/rcube_smtp.inc | 2 +-
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f78d3dc..54830f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
CHANGELOG RoundCube Webmail
---------------------------
+2007/05/28 (thomasb)
+---------
+- Fixed buggy imap_root settings (closes #1484379)
+- Prevent default events on subject links (#1484399)
+- Typo in rcube_smtp.inc
+
+
2007/05/23 (estadtherr)
----------
- Upgrade to TinyMCE v2.1.1.1
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 6953e26..2ddb5cf 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -72,7 +72,7 @@
// create Net_SMTP object and connect to server
if (!is_object($smtp_conn))
{
- $helo_host = !empty($_SERVER['server_name']) ? $_SERVER['server_name'] : 'localhost';
+ $helo_host = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost';
$SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
// set debugging
diff --git a/program/js/list.js b/program/js/list.js
index 23a9c34..c4f0240 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -41,6 +41,7 @@
this.dont_select = false;
this.drag_active = false;
this.last_selected = 0;
+ this.shift_start = 0;
this.in_selection_before = false;
this.focused = false;
this.drag_mouse_start = null;
@@ -218,7 +219,7 @@
if (this.draggable && this.selection.length)
{
this.drag_start = true;
- this.drag_mouse_start = rcube_event.get_mouse_pos(e);
+ this.drag_mouse_start = rcube_event.get_mouse_pos(e);
rcube_event.add_listener({element:document, event:'mousemove', object:this, method:'drag_mouse_move'});
rcube_event.add_listener({element:document, event:'mouseup', object:this, method:'drag_mouse_up'});
}
@@ -301,6 +302,9 @@
var select_before = this.selection.join(',');
if (!this.multiselect)
mod_key = 0;
+
+ if (!this.shift_start)
+ this.shift_start = id
if (!mod_key)
{
@@ -312,13 +316,12 @@
switch (mod_key)
{
case SHIFT_KEY:
- this.shift_select(id, false);
+ this.shift_select(id, false);
break;
case CONTROL_KEY:
- this.shift_start = id;
if (!with_mouse)
- this.highlight_row(id, true);
+ this.highlight_row(id, true);
break;
case CONTROL_SHIFT_KEY:
@@ -326,7 +329,7 @@
break;
default:
- this.highlight_row(id, false);
+ this.highlight_row(id, false);
break;
}
}
@@ -337,6 +340,9 @@
if (this.last_selected != 0 && this.rows[this.last_selected])
this.set_classname(this.rows[this.last_selected].obj, 'focused', false);
+
+ if (!this.selection.length)
+ this.shift_start = null;
this.last_selected = id;
this.set_classname(this.rows[id].obj, 'focused', true);
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index cc1187b..4267b48 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -460,7 +460,7 @@
$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draf_uid' : '_uid';
$cont = Q(rcube_imap::decode_mime_string($header->$col, $header->charset));
if (empty($cont)) $cont = Q(rcube_label('nosubject'));
- $cont = sprintf('<a href="%s" onclick="return false">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
+ $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
}
else if ($col=='size')
$cont = show_bytes($header->$col);
@@ -546,7 +546,7 @@
$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draf_uid' : '_uid';
$cont = Q(rcube_imap::decode_mime_string($header->$col, $header->charset));
if (!$cont) $cont = Q(rcube_label('nosubject'));
- $cont = sprintf('<a href="%s" onclick="return false">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
+ $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
}
else if ($col=='size')
$cont = show_bytes($header->$col);
--
Gitblit v1.9.1