Issue #339: Fixed decoding issue with mailbox folder names

barbushin · Jun 1, 2019 · 0fe61e6 · 0fe61e6
1 parent 0181b20
commit 0fe61e6
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
@@ -1061,11 +1061,13 @@ public function getMailboxes($search = "*") {
  $arr = [];
  if($t = imap_getmailboxes($this->getImapStream(), $this->imapPath, $search)) {
  foreach($t as $item) {
+ // https:/barbushin/php-imap/issues/339
+ $name = $this->decodeStringFromUtf7ImapToUtf8($item->name);
  $arr[] = [
- "fullpath" => $item->name,
+ "fullpath" => $name,
  "attributes" => $item->attributes,
  "delimiter" => $item->delimiter,
- "shortpath" => substr($item->name, strpos($item->name, '}') + 1),
+ "shortpath" => substr($name, strpos($name, '}') + 1),
  ];
  }
  }
@@ -1080,11 +1082,13 @@ public function getSubscribedMailboxes($search = "*") {
  $arr = [];
  if($t = imap_getsubscribed($this->getImapStream(), $this->imapPath, $search)) {
  foreach($t as $item) {
+ // https:/barbushin/php-imap/issues/339
+ $name = $this->decodeStringFromUtf7ImapToUtf8($item->name);
  $arr[] = [
- "fullpath" => $item->name,
+ "fullpath" => $name,
  "attributes" => $item->attributes,
  "delimiter" => $item->delimiter,
- "shortpath" => substr($item->name, strpos($item->name, '}') + 1),
+ "shortpath" => substr($name, strpos($name, '}') + 1),
  ];
  }
  }