Changeset 7414 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

10/11/12 18:14:36 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Realização de merge da melhoria do MailArchiver?

File:

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

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

@@ -3163 +3163 @@
                 $mailService->addHeaderField('Disposition-Notification-To', $_SESSION['phpgw_info']['expressomail']['user']['email']);
 
+            $mailService->addHeaderField('Date', date("r"));
 
             if ($folder != 'null') {
@@ -4660 +4661 @@
 
     function insert_email($source,$folder,$timestamp,$flags){
-                
+
         $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
         $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
@@ -4667 +4668 @@
         $imap_options = '/notls/novalidate-cert';
 
-        
         $folder = mb_convert_encoding( $folder, "UTF7-IMAP","ISO-8859-1");
-
         $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$folder, $username, $password);
         
         if(imap_last_error() === 'Mailbox already exists')
             imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}".$folder));
+
         if($timestamp){
-                        $pdate = date_parse(date('r')); // pega a data atual do servidor (TODO: pegar a data da mensagem local) 
-                        $timestamp += $pdate['zone']*(60); //converte a data da mensagem para o fuso horário GMT 0. Isto é feito devido ao Expresso Mail armazenar a data no fuso horário GMT 0 e para exibi-la converte ela para o fuso horário local. 
-                        /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
-                        $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
-                
-                $f = fopen($file,"w");
-                fputs($f,base64_encode($source));
-            fclose($f);
-            $command = "python ".dirname(__FILE__)."/../imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\"";
-            $return['command']= exec($command);
+            if(version_compare(PHP_VERSION, '5.3.2', '>=')){
+                $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"), $source,'',date('d-M-Y H:i:s O',$timestamp));
+            }else{
+                                $pdate = date_parse(date('r')); // pega a data atual do servidor (TODO: pegar a data da mensagem local) 
+                                $timestamp += $pdate['zone']*(60); //converte a data da mensagem para o fuso horário GMT 0. Isto é feito devido ao Expresso Mail armazenar a data no fuso horário GMT 0 e para exibi-la converte ela para o fuso horário local. 
+                                /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
+                                $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
+                        
+                        $f = fopen($file,"w");
+                        fputs($f,base64_encode($source));
+                    fclose($f);
+                    $command = "python ".dirname(__FILE__)."/../imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\"";
+                    $return['command']= exec($command);
+                }
         }else{
             $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$folder, $source, "\\Seen");
         }
+
+        if (!empty($return['command']))
+        {
+            list ($result, $msg) = explode(':',$return['command']);
+            if (strtoupper($result) === 'NO')
+            {
+                $return['error'] = $msg;
+                return $return;
+            }
+        }
+
         $status = imap_status($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, SA_UIDNEXT);
                         
         $return['msg_no'] = $status->uidnext - 1;
-        $return['error'] = imap_last_error();
-        if(!$return['error'] && $flags != '' ){
-
-                  $flags_array=explode(':',$flags);
-                  //"Answered","Draft","Flagged","Unseen"
-                  $flags_fixed = "";
-                  if($flags_array[0] == 'A')
-                        $flags_fixed.="\\Answered ";
-                  if($flags_array[1] == 'X')
-                        $flags_fixed.="\\Draft ";
-                  if($flags_array[2] == 'F')
-                        $flags_fixed.="\\Flagged ";
-                  if($flags_array[3] != 'U')
-                        $flags_fixed.="\\Seen ";
-                  if($flags_array[4] == 'F')
-                        $flags_fixed.="\\Answered \\Draft ";
-                  imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
-                }
+                
+        $return['error'] = '';
+                if(imap_last_error() && imap_last_error() != "SECURITY PROBLEM: insecure server advertised AUTH=PLAIN")
+            $return['error'] = imap_last_error();
+
+                if(!$return['error'] && $flags != '' ){
+                        $flags_array=explode(':',$flags);
+                        //"Answered","Draft","Flagged","Unseen"
+                        $flags_fixed = "";
+                        if($flags_array[0] == 'A')
+                            $flags_fixed.="\\Answered ";
+                        if($flags_array[1] == 'X')
+                            $flags_fixed.="\\Draft ";
+                        if($flags_array[2] == 'F')
+                            $flags_fixed.="\\Flagged ";
+                        if($flags_array[3] != 'U')
+                            $flags_fixed.="\\Seen ";
+                        if($flags_array[4] == 'F')
+                            $flags_fixed.="\\Answered \\Draft ";
+                        imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
+                }
         
         //Ignorando erro de AUTH=Plain
