X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Flistcommands%2Fsetup.php;h=50b3add1e750eed86be9b17e01f6d2291cc0c3ab;hb=e5f21a9121fd5ad2d5456201059c648849e34504;hp=523940fe8dbc81872115f6cd1ac56f29255bafa2;hpb=e50f5ac2682d655013d18d97f9a2aa30b7ed9485;p=squirrelmail.git

diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php
index 523940fe..50b3add1 100644
--- a/plugins/listcommands/setup.php
+++ b/plugins/listcommands/setup.php
@@ -3,15 +3,14 @@
 /**
  * setup.php
  *
- * 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.
  * When viewing a message from a mailinglist complying with this RFC,
  * this plugin displays a menu which gives the user a choice of mailinglist
  * commands such as (un)subscribe, help and list archives.
  *
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage listcommands
  */
@@ -22,72 +21,24 @@
 function squirrelmail_plugin_init_listcommands () {
     global $squirrelmail_plugin_hooks;
 
-    $squirrelmail_plugin_hooks['read_body_header']['listcommands'] = 'plugin_listcommands_menu';
+    $squirrelmail_plugin_hooks['template_construct_read_headers.tpl']['listcommands'] = 'plugin_listcommands_menu';
+    $squirrelmail_plugin_hooks['optpage_register_block']['listcommands'] = 'plugin_listcommands_optpage_register_block';
+
 }
 
+/**
+ * Main function added to read_body_header
+ */
 function plugin_listcommands_menu() {
-    global $passed_id, $passed_ent_id, $color, $mailbox, $message, $startMessage;
-
-    /**
-     * Array of commands we can deal with from the header. The Reply option
-     * is added later because we generate it using the Post information.
-     */
-    $fieldsdescr = array('post'        => _("Post to List"),
-                         'reply'       => _("Reply to List"),
-                         'subscribe'   => _("Subscribe"),
-                         'unsubscribe' => _("Unsubscribe"),
-                         'archive'     => _("List Archives"),
-                         'owner'       => _("Contact Listowner"),
-                         'help'        => _("Help"));
-    $output = array();
-
-    foreach ($message->rfc822_header->mlist as $cmd => $actions) {
-
-        /* 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);
-
-        if ($proto == 'mailto') {
-
-            if (($cmd == 'post') || ($cmd == 'owner')) {
-                $url = 'src/compose.php?'.
-                (isset($startMessage)?'startMessage='.$startMessage.'&':'');
-            } else {
-                $url = "plugins/listcommands/mailout.php?action=$cmd&";
-            }
-            $url .= 'send_to=' . strtr($act,'?','&');
-
-            $output[] = makeComposeLink($url, $fieldsdescr[$cmd]);
-
-            if ($cmd == 'post') {
-                if (!isset($mailbox))
-                    $mailbox = 'INBOX';
-                $url .= '&passed_id='.$passed_id.
-                        '&mailbox='.urlencode($mailbox).
-                        (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
-                $url .= '&smaction=reply';
+    include_once(SM_PATH . 'plugins/listcommands/functions.php');
+    return plugin_listcommands_menu_do();
+}
 
-                $output[] = makeComposeLink($url, $fieldsdescr['reply']);
-            }
-        } else if ($proto == 'href') {
-            $output[] = '<a href="' . $act . '" target="_blank">'
-                      . $fieldsdescr[$cmd] . '</a>';
-        }
-    }
 
-    if (count($output) > 0) {
-        echo '<tr>';
-        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>';
-    }
+/**
+  * Show mailing list management option section on options page
+  */
+function plugin_listcommands_optpage_register_block() {
+    include_once(SM_PATH . 'plugins/listcommands/functions.php');
+    plugin_listcommands_optpage_register_block_do();
 }
-
-?>
\ No newline at end of file