From: pdontthink Date: Sat, 24 Sep 2005 00:25:00 +0000 (+0000) Subject: Fixed/restored reply focus functionality X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=10bf80c009d938fc0cf85a70d0a6b3834365b146;p=squirrelmail.git Fixed/restored reply focus functionality git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10118 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- 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 +?>