From 9960666abef914905768c5f9fb43c3de846b80c2 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 20 Aug 2006 14:06:30 +0000
Subject: Added support for Nox Spell Server; plus small bugfixes

---
 program/include/main.inc       | 6 +++---
 program/include/rcube_imap.inc | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'program/include')

diff --git a/program/include/main.inc b/program/include/main.inc
index 887668b47..1a2b8c793 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -439,12 +439,12 @@ function rcmail_login($user, $pass, $host=NULL)
      Inspired by Marco <P0L0_notspam_binware.org>
   */
   // Check if we need to add domain
-  if ($CONFIG['username_domain'] && !strstr($user, '@'))
+  if (!empty($CONFIG['username_domain']) && !strstr($user, '@'))
     {
     if (is_array($CONFIG['username_domain']) && isset($CONFIG['username_domain'][$host]))
       $user .= '@'.$CONFIG['username_domain'][$host];
-    else if (!empty($CONFIG['username_domain']))
-      $user .= '@'.$CONFIG['username_domain'];    
+    else if (is_string($CONFIG['username_domain']))
+      $user .= '@'.$CONFIG['username_domain'];
     }
 
 
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 185565ca2..fe97a92f2 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1063,7 +1063,7 @@ class rcube_imap
       
     if (is_array($part->parts))
       for ($i=0; $i<count($part->parts); $i++)
-        $this->_get_part_numbers($part->parts[$i], &$a_parts);
+        $this->_get_part_numbers($part->parts[$i], $a_parts);
     }
   
 
-- 
cgit v1.2.3