Strip HTML for hyperlink creation from core

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

diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php
index 7028ed2f010e591986aeaf1e82b7c56d0de76ba6..adb7b49d22400f16f8c6b637df15a28372384386 100644 (file)
--- a/plugins/listcommands/functions.php
+++ b/plugins/listcommands/functions.php
@@ -3,28 +3,30 @@
 /**
  * functions.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.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage listcommands
  */
 
+/**
+ * internal function that builds mailing list links
+ */
 function plugin_listcommands_menu_do() {
-    global $passed_id, $passed_ent_id, $color, $mailbox, $message, $startMessage;
+    global $passed_id, $passed_ent_id, $color, $mailbox, $message, $startMessage, $oTemplate;
 
     /**
      * 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 = listcommands_fieldsdescr();
-    $output = array();
+    $links = array();
 
     foreach ($message->rfc822_header->mlist as $cmd => $actions) {
 
@@ -34,10 +36,11 @@ function plugin_listcommands_menu_do() {
         }
 
         /* proto = {mailto,href} */
-        $proto = array_shift(array_keys($actions));
+        $aActions = array_keys($actions);
+        $proto = array_shift($aActions);
         $act   = array_shift($actions);
 
-        if ($proto == 'mailto') {
+        if (1||$proto == 'mailto') {
 
             if (($cmd == 'post') || ($cmd == 'owner')) {
                 $url = 'src/compose.php?'.
@@ -45,9 +48,9 @@ function plugin_listcommands_menu_do() {
             } else {
                 $url = "plugins/listcommands/mailout.php?action=$cmd&";
             }
-            $url .= 'send_to=' . strtr($act,'?','&');
+            $url .= 'send_to=' . str_replace('?','&', $act);
 
-            $output[] = makeComposeLink($url, $fieldsdescr[$cmd]);
+            $links[] = makeComposeLink($url, $fieldsdescr[$cmd]);
 
             if ($cmd == 'post') {
                 if (!isset($mailbox))
@@ -57,22 +60,23 @@ function plugin_listcommands_menu_do() {
                     (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
                 $url .= '&smaction=reply';
 
-                $output[] = makeComposeLink($url, $fieldsdescr['reply']);
+                $links[] = makeComposeLink($url, $fieldsdescr['reply']);
             }
         } else if ($proto == 'href') {
-            $output[] = '<a href="' . $act . '" target="_blank">'
-                . $fieldsdescr[$cmd] . '</a>';
+            $oTemplate->assign('uri', $act);
+            $oTemplate->assign('target', '_blank');
+            $oTemplate->assign('text', $fieldsdescr[$cmd]);
+            $output = $oTemplate->fetch('hyperlink.tpl');
+            $links[] = $output;
         }
     }
 
-    if (count($output) > 0) {
-        echo '<tr>' .
-            html_tag('td', '<b>' . _("Mailing List") . ':&nbsp;&nbsp;</b>',
-                    'right', '', 'valign="middle" width="20%"') . "\n" .
-            html_tag('td', '<small>' . implode('&nbsp;|&nbsp;', $output) . '</small>',
-                    'left', $color[0], 'valign="middle" width="80%"') . "\n" .
-            '</tr>';
+    if (count($links) > 0) {
+        $oTemplate->assign('links', $links);
+        $output = $oTemplate->fetch('plugins/listcommands/read_body_header.tpl');
+        return array('read_body_header' => $output);
     }
+
 }
 
 /**
@@ -89,4 +93,3 @@ function listcommands_fieldsdescr() {
             'help'        => _("Help"));
 }
 
-?>
\ No newline at end of file