Listcommands plugin now updated to 1.5.2-style 'templat-ized' output

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11999 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php
index a90587f32d45750cfc90626d732f88ecf10ff31c..931069641a41ae25efd6932fe689ecf3c865674c 100644 (file)
--- a/plugins/listcommands/functions.php
+++ b/plugins/listcommands/functions.php
@@ -26,7 +26,7 @@ function plugin_listcommands_menu_do() {
      * 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) {
 
@@ -40,7 +40,7 @@ function plugin_listcommands_menu_do() {
         $proto = array_shift($aActions);
         $act   = array_shift($actions);
 
-        if ($proto == 'mailto') {
+        if (1||$proto == 'mailto') {
 
             if (($cmd == 'post') || ($cmd == 'owner')) {
                 $url = 'src/compose.php?'.
@@ -50,7 +50,7 @@ function plugin_listcommands_menu_do() {
             }
             $url .= 'send_to=' . str_replace('?','&', $act);
 
-            $output[] = makeComposeLink($url, $fieldsdescr[$cmd]);
+            $links[] = makeComposeLink($url, $fieldsdescr[$cmd]);
 
             if ($cmd == 'post') {
                 if (!isset($mailbox))
@@ -60,22 +60,21 @@ 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">'
+            $links[] = '<a href="' . $act . '" target="_blank">'
                 . $fieldsdescr[$cmd] . '</a>';
         }
     }
 
-    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) {
+        global $oTemplate;
+        $oTemplate->assign('links', $links);
+        $output = $oTemplate->fetch('plugins/listcommands/read_body_header.tpl');
+        return array('read_body_header' => $output);
     }
+
 }
 
 /**

diff --git a/plugins/listcommands/setup.php b/plugins/listcommands/setup.php
index 68764b445ff18284e844d71cdee1fbfaa0ca3b5d..18dc40ca7c8772af23f0f97ba45124caf5051d83 100644 (file)
--- a/plugins/listcommands/setup.php
+++ b/plugins/listcommands/setup.php
@@ -21,7 +21,7 @@
 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';
 }
 
 /**
@@ -29,5 +29,5 @@ function squirrelmail_plugin_init_listcommands () {
  */
 function plugin_listcommands_menu() {
     include_once(SM_PATH . 'plugins/listcommands/functions.php');
-    plugin_listcommands_menu_do();
+    return plugin_listcommands_menu_do();
 }

diff --git a/templates/default/plugins/listcommands/read_body_header.tpl b/templates/default/plugins/listcommands/read_body_header.tpl
new file mode 100644 (file)
index 0000000..9bbcc08
--- /dev/null
+++ b/templates/default/plugins/listcommands/read_body_header.tpl
@@ -0,0 +1,34 @@
+<?php
+
+/**
+  * read_body_header.tpl
+  *
+  * Template for adding controls to the read_headers page template 
+  * for the Listcommands plugin
+  *
+  * The following variables are available in this template:
+  *      + $links   - an array of links for each command/control to be added
+  *
+  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+  * @version $Id$
+  * @package squirrelmail
+  * @subpackage plugins
+  */
+
+
+// retrieve the template vars
+//
+extract($t);
+
+
+?>
+
+<tr>
+  <td class="fieldName">
+    <b><?php echo _("Mailing List"); ?>:</b>
+  </td>
+  <td class="fieldValue">
+    <small><?php echo implode('&nbsp;|&nbsp;', $links); ?></small>
+  </td>
+</tr>