X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=6a2ef1377ae7bba3299f108eb00125802b195ab2;hp=97e71c1be36be7f5f16eece3ec3c751235cd714e;hb=cdf82d4a03ace568f23522ca11a9641216696c8a;hpb=73ee43b174ceb16e6143d0c8feb512e53eee3042

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 97e71c1b..6a2ef137 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -1,38 +1,46 @@
 <?php
-/*
- * mailout.php part of listcommands plugin
- * last modified: 2002/01/12 by Thijs Kinkhorst
+/**
+ * mailout.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
+ * $Id$
  */
- 
+
 chdir('..');
-include_once ('../src/validate.php');
-include_once ('../functions/page_header.php');
-include_once ('../src/load_prefs.php');
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'functions/page_header.php');
+include_once(SM_PATH . 'src/load_prefs.php');
+include_once(SM_PATH . 'functions/html.php');
 
 displayPageHeader($color, $mailbox);
 
-?>
-<P>
-<TABLE align="center" width="75%" BGCOLOR="<?php echo $color[0]; ?>">
-<TR><TH BGCOLOR="<?php echo $color[9] . '">' . _("Mailinglist") . ' ' . _($action); ?></TH></TR>
-<TR><TD>
-<?php
+echo html_tag('p', '', 'left' ) .
+html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
+    html_tag( 'tr',
+        html_tag( 'th', _("Mailinglist") . ' ' . _($action), '', $color[9] )
+    ) .
+    html_tag( 'tr' ) .
+    html_tag( 'td', '', 'left' );
 
 switch ( $action ) {
-case 'Help':
-    $out_string .= _("This will send a message to %s requesting help for this list. You will receive an emailed response at the address below.");
+case 'help':
+    $out_string = _("This will send a message to %s requesting help for this list. You will receive an emailed response at the address below.");
     break;
-case 'Subscribe':
-    $out_string .= _("This will send a message to %s requesting that you will be subscribed to this list. You will be subscribed with the address below.");
+case 'subscribe':
+    $out_string = _("This will send a message to %s requesting that you will be subscribed to this list. You will be subscribed with the address below.");
     break;
-case 'Unsubscribe':
-    $out_string = _("This will send a message to %s requesting that you will be subscribed to this list. It will try to unsubscribe the adress below.");
+case 'unsubscribe':
+    $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below.");
 }
 
 printf( $out_string, htmlspecialchars($send_to) );
 
-echo '<form method="POST" action="../../src/compose.php">';
+echo '<form method="post" action="../../src/compose.php">';
 
 /*
  * Identity support (RFC 2369 sect. B.1.)
@@ -46,17 +54,16 @@ $em = getPref($data_dir, $username, 'email_address');
 if ($em != '') {
     $defaultmail .= htmlspecialchars(' <' . $em . '>') . "\n";
 }
-echo '<P><CENTER>' . _("From:");
+echo html_tag('p', '', 'center' ) . _("From:") . ' ';
 
-$idents = getPref($data_dir, $username, 'identities'); 
-if ($idents != '' && $idents > 1)
-{
-    echo ' <select name=identity>' . "\n" .
-         '<option value=default>' . $defaultmail;
+$idents = getPref($data_dir, $username, 'identities');
+if ($idents != '' && $idents > 1) {
+    echo ' <select name="identity">' . "\n" .
+         '<option value="default">' . $defaultmail;
     for ($i = 1; $i < $idents; $i ++) {
         echo '<option value="' . $i . '"';
         if (isset($identity) && $identity == $i) {
-            echo ' SELECTED';
+            echo ' selected';
         }
         echo '>' . htmlspecialchars(getPref($data_dir, $username,
                                                 'full_name' . $i));
@@ -64,23 +71,18 @@ if ($idents != '' && $idents > 1)
         if ($em != '') {
             echo htmlspecialchars(' <' . $em . '>') . "\n";
         }
-    } 
+    }
     echo '</select>' . "\n" ;
 
-}
-else
-{
+} else {
     echo $defaultmail;
-} 
+}
+
+echo '<br>'
+. '<input type=hidden name="send_to" value="' . htmlspecialchars($send_to) . '">'
+. '<input type=hidden name="subject" value="' . htmlspecialchars($subject) . '">'
+. '<input type=hidden name="body" value="' . htmlspecialchars($body) . '">'
+. '<input type=hidden name="mailbox" value="' . htmlspecialchars($mailbox) . '">'
+. '<input type=submit name="send" value="' . _("Send Mail") . '"><BR><BR></CENTER>'
+. '</form></TD></TR></TABLE></P></BODY></HTML>';
 ?>
-<BR>
-<input type=hidden name="send_to" value="<?php echo htmlspecialchars($send_to); ?>">
-<input type=hidden name="subject" value="<?php echo htmlspecialchars($subject); ?>">
-<input type=hidden name="body" value="<?php echo htmlspecialchars($body); ?>">
-<input type=hidden name="mailbox" value="<?php echo htmlspecialchars($mailbox); ?>">
-<input type=submit name="send" value="<?php echo _("Send Mail"); ?>"><BR><BR></CENTER>
-</form>
-</TD></TR></TABLE>
-</P>
-</BODY>
-</HTML>
\ No newline at end of file