Changeset 650 for trunk

Timestamp:

01/30/09 13:19:05 (15 years ago)

Author:

niltonneto

Message:

Resolve #278, #346 e #410.

File:

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

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

@@ -20 +20 @@
         var $imap_options = '';
         var $functions;
+        var $foldersLimit;
 
         function imap_functions (){
+                $this->foldersLimit = 200; //Limit of folders (mailboxes) user can see
                 $this->username           = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
                 $this->password           = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
@@ -286 +288 @@
                         $return["msg"] = lang("error appending mail on delete attachments");
                 }
-                
+        
                 @imap_delete($this->mbox, imap_msgno($this->mbox, $params["msg_num"])); //Insere o novo e-mail sem anexos.
                 @imap_expunge($this->mbox); //Deleta o e-mail com anexos
@@ -882 +884 @@
                         $body = eregi_replace("</$tag>", "</$tag-->", $new_body);
                 }
+                // Malicious Code Remove
+                $dirtyCodePattern = "/(<([\w]+)([^>]*)on(mouse(move|over|down|up)|load|blur|change|click|dblclick|focus|key(down|up|press)|select)=[\"'][^>\"']*[\"']([^>]*)>)(.*)(<\/\\2>)?/isU";
+                preg_match_all($dirtyCodePattern,$body,$rest,PREG_PATTERN_ORDER);
+                foreach($rest[0] as $i => $val)
+                        if (!(preg_match("/window\.open/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);
 
                 return  "<span>".$body;
@@ -909 +917 @@
                         if(strtolower($msg->encoding[$msg_number][$index]) == 'base64') 
                         {
-                                if ($file_type == 'application/x-pkcs7-signature') 
+                                if ($file_type == 'application/x-pkcs7-signature' || $file_type == 'application/pkcs7-signature') 
                                 {
                                         $export_mail = new ExportEml();
@@ -1152 +1160 @@
                 $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
                 $folders_list = imap_getmailboxes($mbox_stream, $serverString, "*");
+                $folders_list = array_slice($folders_list,0,$this->foldersLimit);
+
                 $tmp = array();
                 $result = array();
@@ -1989 +1999 @@
 
                         if(!$flag_importance)                   
-                                $return["status"] = imap_clearflag_full($this->mbox, $msgs_to_set, "\\Flagged", ST_UID);
+                        $return["status"] = imap_clearflag_full($this->mbox, $msgs_to_set, "\\Flagged", ST_UID);
                         else{
                                 $return["status"] = false;
@@ -2217 +2227 @@
                         $quota_used  = (($quota['usage']/1024)* 100 + .5 )* .01;
                         if($quota_used >= $quota_limit)
-                                $quota_used = $quota_limit;
+                        {
+                                $quotaPercent = 100;
+                        }
+                        else
+                        {
                         $quotaPercent = ($quota_used / $quota_limit)*100;
                         $quotaPercent = (($quotaPercent)* 100 + .5 )* .01;
-
+                        }
                         return array(
                                 'quota_percent' => floor($quotaPercent),
@@ -2410 +2424 @@
                                 $name_box = mb_convert_encoding(utf8_decode($name_box), "UTF7-IMAP", "ISO_8859-1" ); 
                                 $filter = $this->remove_accents($filter);
-                                //Este bloco tem a finalidade de transformar o CPF das pastas compartilhadas em common name
+                                //Este bloco tem a finalidade de transformar o login (quando numerico) das pastas compartilhadas em common name
                                 $folder_name = explode($this->imap_delimiter,$name_box);
                                 if (is_numeric($folder_name[1])) {
@@ -2465 +2479 @@
         {
                 $header = $this->get_header($uid_msg);         
+                $flag = $header->Unseen.$header->Recent.$header->Flagged.$header->Draft;
                 $subject = $this->decode_string($header->fetchsubject);
                 $from = $header->from[0]->mailbox;
                 if($header->from[0]->personal != "")
                         $from = $header->from[0]->personal;
-                $ret_msg = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate)."--". $this->size_msg($header->Size);
+                $ret_msg = $this->decode_string($from) . "--" . $subject . "--". gmdate("d/m/Y",$header ->udate)."--". $this->size_msg($header->Size) ."--". $flag;
                 return $ret_msg;                    
         }