Undo fix for PHP 4.0.4 since SquirrelMail doesn't work reliably with 4.0.4

[squirrelmail.git] / plugins / listcommands / mailout.php

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index a46815694fc5a4a350262ade375faf155f789513..9040fef87d7161892f915bf2d26c65185b68ddc2 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -1,36 +1,52 @@
 <?php
-/*
- * mailout.php part of listcommands plugin
- * last modified: 2002/01/21 by Thijs Kinkhorst
+/**
+ * mailout.php
+ *
+ * Copyright (c) 1999-2003 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 . 'include/load_prefs.php');
+include_once(SM_PATH . 'functions/html.php');
 
 displayPageHeader($color, $mailbox);
 
-echo '<P><TABLE align="center" width="75%" BGCOLOR="' . $color[0] ."\">\n"
-    .'<TR><TH BGCOLOR="'. $color[9] . '">' . _("Mailinglist") . ' ' . _($action) .
-    "</TH></TR>\n<TR><TD>";
+/* get globals */
+$mailbox = $_GET['mailbox'];
+$send_to = $_GET['send_to'];
+$subject = $_GET['subject'];
+$body    = $_GET['body'];
+$action  = $_GET['action'];
 
+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':
+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.)
@@ -44,16 +60,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;
+    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));
@@ -68,11 +84,11 @@ if ($idents != '' && $idents > 1) {
     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>';
-?>
\ No newline at end of file
+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>';
+?>