X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=a7812b526b77302c2998cbe4c26fbbcf0bd5ad6d;hb=a9a7cda1e186f13501bd2d59a28c0763f16f2f96;hp=3cd1e8bd3a0f1343b45d999cd38736037c107196;hpb=4b4abf93a9624311afef0c385023724ee46a2b60;p=squirrelmail.git diff --git a/functions/page_header.php b/functions/page_header.php index 3cd1e8bd..a7812b52 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -142,10 +142,25 @@ function displayInternalLink($path, $text, $target='') { * @return void */ -function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') { - global $hide_sm_attributions, $frame_top, +function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { + + global $reply_focus, $hide_sm_attributions, $frame_top, $provider_name, $provider_uri, $startMessage, - $javascript_on; + $javascript_on, $action; + + if (empty($sBodyTagJs)) { + if (strpos($action, 'reply') !== FALSE && $reply_focus) { + if ($reply_focus == 'select') + $sBodyTagJs = 'onload="checkForm(\'select\');"'; + else if ($reply_focus == 'focus') + $sBodyTagJs = 'onload="checkForm(\'focus\');"'; + else if ($reply_focus != 'none') + $sBodyTagJs = 'onload="checkForm();"'; + } + else + $sBodyTagJs = 'onload="checkForm();"'; + } + sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION ); @@ -238,8 +253,24 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onloa * @param string sBodyTagJs js events to be inserted in the body tag * @return void */ -function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') { - global $javascript_on; +function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') { + + global $reply_focus, $javascript_on, $action; + + if (empty($sBodyTagJs)) { + if (strpos($action, 'reply') !== FALSE && $reply_focus) { + if ($reply_focus == 'select') + $sBodyTagJs = 'onload="checkForm(\'select\');"'; + else if ($reply_focus == 'focus') + $sBodyTagJs = 'onload="checkForm(\'focus\');"'; + else if ($reply_focus != 'none') + $sBodyTagJs = 'onload="checkForm();"'; + } + else + $sBodyTagJs = 'onload="checkForm();"'; + } + + /* * Locate the first displayable form element (only when JavaScript on) */ @@ -260,4 +291,4 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload=" } echo "\n\n"; } -?> \ No newline at end of file +?>