Changeset 91

Timestamp:

11/07/07 15:19:35 (16 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoMail1_2

Files:

• inc/class.exporteml.inc.php (modified) (1 diff)
• inc/class.imap_functions.inc.php (modified) (4 diffs)
• js/draw_api.js (modified) (1 diff)
• templates/default/images/invalid.gif (added)
• templates/default/images/signed.gif (added)

trunk/expressoMail1_2/inc/class.exporteml.inc.php

@@ -183 +183 @@
         function remove_accents($string) {
                         return strtr($string, 
-                        "?Ó??ó?Ý?úÁÀÃÂÄÇÉÈÊËÍÌ?ÎÏÑÕÔÓÒÖÚÙ?ÛÜ?áàãâäçéèêëíì?îïñóòõôöúù?ûüýÿ'\"",
-                        "SOZsozYYuAAAAACEEEEIIIIINOOOOOUUUUUsaaaaaceeeeiiiiinooooouuuuuyy__");
+                        "?Ó??ó?Ý?úÁÀÃÂÄÇÉÈÊËÍÌ?ÎÏÑÕÔÓÒÖÚÙ?ÛÜ?áàãâäçéèêëíì?îïñóòõôöúù?ûüýÿ:'\"",
+                        "SOZsozYYuAAAAACEEEEIIIIINOOOOOUUUUUsaaaaaceeeeiiiiinooooouuuuuyy___");
         }
         

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

@@ -2 +2 @@
 include_once("class.functions.inc.php");
 include_once("class.ldap_functions.inc.php");
+include_once("class.exporteml.inc.php");
+
 class imap_functions
 {
@@ -157 +159 @@
                 $return['body']                 = $return_get_body['body'];
                 $return['attachments']  = $return_get_body['attachments'];
-                $return['thumbs']               = $return_get_body['thumbs'];           
+                $return['thumbs']               = $return_get_body['thumbs'];
+                $return['signature']    = $return_get_body['signature'];
                 
                 foreach($all_header as $line) {
@@ -353 +356 @@
                 $return['attachments'] = $this-> download_attachment($msg,$msg_number);         
                 if(!$this->has_cid)
-                        $return['thumbs']  = $this->get_thumbs($msg,$msg_number,$msg_folder);           
+                {
+                        $return['thumbs']  = $this->get_thumbs($msg,$msg_number,$msg_folder);
+                        $return['signature'] = $this->get_signature($msg,$msg_number,$msg_folder);
+                }                       
                 
                 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece
@@ -689 +695 @@
                 }
                 return $body;
+        }
+
+        function get_signature($msg, $msg_number, $msg_folder)
+        { 
+                foreach ($msg->file_type[$msg_number] as $index => $file_type)
+                {
+                        $file_type = strtolower($file_type);
+                        if(strtolower($msg->encoding[$msg_number][$index]) == 'base64') 
+                        {
+                                if ($file_type == 'application/x-pkcs7-signature') 
+                                {
+                                        $export_mail = new ExportEml();
+                                        $params['folder'] = $msg_folder;
+                                        $params['msgs_to_export'] = $msg_number;
+                                        $result = openssl_pkcs7_verify ($export_mail->export_msg($params),PKCS7_NOVERIFY);
+                                    
+                                    /* Message verified */
+                                    if ($result === true)
+                                            $sign = "signed";
+                                     else
+                                            $sign = "void";
+                                }
+                        }
+                }
+                return $sign;   
         }
 

trunk/expressoMail1_2/js/draw_api.js

@@ -719 +719 @@
         if (info_msg.attachments.length > 0)
                 td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/default/images/clip.gif' title='"+info_msg.attachments.names+"'>";
+        
+        if (typeof(info_msg.signature) == 'string')
+        {       
+                if (info_msg.signature == "signed")
+                        td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, and you can trust.")+"\");' title='"+get_lang("Signed message")+"' src='templates/default/images/signed.gif'>";
+                else
+                        td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='templates/default/images/invalid.gif'>";
+        }
         
         // NORMAL MSG