Changeset 4869 for branches/2.3
- Timestamp:
- 07/29/11 10:02:30 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php
r4798 r4869 608 608 $return['signature'] = $return_get_body['signature']; 609 609 } 610 610 611 611 $flag = preg_match('/importance *: *(.*)\r/i', $header_, $importance); 612 612 $return['Importance'] = ($flag == 0) ? "Normal" : $importance[1]; … … 921 921 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece 922 922 { 923 if(( strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime') && (count($return['signature']) == 0 ) ){923 if((preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) && (count($return['signature']) == 0 ) ){ 924 924 $return['body']='isCripted'; 925 925 return $return; … … 928 928 $attachment = array(); //No attachments 929 929 930 if (strtolower($msg->structure[$msg_number]->subtype) == "x-pkcs7-mime")930 if (preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) 931 931 { 932 932 $return['body']='isSigned'; … … 4005 4005 } 4006 4006 4007 function show_decript($params ){4007 function show_decript($params,$dec=0){ 4008 4008 $source = $params['source']; 4009 //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log'); 4010 $source = str_replace(" ", "+", $source,$i); 4011 4012 if (version_compare(PHP_VERSION, '5.2.0', '>=')){ 4013 if(!$source = base64_decode($source,true)) 4014 return "error ".$source."Espaços ".$i; 4015 4016 } 4017 else { 4018 if(!$source = base64_decode($source)) 4019 return "error ".$source."Espaços ".$i; 4009 //error_log("source: $source\nversao: " . PHP_VERSION); 4010 4011 if ($dec == 0) 4012 { 4013 $source = str_replace(" ", "+", $source,$i); 4014 if (version_compare(PHP_VERSION, '5.2.0', '>=')){ 4015 if(!$source = base64_decode($source,true)) 4016 return "error ".$source."Espaï¿œos ".$i; 4017 4018 } 4019 else { 4020 if(!$source = base64_decode($source)) 4021 return "error ".$source."Espaï¿œos ".$i; 4022 } 4023 4020 4024 } 4021 4025
Note: See TracChangeset
for help on using the changeset viewer.