Fix logic I mixed up.

[squirrelmail.git] / plugins / listcommands / setup.php

diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php
index 07e9f7040bd0504d8e7e5867ee4067b5bc3238fb..04fdb20b999469ec17ba32f39809fb82b5b28f52 100644 (file)
--- 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-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Implementation of RFC 2369 for SquirrelMail.
@@ -40,7 +40,11 @@ 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)) {
+       if ( ( function_exists('array_key_exists') &&       /* PHP >= 4.1 */
+               !array_key_exists($cmd, $fieldsdescr) ) ||
+             ( function_exists('key_exists') && 
+               !key_exists($cmd, $fieldsdescr) )            /* PHP == 4.0.6 */
+        ) {
             continue;
         }
 
@@ -58,10 +62,10 @@ function plugin_listcommands_menu() {
             $url .= 'send_to=' . strtr($act,'?','&');
 
             if ($compose_new_win == '1') {
-                $output[] = "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$url')\">" . $fieldsdescr[$cmd] . '</A>';
+                $output[] = "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$url')\">" . $fieldsdescr[$cmd] . '</a>';
             }
             else {
-                $output[] = '<A HREF="' . $url . '">' . $fieldsdescr[$cmd] . '</A>';
+                $output[] = '<a href="' . $url . '">' . $fieldsdescr[$cmd] . '</a>';
             }
             if ($cmd == 'post') {
                $url .= '&amp;passed_id='.$passed_id.
@@ -69,27 +73,24 @@ function plugin_listcommands_menu() {
                        (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>';
+                    $output[] = "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$url')\">" . $fieldsdescr['reply'] . '</a>';
+                } else {
+                    $output[] = '<a href="' . $url . '">' . $fieldsdescr['reply'] . '</a>';
                 }
             }
-        } 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>';
     }
 }