Menu
▾
▴
[SM-CVS] CVS: squirrelmail/functions mailbox_display.php,1.249,1.250 options.php,1.20,1.21
|
From: Philippe M. <phi...@us...> - 2002-06-26 13:12:01
|
Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv30870/functions
Modified Files:
mailbox_display.php options.php
Log Message:
r2l
Index: mailbox_display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mailbox_display.php,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -w -r1.249 -r1.250
--- mailbox_display.php 24 Jun 2002 07:57:32 -0000 1.249
+++ mailbox_display.php 26 Jun 2002 13:11:58 -0000 1.250
@@ -71,7 +71,7 @@
}
$urlMailbox = urlencode($mailbox);
$subject = processSubject($msg['SUBJECT']);
- echo "<TR>\n";
+ echo html_tag( 'tr' ) . "\n";
if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
$flag = "<font color=\"$color[2]\">";
@@ -587,7 +587,7 @@
/* if there's no messages in this folder */
echo html_tag( 'tr',
html_tag( 'td',
- "<BR><B>" . _("THIS FOLDER IS EMPTY") . "</B><BR> ",
+ "<BR><b>" . _("THIS FOLDER IS EMPTY") . "</b><BR> ",
'center',
$color[4],
'COLSPAN="' . count($index_order) . '"'
@@ -647,7 +647,7 @@
/* End of message-list table */
do_hook('mailbox_index_after');
- echo "</TABLE></FORM>\n";
+ echo "</table></FORM>\n";
}
/*
@@ -689,24 +689,24 @@
, '', $color[4], 'border="0" width="100%" cellpadding="2" cellspacing="0"' )
, 'left', '', '' )
, '', $color[0] )
- . '<TR>'
+ . html_tag( 'tr' ) . "\n"
. html_tag( 'td' ,'' , 'left', $color[0], '' )
. html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0" cellspacing="0"' )
. html_tag( 'tr',
html_tag( 'td',
- '<SMALL> ' . _("Move Selected To:") . '</SMALL>',
+ '<small> ' . _("Move Selected To:") . '</small>',
'left',
'',
'valign="middle" nowrap' ) .
html_tag( 'td',
- '<SMALL>' . _("Transform Selected Messages") . ': </SMALL><BR>',
+ '<small>' . _("Transform Selected Messages") . ': </small>',
'right',
'',
'nowrap' )
)
- . " <TR>\n"
+ . html_tag( 'tr' ) ."\n"
. html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' )
- . ' <SMALL> <TT><SELECT NAME="targetMailbox">';
+ . ' <small> <tt><select name="targetMailbox">';
$boxes = sqimap_mailbox_list($imapConnection);
foreach ($boxes as $boxes_part) {
@@ -716,30 +716,29 @@
if( $box2 == 'INBOX' ) {
$box2 = _("INBOX");
}
+ echo ' <option value="' . $box . '"';
if ($lastTargetMailbox == $box) {
- echo " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
- }
- else {
- echo " <OPTION VALUE=\"$box\">$box2</OPTION>\n";
+ echo ' selected';
}
+ echo '>' . $box2 . '</option>' . "\n";
}
}
- echo ' </SELECT></TT> '
- . '<INPUT TYPE="SUBMIT" NAME="moveButton" VALUE="' . _("Move") . '"> '
- . '<INPUT TYPE="SUBMIT" NAME="attache" VALUE="' . _("Forward")
- . "\"> \n" . "</SMALL>\n";
+ echo ' </select></tt> '
+ . '<input type="submit" name="moveButton" value="' . _("Move") . '"> '
+ . '<input type="submit" name="attache" value="' . _("Forward")
+ . "\"> \n" . "</small>\n";
- echo " </TD>\n"
- . " <TD ALIGN=\"RIGHT\" NOWRAP>";
+ echo " </td>\n"
+ . html_tag( 'td', '', 'right', '', 'nowrap' );
if (!$auto_expunge) {
- echo '<INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="' . _("Expunge")
+ echo '<input type="submit" name="expungeButton" value="' . _("Expunge")
. '"> ' . _("mailbox") . ' ';
}
- echo '<INPUT TYPE="SUBMIT" NAME="markRead" VALUE="' . _("Read") . '">'
- . '<INPUT TYPE="SUBMIT" NAME="markUnread" VALUE="' . _("Unread") . '">'
- . '<INPUT TYPE="SUBMIT" VALUE="' . _("Delete") . '"> '
- . "</TD>\n"
- . " </TR>\n";
+ echo '<input type="submit" name="markRead" value="' . _("Read") . '">'
+ . '<input type="submit" name="markUnread" value="' . _("Unread") . '">'
+ . '<input type="submit" value="' . _("Delete") . '"> '
+ . "</td>\n"
+ . " </tr>\n";
/* draws thread sorting links */
if ($allow_thread_sort == TRUE) {
@@ -761,9 +760,10 @@
, '', '', '' );
}
- echo "</TABLE>\n";
+ echo "</table>\n";
do_hook('mailbox_form_before');
- echo '</TD></TR><TR>'
+ echo '</td></tr>'
+ . html_tag( 'tr' )
. html_tag( 'td' ,'' , '', $color[0], '' );
if ($GLOBALS['alt_index_colors']){
$cellspacing = '0';
@@ -771,7 +771,7 @@
$cellspacing = '1';
}
echo html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="2" cellspacing="'. $cellspacing .'"' )
- . "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
+ . html_tag( 'tr' ,'' , 'center', $color[5] );
/* if using server sort we highjack the
* the $sort var and use $server_sort_order
* instead. but here we reset sort for a bit
@@ -785,7 +785,7 @@
switch ($index_order[$i]) {
case 1: /* checkbox */
case 5: /* flags */
- echo ' <TD WIDTH="1%"></TD>';
+ echo html_tag( 'td' ,' ' , '', '', 'width="1%"' );
break;
case 2: /* from */
if (handleAsSent($mailbox)) {
@@ -798,7 +798,7 @@
if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) {
ShowSortButton($sort, $mailbox, 2, 3);
}
- echo "</TD>\n";
+ echo "</td>\n";
break;
case 3: /* date */
echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
@@ -814,7 +814,7 @@
if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) {
ShowSortButton($sort, $mailbox, 4, 5);
}
- echo "</TD>\n";
+ echo "</td>\n";
break;
case 6: /* size */
echo html_tag( 'td', '<b>' . _("Size") . '</b>', 'center', '', 'width="5%"' );
@@ -827,7 +827,7 @@
if ($allow_server_sort == TRUE) {
$sort = 6;
}
- echo "</TR>\n";
+ echo "</tr>\n";
}
/*
@@ -849,8 +849,8 @@
/* Now that we have everything figured out, show the actual button. */
echo ' <a href="right_main.php?newsort=' . $which
. '&startMessage=1&mailbox=' . urlencode($mailbox)
- . '"><IMG SRC="../images/' . $img
- . '" BORDER=0 WIDTH=12 HEIGHT=10 ALT="sort"></a>';
+ . '"><img src="../images/' . $img
+ . '" border=0 width=12 height=10 alt="sort"></a>';
}
function get_selectall_link($start_msg, $sort) {
@@ -900,7 +900,7 @@
$result .= _("Select All");
}
- $result .= "</A>\n";
+ $result .= "</a>\n";
}
/* Return our final result. */
@@ -914,10 +914,10 @@
/* Compute the $msg_cnt_str. */
$result = '';
if ($start_msg < $end_msg) {
- $result = sprintf(_("Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"),
+ $result = sprintf(_("Viewing Messages: <b>%s</b> to <b>%s</b> (%s total)"),
$start_msg, $end_msg, $num_msgs);
} else if ($start_msg == $end_msg) {
- $result = sprintf(_("Viewing Message: <B>%s</B> (1 total)"), $start_msg);
+ $result = sprintf(_("Viewing Message: <b>%s</b> (1 total)"), $start_msg);
} else {
$result = '<br>';
}
@@ -930,9 +930,9 @@
* Generate a paginator link.
*/
function get_paginator_link($box, $start_msg, $use, $text) {
- $result = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
+ $result = "<a href=\"right_main.php?use_mailbox_cache=$use"
. "&startMessage=$start_msg&mailbox=$box\" "
- . "TARGET=\"right\">$text</A>";
+ . "target=\"right\">$text</a>";
return ($result);
}
@@ -979,9 +979,9 @@
$nxt_str = get_paginator_link($box, $next_grp, $use, _("Next"));
} else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) {
$prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous"));
- $nxt_str = "<FONT COLOR=\"$color[9]\">"._("Next")."</FONT>\n";
+ $nxt_str = "<font color=\"$color[9]\">"._("Next")."</font>\n";
} else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) {
- $prv_str = "<FONT COLOR=\"$color[9]\">"._("Previous") . '</FONT>';
+ $prv_str = "<font color=\"$color[9]\">"._("Previous") . '</font>';
$nxt_str = get_paginator_link($box, $next_grp, $use, _("Next"));
}
@@ -1099,16 +1099,16 @@
}
}
} else if ($PG_SHOWNUM == 999999) {
- $pg_str = "<A HREF=\"right_main.php?PG_SHOWALL=0"
+ $pg_str = "<a href=\"right_main.php?PG_SHOWALL=0"
. "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
- . "TARGET=\"right\">" ._("Paginate") . '</A>' . $spc;
+ . "TARGET=\"right\">" ._("Paginate") . '</a>' . $spc;
}
/* If necessary, compute the 'show all' string. */
if (($prv_str != '') || ($nxt_str != '')) {
- $all_str = "<A HREF=\"right_main.php?PG_SHOWALL=1"
+ $all_str = "<a href=\"right_main.php?PG_SHOWALL=1"
. "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
- . "TARGET=\"right\">" . _("Show All") . '</A>';
+ . "TARGET=\"right\">" . _("Show All") . '</a>';
}
/* Last but not least, get the value for the toggle all link. */
Index: options.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/options.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- options.php 2 Mar 2002 20:28:33 -0000 1.20
+++ options.php 26 Jun 2002 13:11:58 -0000 1.21
@@ -18,11 +18,11 @@
/* Define constants for the various option types. */
define('SMOPT_TYPE_STRING', 0);
define('SMOPT_TYPE_STRLIST', 1);
-define('SMOPT_TYPE_TEXTAREA', 2);
+define('SMOPT_TYPE_textarea', 2);
define('SMOPT_TYPE_INTEGER', 3);
define('SMOPT_TYPE_FLOAT', 4);
define('SMOPT_TYPE_BOOLEAN', 5);
-define('SMOPT_TYPE_HIDDEN', 6);
+define('SMOPT_TYPE_hidden', 6);
define('SMOPT_TYPE_COMMENT', 7);
/* Define constants for the options refresh levels. */
@@ -97,7 +97,7 @@
}
/* Set the default save function. */
- if (($type != SMOPT_TYPE_HIDDEN) && ($type != SMOPT_TYPE_COMMENT)) {
+ if (($type != SMOPT_TYPE_hidden) && ($type != SMOPT_TYPE_COMMENT)) {
$this->save_function = SMOPT_SAVE_DEFAULT;
} else {
$this->save_function = SMOPT_SAVE_NOOP;
@@ -145,7 +145,7 @@
case SMOPT_TYPE_STRLIST:
$result = $this->createWidget_StrList();
break;
- case SMOPT_TYPE_TEXTAREA:
+ case SMOPT_TYPE_textarea:
$result = $this->createWidget_TextArea();
break;
case SMOPT_TYPE_INTEGER:
@@ -157,16 +157,16 @@
case SMOPT_TYPE_BOOLEAN:
$result = $this->createWidget_Boolean();
break;
- case SMOPT_TYPE_HIDDEN:
+ case SMOPT_TYPE_hidden:
$result = $this->createWidget_Hidden();
break;
case SMOPT_TYPE_COMMENT:
$result = $this->createWidget_Comment();
break;
default:
- $result = '<FONT COLOR="' . $color[2] . '">'
+ $result = '<font color="' . $color[2] . '">'
. sprintf(_("Option Type '%s' Not Found"), $this->type)
- . '</FONT>';
+ . '</font>';
}
/* Add the script for this option. */
@@ -195,33 +195,33 @@
$width = 25;
}
- $result = "<INPUT NAME=\"new_$this->name\" VALUE=\"$this->value\" SIZE=\"$width\">";
+ $result = "<input name=\"new_$this->name\" value=\"$this->value\" size=\"$width\">";
return ($result);
}
function createWidget_StrList() {
/* Begin the select tag. */
- $result = "<SELECT NAME=\"new_$this->name\">";
+ $result = "<select name=\"new_$this->name\">";
/* Add each possible value to the select list. */
foreach ($this->possible_values as $real_value => $disp_value) {
/* Start the next new option string. */
- $new_option = "<OPTION VALUE=\"$real_value\"";
+ $new_option = "<option value=\"$real_value\"";
/* If this value is the current value, select it. */
if ($real_value == $this->value) {
- $new_option .= ' SELECTED';
+ $new_option .= ' selected';
}
/* Add the display value to our option string. */
- $new_option .= ">$disp_value</OPTION>";
+ $new_option .= ">$disp_value</option>";
/* And add the new option string to our select tag. */
$result .= $new_option;
}
/* Close the select tag and return our happy result. */
- $result .= '</SELECT>';
+ $result .= '</select>';
return ($result);
}
@@ -234,8 +234,8 @@
case SMOPT_SIZE_NORMAL:
default: $rows = 5; $cols = 50;
}
- $result = "<TEXTAREA NAME=\"new_$this->name\" ROWS=\"$rows\" "
- . "COLS=\"$cols\">$this->value</TEXTAREA>";
+ $result = "<textarea name=\"new_$this->name\" rows=\"$rows\" "
+ . "cols=\"$cols\">$this->value</textarea>";
return ($result);
}
@@ -250,21 +250,21 @@
function createWidget_Boolean() {
/* Do the whole current value thing. */
if ($this->value != SMPREF_NO) {
- $yes_chk = ' CHECKED';
+ $yes_chk = ' checked';
$no_chk = '';
} else {
$yes_chk = '';
- $no_chk = ' CHECKED';
+ $no_chk = ' checked';
}
/* Build the yes choice. */
- $yes_option = '<INPUT TYPE="RADIO" NAME="new_' . $this->name
- . '" VALUE="' . SMPREF_YES . "\"$yes_chk> "
+ $yes_option = '<input type="radio" name="new_' . $this->name
+ . '" value="' . SMPREF_YES . "\"$yes_chk> "
. _("Yes");
/* Build the no choice. */
- $no_option = '<INPUT TYPE="RADIO" NAME="new_' . $this->name
- . '" VALUE="' . SMPREF_NO . "\"$no_chk> "
+ $no_option = '<input type="radio" name="new_' . $this->name
+ . '" value="' . SMPREF_NO . "\"$no_chk> "
. _("No");
/* Build and return the combined "boolean widget". */
@@ -273,8 +273,8 @@
}
function createWidget_Hidden() {
- $result = '<INPUT TYPE="HIDDEN" NAME="new_' . $this->name
- . '" VALUE="' . $this->value . '">';
+ $result = '<input type="hidden" name="new_' . $this->name
+ . '" value="' . $this->value . '">';
return ($result);
}
@@ -314,9 +314,9 @@
}
function create_hidden_element($name, $value) {
- $result = '<INPUT TYPE="HIDDEN" '
- . 'NAME="' . $name . '" '
- . 'VALUE="' . $value . '">';
+ $result = '<input type="hidden" '
+ . 'name="' . $name . '" '
+ . 'value="' . $value . '">';
return ($result);
}
@@ -387,32 +387,37 @@
foreach ($option_groups as $next_optgrp) {
/* If it is not blank, print the name for this option group. */
if ($next_optgrp['name'] != '') {
- echo '<TR><TD ALIGN=CENTER VALIGN=MIDDLE COLSPAN=2 NOWRAP><B>'
- . $next_optgrp['name']
- . "</B></TD></TR>\n";
+ echo html_tag( 'tr', "\n".
+ html_tag( 'td',
+ '<b>' . $next_optgrp['name'] . '</b>' ,
+ 'center' ,'', 'valign="middle" colspan="2" nowrap' )
+ ) ."\n";
}
/* Print each option in this option group. */
foreach ($next_optgrp['options'] as $option) {
- if ($option->type != SMOPT_TYPE_HIDDEN) {
- echo "<TR>\n";
- echo ' <TD ALIGN="RIGHT" VALIGN="MIDDLE">'
- . $option->caption . ":</TD>\n";
- echo ' <TD>' . $option->createHTMLWidget() . "</TD>\n";
- echo "</TR>\n";
+ if ($option->type != SMOPT_TYPE_hidden) {
+ echo html_tag( 'tr', "\n".
+ html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
+ html_tag( 'td', $option->createHTMLWidget(), 'left' )
+ ) ."\n";
} else {
echo $option->createHTMLWidget();
}
}
/* Print an empty row after this option group. */
- echo "<TR><TD COLSPAN=\"2\"> </TD></TR>\n";
+ echo html_tag( 'tr',
+ html_tag( 'td', ' ', 'left', '', 'colspan="2"' )
+ ) . "\n";
}
}
function OptionSubmit( $name ) {
- echo '<tr><td> </td><td><input type="submit" value="' . _("Submit") . '" name="' . $name . '">' .
- '</td></tr>';
+ echo html_tag( 'tr',
+ html_tag( 'td', ' ', 'left', '', 'colspan="2"' ) .
+ html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '">', 'left', '', 'colspan="2"' )
+ ) . "\n";
}
?>
|