X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Flistcommands%2Fsetup.php;h=bb7be7941b87068a2980aba88178a0a82d9a0873;hp=aa7dba06632881ff8b51c760e1a6638f0cb0f6d0;hb=6614128e580396f5e881fa058c1935b0ee2fc867;hpb=9c3e6cd4518d9e0d072a146fd6d19acd4daac243

diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php
index aa7dba06..bb7be794 100644
--- a/plugins/listcommands/setup.php
+++ b/plugins/listcommands/setup.php
@@ -21,100 +21,76 @@ function squirrelmail_plugin_init_listcommands () {
 }
 
 function plugin_listcommands_menu() {
-    global $imapConnection, $passed_id, $color, $mailbox,
-           $subject, $ent_num, $priority_level, $compose_new_win;
+    global $passed_id, $passed_ent_id, $color, $mailbox,
+           $message, $compose_new_win;
 
     /**
      * 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"));
-    $fields = array_keys($fieldsdescr);
-
-    $sorted_cmds = array();
-    $unsorted_cmds = array();
+    $fieldsdescr = array('post'        => _("Post to List"),
+                         'reply'       => _("Reply to List"),
+                         'subscribe'   => _("Subscribe"),
+                         'unsubscribe' => _("Unsubscribe"),
+                         'archive'     => _("List Archives"),
+                         'owner'       => _("Contact Listowner"),
+                         'help'        => _("Help"));
     $output = array();
 
-    $lfields = 'List-' . implode (' List-', $fields);
-
-    $sid = sqimap_session_id();
-    fputs ($imapConnection, "$sid FETCH $passed_id BODY.PEEK[HEADER.FIELDS ($lfields)]\r\n");
-    $read = sqimap_read_data($imapConnection, $sid, true, $response, $emessage);
+    foreach ($message->rfc822_header->mlist as $cmd => $actions) {
 
-    for ($i = 1; $i < count($read); $i++) {
-        foreach ($fields as $field) {
-            if ( preg_match("/^List-$field: *<(.+?)>/i", $read[$i], $match) ) {
-                $unsorted_cmds[$field] = $match[1];
+	/* I don't know this action... skip it */
+        /* grrr PHP keeps changing their syntax... */
+        if( function_exists('array_key_exists') ) {
+            if(!array_key_exists($cmd, $fieldsdescr)) {
+                continue;
             }
+        } elseif ( !key_exists($cmd, $fieldsdescr) ) {
+            continue;
         }
-    }
 
-    if (count($unsorted_cmds) == 0) {
-        return;
-    }
-
-    foreach ($fields as $field) {
-        foreach ($unsorted_cmds as $cmd => $url) {
-            if ($field == $cmd) {
-                $cmds[$cmd] = $url;
-            }
-        }
-    }
+        /* proto = {mailto,href} */
+	$proto = array_shift(array_keys($actions));
+	$act   = array_shift($actions);
 
-    foreach ($cmds as $cmd => $url) {
-        if (eregi('mailto:(.+)', $url, $regs)) {
-            $purl = parse_url($url);
+        if ($proto == 'mailto') {
 
-            if (($cmd == 'Post') || ($cmd == 'Owner')) {
+            if (($cmd == 'post') || ($cmd == 'owner')) {
                 $url = 'compose.php?';
             } else {
-                $url = "../plugins/listcommands/mailout.php?action=$cmd&";
+                $url = "../plugins/listcommands/mailout.php?action=$cmd&amp;";
             }
+            $url .= 'send_to=' . strtr($act,'?','&');
 
-            $url .= 'mailbox=' . urlencode($mailbox)
-                  . '&send_to=' . $purl['path'];
-
-            if (isset($purl['query'])) {
-                $url .= '&' . $purl['query'];
-            }
-            if ($compose_new_win == '1') {
-                $output[] = '<A HREF="' . $url . '" target="compose_window" onClick="comp_in_new()">' . $fieldsdescr[$cmd] . '</A>';
-            }
-            else {
-                $output[] = '<A HREF="' . $url . '">' . $fieldsdescr[$cmd] . '</A>';
-            }
-            if ($cmd == 'Post') {
-                $url .= '&reply_subj=' . urlencode($subject)
-                      . '&reply_id=' . $passed_id
-                      . '&ent_num=' . $ent_num
-                      . '&mailprio=' . $priority_level;
             if ($compose_new_win == '1') {
-                $output[] = '<A HREF="' . $url . '" target="compose_window" onClick="comp_in_new()">' . $fieldsdescr['Reply'] . '</A>';
+                $output[] = "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$url')\">" . $fieldsdescr[$cmd] . '</a>';
             }
             else {
-                $output[] = '<A HREF="' . $url . '">' . $fieldsdescr['Reply'] . '</A>';
+                $output[] = '<a href="' . $url . '">' . $fieldsdescr[$cmd] . '</a>';
             }
+            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>';
+                }
             }
-        } else if (eregi('^(http|ftp)', $url)) {
-            $output[] = '<A HREF="' . $url . '" TARGET="_blank">'
-                      . $fieldsdescr[$cmd] . '</A>';
+        } else if ($proto == 'href') {
+            $output[] = '<a href="' . $act . '" target="_blank">'
+                      . $fieldsdescr[$cmd] . '</a>';
         }
     }
 
     if (count($output) > 0) {
-        echo "<tr>";
-        echo "<td BGCOLOR=\"$color[0]\">"
-           .   str_replace(' ', '&nbsp;', _("Mailing List:"))
-           . '</td>';
-        echo "<td BGCOLOR=\"$color[0]\" WIDTH=\"100%\" colspan=\"2\">"
-           .   '<SMALL>' . implode('&nbsp;|&nbsp;', $output) . '</SMALL>'
-           . '</td>';
+        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>';
     }
 }