Renamed class/*.class files to class/*.class.php and made modifications

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index d4c3b5d60129b1978e77373cea431b806f0a874b..48ad331b76c7b9daff01b5fd1bd192095cf01408 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -19,7 +19,7 @@ require_once('../functions/date.php');
 require_once('../functions/url_parser.php');
 require_once('../functions/smtp.php');
 require_once('../functions/html.php');
-require_once('../class/html.class');
+require_once('../class/html.class.php');
 require_once('../src/view_header.php');
 
 /**
@@ -672,9 +672,9 @@ if ( $dir == 'ltr' ) {
 if ($use_css) {
    $table_ar = array('cellpadding' => 3);
 } else {
-   $table_ar = array( 'width' => '100%', 'cellpadding' => 3 ,
-                      'cellspacing'=> 0,'align'=> 'center', 
-                     'bgcolor' => $color[9]);
+   $table_ar = array( 'width' => '100%', 'cellpadding' => 3,
+                      'cellspacing' => 0, 'align'=> 'center',
+                      'border' => 0, 'bgcolor' => $color[9]);
 }
                      
 $topbar = new html('table','','','rb_tb','',$table_ar);
@@ -845,6 +845,7 @@ if (!$use_css) {
    $ar_table = array( 'width' => '100%',
                       'cellpadding' => '0',
                      'cellspacing' => '0',
+                      'border' => '0',
                      'align' =>'center');
 } else {
    $ar_key = '';
@@ -972,10 +973,9 @@ if ($default_use_mdn) {
 //$envtable->echoHtml($use_css);
 
 $rb_tools_table = new html('table','','','rb_tools','',$ar_table);
-$row = new html('tr','','','rb_rt','',array('width'=> '100%',
-                                            'valign'=> 'top',
-                                            'align'=> 'right',                                     
-                                           'nowrap'));
+$row = new html('tr','','','rb_rt','',array('valign'=> 'top',
+                                            'align'=> 'right'));
+
 /* view header */
 $viewheader_url = $base_uri . 'src/read_body.php?mailbox=' . $urlMailbox . 
                   '&passed_id='. $passed_id. '&';
@@ -989,7 +989,7 @@ if ($where && $what) {
 
 $link = new html('a',_("View Full Header") .' | ','','','',array (
             'href' => $viewheader_url));
-$col = new html('td','',array('small'=>true),'rb_ht','rb_vht');
+$col = new html('td','',array('small'=>true),'rb_ht','rb_vht',array('nowrap'));
 $col->htmlAdd($link);
 
 /* Output the printer friendly link if we are in subtle mode. */
@@ -1016,13 +1016,13 @@ if ($use_css) {
 
 $rb_message_table =  new html('table','','','rb_body','',$ar_table);
 $row_body = new html('tr','','','rb_bd','rb_bdr');
-$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
+$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','',$ar_row);
 $row_body->htmlAdd($col_body);
 $rb_message_table->htmlAdd($row_body);
 
-$row_body = new html('tr','','','rb_bd','rb_bdr');
+$row_body = new html('tr','','','rb_bd','');
 $attachements = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
-$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','rb_bdr',$ar_row);
+$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','',$ar_row);
 $row_body->htmlAdd($col_body);
 $rb_message_table->htmlAdd($row_body);
 
@@ -1039,8 +1039,8 @@ $body->htmlAdd($envtable);
 $body->htmlAdd($rb_tools_table);
 $body->htmlAdd($rb_message_table);
 
-$page->html_el[0]->htmlAdd($head);
-$page->html_el[0]->htmlAdd($body);
+$page->html_el[1]->htmlAdd($head);
+$page->html_el[1]->htmlAdd($body);
 
 $page->echoHtml();
 
@@ -1073,5 +1073,4 @@ if (($attachment_common_show_images) &&
 //do_hook('html_bottom');
 sqimap_logout($imapConnection);
 ?>
-</body>
-</html>
+