Changeset 109

Timestamp:

11/12/07 16:24:19 (16 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• js/main.js (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

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

@@ -709 +709 @@
                                         $params['folder'] = $msg_folder;
                                         $params['msgs_to_export'] = $msg_number;
-                                        $result = openssl_pkcs7_verify ($export_mail->export_msg($params),PKCS7_NOVERIFY);
-                                    
+                                    $tempDir = ini_get("session.save_path");
+                                        $cert_file = $tempDir."/certificate_".base_convert(microtime(), 10, 36).".crt";                                 
+                                        $result = openssl_pkcs7_verify($export_mail->export_msg($params),PKCS7_NOVERIFY,$cert_file);
+                                        if (file_exists($cert_file))
+                                        {
+                                                $handle = fopen ($cert_file,"r");
+                                                $pemout = fread($handle,filesize($cert_file));
+                                                fclose($handle);
+                                                $cert=openssl_x509_parse($pemout);
+                                                $temp = "\\nSigned by: ".$cert[subject][CN];
+                                                $temp .= "\\nEmail Address: ".$cert[subject][emailAddress];
+                                                $temp .= "\\nCertificate issued by: ".$cert[issuer][CN]."\\n";
+                                        }
                                     /* Message verified */
                                     if ($result === true)
-                                            $sign = "signed";
+                                            $sign = $temp;
                                      else
                                             $sign = "void";

trunk/expressoMail1_2/index.php

@@ -84 +84 @@
        // Set Imap Folder names options
 
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'] = $current_config['expressoMail_trash_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'] = $current_config['expressoMail_drafts_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder'] = $current_config['expressoMail_spam_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder'] = $current_config['expressoMail_sent_folder'];
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder']      = $current_config['expressoMail_trash_folder']  ? $current_config['expressoMail_trash_folder']  : lang("Trash");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'] = $current_config['expressoMail_drafts_folder'] ? $current_config['expressoMail_drafts_folder'] : lang("Drafts");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder']       = $current_config['expressoMail_spam_folder']   ? $current_config['expressoMail_spam_folder']   : lang("Spam");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder']       = $current_config['expressoMail_sent_folder']   ? $current_config['expressoMail_sent_folder']   : lang("Sent");
 
     echo '<script> var special_folders = new Array(4);
-                      special_folders["'. $current_config['expressoMail_trash_folder'].'"] = \'Trash\';
-                      special_folders["'. $current_config['expressoMail_drafts_folder'].'"] = \'Drafts\';
-                      special_folders["'. $current_config['expressoMail_spam_folder'].'"] = \'Spam\';
-                      special_folders["'. $current_config['expressoMail_sent_folder'].'"] = \'Sent\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'"] = \'Trash\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'].'"] = \'Drafts\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder'].'"] = \'Spam\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder'].'"] = \'Sent\';
 
-       var trashfolder = "' . $current_config['expressoMail_trash_folder'] . '";
+       var trashfolder = "'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'";
                        
                       

trunk/expressoMail1_2/js/draw_api.js

@@ -723 +723 @@
         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'>";
+                if (info_msg.signature != "void")
+                        td.innerHTML += '&nbsp;<img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" 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'>";

trunk/expressoMail1_2/js/main.js

@@ -169 +169 @@
 
 function move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name){
+
         if (folder == 'null')
                 folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : get_current_folder();                    
@@ -190 +191 @@
                         }
                 }
+
                 if (data.msgs_number.length == 1)
-                        write_msg(get_lang('The message was moved to folder ') +  lang_folder(data.new_folder_name));
+                        write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
                 else
-
-                        write_msg(get_lang('The messages were moved to folder ') + lang_folder(data.new_folder_name));          
+                        write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
 
                 if (data.border_ID != '' && data.border_ID != 'null'){