Enable better plugin motd hooking

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

diff --git a/src/right_main.php b/src/right_main.php
index 0522221fedc3013b8076ada4b730df1a966bb79e..858998a3b686298f473f317335fc1aa48f305b17 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -277,7 +277,12 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
     displayPageHeader($color, $mailbox);
 }
 
-do_hook('right_main_after_header', $null);
+// plugins can operate normally here (don't output anything, of course!),
+// but can also return TRUE if they want to enable the MOTD display
+// even when SM's MOTD is empty (there is plugin output that can
+// be then hooked into in motd.tpl)
+//
+$show_motd = boolean_hook_function('right_main_after_header', $null, 1);
 
 /* display a message to the user that their mail has been sent */
 if (isset($mail_sent) && $mail_sent == 'yes') {
@@ -294,7 +299,7 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
         sqsession_register($just_logged_in, 'just_logged_in');
 
         $motd = trim($motd);
-        if (strlen($motd) > 0) {
+        if ($show_motd || strlen($motd) > 0) {
             $oTemplate->assign('motd', $motd);
             $oTemplate->display('motd.tpl');
         }

diff --git a/templates/default/motd.tpl b/templates/default/motd.tpl
index 19fcaf9a79aac6fdeb50408a65525368d3cf8662..9abf57191cd7487dac3af36833fc578551e03bad 100644 (file)
--- a/templates/default/motd.tpl
+++ b/templates/default/motd.tpl
@@ -22,7 +22,10 @@ extract($t);
  <table class="sqm_motd" cellspacing="3">
   <tr>
    <td>
-    <?php echo $motd; ?>
+    <?php echo $motd; 
+          if (!empty($plugin_output['motd_inside'])) 
+             echo $plugin_output['motd_inside']; 
+    ?>
    </td>
   </tr>
  </table>