Changeset 4887
- Timestamp:
- 08/02/11 09:50:18 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r4843 r4887 1199 1199 switch (strtolower($structure->ctype_primary)) 1200 1200 { 1201 case 'text': 1202 if(strtolower($structure->ctype_secondary) == 'x-pkcs7-mime') 1203 { 1201 if((preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) && (count($return['signature']) == 0 ) ){ 1204 1202 $return['body']='isCripted'; 1205 1203 return $return; … … 1210 1208 $disposition = strtolower($structure->disposition); 1211 1209 1212 if (($msg_subtype == "html" || $msg_subtype == 'plain') && ($disposition != 'attachment'))1210 if (preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) 1213 1211 { 1214 1212 … … 2294 2292 if( $allow ) 2295 2293 { 2296 $this->add_recipients("cco", $ccoaddress, &$mail); 2294 $this->add_recipients("cco", $ccoaddress, &$mail); 2297 2295 } 2298 2296 $mail->AddReplyTo($replytoaddress); … … 4179 4177 } 4180 4178 4181 function show_decript($params ){4179 function show_decript($params,$dec=0){ 4182 4180 $source = $params['source']; 4183 //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log'); 4184 $source = str_replace(" ", "+", $source,$i); 4185 4186 if (version_compare(PHP_VERSION, '5.2.0', '>=')){ 4187 if(!$source = base64_decode($source,true)) 4188 return "error ".$source."Espaços ".$i; 4189 4190 } 4191 else { 4192 if(!$source = base64_decode($source)) 4193 return "error ".$source."Espaços ".$i; 4181 //error_log("source: $source\nversao: " . PHP_VERSION); 4182 4183 if ($dec == 0) 4184 { 4185 $source = str_replace(" ", "+", $source,$i); 4186 if (version_compare(PHP_VERSION, '5.2.0', '>=')){ 4187 if(!$source = base64_decode($source,true)) 4188 return "error ".$source."Espaï¿œos ".$i; 4189 4190 } 4191 else { 4192 if(!$source = base64_decode($source)) 4193 return "error ".$source."Espaï¿œos ".$i; 4194 } 4195 4194 4196 } 4195 4197
Note: See TracChangeset
for help on using the changeset viewer.