X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmessage_details%2Fmessage_details_bottom.php;h=a5980ebdb469498a642c28e434365e9fc2ef7f63;hp=3d9e2182bacdf9a0ea4247a6d7825f80022e81c3;hb=9ae70b623b5bda18ee4b60d9481d49d057b2f508;hpb=e9ec1bd881d1d9b633048d0d86ce09159c5be5ed
diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php
index 3d9e2182..a5980ebd 100644
--- a/plugins/message_details/message_details_bottom.php
+++ b/plugins/message_details/message_details_bottom.php
@@ -1,36 +1,66 @@
{'.dechex(ord('\\1')).'}'",$string);
+}
/**
* Calculates id of MIME entity
@@ -52,7 +82,7 @@ function CalcEntity($entString, $direction) {
if ($pos === false) {
$entString++;
$result= $entString;
- }
+ }
else {
$level = substr($entString,0,$pos);
$sublevel = substr($entString,$pos+1);
@@ -69,200 +99,203 @@ function CalcEntity($entString, $direction) {
return ($result);
}
+
/**
- * Returns time in microseconds between selected and current timestamp
- *
- * @param array $start see details about array format at http://www.php.net/gettimeofday
- * @return integer time in microseconds
- * @access private
+ * Returns actual message details
+ * @param string $mailbox
+ * @param string $passed_id
+ * @param string $passed_ent_id
+ * @param boolean $stripHTML If TRUE, only plain text is returned,
+ * default is FALSE, wherein output contains
+ * pretty-HTMLification of message body
+ * @return string The formatted message details
+ * @access public
*/
-function returnTime($start) {
- $stop = gettimeofday();
- $timepassed = 1000000 * ($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
- return $timepassed;
-}
+function get_message_details($mailbox, $passed_id, $passed_ent_id=0, $stripHTML=FALSE) {
+ global $imapServerAddress, $imapPort, $imapSslOptions,
+ $color,$msgd_8bit_in_hex, $username;
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$read = sqimap_mailbox_select($imapConnection, $mailbox);
-$start = gettimeofday();
-$body = sqimap_run_command($imapConnection, "FETCH $passed_id RFC822",true, $response, $readmessage, TRUE);
-$message_body = '';
-$header = false;
-$mimepart = false;
-$bnd_end = false;
-$messageheader = true;
-$messageheaderstart=false;
-$boundaries = array();
-$entities = array();
-session_unregister("entities");
-$pre = '';
-$end = '';
-$entStr = '';
-$bla ='';
-$content = array ();
-$content_indx = -1;
-$contentset = false;
+ $returnValue = '';
-$count=count($body);
-$body[$count-1] = substr($body[$count-1], -1);
-for ($i=1; $i < $count; $i++) {
- $line = trim($body[$i]);
- if ($line == '') {
- $pre = '';
- $end = '';
- if ($bnd_end) {
- $header = true;
- $mimepart = false;
- } else if ($messageheader) {
- if ($header) {
- $header=false;
- $end = "\n \n".''."\n \n".'
'."\n \n";
- }
- $mimepart = -$header;
- $bnd_end = false;
- if ($messageheaderstart) {
- $messageheaderstart=false;
+ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imapSslOptions);
+ $read = sqimap_mailbox_select($imapConnection, $mailbox);
+ if (!empty($passed_ent_id))
+ $body = sqimap_run_command($imapConnection, "FETCH $passed_id BODY[$passed_ent_id]",true, $response, $readmessage, TRUE);
+ else
+ $body = sqimap_run_command($imapConnection, "FETCH $passed_id RFC822",true, $response, $readmessage, TRUE);
+ $message_body = '';
+ $header = false;
+ $mimepart = false;
+ $bnd_end = false;
+ $messageheader = true;
+ $messageheaderstart=false;
+ $boundaries = array();
+ $entities = array();
+ sqsession_unregister("entities");
+ $pre = '';
+ $end = '';
+ $entStr = '';
+ $bla ='';
+ $content = array ();
+ $content_indx = -1;
+ $contentset = false;
+
+ $count=count($body);
+ $body[$count-1] = substr($body[$count-1], -1);
+ for ($i=1; $i < $count; $i++) {
+ $line = rtrim($body[$i]);
+ if ($line == '') {
+ $pre = '';
+ $end = '';
+ if ($bnd_end) {
+ $header = true;
+ $mimepart = false;
+ } else if ($messageheader) {
+ if ($header) {
+ $header=false;
+ $end = '
';
+ }
+ $mimepart = -$header;
+ $bnd_end = false;
+ if ($messageheaderstart) {
+ $messageheaderstart=false;
+ }
+ } else if ($messageheaderstart) {
+ $messageheader= false;
+ } else {
+ if ($header) {
+ $pre = '';
+ $end = '
';
+ }
+ $header = false;
+ $mimepart=true;
}
- } else if ($messageheaderstart) {
- $messageheader= false;
+ $contentset = false;
+ $nameset = false;
} else {
- if ($header) {
- $pre = '';
- $end = "\n \n".'
'."\n \n".''."\n \n";
+ if (!$header && $messageheader) {
+ $messageheaderstart=true;
+ if ($pre != '
') {
+ $pre = '';
+ $end = '';
+ }
}
- $header = false;
- $mimepart=true;
- }
- $contentset = false;
- $nameset = false;
- } else {
- if (!$header && $messageheader) {
- $messageheaderstart=true;
- if ($pre != '') {
- $pre = '';
- $end = '';
+ if (!$messageheader && !$header ) {
+ $mimepart=true;
+ } else {
+ $mimepart=false;
}
- }
- if (!$messageheader && !$header ) {
- $mimepart=true;
- } else {
- $mimepart=false;
- }
- $pre = '';
- $end = '';
- }
- if ( ( $header || $messageheader) && (preg_match("/^.*boundary=\"?(.+(?=\")|.+).*/i",$line,$reg)) ) {
- $bnd = $reg[1];
- $bndreg = $bnd;
- $bndreg = str_replace("\\","\\\\",$bndreg);
- $bndreg = str_replace("?","\\?",$bndreg);
- $bndreg = str_replace("+","\\+",$bndreg);
- $bndreg = str_replace(".","\\.",$bndreg);
- $bndreg = str_replace("/","\\/",$bndreg);
- $bndreg = str_replace("-","\\-",$bndreg);
- $bndreg = str_replace("(","\\(",$bndreg);
- $bndreg = str_replace(")","\\)",$bndreg);
-
- $boundaries[] = array( 'bnd' => $bnd, 'bndreg' => $bndreg);
- $messageheader = false;
- $messageheaderstart=false;
- $mimepart=false;
- if ($entStr=='') {
- $entStr='0';
- } else {
- $entStr = CalcEntity("$entStr",1);
+ $pre = '';
+ $end = '';
}
- }
-
- if (($line != '' && $line{0} == '-' || $header) && isset($boundaries[0])) {
- $cnt=count($boundaries)-1;
- $bnd = $boundaries[$cnt]['bnd'];
- $bndreg = $boundaries[$cnt]['bndreg'];
-
- $regstr = '/^--'."($bndreg)".".*".'/';
- if (preg_match($regstr,$line,$reg) ) {
- $bndlen = strlen($reg[1]);
- $bndend = false;
- if (strlen($line) > ($bndlen + 3)) {
- if ($line{$bndlen+2} == '-' && $line{$bndlen+3} == '-')
- $bndend = true;
- }
- if ($bndend) {
- $entStr = CalcEntity("$entStr",-1);
- array_pop($boundaries);
- $pre .= '';
- $end .= '';
- $header = true;
- $mimepart = false;
- $bnd_end = true;
- $encoding = '';
+ if ( ( $header || $messageheader) && (preg_match("/^.*boundary=\"?(.+(?=\")|.+).*/i",$line,$reg)) ) {
+ $bnd = $reg[1];
+ $bndreg = $bnd;
+ $bndreg = str_replace("\\","\\\\",$bndreg);
+ $bndreg = str_replace("?","\\?",$bndreg);
+ $bndreg = str_replace("+","\\+",$bndreg);
+ $bndreg = str_replace(".","\\.",$bndreg);
+ $bndreg = str_replace("/","\\/",$bndreg);
+ $bndreg = str_replace("-","\\-",$bndreg);
+ $bndreg = str_replace("(","\\(",$bndreg);
+ $bndreg = str_replace(")","\\)",$bndreg);
+
+ $boundaries[] = array( 'bnd' => $bnd, 'bndreg' => $bndreg);
+ $messageheader = false;
+ $messageheaderstart=false;
+ $mimepart=false;
+ if ($entStr=='') {
+ $entStr='0';
} else {
- $header = true;
- $bnd_end = false;
- $entStr = CalcEntity("$entStr",0);
- $content_indx++;
- $content[$content_indx]=array();
- $content[$content_indx]['ent'] = '$entStr".'';
- $pre .= "\n \n".' '."\n \n".'