@@ -4773 +4791 @@
 
     function treat_base64_from_post($source){
-            $offset = 0;
-            do
+        $source = preg_replace('/(?<!\r)\n/', "\r\n", $source);
+
+        $offset = 0;
+        do
+        {
+            if($inicio = strpos($source, 'Content-Transfer-Encoding: base64', $offset))
             {
-                    if($inicio = strpos($source, 'Content-Transfer-Encoding: base64', $offset))
-                    {
-                            $inicio = strpos($source, "\n\r", $inicio);
-                            $fim = strpos($source, '--', $inicio);
-                            if(!$fim)
-                                    $fim = strpos($source,"\n\r", $inicio);
-                            $length = $fim-$inicio;
-                            $parte = substr( $source,$inicio,$length-1);
-                            $parte = str_replace(" ", "+", $parte);
-                            $source = substr_replace($source, $parte, $inicio, $length-1);
-                    }
-                    if($offset > $inicio)
-                    $offset=FALSE;
-                    else
-                    $offset = $inicio;
+                    $inicio = strpos($source, "\n\r", $inicio);
+                    $fim = strpos($source, '--', $inicio);
+                    if(!$fim)
+                            $fim = strpos($source,"\n\r", $inicio);
+                    $length = $fim-$inicio;
+                    $parte = substr( $source,$inicio,$length-1);
+                    $parte = str_replace(" ", "+", $parte);
+                    $source = substr_replace($source, $parte, $inicio, $length-1);
             }
-            while($offset);
-            return $source;
+            if($offset > $inicio)
+            $offset=FALSE;
+            else
+            $offset = $inicio;
+        }
+        while($offset);
+        return $source;
     }
 
-//Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Recebe os fontes dos emails a serem desarquivados, separa e envia cada um para função insert_mail.
+        //Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Recebe os fontes dos emails a serem desarquivados, separa e envia cada um para função insert_mail.
 
     function unarchive_mail($params)
-    {           
-        $dest_folder = $params['folder'];
+    {   
+        $dest_folder = urldecode($params['folder']);
         $sources = explode("#@#@#@",$params['source']);
-        //Add user timeszone
         $timestamps = explode("#@#@#@",$params['timestamp']);
-
-
         $flags = explode("#@#@#@",$params['flags']);
-                
-                foreach($sources as $index=>$src) {
-                        if($src!=""){
-                $source = $this->treat_base64_from_post($src);
-                $timestampsactual = $timestamps[$index] + $this->functions->CalculateDateOffset(); 
-                        $insert = $this->insert_email($source, mb_convert_encoding( $dest_folder,"ISO-8859-1","UTF-8"), $timestampsactual,$flags[$index]); 
+        $ids = explode("#@#@#@",$params['id']);
+        $return = array();
+        $archived = array();
+        $error = array();
+
+        foreach($sources as $index=>$src)
+        {
+            if($src!="")
+            {
+                //If it is a MailArchiver incomming data
+                if($params['madata'])
+                    $sourcedec = utf8_decode($src);
+                //Default data
+                else
+                    $sourcedec = $src;
+
+                                $source = $this->treat_base64_from_post($sourcedec);
+
+                                $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
+
+                if($insert['error'])
+                {
+                    $error[] = $ids[$index];
+                }
+                else 
+                {
+                    $archived[] = $ids[$index];
+                }
+            }else{
+                $error[] = $ids[$index];
             }
-        }
-        return $insert;
+                }
+        
+        if (!empty($error))
+        {
+            $return['error'] = $error;
+        }
+        if (!empty($archived))
+        {
+            $return['archived'] = $archived;
+        }
+        
+        return $return;
     }
 
@@ -5484 +5535 @@
         }
 
+        //MailArchiver -> get offsettogmt as a global javascript variable, invoked at "main.js", init()
+    function get_offset_gmt(){
+        return($this->functions->CalculateDateOffset());
+    }
+
+    //MailArchiver -> get message flags only, invoked at archive operation
+    function get_msg_flags($args){  
+        $msg_folder = $args['folder'];
+        $msg_n = $args['msg_number'];
+        $arr_msg = explode(",", $msg_n);
+       
+        for($i=0; $i<count($arr_msg); $i++){
+                        
+            if(!$this->mbox || !is_resource($this->mbox))
+                $this->mbox = $this->open_mbox($msg_folder);
+        
+            if(!is_resource($this->mbox))
+                return(false);
+                       
+            $msgno_imap = imap_msgno($this->mbox, $msg_n);          
+                $header = @imap_headerinfo($this->mbox, $msgno_imap, 80, 255);
+                
+            if (!is_object($header))
+                return false;
+
+            $taglist[$i]["msgid"] = $msg_n;
+            $taglist[$i]["unseen"] = $header->Unseen;
+            $taglist[$i]["recent"] = $header->Recent;
+            $taglist[$i]["flagged"] = $header->Flagged;
+            $taglist[$i]["draft"] = $header->Draft;
+            $taglist[$i]["answered"] = $header->Answered;
+            $taglist[$i]["deleted"] = $header->Deleted;
+        
+            if($header->Answered =='A' && $header->Draft == 'X')
+                $taglist[$i]['forwarded'] = 'F';
+            else
+                $taglist[$i]['forwarded'] = ' ';
+        }
+
+                return $taglist;        
+    }    
 }
 ?>