* This file is used for reading the msgs array and displaying
* the resulting emails in the right frame.
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
global $javascript_on, $color;
- $params = '?passed_ent_id=' . $passed_ent_id .
+ $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id;
+ '&passed_id=' . urlencode($passed_id);
$print_text = _("View Printable Version");
}
}
- $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.'><small>'."\n";
+ $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.' style="display: inline">'."\n";
// If Draft folder - create Resume link
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
$menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click);
if ($enable_forward_as_attachment)
- $menu_row .= '<input type="checkbox" name="smaction_attache">' . _("Attachment") ."\n";
+ $menu_row .= '<input type="checkbox" name="smaction_attache">' . _("As Attachment") .' '."\n";
- $menu_row .= '</form>'.' '."\n";
+ $menu_row .= '</form> ';
// Form for deletion
$delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
- $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline"><small>';
+ $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline">';
if (!(isset($passed_ent_id) && $passed_ent_id)) {
- $menu_row .= '<input type="hidden" name="message" value="'.$passed_id.'" />';
+ $menu_row .= addHidden('message', $passed_id);
if ($where && $what) {
- $menu_row .= '<input type="hidden" name="where" value="'.$where.'" />';
- $menu_row .= '<input type="hidden" name="what" value="'.$what.'" />';
+ $menu_row .= addHidden('where', $where);
+ $menu_row .= addHidden('what', $what);
} else {
- $menu_row .= '<input type="hidden" name="sort" value="'.$sort.'" />';
- $menu_row .= '<input type="hidden" name="startMessage" value="'.$startMessage.'" />';
+ $menu_row .= addHidden('sort', $sort);
+ $menu_row .= addHidden('startMessage', $startMessage);
}
$menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
$menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
else
$menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
- $menu_row .= '</form>' . "\n";
+ $menu_row .= '</form>';
// Add top move link
// Set subsequent location based on whether or not there is a 'next' message.
if ( isset($next) && $next >= 0 ) {
- $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&';
+ $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&';
+ } elseif (isset($prev) && $prev >= 0) {
+ $location = $base_uri . 'src/read_body.php?passed_id='.$prev.'&';
} else {
- $location = $base_uri . 'src/right_main.php?';
+ $location = $base_uri . 'src/right_main.php?';
}
- $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post">'.
- '<small><input type="hidden" name="show_more" value="0" />'.
- '<input type="hidden" name="location" value="'.$location.$current_box.'" />'.
- '<input type="hidden" name="msg[0]" value="'.$passed_id.'" />'._("Move to:") .
+ $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post" style="display: inline">'.
+ '<small>'.
+ addHidden('show_more', '0' ).
+ addHidden('dmn', '1').
+ addHidden('location', $location.$current_box).
+ addHidden('msg[0]', $passed_id) . _("Move to:") .
'<select name="targetMailbox" style="padding: 0px; margin: 0px">';
if (isset($lastTargetMailbox) && !empty($lastTargetMailbox)) {
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri;
-
+ global $base_uri, $where, $what;
+
$urlMailbox = urlencode($mailbox);
- sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER);
+ $urlPassed_id = urlencode($passed_id);
+ $urlPassed_ent_id = urlencode($passed_ent_id);
+
+ $query_string = 'mailbox=' . $urlMailbox . '&passed_id=' . $urlPassed_id . '&passed_ent_id=' . $urlPassed_ent_id;
+
+ if (!empty($where)) {
+ $query_string .= '&where=' . urlencode($where);
+ }
+
+ if (!empty($what)) {
+ $query_string .= '&what=' . urlencode($what);
+ }
+
$url = $base_uri.'src/view_header.php?'.$query_string;
$s = "<TR>\n" .