0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Closes bug 672350. Right-to-Left language fixes from Saleh Madi

Browse source
This commit is contained in:
tokul 2003-02-02 13:14:58 +00:00
parent a1c58e1967
commit c84d2b36eb
3 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
functions/page_header.php
View file

@ -25,7 +25,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
global $theme_css, $custom_css;
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' .
"\n\n<html>\n<head>\n";
"\n\n" . html_tag( 'html' ,'' , '', '', '' ) . "\n<head>\n";
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {

40
src/compose.php
View file

@ -867,7 +867,7 @@ function showInputForm ($session, $values=false) {
echo '<TABLE ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
if ($compose_new_win == '1') {
echo '<TABLE ALIGN=CENTER BGCOLOR="'.$color[0].'" WIDTH="100%" BORDER=0>'."\n" .
' <TR><TD></TD><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
' <TR><TD></TD>'. html_tag( 'td', '', 'right' ) . '<INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
}
if ($location_of_buttons == 'top') {
showComposeButtonRow();
@ -876,9 +876,9 @@ function showInputForm ($session, $values=false) {
$idents = getPref($data_dir, $username, 'identities', 0);
if ($idents > 1) {
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
_("From:") . '</TD>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
' <select name=identity>' . "\n" .
' <option value=default>' .
htmlspecialchars(getPref($data_dir, $username, 'full_name'));
@ -904,33 +904,33 @@ function showInputForm ($session, $values=false) {
' </TR>' . "\n";
}
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
_("To:") . '</TD>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
' <INPUT TYPE=text NAME="send_to" VALUE="' .
htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', $color[4] ) .
_("CC:") . '</TD>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', $color[4] ) .
_("BCC:") . '</TD>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', $color[4] ) .
_("Subject:") . '</TD>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
html_tag( 'td', '', 'left', $color[4] ) . "\n";
echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
htmlspecialchars($subject) . '">' . "\n" .
' </TD>' . "\n" .
@ -990,7 +990,7 @@ function showInputForm ($session, $values=false) {
showComposeButtonRow();
} else {
echo ' <TR>' . "\n" .
' <TD COLSPAN=2 ALIGN=RIGHT>' . "\n" .
html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" .
' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '">' . "\n" .
' &nbsp;&nbsp;&nbsp;&nbsp;<BR><BR>' . "\n" .
' </TD>' . "\n" .
@ -1008,9 +1008,9 @@ function showInputForm ($session, $values=false) {
' <table width="100%" cellpadding="3" cellspacing="0" align="center"'.
' border="0">' . "\n" .
' <TR>' . "\n" .
' <TD VALIGN=MIDDLE ALIGN=RIGHT>' .
html_tag( 'td', '', 'right', '', 'VALIGN=MIDDLE' ) .
_("Attach:") . '</TD>' . "\n" .
' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
html_tag( 'td', '', 'left', '', 'VALIGN=MIDDLE' ) .
' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
' &nbsp;&nbsp;<input type="submit" name="attach"' .
' value="' . _("Add") .'">' . "\n" .
@ -1026,16 +1026,18 @@ function showInputForm ($session, $values=false) {
$attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
$type = $attachment->mime_header->type0.'/'.
$attachment->mime_header->type1;
$s_a[] = '<input type="checkbox" name="delete[]" value="' .
$key . "\">\n" . $attached_filename . ' - ' . $type .
' ('.show_readable_size( filesize( $attached_file ) )
. ')<br>'."\n";
$s_a[] = '<table bgcolor="'.$color[0].'" border="0"><tr><td><input type="checkbox" name="delete[]" value
="' .
$key . "\"></td><td>\n" . $attached_filename . '</td><td>-</
td><td> ' . $type . '</td><td>('.show_readable_size( filesize( $attached_file ) ) . '
)</td></tr></table>'."\n";
}
}
}
if (count($s_a)) {
foreach ($s_a as $s) {
echo '<tr><td align=left colspan="2" bgcolor="' . $color[0] . '">'.$s.'</td></tr>';
echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
}
echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
_("Delete selected attachments") . "\">\n" .

16
src/read_body.php
View file

@ -480,7 +480,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$topbar_delimiter = '&nbsp;|&nbsp;';
$urlMailbox = urlencode($mailbox);
$s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
' border="0" bgcolor="'.$color[9].'"><tr>' .
html_tag( 'td', '', 'left', '', 'width="33%"' ) . '<small>';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
@ -592,7 +593,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$s .= $topbar_delimiter . $next_link;
}
$s .= '</small></td>' . "\n" . '<td align="right" width="33%" nowrap><small>';
$s .= '</small></td>' . "\n" .
html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
$comp_action_uri = $comp_uri . '&amp;action=forward';
$s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
@ -622,8 +624,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
$url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
$s = "<TR>\n" .
'<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ":&nbsp;&nbsp;</B></TD>\n" .
'<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>' .
html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ":&nbsp;&nbsp;</B></TD>\n" .
html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '<SMALL>' .
'<a href="'.$url.'">'._("View Full Header").'</a>';
/* Output the printer friendly link if we are in subtle mode. */
@ -830,7 +832,8 @@ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" bor
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
echo ' <tr bgcolor="'.$color[4].'"><td>';
echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
// echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
echo ' <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
. '</tr>';
echo ' </table>';
@ -848,7 +851,8 @@ if ($attachmentsdisplay) {
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
// echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo ' <tr><td>';