Changeset 7705 for trunk

Timestamp:

01/04/13 17:43:27 (11 years ago)

Author:

cristiano

Message:

Ticket #3264 - Inserir validação alerta de esquecimento de inserção de anexo

File:

• trunk/expressoMail1_2/js/main.js (modified) (1 diff)

trunk/expressoMail1_2/js/main.js

@@ -3290 +3290 @@
  * Se houver, retorna a primeira ocorrência encontrada de words, caso contrário retorna false.
  */
-function verifyBodyWords(body, words) {
-        for(i = 0; i < words.length; i++) {
+function verifyBodyWords(body, words)
+{
+    var forwStartPT = body.search(/\<div\>\n*\s*---------- Mensagem encaminhada ----------/);
+    if(forwStartPT >= 0)
+        body = body.substr(0,forwStartPT);
+
+    var forwStartEN = body.search(/\<div\>\n*\s*---------- Forwarded message ----------/);
+    if(forwStartEN >= 0)
+        body = body.substr(0,forwStartEN);
+
+    var forwStartES = body.search(/\<div\>\n*\s*---------- Mensaje reenviada ----------/);
+    if(forwStartES >= 0)
+        body = body.substr(0,forwStartES);
+
+    var replyStartPT = body.search(/\<div\>\n*\s*Em (\d{1,2})\/(\d{1,2})\/(\d{4}) \&agrave\;s (\d{1,2}):(\d{1,2}) horas, (.)+ escreveu:/);
+    if(replyStartPT >= 0)
+        body = body.substr(0,replyStartPT);
+
+    var replyStartEN = body.search(/\<div\>\n*\s*At (\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}) hours, (.)+ wrote:/);
+    if(replyStartEN >= 0)
+        body = body.substr(0,replyStartEN);
+
+    var replyStartES = body.search(/\<div\>\n*\s*En (\d{1,2})\/(\d{1,2})\/(\d{4}) las (\d{1,2}):(\d{1,2}) horas, (.)+ escribi\&oacute\;:/);
+    if(replyStartES >= 0)
+        body = body.substr(0,replyStartES);
+
+    for(i = 0; i < words.length; i++) {
                 if(body.search(words[i]) != -1) {
                         return words[i]; 
                 }
         }
+
         return false;
 }