fix enter button to submit form with certain browsers. Thanks Ryan

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

diff --git a/functions/imap_search.php b/functions/imap_search.php
index fbc9baeb551345657dbc1f549faa7eeff5750bbe..faddd3bf2eb1a6504c5e557bb5a0d3bd618698f4 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -194,7 +194,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
                 -1,
                 '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>');
         }
-               echo "<b><big><center>$mailbox</center></big></b>";
+               echo "<b><big>Folder: $mailbox</big></b>";
         while ($j < count($msgs)) {
             printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
             $j++;

diff --git a/src/search.php b/src/search.php
index 5d6cc4ec431719a495c71aa02c31fa66b7504453..12121f7c0cc8adc9bd9f3a77dbf52e96ba4faff4 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -175,9 +175,13 @@ if ($mailbox == 'All Folders') {
 displayPageHeader($color, $mailbox);
 
 /*  See how the page was called and fire off correct function  */
-if ( !isset( $submit ) ) {
-    $submit = '';
-} else if ($submit == 'Search' && !empty($what)) {
+//if ( !isset( $submit ) ) {
+//    $submit = '';
+//} else if ($submit == 'Search' && !empty($what)) {
+if ((!isset($submit) || empty($submit)) && !empty($what)) {
+    $submit = 'Search';
+}
+if ($submit == 'Search' && !empty($what)) {
     update_recent($what, $where, $mailbox, $username, $data_dir); 
 }
 elseif ($submit == 'forget') {