From b71975ad40d8f150d665125b97a04fc02dd4cea9 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Thu, 25 Jan 2007 07:27:37 +0000 Subject: [PATCH] Removing hooks where we can from templates; one hook will probably have to stay; see comments in the code git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12203 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- templates/default/left_main.tpl | 6 +++--- templates/default_advanced/left_main.tpl | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl index 92e6c555..27fada32 100644 --- a/templates/default/left_main.tpl +++ b/templates/default/left_main.tpl @@ -229,7 +229,7 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) ******** // let plugins fiddle with end of line -// FIXME: no hooks in templates! +// FIXME: no hooks in templates! Although note that I'm not sure we can avoid it here because the context of which folder we are displaying is important to the hook, unless we preemptively iterate through all folders and collect the output from the hook call for that and give that to the template.... seems like overkill; I say this hook remains $end .= concat_hook_function('left_main_after_each_folder', $temp=array(isset($numMessages) ? &$numMessages : '', &$box['MailboxFullName'], &$settings['imapConnection'])); @@ -263,7 +263,7 @@ extract($t); ?>

- +

@@ -281,5 +281,5 @@ extract($t);

- +

diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl index c8bad7ab..3c0edff9 100644 --- a/templates/default_advanced/left_main.tpl +++ b/templates/default_advanced/left_main.tpl @@ -245,6 +245,7 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $parent_node=-1) { } return $out; +//FIXME: somewhere above, need to insert the left_main_after_each_folder hook, or if no plugin hooks allowed in templates, at least the output from that hook (but I think it might be impossible not to have the hook here in this fxn } /* retrieve the template vars */ @@ -272,7 +273,7 @@ extract($t); //-->

- +

-- 2.25.1