X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=09c41347ee2a2b9e322615fe859f63a7295902b3;hb=f7cd8eb4e788b45f94c494836eae2ac63522a672;hp=43805d1531592f20e8fe2d2d37541a761739ef54;hpb=324ac3c54f72cb39a994d9a80a586fce591fca84;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 43805d15..09c41347 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -1,13 +1,13 @@
$value) {
- if ($passed_id == $value) {
- if ($key == $count) {
- break;
- }
- $result = $uidset[$key + 1];
- break;
- }
+ $result = sqm_array_get_value_by_offset($uidset,$passed_id,1);
+ if ($result === false) {
+ return -1;
+ } else {
+ return $result;
}
- return $result;
}
/**
@@ -70,17 +65,12 @@ function findPreviousMessage($uidset, $passed_id) {
if (!is_array($uidset)) {
return -1;
}
- $result = -1;
- foreach($uidset as $key=>$value) {
- if ($passed_id == $value) {
- if ($key != 0) {
- $result = $uidset[$key - 1];
- }
- break;
- }
+ $result = sqm_array_get_value_by_offset($uidset,$passed_id,-1);
+ if ($result === false) {
+ return -1;
+ } else {
+ return $result;
}
-
- return $result;
}
/**
@@ -90,11 +80,19 @@ function findPreviousMessage($uidset, $passed_id) {
* @param int $passed_id
*/
function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
- global $javascript_on, $color;
+ global $javascript_on, $show_html_default;
+ /* hackydiehack */
+ if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+ $view_unsafe_images = false;
+ } else {
+ $view_unsafe_images = true;
+ }
$params = '?passed_ent_id=' . urlencode($passed_ent_id) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . urlencode($passed_id);
+ '&passed_id=' . urlencode($passed_id) .
+ '&view_unsafe_images='. (bool) $view_unsafe_images .
+ '&show_html_default=' . $show_html_default;
$print_text = _("View Printable Version");
@@ -124,15 +122,13 @@ function ServerMDNSupport($aFlags) {
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
- global $username, $attachment_dir,
- $version, $attachments, $squirrelmail_language, $default_charset,
- $languages, $useSendmail, $domain, $sent_folder,
- $popuser, $data_dir, $username;
+ global $username, $attachment_dir, $popuser, $username, $color,
+ $version, $squirrelmail_language, $default_charset,
+ $languages, $useSendmail, $domain, $sent_folder;
sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER);
$header = $message->rfc822_header;
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rfc822_header = new Rfc822Header();
$content_type = new ContentType('multipart/report');
@@ -184,16 +180,16 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$now = getLongDateString( time() );
set_my_charset();
$body = _("Your message") . "\r\n\r\n" .
- "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" .
- "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" .
- "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
+ "\t" . _("To") . ': ' . decodeHeader($to,false,false) . "\r\n" .
+ "\t" . _("Subject") . ': ' . decodeHeader($header->subject,false,false) . "\r\n" .
+ "\t" . _("Sent") . ': ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
$special_encoding = '';
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
- $body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body);
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) {
+ $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $body);
if (strtolower($default_charset) == 'iso-2022-jp') {
if (mb_detect_encoding($body) == 'ASCII') {
$special_encoding = '8bit';
@@ -202,6 +198,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$special_encoding = '7bit';
}
}
+ } elseif (sq_is8bit($body)) {
+ $special_encoding = '8bit';
}
$part1 = new Message();
$part1->setBody($body);
@@ -253,7 +251,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
} else {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp;
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
@@ -265,8 +263,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . ' ' .
- _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $msg = $deliver->dlv_msg . ' ' .
+ _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
$deliver->dlv_server_msg;
require_once(SM_PATH . 'functions/display_messages.php');
plain_error_message($msg, $color);
@@ -291,27 +289,6 @@ function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) {
$readmessage, TRUE);
}
-function ClearAttachments() {
- global $username, $attachments, $attachment_dir;
-
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-
- $rem_attachments = array();
- if (isset($attachments)) {
- foreach ($attachments as $info) {
- if ($info['session'] == -1) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- } else {
- $rem_attachments[] = $info;
- }
- }
- }
- $attachments = $rem_attachments;
-}
-
function formatRecipientString($recipients, $item ) {
global $show_more_cc, $show_more, $show_more_bcc,
$PHP_SELF;
@@ -347,15 +324,15 @@ function formatRecipientString($recipients, $item ) {
foreach($recipients as $r) {
$add = decodeHeader($r->getAddress(true));
if ($string) {
- $string .= ' ' . $add;
+ $string .= ' ' . $add;
} else {
$string = $add;
if ($cnt > 1) {
- $string .= ' ()';
+ $string .= '">'._("less").' )';
} else {
- $string .= '">'._("more").')';
+ $string .= '">'._("more").')';
break;
}
}
@@ -367,11 +344,11 @@ function formatRecipientString($recipients, $item ) {
function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
- global $msn_user_support, $default_use_mdn, $default_use_priority,
+ global $default_use_mdn, $default_use_priority,
$show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
- $squirrelmail_language;
+ $squirrelmail_language;
- $mailbox = $aMailbox['NAME'] ;
+ $mailbox = $aMailbox['NAME'];
$header = $message->rfc822_header;
$env = array();
@@ -425,26 +402,26 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
}
}
- $s = '
';
+ $s = '';
foreach ($env as $key => $val) {
if ($val) {
- $s .= '';
- $s .= html_tag('TD', '' . $key . ': ', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
- $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
- $s .= ' ';
+ $s .= '';
+ $s .= html_tag('td', '' . $key . ': ', 'right', '', 'valign="top" width="20%"') . "\n";
+ $s .= html_tag('td', $val, 'left', '', 'valign="top" width="80%"') . "\n";
+ $s .= ' ';
}
}
- echo ''."\n";
- echo ''."\n";
+ echo ''."\n";
+ echo ''."\n";
echo $s;
do_hook('read_body_header');
formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
- echo '
';
- echo ' '."\n";
- echo '
';
+ echo '
';
+ echo ' '."\n";
+ echo '
';
}
/**
@@ -460,8 +437,8 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
global $base_uri, $draft_folder, $where, $what, $color, $sort,
$startMessage, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
- $data_dir, $username, $delete_prev_next_display,
- $compose_new_win, $javascript_on;
+ $username, $delete_prev_next_display,
+ $compose_new_win, $javascript_on, $compose_width, $compose_height;
//FIXME cleanup argument list, use $aMailbox where possible
$mailbox = $aMailbox['NAME'];
@@ -493,7 +470,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
}
$prev_link = _("Previous");
- if($entities[$passed_ent_id] > 1) {
+ if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] > 1) {
$prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
$prev_link = '';
+ $menu_row = '';
$comp_uri = $base_uri.'src/compose.php' .
'?passed_id=' . $passed_id .
'&mailbox=' . $urlMailbox .
@@ -607,17 +578,26 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
$target = '';
$on_click='';
$method='method="post" ';
+ $onsubmit='';
if ($compose_new_win == '1') {
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+ $compose_width = '640';
+ }
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+ $compose_height = '550';
+ }
if ( $javascript_on ) {
- $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"';
+ $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"';
$comp_uri = 'javascript:void(0)';
$method='method="get" ';
+ $onsubmit = 'onsubmit="return false" ';
} else {
$target = 'target="_blank"';
}
}
- $menu_row .= "\n".' ';
if ( in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
// Form for deletion. Form is handled by the originating display in $where. This is right_main.php or search.php
$delete_url = $base_uri . "src/$where";
- $menu_row .= '';
@@ -662,7 +643,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
if ( !(isset($passed_ent_id) && $passed_ent_id) &&
in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
- $menu_row .= '';
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '';
}
$menu_row .= ' ';
@@ -715,9 +696,9 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
$url = $base_uri.'src/view_header.php?'.$query_string;
- $s = "\n" .
- html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '' . _("Options") . ": \n" .
- html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '' .
+ $s = "\n" .
+ html_tag( 'td', '', 'right', '', 'valign="middle" width="20%"' ) . '' . _("Options") . ": \n" .
+ html_tag( 'td', '', 'left', '', 'valign="middle" width="80%"' ) . '' .
''._("View Full Header").' ';
/* Output the printer friendly link if we are in subtle mode. */
@@ -725,12 +706,33 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
do_hook("read_body_header_right");
- $s = " \n" .
- " \n";
+ $s = " \n" .
+ " \n";
echo $s;
}
+/**
+ * Creates button
+ *
+ * @deprecated see form functions available in 1.5.1 and 1.4.3.
+ * @param string $type
+ * @param string $name
+ * @param string $value
+ * @param string $js
+ * @param bool $enabled
+ */
+function getButton($type, $name, $value, $js = '', $enabled = TRUE) {
+ $disabled = ( $enabled ? '' : 'disabled ' );
+ $js = ( $js ? $js.' ' : '' );
+ return ' ';
+}
+
+
/***************************/
/* Main of read_body.php */
/***************************/
@@ -752,6 +754,10 @@ sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET);
if (!sqgetGlobalVar('where', $where, SQ_GET) ) {
$where = 'right_main.php';
}
+/*
+ * Used as entry key to the list of uid's cached in the mailbox cache
+ * we use the cached uid's to get the next and prev message.
+ */
if (!sqgetGlobalVar('what', $what, SQ_GET) ){
$what = 0;
}
@@ -768,6 +774,12 @@ if ( sqgetGlobalVar('view_hdr', $temp, SQ_GET) ) {
$view_hdr = (int) $temp;
}
+if ( sqgetGlobalVar('account', $temp, SQ_GET) ) {
+ $iAccount = (int) $temp;
+} else {
+ $iAccount = 0;
+}
+
/** GET/POST VARS */
sqgetGlobalVar('passed_ent_id', $passed_ent_id);
sqgetGlobalVar('mailbox', $mailbox);
@@ -792,7 +804,65 @@ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
global $sqimap_capabilities, $lastTargetMailbox;
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array('setindex' => $what),array());
+$aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array());
+
+
+/**
+ Start code to set the columns to fetch in case of hitting the next/prev link
+ The reason for this is the fact that the cache can be invalidated which means that the headers
+ to fetch aren't there anymore. Before they got calculated when the messagelist was shown.
+
+ Todo, better central handling of setting the mailbox options so we do not need to do the stuff below
+*/
+
+/**
+ * Replace From => To in case it concerns a draft or sent folder
+ */
+if (($mailbox == $sent_folder || $mailbox == $draft_folder) &&
+ !in_array(SQM_COL_TO,$index_order)) {
+ $aNewOrder = array(); // nice var name ;)
+ foreach($index_order as $iCol) {
+ if ($iCol == SQM_COL_FROM) {
+ $iCol = SQM_COL_TO;
+ }
+ $aNewOrder[] = $iCol;
+ }
+ $aColumns = $aNewOrder;
+} else {
+ $aColumns = $index_order;
+}
+
+$aProps = array(
+ 'columns' => $aColumns, // columns bound settings
+ 'config' => array(
+ 'highlight_list' => $message_highlight_list, // row highlighting rules
+ 'trash_folder' => $trash_folder,
+ 'sent_folder' => $sent_folder,
+ 'draft_folder' => $draft_folder));
+
+calcFetchColumns($aMailbox,$aProps);
+
+/**
+ End code to set the columns to fetch in case of hitting the next/prev link
+*/
+
+
+
+/**
+ * Check if cache is still valid, $what contains the key
+ * which gives us acces to the array with uid's. At this moment
+ * 0 is used for a normal message list and search uses 1 as key. This can be
+ * changed / extended in the future.
+ * If on a select of a mailbox we detect that the cache should be invalidated due to
+ * the delete of messages or due to new messages we empty the list with uid's and
+ * that's what we detect below.
+ */
+if (!is_array($aMailbox['UIDSET'][$what])) {
+ fetchMessageHeaders($imapConnection, $aMailbox);
+}
+
+$iSetIndex = $aMailbox['SETINDEX'];
+$aMailbox['CURRENT_MSG'][$iSetIndex] = $passed_id;
/**
* Update the seen state
@@ -808,8 +878,6 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) {
*/
if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id));
-// sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
-// sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id);
}
/**
@@ -836,12 +904,18 @@ if (isset($passed_ent_id) && $passed_ent_id) {
$rfc822_header = new Rfc822Header();
$rfc822_header->parseHeader($read);
$message->rfc822_header = $rfc822_header;
+} else if ($message->type0 == 'message' && $message->type1 == 'rfc822' && isset($message->entities[0])) {
+ $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[1.HEADER]", true, $response, $msg, TRUE);
+ $rfc822_header = new Rfc822Header();
+ $rfc822_header->parseHeader($read);
+ $message->rfc822_header = $rfc822_header;
} else {
$passed_ent_id = 0;
}
$header = $message->header;
-do_hook('html_top');
+$header = $message->header;
+
/****************************************/
/* Block for handling incoming url vars */
@@ -850,7 +924,7 @@ do_hook('html_top');
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
$final_recipient = '';
- if ((isset($identity)) && ($identity != 0)) //Main identity
+ if ((isset($identity)) && ($identity != 0)) //Main identity
$final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' ));
if ($final_recipient == '' )
$final_recipient = trim(getPref($data_dir, $username, 'email_address', '' ));
@@ -858,9 +932,8 @@ if (isset($sendreceipt)) {
if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) {
ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id);
$message->is_mdnsent = true;
- $messages[$uidvalidity][$passed_id]=$message;
+ $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message;
}
- ClearAttachments();
}
}
/***********************************************/
@@ -880,11 +953,11 @@ $cnt = count($ent_ar);
for ($i = 0; $i < $cnt; $i++) {
$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
if ($i != $cnt-1) {
- $messagebody .= ' ';
+ $messagebody .= ' ';
}
}
-displayPageHeader($color, $mailbox);
+displayPageHeader($color, $mailbox,'','');
formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message,false);
formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
echo '';
@@ -894,8 +967,8 @@ echo ' ';
echo ' ';
echo ' ';
// echo ' ';
-echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
-echo ' ' . html_tag( 'td', ' '. $messagebody."\n", 'left')
+echo html_tag( 'table' ,'' , 'left', '', 'width="100%" cellpadding="1" cellspacing="5" border="0"' );
+echo ' ' . html_tag( 'td', ' '. $messagebody."\n", 'left')
. ' ';
echo '
';
echo ' ';
@@ -903,8 +976,8 @@ echo '
';
echo '
';
echo ' ';
-echo ' '."\n";
+echo ' '."\n";
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
@@ -921,8 +994,8 @@ if ($attachmentsdisplay) {
echo ' ';
echo ' ';
echo ' ';
- echo ' ';
+ echo ' ';
}
echo '';
@@ -939,23 +1012,23 @@ if (($attachment_common_show_images) &&
echo html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', ' ' ."\n", 'left'
+ html_tag( 'td', ' ' ."\n", 'left'
)
) ,
- 'center', '', 'cellspacing=0 border="0" cellpadding="2"');
+ 'center', '', 'cellspacing="0" border="0" cellpadding="2"');
}
}
formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE);
do_hook('read_body_bottom');
-do_hook('html_bottom');
sqimap_logout($imapConnection);
-/* sessions are written at the end of the script. it's better to register
- them at the end so we avoid double session_register calls */
-/* add the mailbox to the cache */
-$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+
+/**
+ * Write mailbox with updated seen flag information back to cache.
+ */
+$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
sqsession_register($mailbox_cache,'mailbox_cache');
+
?>
-