Changeset 7161

Timestamp:

09/04/12 12:54:18 (12 years ago)

Author:

cristiano

Message:

Ticket #3077 - Problema para aceitar ou rejeitar convite

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1906 +1906 @@
             $body = str_ireplace('<o:p>&nbsp;</o:p>','<br />', $body);//Qubra de linha do MSO
             $body = preg_replace('/<(meta|base|link|html|\/html)[^>]*>/i', '', $body);
+
+
+                        // Malicious Code Remove
+            $dirtyCodePattern = "/(<([\w]+[\w0-9]*)(.*)on(mouse(move|over|down|up)|load|blur|change|error|click|dblclick|focus|key(down|up|press)|select)([\n\ ]*)=([\n\ ]*)[\"'][^>\"']*[\"']([^>]*)>)(.*)(<\/\\2>)?/misU";
+            preg_match_all($dirtyCodePattern, $body, $rest, PREG_PATTERN_ORDER);
+            foreach ($rest[0] as $i => $val) {
+                if (!(preg_match("/javascript:window\.open\(\"([^'\"]*)\/index\.php\?menuaction=calendar\.uicalendar\.set_action\&cal_id=([^;'\"]+);?['\"]/i", $rest[1][$i]) && strtoupper($rest[4][$i]) == "CLICK" )) //Calendar events
+                    $body = str_replace($rest[1][$i], "<" . $rest[2][$i] . $rest[3][$i] . $rest[7][$i] . ">", $body);
+            }
             
             require_once(dirname(__FILE__).'/../../library/CssToInlineStyles/css_to_inline_styles.php');
@@ -1923 +1932 @@
             foreach ($tag_list as $index => $tag) 
                 $body = @mb_eregi_replace("<$tag\\b[^>]*>(.*?)</$tag>", '', $body);
-
-            // Malicious Code Remove
-            $dirtyCodePattern = "/(<([\w]+[\w0-9]*)(.*)on(mouse(move|over|down|up)|load|blur|change|error|click|dblclick|focus|key(down|up|press)|select)([\n\ ]*)=([\n\ ]*)[\"'][^>\"']*[\"']([^>]*)>)(.*)(<\/\\2>)?/misU";
-            preg_match_all($dirtyCodePattern, $body, $rest, PREG_PATTERN_ORDER);
-            foreach ($rest[0] as $i => $val) {
-                if (!(preg_match("/javascript:window\.open\(\"([^'\"]*)\/index\.php\?menuaction=calendar\.uicalendar\.set_action\&cal_id=([^;'\"]+);?['\"]/i", $rest[1][$i]) && strtoupper($rest[4][$i]) == "CLICK" )) //Calendar events
-                    $body = str_replace($rest[1][$i], "<" . $rest[2][$i] . $rest[3][$i] . $rest[7][$i] . ">", $body);
-            }
 
             /*