Don't auto-focus on compose form when user has already focused somewhere manually...

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

diff --git a/functions/forms.php b/functions/forms.php
index 388ce3e409acd2fb48768df423c9967989afa54c..f35edc66e1215dd9a3cc5f290b3ef33b353b4ad2 100644 (file)
--- a/functions/forms.php
+++ b/functions/forms.php
@@ -130,7 +130,8 @@ function addHidden($sName, $sValue, $aAttribs=array()) {
  * @param string $sValue initial field value
  * @param integer $iSize field size (number of characters)
  * @param integer $iMaxlength maximum number of characters the user may enter
- * @param array $aAttribs (since 1.5.1) extra attributes
+ * @param array $aAttribs (since 1.5.1) extra attributes - should be given
+ *                        in the form array('attribute_name' => 'attribute_value', ...)
  * @return string html formated text input field
  */
 function addInput($sName, $sValue = '', $iSize = 0, $iMaxlength = 0, $aAttribs=array()) {
@@ -291,4 +292,4 @@ function addForm($sAction, $sMethod = 'post', $sName = '', $sEnctype = '', $sCha
         $sEnctype . $sName . $sCharset . $sAttribs . ">\n";
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/src/compose.php b/src/compose.php
index a11e178e518d84a12e1d3a5395ef8d2e971b0e6e..e0011165ca94786d5c91369d8bd1c09e1ae9c654 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1020,6 +1020,15 @@ function showInputForm ($session, $values=false) {
         $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
         $username, $compose_messages, $composesession, $default_charset;
 
+    if (checkForJavascript()) {
+        $onfocus = ' onfocus="alreadyFocused=true;"';
+        $onfocus_array = array('onfocus' => 'alreadyFocused=true;');
+    }
+    else {
+        $onfocus = '';
+        $onfocus_array = array();
+    }
+
     $composeMessage = $compose_messages[$session];
     if ($values) {
         $send_to = $values['send_to'];
@@ -1108,28 +1117,28 @@ function showInputForm ($session, $values=false) {
         html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
         _("To") . ':</td>' . "\n" .
         html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
-        addInput('send_to', $send_to, 60). '<br />' . "\n" .
+        addInput('send_to', $send_to, 60, 0, $onfocus_array). '<br />' . "\n" .
         '      </td>' . "\n" .
         '   </tr>' . "\n" .
         '   <tr>' . "\n" .
         html_tag( 'td', '', 'right', $color[4] ) .
         _("Cc") . ':</td>' . "\n" .
         html_tag( 'td', '', 'left', $color[4] ) .
-        addInput('send_to_cc', $send_to_cc, 60). '<br />' . "\n" .
+        addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '<br />' . "\n" .
         '      </td>' . "\n" .
         '   </tr>' . "\n" .
         '   <tr>' . "\n" .
         html_tag( 'td', '', 'right', $color[4] ) .
         _("Bcc") . ':</td>' . "\n" .
         html_tag( 'td', '', 'left', $color[4] ) .
-        addInput('send_to_bcc', $send_to_bcc, 60).'<br />' . "\n" .
+        addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'<br />' . "\n" .
         '      </td>' . "\n" .
         '   </tr>' . "\n" .
         '   <tr>' . "\n" .
         html_tag( 'td', '', 'right', $color[4] ) .
         _("Subject") . ':</td>' . "\n" .
         html_tag( 'td', '', 'left', $color[4] ) . "\n";
-    echo '         '.addInput('subject', $subject, 60).
+    echo '         '.addInput('subject', $subject, 60, 0, $onfocus_array).
         '      </td>' . "\n" .
         '   </tr>' . "\n\n";
 
@@ -1142,13 +1151,13 @@ function showInputForm ($session, $values=false) {
         echo '   <tr>' . "\n" .
             '      <td bgcolor="' . $color[0] . '" colspan="2" align="center">' . "\n" .
             '         <textarea name="body" id="body" rows="' . (int)$editor_height .
-            '" cols="' . (int)$editor_size . '" wrap="virtual">';
+            '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
     }
     else {
         echo '   <tr>' . "\n" .
             '      <td bgcolor="' . $color[4] . '" colspan="2">' . "\n" .
             '         &nbsp;&nbsp;<textarea name="body" id="body" rows="' . (int)$editor_height .
-            '" cols="' . (int)$editor_size . '" wrap="virtual">';
+            '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
     }
 
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
@@ -1660,4 +1669,4 @@ function deliverMessage($composeMessage, $draft=false) {
     return $succes;
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/templates/default/js/default.js b/templates/default/js/default.js
index b9850507d1e16993bf5684855ebe579345648568..97de27083d16b7ff37fd86eafb26fd5a247a90ea 100644 (file)
--- a/templates/default/js/default.js
+++ b/templates/default/js/default.js
@@ -226,7 +226,11 @@ function sendMDN() {
     var newwin = window.open(mdnuri,'right');
 }
 
+var alreadyFocused = false;
 function checkForm(smaction) {
+
+    if (alreadyFocused) return;
+
     /*
      * this part is used for setting the focus in the compose screen
      */