From 3fde693bb3935007ca630a23f72e352dd3889549 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 25 Jun 2002 07:58:34 +0000
Subject: [PATCH] r2l by Yoav

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3006 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 locale/he_HE/LC_MESSAGES/squirrelmail.po |   4 +-
 src/image.php                            |  50 ++++++-----
 src/left_main.php                        |  39 ++++++---
 src/login.php                            | 107 ++++++++++++++---------
 4 files changed, 120 insertions(+), 80 deletions(-)

diff --git a/locale/he_HE/LC_MESSAGES/squirrelmail.po b/locale/he_HE/LC_MESSAGES/squirrelmail.po
index 88dd36bb..d53d3489 100644
--- a/locale/he_HE/LC_MESSAGES/squirrelmail.po
+++ b/locale/he_HE/LC_MESSAGES/squirrelmail.po
@@ -311,7 +311,7 @@ msgstr "
 
 #: squirrelmail/src/compose.php:798
 msgid "On read"
-msgstr "á÷øéä"
+msgstr "á÷øéàä"
 
 #: squirrelmail/src/compose.php:800
 msgid "On Delivery"
@@ -536,7 +536,7 @@ msgstr "
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
-msgstr "äëæøä òãééï ìà úåøâîä ì %s. äéà úåöâ áàðâìéú áî÷åí æàú."
+msgstr "äòæøä òãééï ìà úåøâîä ì %s. äéà úåöâ áàðâìéú áî÷åí æàú."
 
 #: squirrelmail/src/help.php:137
 msgid "Some or all of the help documents are not present!"
diff --git a/src/image.php b/src/image.php
index 52f6c854..559ad12f 100644
--- a/src/image.php
+++ b/src/image.php
@@ -15,41 +15,49 @@ require_once('../src/validate.php');
 require_once('../functions/date.php');
 require_once('../functions/page_header.php');
 require_once('../src/load_prefs.php');
+require_once('../functions/html.php');
 
 displayPageHeader($color, 'None');
 
-echo '<BR>' . 
-    '<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
-    "\n" .
-    '<TR><TD BGCOLOR="' . $color[0] . '">' .
-    '<B><CENTER>' .
-    _("Viewing an image attachment") . " - ";
 if (isset($where) && isset($what)) {
   // from a search
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
+  $ViewMessageLink = '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
         '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) . 
         '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
 } else {   
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
+  $ViewMessageLink = '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
        '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
        '&amp;show_more=0">' . _("View message") . '</a>';
-}   
+}
 
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
                '&amp;mailbox=' . urlencode($mailbox) . 
                '&amp;passed_ent_id=' . $passed_ent_id . '&amp;absolute_dl=true';
 
-echo '</b></td></tr>' . "\n" .
-    '<tr><td align=center><A HREF="' . $DownloadLink . '">' .
-    _("Download this as a file") .
-    '</A></B><BR>&nbsp;' . "\n" .
-    '</TD></TR></TABLE>' . "\n" .
-
-    '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' . "\n" .
-    '<TR><TD BGCOLOR="' . $color[4] . '">' .
-    '<img src="' . $DownloadLink . '">' .
-
-    '</TD></TR></TABLE>' . "\n";
-    '</body></html>' . "\n";
+echo '<br>' . 
+    html_tag( 'table',
+        html_tag( 'tr',
+        html_tag( 'td',
+                '<b>' .
+                _("Viewing an image attachment") . ' - ' .
+                $ViewMessageLink . '</b>' ,
+          'center', $color[0] )
+         ) .
+        html_tag( 'tr',
+        html_tag( 'td',
+                    '<a href="' . $DownloadLink . '">' .
+		    _("Download this as a file") .
+                    '</a><br>&nbsp;' . "\n" ,
+          'center' )
+         ) ,
+     'center', '', 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) .
+
+    html_tag( 'table',
+        html_tag( 'tr',
+        html_tag( 'td',
+                '<img src="' . $DownloadLink . '">'
+        , 'left', $color[4] )
+         )
+   , 'center', '', 'border="0" cellspacing="0" cellpadding="2"' );
 
 ?>
