projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent notice on non-html attachment viewing
[squirrelmail.git]
/
src
/
view_text.php
diff --git
a/src/view_text.php
b/src/view_text.php
index 563b8778db7a1a020baa5d6c40bd9bf98d6150e7..948420e016b5ba1728b9c2791c281d66ac10530a 100644
(file)
--- a/
src/view_text.php
+++ b/
src/view_text.php
@@
-1,11
+1,9
@@
<?php
/**
<?php
/**
- * view_text.php --
Displays the main framese
t
+ * view_text.php --
View a text attachmen
t
*
*
- * Who knows what this file does. However PUT IT HERE DID NOT PUT
- * A SINGLE FREAKING COMMENT IN! Whoever is responsible for this,
- * be very ashamed.
+ * Used by attachment_common code.
*
* @copyright © 1999-2006 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
* @copyright © 1999-2006 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@
-13,8
+11,7
@@
* @package squirrelmail
*/
* @package squirrelmail
*/
-
-/* SquirrelMail required files. */
+/** SquirrelMail required files. */
include('../include/init.php');
include(SM_PATH . 'functions/imap_general.php');
include(SM_PATH . 'functions/imap_messages.php');
include('../include/init.php');
include(SM_PATH . 'functions/imap_general.php');
include(SM_PATH . 'functions/imap_messages.php');
@@
-22,9
+19,6
@@
include(SM_PATH . 'functions/mime.php');
include(SM_PATH . 'functions/date.php');
include(SM_PATH . 'functions/url_parser.php');
include(SM_PATH . 'functions/date.php');
include(SM_PATH . 'functions/url_parser.php');
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('messages', $messages, SQ_SESSION);
sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
sqgetGlobalVar('messages', $messages, SQ_SESSION);
sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
@@
-34,7
+28,7
@@
if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
$passed_id = (int) $temp;
}
$passed_id = (int) $temp;
}
-$imapConnection = sqimap_login($username,
$key
, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username,
false
, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
$message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
$message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
@@
-54,6
+48,9
@@
$encoding = strtolower($header->encoding);
$msg_url = 'read_body.php?' . $QUERY_STRING;
$msg_url = set_url_var($msg_url, 'ent_id', 0);
$dwnld_url = '../src/download.php?' . $QUERY_STRING . '&absolute_dl=true';
$msg_url = 'read_body.php?' . $QUERY_STRING;
$msg_url = set_url_var($msg_url, 'ent_id', 0);
$dwnld_url = '../src/download.php?' . $QUERY_STRING . '&absolute_dl=true';
+$unsafe_url = 'view_text.php?' . $QUERY_STRING;
+$unsafe_url = set_url_var($unsafe_url, 'view_unsafe_images', 1);
+
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
@@
-68,11
+65,14
@@
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
}
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
}
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
+ $ishtml = TRUE;
$body = MagicHTML( $body, $passed_id, $message, $mailbox);
// html attachment with character set information
$body = MagicHTML( $body, $passed_id, $message, $mailbox);
// html attachment with character set information
- if (! empty($charset))
+ if (! empty($charset))
{
$body = charset_decode($charset,$body,false,true);
$body = charset_decode($charset,$body,false,true);
+ }
} else {
} else {
+ $ishtml = FALSE;
translateText($body, $wrap_at, $charset);
}
translateText($body, $wrap_at, $charset);
}
@@
-86,6
+86,9
@@
echo _("Viewing a text attachment") . ' - ' .
?>
</b></td><tr><tr><td><div style="text-align: center;">
<?php
?>
</b></td><tr><tr><td><div style="text-align: center;">
<?php
+if ( $ishtml ) {
+ echo '<a href="' . $unsafe_url . '">' . _("View Unsafe Images") . '</a> | ';
+}
echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
?>
</div><br />
echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
?>
</div><br />
@@
-97,4
+100,4
@@
echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
</tt></td></tr></table>
<?php
$oTemplate->display('footer.tpl');
</tt></td></tr></table>
<?php
$oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>