[Svn] r4263 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Wed Nov 24 16:44:05 CET 2010


Author: thomasb
Date: 2010-11-24 09:44:05 -0600 (Wed, 24 Nov 2010)
New Revision: 4263

Modified:
   trunk/roundcubemail/program/include/iniset.php
   trunk/roundcubemail/program/include/rcube_imap.php
   trunk/roundcubemail/program/include/rcube_imap_generic.php
Log:
Fix php warnings; Courier doesn't like spaces appended to the EXPUNGE command

Modified: trunk/roundcubemail/program/include/iniset.php
===================================================================
--- trunk/roundcubemail/program/include/iniset.php	2010-11-24 14:49:03 UTC (rev 4262)
+++ trunk/roundcubemail/program/include/iniset.php	2010-11-24 15:44:05 UTC (rev 4263)
@@ -91,6 +91,7 @@
             '/MDB2_(.+)/',
             '/Mail_(.+)/',
             '/Net_(.+)/',
+            '/Auth_(.+)/',
             '/^html_.+/',
             '/^utf8$/',
         ),
@@ -98,6 +99,7 @@
             'MDB2/\\1',
             'Mail/\\1',
             'Net/\\1',
+            'Auth/\\1',
             'html',
             'utf8.class',
         ),

Modified: trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap.php	2010-11-24 14:49:03 UTC (rev 4262)
+++ trunk/roundcubemail/program/include/rcube_imap.php	2010-11-24 15:44:05 UTC (rev 4263)
@@ -3236,7 +3236,7 @@
             if (is_array($this->namespace['shared'])) {
                 foreach ($this->namespace['shared'] as $ns) {
                     foreach ((array)$ns as $root) {
-                        if (strpos($mbox_name, $root[0]) === 0) {
+                        if ($root[0] && strpos($mbox_name, $root[0]) === 0) {
                             return $mbox_name;
                         }
                     }

Modified: trunk/roundcubemail/program/include/rcube_imap_generic.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap_generic.php	2010-11-24 14:49:03 UTC (rev 4262)
+++ trunk/roundcubemail/program/include/rcube_imap_generic.php	2010-11-24 15:44:05 UTC (rev 4263)
@@ -1574,8 +1574,10 @@
         // Clear internal status cache
         unset($this->data['STATUS:'.$mailbox]);
 
-		$result = $this->execute($messages ? 'UID EXPUNGE' : 'EXPUNGE',
-		    array($messages), self::COMMAND_NORESPONSE);
+		if ($messages)
+			$result = $this->execute('UID EXPUNGE', array($messages), self::COMMAND_NORESPONSE);
+		else
+			$result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
 
 		if ($result == self::ERROR_OK) {
 			$this->selected = ''; // state has changed, need to reselect

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list