X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=aff1feb391eef1e8830b06e01c4cf0ce53db2303;hb=1cbd87548bd63a925cb3d4ce025ae40b616b7c64;hp=501d9745ef3f51e57e2065f22217a786c0607473;hpb=e9e5a32294550b0f6c46d4c3f7f0945ab1bd0c55;p=squirrelmail.git diff --git a/functions/page_header.php b/functions/page_header.php index 501d9745..aff1feb3 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -5,7 +5,7 @@ * * Prints the page header (duh) * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -46,7 +46,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE $header_tags = ''; - $header_tags .= "\n"; + $header_tags .= "\n"; $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset); $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize); @@ -103,13 +103,27 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE * recommendations and switch to unicode. */ $header_tags .= "\n"; - $header_tags .= '' . "\n"; + $header_tags .= '' . "\n"; } if ($do_hook) { - // NOTE! plugins here must assign output to template - // and NOT echo anything directly!! + // NOTE! plugins here MUST assign output to template + // and NOT echo anything directly!! A common + // approach is if a plugin decides it needs to + // put something at page-top after the standard + // SM page header, to dynamically add itself to + // the page_header_bottom and/or compose_header_bottom + // hooks for the current page request. See + // the Sent Confirmation v1.7 or Restrict Senders v1.2 + // plugins for examples of this approach. global $null; + ob_start(); do_hook('generic_header', $null); + $output = ob_get_contents(); + ob_end_clean(); + // plugin authors can debug their errors with one of the following: + //sm_print_r($output); + //echo $output; + if (!empty($output)) trigger_error('A plugin on the "generic_header" hook has attempted to output directly to the browser', E_USER_ERROR); } $header_tags .= $xtra; @@ -182,12 +196,13 @@ function displayInternalLink($path, $text, $target='') { * @return void */ -function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { +function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '') { global $reply_focus, $hide_sm_attributions, $frame_top, $provider_name, $provider_uri, $startMessage, - $action, $oTemplate, $org_title; + $action, $oTemplate, $org_title, $base_uri; +//FIXME: $sBodyTag should be turned into $sOnload and should only contain the contents of the onload attribute (not the attribute name nor any quotes).... only question is if anyone was using $sBodyTag for anything but onload event handlers? (see function compose_Header() below for how to fix it once we confirm it can be changed) if (empty($sBodyTagJs)) { if (strpos($action, 'reply') !== FALSE && $reply_focus) { if ($reply_focus == 'select') @@ -238,26 +253,22 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { $shortBoxName = _("INBOX"); } - $sm_attributes = ''; - if (!$hide_sm_attributions) { - $sm_attributes .= '