diff --git a/src/left_main.php b/src/left_main.php
index 12efed21..0a768061 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -17,6 +17,7 @@ require_once('../functions/array.php');
 require_once('../functions/imap.php');
 require_once('../functions/plugin.php');
 require_once('../functions/page_header.php');
+require_once('../functions/html.php');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -65,9 +66,9 @@ function formatMailboxName($imapConnection, $box_array) {
     if ($unseen > 0) { $line .= '<B>'; }
 
     /* Crate the link for this folder. */
-    $line .= "<A HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+    $line .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
     if ($special_color) {
-        $line .= "<FONT COLOR=\"$color[11]\">";
+        $line .= "<font color=\"$color[11]\">";
     }
     if ( $mailbox == 'INBOX' ) {
         $line .= _("INBOX");
@@ -75,8 +76,8 @@ function formatMailboxName($imapConnection, $box_array) {
         $line .= str_replace(' ','&nbsp;',$mailbox);
     }
     if ($special_color == TRUE)
-        $line .= "</FONT>";
-    $line .= '</A>';
+        $line .= '</font>';
+    $line .= '</a>';
 
     /* If there are unseen message, close bolding. */
     if ($unseen > 0) { $line .= "</B>"; }
@@ -362,7 +363,10 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 	      $folder_img = '&nbsp<img src="'.$folder_img.'" heigth="15" valign="center">&nbsp';
 	    } else $folder_img = '';
 	    if (!isset($boxes->mbxs[0])) {
-		echo '   <div class="mbx_sub" id='.$j. ' onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)">' . $folder_img .$pre .$font. $boxes->mailboxname_sub .$fontend . $end. '</div>'."\n";
+	        echo '   ' . html_tag( 'div',
+	                        $folder_img .$pre .$font. $boxes->mailboxname_sub .$fontend . $end ,
+	                'left', '', 'class="mbx_sub" id="' .$j. '" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' )
+		        . "\n";
 	    } else {
     		/* get collapse information */
 		if ($collapse_folders) {
@@ -386,7 +390,10 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 		    }
 		    $collapse_link = $link;
 		} else $collapse_link='';
-		echo '   <div class="mbx_par" id='.$j. 'P onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)">' . $collapse_link . $folder_img .$pre.  $font. '&nbsp '. $boxes->mailboxname_sub .$fontend . $end. '</div>'."\n";
+	        echo '   ' . html_tag( 'div',
+	                        $collapse_link . $folder_img .$pre.  $font. '&nbsp '. $boxes->mailboxname_sub .$fontend . $end ,
+	                'left', '', 'class="mbx_par" id="' .$j. 'P" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' )
+		        . "\n";
 		echo '   <INPUT TYPE="hidden" name=mbx['.$j. 'F] value="'.$collapse.'" id=mbx['.$j.'F>'."\n";
 	    }
 	}
@@ -397,7 +404,8 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 	}
 
 	if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */
-	    echo '<div class="par_area" id='.$j.'.0 '. $visible .'>'."\n"; 
+	    echo html_tag( 'div', '', 'left', '', 'class="par_area" id='.$j.'.0 '. $visible ) . "\n";
+
 	    if ($j !='ID.0') {
 	       $j = $j .'.0';
 	}
@@ -740,8 +748,10 @@ if ($advanced_tree) {
    echo '<div ID="leftframe"><br><br>';
 }
 
-
-echo '<CENTER><FONT SIZE=4><B>'. _("Folders") . "</B><BR></FONT>\n\n";
+echo "\n\n" . html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) . 
+    html_tag( 'tr' ) . 
+    html_tag( 'td', '', 'left' ) . 
+    '<center><font size="4"><b>'. _("Folders") . "</b><br></font>\n\n";
 
 if ($date_format != 6) {
     /* First, display the clock. */
@@ -774,13 +784,13 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<CENTER><SMALL>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</SMALL></CENTER>";
+    echo '<center><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
+         ": $clk</small></center>";
 }
 
 /* Next, display the refresh button. */
-echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">'.
-     _("refresh folder list") . '</A>)</SMALL></CENTER><BR>';
+echo '<small>(<a href="../src/left_main.php" target="left">'.
+     _("refresh folder list") . '</a>)</small></center><br>';
 
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
@@ -867,6 +877,7 @@ for ($i = 0; $i < count($boxes); $i++) {
 do_hook('left_main_after');
 sqimap_logout($imapConnection);
 
-echo "</div></BODY></HTML>\n";
+echo '</td></tr></table>' . "\n".
+    "</div></body></html>\n";
 
 ?>
diff --git a/src/login.php b/src/login.php
index e84abbcd..df1a1b9a 100644
--- a/src/login.php
+++ b/src/login.php
@@ -59,6 +59,7 @@ require_once('../functions/i18n.php');
 require_once('../functions/plugin.php');
 require_once('../functions/constants.php');
 require_once('../functions/page_header.php');
+require_once('../functions/html.php');
 
 /*
  * $squirrelmail_language is set by a cookie when the user selects
@@ -90,7 +91,7 @@ do_hook('login_cookie');
 
 /* Output the javascript onload function. */
 
-$header = "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\">\n" .
+$header = "<SCRIPT LANGUAGE=\"JavaScript\" type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
@@ -102,8 +103,7 @@ $custom_css = 'none';
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
 /* Set the title of this page. */
-echo '<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000CC" VLINK="#0000CC" ALINK="#0000CC" onLoad="squirrelmail_loginpage_onload();">'.
-     "\n<FORM ACTION=\"redirect.php\" METHOD=\"POST\">\n";
+echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onLoad="squirrelmail_loginpage_onload();">';
 
 $username_form_name = 'login_username';
 $password_form_name = 'secretkey';
@@ -114,54 +114,75 @@ $loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : '');
 /* Display width and height like good little people */
 $width_and_height = '';
 if (isset($org_logo_width) && is_int($org_logo_width) && $org_logo_width>0) {
-    $width_and_height = " WIDTH=\"$org_logo_width\"";
+    $width_and_height = " width=\"$org_logo_width\"";
 }
 if (isset($org_logo_height) && is_int($org_logo_height) && $org_logo_height>0) {
-    $width_and_height .= " HEIGHT=\"$org_logo_height\"";
+    $width_and_height .= " height=\"$org_logo_height\"";
 }
 
-echo '<CENTER>'.
-     "  <IMG SRC=\"$org_logo\" ALT=\"" . sprintf(_("%s Logo"), $org_name) . 
-        "\"$width_and_height><BR>\n".
-     ( $hide_sm_attributions ? '' :
-       '<SMALL>' . sprintf (_("SquirrelMail version %s"), $version) . "<BR>\n".
-       '  ' . _("By the SquirrelMail Development Team") . "<BR></SMALL>\n" ) .
-     "</CENTER>\n".
-
-     "<CENTER>\n".
-     "<TABLE COLS=\"1\" WIDTH=\"350\">\n".
-     "   <TR><TD ALIGN=CENTER BGCOLOR=\"#DCDCDC\">\n".
-     '      <B>' . sprintf (_("%s Login"), $org_name) . "</B>\n".
-     "   </TD></TR>".
-     "   <TR><TD BGCOLOR=\"#FFFFFF\"><TABLE COLS=2 WIDTH=\"100%\">\n".
-     "      <TR>\n".
-     '         <TD WIDTH="30%" ALIGN=right>' . _("Name:") . "</TD>\n".
-     "         <TD WIDTH=\"*\" ALIGN=left>\n".
-     "            <INPUT TYPE=TEXT NAME=\"$username_form_name\" VALUE=\"$loginname_value\">\n".
-     "         </TD>\n".
-     "      </TR>\n".
-     "      <TR>\n".
-     '         <TD WIDTH="30%" ALIGN=right>' . _("Password:") . "</TD>\n".
-     "         <TD WIDTH=\"*\" ALIGN=left>\n".
-     "            <INPUT TYPE=PASSWORD NAME=\"$password_form_name\">\n".
-     "            <INPUT TYPE=HIDDEN NAME=\"js_autodetect_results\" VALUE=\"" . SMPREF_JS_OFF . "\">\n".
-     "            <INPUT TYPE=HIDDEN NAME=\"just_logged_in\" value=1>\n";
+$rcptaddress_input = '';
 if ($rcptaddress != '') {
-    echo "         <INPUT TYPE=HIDDEN NAME=\"rcptemail\" VALUE=\"".htmlspecialchars($rcptaddress)."\">\n";
+    $rcptaddress_input = '<input type="hidden" name="rcptemail" value="htmlspecialchars(' . $rcptaddress . ')">';
 }
