[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/src view_text.php,1.17,1.18
From:       "Seth E. Randall" <indiri69 () users ! sourceforge ! net>
Date:       2003-07-29 16:35:14
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9197

Modified Files:
	view_text.php 
Log Message:
Clean ups and error checking.

Index: view_text.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/view_text.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- view_text.php	27 Mar 2003 16:47:48 -0000	1.17
+++ view_text.php	29 Jul 2003 16:35:11 -0000	1.18
@@ -26,60 +26,39 @@
 sqgetGlobalVar('key',        $key,          SQ_COOKIE);
 sqgetGlobalVar('username',   $username,     SQ_SESSION);
 sqgetGlobalVar('onetimepad', $onetimepad,   SQ_SESSION);
-sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
+sqgetGlobalVar('messages',   $messages,     SQ_SESSION);
+sqgetGlobalVar('mailbox',    $mailbox,      SQ_GET);
+sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
+sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET);
 sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
-sqgetGlobalVar('messages', $messages);
-sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
-
-if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
-  $mailbox = $temp;
-}
-if ( !sqgetGlobalVar('ent_id', $ent_id, SQ_GET) ) {
-  $ent_id = '';
-}
-if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
-  $passed_ent_id = '';
+if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
+    $passed_id = (int) $temp;
 } 
 
-
-
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);
 
-$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
+$message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
+if (!is_object($message)) {
+    $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+}
 $message_ent = &$message->getEntity($ent_id);
 if ($passed_ent_id) {
     $message = &$message->getEntity($passed_ent_id);
 }
-   
 $header = $message_ent->header;
-$charset = $header->getParameter('charset');
 $type0 = $header->type0;
 $type1 = $header->type1;
+$charset  = $header->getParameter('charset');
 $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 . '&amp;absolute_dl=true';
 
 $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 $body = decodeBody($body, $encoding);
 
-displayPageHeader($color, 'None');
-
-echo "<BR><TABLE WIDTH=\"100%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 \
                ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
-     "<B><CENTER>".
-     _("Viewing a text attachment") . " - ";
-echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
-
-$dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=true';
-echo '</b></td><tr><tr><td><CENTER><A HREF="'.$dwnld_url. '">'.
-     _("Download this as a file").
-     "</A></CENTER><BR>".
-     "</CENTER></B>".
-     "</TD></TR></TABLE>".
-     "<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD \
                BGCOLOR=\"$color[0]\">".
-     "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
-
     if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
         function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
         if (mb_detect_encoding($body) != 'ASCII') {
@@ -92,6 +71,20 @@
 } else {
     translateText($body, $wrap_at, $charset);
 }
-echo $body . "</TT></TD></TR></TABLE>";
 
+displayPageHeader($color, 'None');
+
+echo '<BR><TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 \
ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' . +     '<B><CENTER>' .
+     _("Viewing a text attachment") . ' - ' .
+     '<a href="'.$msg_url.'">'. _("View message") . '</a>' .
+     '</b></td><tr><tr><td><CENTER><A HREF="' . $dwnld_url . '">' .
+     _("Download this as a file") .
+     '</A></CENTER><BR>' .
+     '</CENTER></B>' .
+     '</TD></TR></TABLE>' .
+     '<TABLE WIDTH="98%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD \
BGCOLOR="' . $color[0] . '">' . +     '<TR><TD BGCOLOR="' . $color[4] . '"><TT>' .
+     $body . '</TT></TD></TR></TABLE>' .
+     '</body></html>';
 ?>



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]