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

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index 56b8416c..58dfb7ae 100644
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -1,13 +1,17 @@
 <?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
  */
 
+/** @ignore */
 define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
@@ -15,8 +19,9 @@ 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);
+require_once(SM_PATH . 'functions/identity.php');
+require_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'plugins/listcommands/functions.php');
 
 /* get globals */
 sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
@@ -25,70 +30,59 @@ sqgetGlobalVar('subject', $subject, SQ_GET);
 sqgetGlobalVar('body',    $body,    SQ_GET);
 sqgetGlobalVar('action',  $action,  SQ_GET);
 
+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.");
+        break;
+    default:
+        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)), $color);
+        exit;
+}
+
 echo html_tag('p', '', 'left' ) .
-html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
+    html_tag( 'table', '', 'center', $color[0], 'border="0" width="75%"' ) . "\n" .
     html_tag( 'tr',
-        html_tag( 'th', _("Mailinglist") . ' ' . _($action), '', $color[9] )
-    ) .
+            html_tag( 'th', _("Mailinglist") . ': ' . $fieldsdescr[$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.");
-    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.");
-}
+printf($out_string, '&quot;' . htmlspecialchars($send_to) . '&quot;');
 
-printf( $out_string, htmlspecialchars($send_to) );
+echo addForm(SM_PATH . 'src/compose.php', 'post');
 
-echo '<form method="post" action="../../src/compose.php">';
+$idents = get_identities();
 
-/*
- * Identity support (RFC 2369 sect. B.1.)
- *
- * I had to copy this from compose.php because there doesn't
- * seem to exist a function to get the identities.
- */
-
-$defaultmail = htmlspecialchars(getPref($data_dir, $username, 'full_name'));
-$em = getPref($data_dir, $username, 'email_address');
-if ($em != '') {
-    $defaultmail .= htmlspecialchars(' <' . $em . '>') . "\n";
-}
 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;
-    for ($i = 1; $i < $idents; $i ++) {
-        echo '<option value="' . $i . '"';
-        if (isset($identity) && $identity == $i) {
-            echo ' selected';
-        }
-        echo '>' . htmlspecialchars(getPref($data_dir, $username,
-                                                'full_name' . $i));
-        $em = getPref($data_dir, $username, 'email_address' . $i);
-        if ($em != '') {
-            echo htmlspecialchars(' <' . $em . '>') . "\n";
-        }
+if (count($idents) > 1) {
+    echo '<select name="identity">';
+    foreach($idents as $nr=>$data) {
+        echo '<option value="' . $nr . '">' .
+            htmlspecialchars(
+                    $data['full_name'].' <'.
+                    $data['email_address'] . ">\n");
     }
     echo '</select>' . "\n" ;
-
 } else {
-    echo $defaultmail;
+    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