Changeset 5318

Timestamp:

01/06/12 10:56:52 (12 years ago)

Author:

cristiano

Message:

Ticket #2424 - Mensagem alterando o layout do expresso

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• services/class.ldap.php (modified) (1 diff)

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

@@ -1860 +1860 @@
 
             $regs_found = array();
-            $tags_found = @mb_eregi("<style\b[^>]*>(.*?)</style[^>]*>", $body, $regs_found);
+            $tags_found = preg_match_all("@<style[^>]*>.*?</style[^>]*>@s", $body, $regs_found);
             $wrapper_class = 'ExpressoCssWrapper' . time();
-
+                        
             foreach ($regs_found as $block_found) {
-                $n_start = strpos($block_found, '>') + 1;
-                $n_length = strrpos($block_found, '<') - $n_start;
-                $bf_innerHTML = substr($block_found, $n_start, $n_length);
-
+                $n_start = strpos($block_found[0], '>') + 1;
+                $n_length = strrpos($block_found[0], '<') - $n_start;
+                $bf_innerHTML = substr($block_found[0], $n_start, $n_length);
+                              
                 $bf_innerHTML = mb_ereg_replace('<!--', '', $bf_innerHTML);
                 $bf_innerHTML = mb_ereg_replace('-->', '', $bf_innerHTML);
-
+              
                 $css->parse($bf_innerHTML);
 
@@ -1890 +1890 @@
                         unset($css->css[41][$key]);
                     }
-
+                                              
                 $body = str_replace($block_found, '<style>' . $css->print->plain() . '</style>', $body);
         }

trunk/services/class.ldap.php

@@ -349 +349 @@
                          $returnL = ldap_get_entries( $this->connection,$sr); 
                          $return = array(); 
-                         foreach ($returnL[0]['mailalternateaddress'] as $i => $v) 
-                         { 
-                             if($i === 'count') continue; 
-                             $return[] = $v; 
-                         } 
+                         if(is_array($returnL[0]['mailalternateaddress']))
+                             foreach ($returnL[0]['mailalternateaddress'] as $i => $v) 
+                             { 
+                                 if($i === 'count') continue; 
+                                 $return[] = $v; 
+                             } 
                          return $return; 
                     }