X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Fsetup.php;h=523940fe8dbc81872115f6cd1ac56f29255bafa2;hp=07e9f7040bd0504d8e7e5867ee4067b5bc3238fb;hb=e29a0356bdab63512a2592ccf23cb86423bc214b;hpb=ff5d07191b97e40f412c228ec1fbeaf8136b06fd

diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php
index 07e9f704..523940fe 100644
--- a/plugins/listcommands/setup.php
+++ b/plugins/listcommands/setup.php
@@ -3,7 +3,7 @@
 /**
  * setup.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Implementation of RFC 2369 for SquirrelMail.
@@ -12,8 +12,13 @@
  * commands such as (un)subscribe, help and list archives.
  *
  * $Id$
+ * @package plugins
+ * @subpackage listcommands
  */
 
+/**
+ * Initialize the listcommands plugin
+ */
 function squirrelmail_plugin_init_listcommands () {
     global $squirrelmail_plugin_hooks;
 
@@ -21,8 +26,7 @@ function squirrelmail_plugin_init_listcommands () {
 }
 
 function plugin_listcommands_menu() {
-    global $passed_id, $passed_ent_id, $color, $mailbox,
-           $message, $compose_new_win;
+    global $passed_id, $passed_ent_id, $color, $mailbox, $message, $startMessage;
 
     /**
      * Array of commands we can deal with from the header. The Reply option
@@ -39,58 +43,51 @@ function plugin_listcommands_menu() {
 
     foreach ($message->rfc822_header->mlist as $cmd => $actions) {
 
-	/* I don't know this action... skip it */
-	if(!array_key_exists($cmd, $fieldsdescr)) {
+        /* I don't know this action... skip it */
+        if ( !array_key_exists($cmd, $fieldsdescr) ) {
             continue;
         }
 
         /* proto = {mailto,href} */
-	$proto = array_shift(array_keys($actions));
-	$act   = array_shift($actions);
+        $proto = array_shift(array_keys($actions));
+        $act   = array_shift($actions);
 
         if ($proto == 'mailto') {
 
             if (($cmd == 'post') || ($cmd == 'owner')) {
-                $url = 'compose.php?';
+                $url = 'src/compose.php?'.
+                (isset($startMessage)?'startMessage='.$startMessage.'&':'');
             } else {
-                $url = "../plugins/listcommands/mailout.php?action=$cmd&";
+                $url = "plugins/listcommands/mailout.php?action=$cmd&";
             }
             $url .= 'send_to=' . strtr($act,'?','&');
 
-            if ($compose_new_win == '1') {
-                $output[] = "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$url')\">" . $fieldsdescr[$cmd] . '</A>';
-            }
-            else {
-                $output[] = '<A HREF="' . $url . '">' . $fieldsdescr[$cmd] . '</A>';
-            }
+            $output[] = makeComposeLink($url, $fieldsdescr[$cmd]);
+
             if ($cmd == 'post') {
-	        $url .= '&amp;passed_id='.$passed_id.
-		        '&amp;mailbox='.urlencode($mailbox).
-		        (isset($passed_ent_id)?'&amp;passed_ent_id='.$passed_ent_id:'');
-                $url .= '&amp;action=reply';
-                if ($compose_new_win == '1') {
-                    $output[] = "<A HREF=\"javascript:void(0)\" onClick=\"comp_in_new('$url')\">" . $fieldsdescr['reply'] . '</A>';
-                }
-                else {
-                    $output[] = '<A HREF="' . $url . '">' . $fieldsdescr['reply'] . '</A>';
-                }
+                if (!isset($mailbox))
+                    $mailbox = 'INBOX';
+                $url .= '&amp;passed_id='.$passed_id.
+                        '&amp;mailbox='.urlencode($mailbox).
+                        (isset($passed_ent_id)?'&amp;passed_ent_id='.$passed_ent_id:'');
+                $url .= '&amp;smaction=reply';
+
+                $output[] = makeComposeLink($url, $fieldsdescr['reply']);
             }
-        } elseif ($proto == 'href') {
-            $output[] = '<A HREF="' . $act . '" TARGET="_blank">'
-                      . $fieldsdescr[$cmd] . '</A>';
+        } else if ($proto == 'href') {
+            $output[] = '<a href="' . $act . '" target="_blank">'
+                      . $fieldsdescr[$cmd] . '</a>';
         }
     }
 
     if (count($output) > 0) {
-        echo '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
-             ' border="0" bgcolor="'.$color[0].'">'. "\n";
         echo '<tr>';
-        echo html_tag( 'td', '<b>'._("Mailing List").':&nbsp;&nbsp;</b>', 'right', $color[0], 'valign="top" width="20%"') . "\n";
-        echo html_tag( 'td', 
-	         '<small>' . implode('&nbsp;|&nbsp;', $output) . '</small>', 'left', $color[0], 'valign="top" width="80%"');
-        echo "\n</tr>";
-	echo '</table>'."\n";
+        echo html_tag('td', '<b>' . _("Mailing List") . ':&nbsp;&nbsp;</b>',
+                      'right', '', 'valign="middle" width="20%"') . "\n";
+        echo html_tag('td', '<small>' . implode('&nbsp;|&nbsp;', $output) . '</small>',
+                      'left', $color[0], 'valign="middle" width="80%"') . "\n";
+        echo '</tr>';
     }
 }
 
-?>
+?>
\ No newline at end of file