Tylerisation

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

diff --git a/functions/smtp.php b/functions/smtp.php
index 403f3bd7be7e8ff2da8b6e1e8ba23a830bd9fbd2..d3c6de3807776b449c0e5c5a583a5d2e1c7e5842 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -476,7 +476,9 @@ function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
         exit;
     }
     $tmp = fgets($smtpConnection, 1024);
-    if (errorCheck($tmp, $smtpConnection)!=5) return(0);
+    if (errorCheck($tmp, $smtpConnection)!=5) {
+        return(0);
+    }
     
     $to_list = getLineOfAddrs($to);
     $cc_list = getLineOfAddrs($cc);

diff --git a/src/search.php b/src/search.php
index bb98716a15f9c18b51d061cc29886c4047acc0c7..78f3f7e77d801b11b28f64a60090591e80ae770d 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -164,7 +164,7 @@ $boxes = sqimap_mailbox_list($imapConnection);
 
 /*  set current mailbox to INBOX if none was selected or if page
     was called to search all folders.  */
-if ($mailbox == 'None' || $mailbox == '' ) {
+if ( !isset($mailbox) || $mailbox == 'None' || $mailbox == '' ) {
     $mailbox = $boxes[0]['unformatted'];
 }
 if ($mailbox == 'All Folders') {