r2l

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3013 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 7cb5e4e12381f47f4bfb9bf8773503733f638026..c6f7eb633d9cb4c1a34a352adb48ad5cb698dbb1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -71,7 +71,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort,
     }
     $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 @@ $show_num) {
         /* if there's no messages in this folder */
         echo html_tag( 'tr',
                 html_tag( 'td',
-                          "<BR><B>" . _("THIS FOLDER IS EMPTY") . "</B><BR>&nbsp;",
+                          "<BR><b>" . _("THIS FOLDER IS EMPTY") . "</b><BR>&nbsp;",
                           'center',
                           $color[4],
                           'COLSPAN="' . count($index_order) . '"'
@@ -647,7 +647,7 @@ $show_num) {
     /* End of message-list table */
 
     do_hook('mailbox_index_after');
-    echo "</TABLE></FORM>\n";
+    echo "</table></FORM>\n";
 }
 
 /*
@@ -689,24 +689,24 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
                     , '', $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>&nbsp;' . _("Move Selected To:") . '</SMALL>',
+                            '<small>&nbsp;' . _("Move Selected To:") . '</small>',
                             'left',
                             '',
                             'valign="middle" nowrap' ) .
                 html_tag( 'td',            
-                            '<SMALL>' . _("Transform Selected Messages") . ': &nbsp; </SMALL><BR>',
+                            '<small>' . _("Transform Selected Messages") . ': &nbsp; </small>',
                             'right',
                             '',
                             'nowrap' )
             )
-        . "   <TR>\n"
+        . html_tag( 'tr' ) ."\n"
         . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' )
-        . '         <SMALL>&nbsp;<TT><SELECT NAME="targetMailbox">';
+        . '         <small>&nbsp;<tt><select name="targetMailbox">';
 
     $boxes = sqimap_mailbox_list($imapConnection);
     foreach ($boxes as $boxes_part) {
@@ -716,30 +716,29 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
             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>&nbsp;'
-    . '<INPUT TYPE="SUBMIT" NAME="moveButton" VALUE="' . _("Move") . '">&nbsp;'
-    . '<INPUT TYPE="SUBMIT" NAME="attache" VALUE="' . _("Forward")
-    . "\">&nbsp;\n" . "</SMALL>\n";
+    echo '         </select></tt>&nbsp;'
+    . '<input type="submit" name="moveButton" value="' . _("Move") . '">&nbsp;'
+    . '<input type="submit" name="attache" value="' . _("Forward")
+    . "\">&nbsp;\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")
         . '">&nbsp;' . _("mailbox") . '&nbsp;';
     }
-    echo '<INPUT TYPE="SUBMIT" NAME="markRead" VALUE="' . _("Read") . '">'
-    . '<INPUT TYPE="SUBMIT" NAME="markUnread" VALUE="' . _("Unread") . '">'
-    . '<INPUT TYPE="SUBMIT" VALUE="' . _("Delete") . '">&nbsp;'
-    . "</TD>\n"
-    . "   </TR>\n";
+    echo '<input type="submit" name="markRead" value="' . _("Read") . '">'
+    . '<input type="submit" name="markUnread" value="' . _("Unread") . '">'
+    . '<input type="submit" value="' . _("Delete") . '">&nbsp;'
+    . "</td>\n"
+    . "   </tr>\n";
 
     /* draws thread sorting links */
     if ($allow_thread_sort == TRUE) {
@@ -761,9 +760,10 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
                  , '', '', '' );
     }
 
-    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 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
         $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 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
         switch ($index_order[$i]) {
         case 1: /* checkbox */
         case 5: /* flags */
-            echo '   <TD WIDTH="1%"></TD>';
+            echo html_tag( 'td' ,'&nbsp;' , '', '', 'width="1%"' );
             break;
         case 2: /* from */
             if (handleAsSent($mailbox)) {
@@ -798,7 +798,7 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
             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 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
             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 @@ function mail_message_listing_beginning ($imapConnection, $moveURL,
     if ($allow_server_sort == TRUE) {
         $sort = 6;
     }
-    echo "</TR>\n";
+    echo "</tr>\n";
 }
 
 /*
@@ -849,8 +849,8 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) {
     /* Now that we have everything figured out, show the actual button. */
     echo ' <a href="right_main.php?newsort=' . $which
     . '&amp;startMessage=1&amp;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 @@ function get_selectall_link($start_msg, $sort) {
             $result .= _("Select All");
         }
 
-        $result .= "</A>\n";
+        $result .= "</a>\n";
     }
 
     /* Return our final result. */
@@ -914,10 +914,10 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) {
     /* 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 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) {
 * 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"
     . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
-    . "TARGET=\"right\">$text</A>";
+    . "target=\"right\">$text</a>";
     return ($result);
 }
 
@@ -979,9 +979,9 @@ $show_num, $sort) {
         $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 @@ $show_num, $sort) {
             }
         }
     } 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"
         . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;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"
         . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;mailbox=$box\" "
-        . "TARGET=\"right\">" . _("Show All") . '</A>';
+        . "TARGET=\"right\">" . _("Show All") . '</a>';
     }
 
     /* Last but not least, get the value for the toggle all link. */

diff --git a/functions/options.php b/functions/options.php
index 0137114c74023db4f98de46ff78893bb7a46e2aa..057cb8c86b00801ca1981ec31bb911b506e5935b 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -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 @@ class SquirrelOption {
         }
 
         /* 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 @@ class SquirrelOption {
             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 @@ class SquirrelOption {
             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 @@ class SquirrelOption {
                 $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 @@ class SquirrelOption {
             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 @@ class SquirrelOption {
     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>&nbsp;"
+        $yes_option = '<input type="radio" name="new_' . $this->name
+                    . '" value="' . SMPREF_YES . "\"$yes_chk>&nbsp;"
                     . _("Yes");
 
         /* Build the no choice. */
-        $no_option = '<INPUT TYPE="RADIO" NAME="new_' . $this->name
-                   . '" VALUE="' . SMPREF_NO . "\"$no_chk>&nbsp;"
+        $no_option = '<input type="radio" name="new_' . $this->name
+                   . '" value="' . SMPREF_NO . "\"$no_chk>&nbsp;"
                    . _("No");
 
         /* Build and return the combined "boolean widget". */
@@ -273,8 +273,8 @@ class SquirrelOption {
     }
 
     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_optmode_element($optmode) {
 }
 
 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 @@ function print_option_groups($option_groups) {
     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\">&nbsp;</TD></TR>\n";
+        echo html_tag( 'tr',
+                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' )
+                ) . "\n";
     }
 }
 
 function OptionSubmit( $name ) {
-    echo '<tr><td>&nbsp;</td><td><input type="submit" value="' . _("Submit") . '" name="' . $name . '">' .
-         '</td></tr>';
+        echo html_tag( 'tr',
+                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' ) .
+                   html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '">', 'left', '', 'colspan="2"' )
+                ) . "\n";
 }
 
 ?>

