projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c0f178)
Removing hooks where we can from templates; one hook will probably have to stay;...
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 Jan 2007 07:27:37 +0000 (07:27 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 Jan 2007 07:27:37 +0000 (07:27 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12203 7612ce4b-ef26-0410-bec9-ea0150e637f0

templates/default/left_main.tpl patch | blob | blame | history
templates/default_advanced/left_main.tpl patch | blob | blame | history

diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl
index 92e6c555784f4c59f88a80321b52b656622cf389..27fada32e99638b8a2c02ae5363c503a25cf0d49 100644 (file)
--- 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);
 ?>
 <body class="sqm_leftMain">
 <div class="sqm_leftMain">
-<?php /* FIXME: no hooks in templates! */ global $null; do_hook('left_main_before', $null); ?>
+<?php if (!empty($plugin_output['left_main_before'])) echo $plugin_output['left_main_before']; ?>
 <table class="sqm_wrapperTable" cellspacing="0">
  <tr>
   <td>
@@ -281,5 +281,5 @@ extract($t);
   </td>
  </tr>
 </table>
-<?php /* FIXME: no hooks in templates! */ do_hook('left_main_after', $null); ?>
+<?php if (!empty($plugin_output['left_main_after'])) echo $plugin_output['left_main_after']; ?>
 </div>
diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl
index c8bad7aba28b3455425ae4d0fa5a529ba9a3e4f8..3c0edff924ce26b2bb3195b2589864c3ee212684 100644 (file)
--- 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);
 //-->
 </script>
 <div class="sqm_leftMain">
-<?php /* FIXME: no hooks in templates! */ global $null; do_hook('left_main_before', $null); ?>
+<?php if (!empty($plugin_output['left_main_before'])) echo $plugin_output['left_main_before']; ?>
 <div class="dtree">
 <table class="sqm_wrapperTable" cellspacing="0">
  <tr>
Unnamed repository; edit this file 'description' to name the repository.