diff options
| -rw-r--r-- | program/include/rcube_imap.inc | 1 | ||||
| -rw-r--r-- | program/js/app.js | 10 | ||||
| -rw-r--r-- | program/localization/en/messages.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 9 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/move_del.inc | 6 |
6 files changed, 24 insertions, 8 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc index 6985212a9..e927dc799 100644 --- a/program/include/rcube_imap.inc +++ b/program/include/rcube_imap.inc @@ -579,7 +579,6 @@ class rcube_imap } return $deleted; - } diff --git a/program/js/app.js b/program/js/app.js index 3182ce365..3837a3179 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6,7 +6,7 @@ | Copyright (C) 2005, RoundCube Dev, - Switzerland | | Licensed under the GNU GPL | | | - | Modified: 2005/08/19 (tbr) | + | Modified: 2005/10/13 (tbr) | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | @@ -565,12 +565,14 @@ function rcube_webmail() case 'nextmessage': if (this.env.next_uid) - location.href = this.env.comm_path+'&_action=show&_uid='+this.env.next_uid+'&_mbox='+this.env.mailbox; + this.show_message(this.env.next_uid); + //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.next_uid+'&_mbox='+this.env.mailbox; break; case 'previousmessage': if (this.env.prev_uid) - location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox; + this.show_message(this.env.prev_uid); + //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox; break; case 'compose': @@ -964,7 +966,7 @@ function rcube_webmail() if (id) { - this.set_busy(true); + this.set_busy(true, 'loading'); target.location.href = this.env.comm_path+'&_action=show&_uid='+id+'&_mbox='+escape(this.env.mailbox)+add_url; } }; diff --git a/program/localization/en/messages.inc b/program/localization/en/messages.inc index 4a9009aa7..0ad04ed7e 100644 --- a/program/localization/en/messages.inc +++ b/program/localization/en/messages.inc @@ -52,5 +52,9 @@ $messages['sendingfailed'] = 'Failed to send message'; $messages['errorsaving'] = 'An error occured while saving'; +$messages['errormoving'] = 'Could not move the message'; + +$messages['errordeleting'] = 'Could not delete the message'; + ?>
\ No newline at end of file diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index f65e4ff7b..52b64d804 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -404,7 +404,7 @@ function rcmail_compose_subject($attrib) // create a reply-subject else if (isset($REPLY_MESSAGE['subject'])) { - if (strpos($REPLY_MESSAGE['subject'], 'Re:')===0) + if (eregi('^re:', $REPLY_MESSAGE['subject'])) $subject = $REPLY_MESSAGE['subject']; else $subject = 'Re: '.$REPLY_MESSAGE['subject']; @@ -412,7 +412,12 @@ function rcmail_compose_subject($attrib) // create a forward-subject else if (isset($FORWARD_MESSAGE['subject'])) - $subject = 'Fwd: '.$FORWARD_MESSAGE['subject']; + { + if (eregi('^fwd:', $REPLY_MESSAGE['subject'])) + $subject = $FORWARD_MESSAGE['subject']; + else + $subject = 'Fwd: '.$FORWARD_MESSAGE['subject']; + } $out = $form_start ? "$form_start\n" : ''; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 6ffde1c90..e3437db4f 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -549,7 +549,7 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_pr // make links and email-addresses clickable $convert_patterns = $convert_replaces = $replace_strings = array(); - $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#'; + $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:'; $url_chars_within = '\?\.~,!'; $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 4972478f1..20d46e37d 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -30,6 +30,9 @@ if ($_action=='moveto' && $_GET['_uid'] && $_GET['_target_mbox']) if (!$moved) { // send error message + $commands = "this.list_mailbox();\n"; + $commands .= show_message('errormoving', 'error'); + rcube_remote_response($commands); exit; } } @@ -43,6 +46,9 @@ else if ($_action=='delete' && $_GET['_uid']) if (!$del) { // send error message + $commands = "this.list_mailbox();\n"; + $commands .= show_message('errordeleting', 'error'); + rcube_remote_response($commands); exit; } } |