diff --git a/locale/he_HE/LC_MESSAGES/squirrelmail.po b/locale/he_HE/LC_MESSAGES/squirrelmail.po
index d53d348938d4f0f9f82b6a425c5fc891c01cb568..9f1a878b075e4cb5e2417a1d770f626fad71f949 100644 (file)
--- a/locale/he_HE/LC_MESSAGES/squirrelmail.po
+++ b/locale/he_HE/LC_MESSAGES/squirrelmail.po
@@ -1438,7 +1438,7 @@ msgstr "
 
 #: squirrelmail/src/signout.php:80
 msgid "You have been successfully signed out."
-msgstr "äúðú÷ îäîòøëú áäöìçä."
+msgstr "äúðú÷ú îäîòøëú áäöìçä."
 
 #: squirrelmail/src/signout.php:82
 msgid "Click here to log back in."

diff --git a/src/download.php b/src/download.php
index b148bb1c5a36856f250e1d944fdfada31ce933c7..6a24ce183e72b1b4f4796def32fcb7b7d8a94efd 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -62,9 +62,6 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at, $imapC
 
     flush();
 
-         //"<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
-        //"<TR><TD BGCOLOR=\"$color[4]\"><TT>";
-
         html_tag( 'table',
             html_tag( 'tr',
                 html_tag( 'td', '<tt>' . $body . '</tt>', 'left', $color[4] )

diff --git a/src/folders.php b/src/folders.php
index f7d743741636cc2a24c2d858b8d610a7d9804b32..c9d2540fabc5f2e73309c48a647a90397cfac8ba 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -67,7 +67,7 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="4"
                 html_tag( 'td', '', 'center', $color[0] ) .
 
      "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n".
-     "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n".
+     "<input type=TEXT SIZE=25 NAME=folder_name><BR>\n".
      _("as a subfolder of").
      "<BR>".
      "<TT><SELECT NAME=subfolder>\n";
@@ -98,12 +98,12 @@ for ($i = 0; $i < count($boxes); $i++) {
 }
 echo "</SELECT></TT>\n";
 if ($show_contain_subfolders_option) {
-    echo "<br><INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
+    echo "<br><input type=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
     echo _("Let this folder contain subfolders");
     echo "<BR>";
 }
-echo "<INPUT TYPE=SUBMIT VALUE=\""._("Create")."\">\n";
-echo "</FORM></TD></TR>\n";
+echo "<input type=SUBMIT VALUE=\""._("Create")."\">\n";
+echo "</FORM></td></tr>\n";
 
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[4] )
@@ -164,7 +164,7 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT>\n".
-         "<INPUT TYPE=SUBMIT VALUE=\"".
+         "<input type=SUBMIT VALUE=\"".
          _("Rename").
          "\">\n".
          "</FORM></td></tr>\n";
@@ -204,12 +204,12 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT>\n";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"";
+    echo "<input type=SUBMIT VALUE=\"";
     echo _("Delete");
     echo "\">\n";
-    echo "</FORM></TD></TR>\n";
+    echo "</form></td></tr>\n";
 } else {
-    echo _("No folders found") . "<br><br></td><tr>";
+    echo _("No folders found") . "<br><br></td></tr>";
 }
 
 echo html_tag( 'tr',
@@ -241,7 +241,7 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT><br><br>\n";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"";
+    echo "<input type=SUBMIT VALUE=\"";
     echo _("Unsubscribe");
     echo "\">\n";
     echo "</FORM></td>\n";
@@ -283,7 +283,7 @@ if ($box && $box2) {
        echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
     }      
     echo "</select></tt><br><br>";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
+    echo "<input type=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
     echo "</FORM></td></tr></table><BR>\n";
 } else {
     echo _("No folders were found to subscribe to!") . "</td></tr></table>";

diff --git a/src/right_main.php b/src/right_main.php
index 33126f19d4d63d7bff8263e868c805e20d7635a8..aee1acd1556b50bf7cb1d678c221ebeaedc29c1a 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -129,7 +129,7 @@ if ($just_logged_in == true) {
     if (strlen(trim($motd)) > 0) {
         echo html_tag( 'table',
                     html_tag( 'tr',
-                        html_tag( 'td', $motd ,
+                        html_tag( 'td', 
                             html_tag( 'table',
                                 html_tag( 'tr',
                                     html_tag( 'td', $motd, 'center' )

diff --git a/src/vcard.php b/src/vcard.php
index bf9d46f1c499df8a1268b6eb89205660264443e9..46207d5c5f427014b1efba91f421a5e452be27d6 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -112,8 +112,10 @@ if (isset($vcard_safe['url'])) {
 
 foreach ($ShowValues as $k => $v) {
     if (isset($vcard_safe[$k]) && $vcard_safe[$k])     {
-        echo "<tr><td align=right><b>$v:</b></td><td>" . $vcard_safe[$k] .
-                "</td><tr>\n";
+        echo html_tag( 'tr',
+                   html_tag( 'td', '<b>' . $v . ':</b>', 'right' ) .
+                   html_tag( 'td', $vcard_safe[$k], 'left' )
+               ) . "\n";
     }
 }