Changeset 9a5762a in github

Timestamp:

Aug 13, 2008 1:00:35 PM (5 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

1b5deba

Parents:

7c2d30b

Message:

#1485242: better handling of situation when message was sent successfully but cannot be saved

Location:

program

Files:

• js/app.js (modified) (1 diff)
• localization/en_GB/messages.inc (modified) (1 diff)
• localization/en_US/messages.inc (modified) (1 diff)
• localization/pl_PL/messages.inc (modified) (1 diff)
• steps/mail/sendmail.inc (modified) (2 diffs)

program/js/app.js

@@ -2207 +2207 @@
 
 
-  this.sent_successfully = function(msg)
+  this.sent_successfully = function(type, msg)
     {
     this.list_mailbox();
-    this.display_message(msg, 'confirmation', true);
+    this.display_message(msg, type, true);
     }
 

program/localization/en_GB/messages.inc

@@ -41 +41 @@
 $messages['contactnotfound'] = 'The requested contact was not found';
 $messages['sendingfailed'] = 'Failed to send message';
+$messages['errorsavingsent'] = 'An error occured while saving sent message';
 $messages['errorsaving'] = 'An error occured while saving';
 $messages['errormoving'] = 'Could not move the message';

program/localization/en_US/messages.inc

@@ -41 +41 @@
 $messages['contactnotfound'] = 'The requested contact was not found';
 $messages['sendingfailed'] = 'Failed to send message';
+$messages['errorsavingsent'] = 'An error occured while saving sent message';
 $messages['errorsaving'] = 'An error occured while saving';
 $messages['errormoving'] = 'Could not move the message';

program/localization/pl_PL/messages.inc

@@ -52 +52 @@
 $messages['contactnotfound'] = 'Szukany kontakt nie został odnaleziony';
 $messages['sendingfailed'] = 'Nie udało się wysłać wiadomości!';
-$messages['errorsaving'] = 'BłÄ
+$messages['errorsavingsent'] = 'WystÄ
+pił błÄ
+d podczas zapisu wysłanej wiadomości!';
+$messages['errorsaving'] = 'WystÄ
+pił błÄ
 d podczas zapisu!';
 $messages['errormoving'] = 'Nie moÅŒna przenieść wybranej wiadomości!';

program/steps/mail/sendmail.inc

@@ -378 +378 @@
                       'message' => "Could not save message in $store_target"), TRUE, FALSE);
     
-    $OUTPUT->show_message('errorsaving', 'error');
-    $OUTPUT->send('iframe');
+    if ($savedraft) {
+      $OUTPUT->show_message('errorsaving', 'error');
+      $OUTPUT->send('iframe');
+      }
     }
 
@@ -435 +437 @@
 
   rcmail_compose_cleanup();
-  $OUTPUT->command('sent_successfully', rcube_label('messagesent'));
+
+  if ($store_folder && !$saved)
+    $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
+  else
+    $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
   $OUTPUT->send('iframe');
   }