diff options
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | program/include/rcube_smtp.inc | 2 | ||||
| -rw-r--r-- | program/js/list.js | 16 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
4 files changed, 21 insertions, 8 deletions
@@ -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 6953e2666..2ddb5cf17 100644 --- a/program/include/rcube_smtp.inc +++ b/program/include/rcube_smtp.inc @@ -72,7 +72,7 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response) // 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 23a9c349c..c4f02402b 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -41,6 +41,7 @@ function rcube_list_widget(list, p) 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 @@ drag_row: function(e, id) 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 @@ select_row: function(id, mod_key, with_mouse) 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 @@ select_row: function(id, mod_key, with_mouse) 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 @@ select_row: function(id, mod_key, with_mouse) break; default: - this.highlight_row(id, false); + this.highlight_row(id, false); break; } } @@ -337,6 +340,9 @@ select_row: function(id, mod_key, with_mouse) 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 cc1187bd9..4267b48fe 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -460,7 +460,7 @@ function rcmail_message_list($attrib) $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 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) $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); |