-echo "         </TD>\n".
-     "      </TR>\n".
-     "   </TABLE></TD></TR>\n".
-     "   <TR><TD>\n".
-     '      <CENTER><INPUT TYPE=SUBMIT VALUE="' . _("Login") . "\"></CENTER>\n".
-     "   </TD></TR>\n".
-     "</TABLE>\n".
-     "</CENTER>\n";
+
+echo
+html_tag( 'table',
+    html_tag( 'tr',
+        html_tag( 'td',
+            "\n" . '<form action="redirect.php" method="post">' . "\n" .
+            '<center>'.
+            '<img src="' . $org_logo . '" alt="' . sprintf(_("%s Logo"), $org_name) .'"' .
+            $width_and_height .'><br>' . "\n".
+            ( $hide_sm_attributions ? '' :
+            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br>' ."\n".
+            '  ' . _("By the SquirrelMail Development Team") . '<br></small>' . "\n" ) .
+            "<br>\n" .
+
+            html_tag( 'table',
+                html_tag( 'tr',
+                    html_tag( 'td',
+                        '<b>' . sprintf (_("%s Login"), $org_name) . "</b>\n",
+                            'left', '#DCDCDC' )
+                    ) . "\n" .
+                html_tag( 'tr',
+                    html_tag( 'td',  "\n" .
+                        html_tag( 'table',
+                            html_tag( 'tr',
+                                html_tag( 'td',
+                                    _("Name:") ,
+                                'right', '', 'width="30%"' ) .
+                                html_tag( 'td',
+                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'">' ,
+                                'left', '', 'width="*"' )
+                                ) . "\n" .
+                            html_tag( 'tr',
+                                html_tag( 'td',
+                                    _("Password:") ,
+                                'right', '', 'width="30%"' ) .
+                                html_tag( 'td',
+                                    '<input type="password" name="' . $password_form_name . '">' . "\n" .
+                                    '<input type=hidden name="js_autodetect_results" value="SMPREF_JS_OFF">' . "\n" .
+                                    '<input type=hidden name="just_logged_in" value=1>' . "\n" .
+                                    $rcptaddress_input . "\n" ,
+                                'left', '', 'width="*"' )
+                            ) ,
+                        '', '', '', 'border="0" cols="2" width="100%"' ) ,
+                    'left', '#FFFFFF' )
+                ) . "\n" .
+                html_tag( 'tr',
+                    html_tag( 'td',
+                        '<center><input type="submit" value="' . _("Login") . '"></center>',
+                    'left' )
+                ) . "\n" ,
+            '', '', 'border="0" cols="1" width="350"' ) .
+            '</form>' . "\n",
+        'left' )
+    ) ,
+'', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
 
 do_hook('login_form');
-echo "</FORM>\n";
 
 do_hook('login_bottom');
-echo "</BODY>\n".
-     "</HTML>\n";
+echo "</body>\n".
+     "</html>\n";
 ?>
\ No newline at end of file
-- 
2.25.1