Просмотр исходного кода

Remove check for INBOX. If inbox isn't in the LSUB response then it's
unsubscribed and we just add it to the list. No reason to check specificly
for LSUB "" "INBOX" or LIST "" "INBOX"
If there is no inbox then a select will produce an error message.

stekkel 22 лет назад
Родитель
Сommit
959de6649a
1 измененных файлов с 1 добавлено и 11 удалено
  1. 1 11
      functions/imap_mailbox.php

+ 1 - 11
functions/imap_mailbox.php

@@ -737,17 +737,7 @@ function sqimap_mailbox_tree($imap_stream) {
         }
 
         if ($has_inbox == false) {
-            $lsub_ibx = sqimap_run_command( $imap_stream, "LSUB \"\" \"INBOX\"", true, $response, $message );
-            if (isset($lsub_ibx[0]) && (preg_match("/^\*\s+LSUB\s+(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0]))) {
-                $lsub_ary[] = $lsub_ibx[0];
-            } else {
-                $lsub_ibx = sqimap_run_command( $imap_stream, "LIST \"\" \"INBOX\"", true, $response, $message );
-                if (preg_match("/^\*\s+LIST\s+(.*)\"?INBOX\"?[^(\/\.)].*$/",$lsub_ibx[0])) {
-                    sqimap_run_command( $imap_stream, "SUBSCRIBE \"INBOX\"", true, $response, $message );
-                    $lsub_ibx[0] = str_replace("LIST","LSUB",$lsub_ibx[0]);
-                    $lsub_ary[] = $lsub_ibx[0];
-                }
-            }
+	    $lsub_ary[] = '* LSUB () INBOX';
         }
 
         /*