return $result;
}
+function view_as_html_link($mailbox, $passed_id, $passed_ent_id, $message) {
+ global $base_uri, $show_html_default;
+
+ $has_html = false;
+ if ($message->header->type0 == 'message' && $message->header->type1 == 'rfc822') {
+ $type0 = $message->rfc822_header->content_type->type0;
+ $type1 = $message->rfc822_header->content_type->type1;
+ } else {
+ $type0 = $message->header->type0;
+ $type1 = $message->header->type1;
+ }
+ if($type0 == 'multipart' &&
+ ($type1 == 'alternative' || $type1 == 'mixed' || $type1 == 'related')) {
+ if ($message->findDisplayEntity(array(), array('text/html'), true)) {
+ $has_html = true;
+ }
+ }
+ /*
+ * Normal single part message so check its type.
+ */
+ else {
+ if($type0 == 'text' && $type1 == 'html') {
+ $has_html = true;
+ }
+ }
+ if($has_html == true) {
+ $vars = array('passed_ent_id', 'show_more', 'show_more_cc', 'override_type0', 'override_type1', 'startMessage');
+
+ $new_link = $base_uri . 'src/read_body.php?passed_id=' . urlencode($passed_id) .
+ '&passed_ent_id=' . urlencode($passed_ent_id) .
+ '&mailbox=' . urlencode($mailbox);
+ foreach($vars as $var) {
+ if(sqgetGlobalVar($var, $temp)) {
+ $new_link .= '&' . $var . '=' . urlencode($temp);
+ }
+ }
+
+ if($show_html_default == 1) {
+ $new_link .= '&show_html_default=0';
+ $link = _("View as plain text");
+ } else {
+ $new_link .= '&show_html_default=1';
+ $link = _("View as HTML");
+ }
+ return ' | <a href="' . $new_link . '">' . $link . '</a>';
+ }
+ return '';
+}
+
function ServerMDNSupport($aFlags) {
/* escaping $ doesn't work -> \x36 */
return ( in_array('$mdnsent',$aFlags,true) ||
} else {
unset ($deliver);
if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
- sqimap_append ($imapConnection, $sent_folder, $length);
+ $sid = sqimap_append ($imapConnection, $sent_folder, $length);
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
$imap_deliver->mail($composeMessage, $imapConnection);
- sqimap_append_done ($imapConnection);
+ sqimap_append_done ($imapConnection, $sent_folder);
unset ($imap_deliver);
}
}
$s .= ' | ' .
printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
+ echo view_as_html_link($mailbox, $passed_id, $passed_ent_id, $message);
/* Output the download and/or unsafe images link/-s, if any. */
if ($download_and_unsafe_link) {
if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) {
$messages = array();
}
-
+sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
+if (is_array($delayed_errors)) {
+ $oErrorHandler->AssignDelayedErrors($delayed_errors);
+ sqsession_unregister("delayed_errors");
+}
/** GET VARS */
sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET);
if (!sqgetGlobalVar('where', $where, SQ_GET) ) {
} else {
$startMessage = 1;
}
+if(sqgetGlobalVar('show_html_default', $temp)) {
+ $show_html_default = (int) $temp;
+}
+
+if(sqgetGlobalVar('view_unsafe_images', $temp)) {
+ $view_unsafe_images = (int) $temp;
+ if($view_unsafe_images == 1) {
+ $show_html_default = 1;
+ }
+} else {
+ $view_unsafe_images = 0;
+}
/**
* Retrieve mailbox cache
*/
/**
* Replace From => To in case it concerns a draft or sent folder
*/
+$aColumns = array();
if (($mailbox == $sent_folder || $mailbox == $draft_folder) &&
!in_array(SQM_COL_TO,$index_order)) {
$aNewOrder = array(); // nice var name ;)
if ($iCol == SQM_COL_FROM) {
$iCol = SQM_COL_TO;
}
- $aNewOrder[] = $iCol;
+ $aColumns[$iCol] = array();
}
- $aColumns = $aNewOrder;
} else {
- $aColumns = $index_order;
+ foreach ($index_order as $iCol) {
+ $aColumns[$iCol] = array();
+ }
}
$aProps = array(
$message->is_seen = true;
$aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
}
-
if (isset($passed_ent_id) && $passed_ent_id) {
$message = $message->getEntity($passed_ent_id);
if ($message->type0 != 'message' && $message->type1 != 'rfc822') {
}
$header = $message->header;
-$header = $message->header;
-
/****************************************/
/* Block for handling incoming url vars */
/* End of block for handling incoming url vars */
/***********************************************/
-
-
$messagebody = '';
do_hook('read_body_top');
if ($show_html_default == 1) {
$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
sqsession_register($mailbox_cache,'mailbox_cache');
$oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>