X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Flistcommands%2Fmailout.php;h=58dfb7aed2ab81a028677353535eb24a47e4bde7;hb=e392edc27bed0e613089a824aa7abac5144fce64;hp=5d08b20b78d992801783f71786dd500c136a5661;hpb=dcc1cc825e550711d0207a737f9ea3ac2b38e923;p=squirrelmail.git

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 5d08b20b..58dfb7ae 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -1,11 +1,12 @@
 <?php
+
 /**
  * mailout.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * $Id$
+ * @version $Id$
  * @package plugins
  * @subpackage listcommands
  */
@@ -19,8 +20,8 @@ include_once(SM_PATH . 'functions/page_header.php');
 include_once(SM_PATH . 'include/load_prefs.php');
 include_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/identity.php');
-
-displayPageHeader($color, $mailbox);
+require_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'plugins/listcommands/functions.php');
 
 /* get globals */
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
@@ -29,29 +30,35 @@ sqgetGlobalVar('subject', $subject, SQ_GET);
 sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
 
-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' );
+displayPageHeader($color, $mailbox);
+$fieldsdescr = listcommands_fieldsdescr();
 
 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.");
-    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.");
-    break;
-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.");
+    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.");
+        break;
+    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.");
+        break;
+    default:
+        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)), $color);
+        exit;
 }
 
-printf( $out_string, htmlspecialchars($send_to) );
+echo html_tag('p', '', 'left' ) .
+    html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
+    html_tag( 'tr',
+            html_tag( 'th', _("Mailinglist") . ': ' . $fieldsdescr[$action], '', $color[9] )
+            ) .
+    html_tag( 'tr' ) .
+    html_tag( 'td', '', 'left' );
 
-echo '<form method="post" action="../../src/compose.php">';
+printf($out_string, '&quot;' . htmlspecialchars($send_to) . '&quot;');
 
+echo addForm(SM_PATH . 'src/compose.php', 'post');
 
 $idents = get_identities();
 
@@ -62,19 +69,20 @@ if (count($idents) > 1) {
     foreach($idents as $nr=>$data) {
         echo '<option value="' . $nr . '">' .
             htmlspecialchars(
-                $data['full_name'].' <'.
-                $data['email_address'] . ">\n");
+                    $data['full_name'].' <'.
+                    $data['email_address'] . ">\n");
     }
     echo '</select>' . "\n" ;
 } else {
     echo htmlspecialchars('"'.$idents[0]['full_name'].'" <'.$idents[0]['email_address'].'>');
 }
 
-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>';
+echo '<br />' .
+    addHidden('send_to', $send_to) .
+    addHidden('subject', $subject) .
+    addHidden('body', $body) .
+    addHidden('mailbox', $mailbox) .
+    addSubmit(_("Send Mail"), 'send');
 ?>
+<br /><br /></center>
+</form></td></tr></table></p></body></html>
\ No newline at end of file