Changeset 09941ea in github

Timestamp:

Oct 13, 2005 5:53:33 PM (8 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

455c2bd

Parents:

520c36a

Message:

Some error messages added

Location:

program

Files:

• include/rcube_imap.inc (modified) (1 diff)
• js/app.js (modified) (3 diffs)
• localization/en/messages.inc (modified) (1 diff)
• steps/mail/compose.inc (modified) (2 diffs)
• steps/mail/func.inc (modified) (1 diff)
• steps/mail/move_del.inc (modified) (2 diffs)

program/include/rcube_imap.inc

@@ -580 +580 @@
 
     return $deleted;
-
     }
 

program/js/app.js

@@ -7 +7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
- | Modified: 2005/08/19 (tbr)                                            |
+ | Modified: 2005/10/13 (tbr)                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
@@ -566 +566 @@
       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;
 
@@ -965 +967 @@
     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;
       }

program/localization/en/messages.inc

@@ -53 +53 @@
 $messages['errorsaving'] = 'An error occured while saving';
 
+$messages['errormoving'] = 'Could not move the message';
+
+$messages['errordeleting'] = 'Could not delete the message';
+
 
 ?>

program/steps/mail/compose.inc

@@ -405 +405 @@
   else if (isset($REPLY_MESSAGE['subject']))
     {
-    if (strpos($REPLY_MESSAGE['subject'], 'Re:')===0)
+    if (eregi('^re:', $REPLY_MESSAGE['subject']))
       $subject = $REPLY_MESSAGE['subject'];
     else
@@ -413 +413 @@
   // 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'];
+    }
 
   

program/steps/mail/func.inc

@@ -550 +550 @@
     $convert_patterns = $convert_replaces = $replace_strings = array();
     
-    $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#';
+    $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:';
     $url_chars_within = '\?\.~,!';
 

program/steps/mail/move_del.inc

@@ -31 +31 @@
     {
     // send error message
+    $commands = "this.list_mailbox();\n";
+    $commands .= show_message('errormoving', 'error');
+    rcube_remote_response($commands);
     exit;
     }
@@ -44 +47 @@
     {
     // send error message
+    $commands = "this.list_mailbox();\n";
+    $commands .= show_message('errordeleting', 'error');
+    rcube_remote_response($commands);
     exit;
     }