Changeset 504 for trunk/expressoMail1_2/js/main.js

Timestamp:

10/07/08 14:50:11 (16 years ago)

Author:

niltonneto

Message:

Vide no Trac #344 - Melhorar tratamento de erros (parte 1)

File:

• trunk/expressoMail1_2/js/main.js (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -77 +77 @@
 
 
-function show_msg(msg_info){
+function show_msg(msg_info){    
         if(!verify_session(msg_info))
                 return;
@@ -872 +872 @@
         }
         else{                   
-                if(data == 'false')
+                if(data == 'Post-Content-Length')
                         write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value));
-                else if(data == null)
-                        write_msg(get_lang("your session could not be verified."));
+                else if(data)
+                        write_msg(data);
                 else
-                        write_msg(data);
+                        write_msg(get_lang("Connection failed with %1 Server. Try later.", "Web"));
         }
 }
@@ -1366 +1366 @@
 
 function verify_session(data){
+
         if(data && data.imap_error) {
-                write_msg(get_lang("your session could not be verified."));
-                // Hold session for edit message.
-                if(!hold_session)
-                        location.href="../login.php?cd=10&phpgw_forward=%2FexpressoMail1_2%2Findex.php";
+                if(data.imap_error == "nosession")
+                        write_msg(get_lang("your session could not be verified."));
+                else
+                        write_msg(data.imap_error);
+                // Hold sesion for edit message.
+                //if(!hold_session)
+                //      location.href="../login.php?cd=10&phpgw_forward=%2FexpressoMail1_2%2Findex.php";                
                 return false;
         }