Allow to fetch emails from nested folders - closes #3623

freescout-help-desk · Dec 22, 2023 · 1618bb1 · 1618bb1
1 parent 54e5aa2
commit 1618bb1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/app/Console/Commands/FetchEmails.php b/app/Console/Commands/FetchEmails.php
@@ -171,6 +171,8 @@ public function fetch($mailbox)
 
             if ($folder) {
                 $folders[] = $folder;
+            } else {
+                $this->line('['.date('Y-m-d H:i:s').'] Could not get folder: '.$folder_name);
             }
         }
         // try {
@@ -185,7 +187,7 @@ public function fetch($mailbox)
         }
 
         foreach ($folders as $folder) {
-            $this->line('['.date('Y-m-d H:i:s').'] Folder: '.$folder->name);
+            $this->line('['.date('Y-m-d H:i:s').'] Folder: '.($folder->full_name ?? $folder->name));
 
             // Requesting emails by bunches allows to fetch large amounts of emails
             // without problems with memory.

diff --git a/app/Http/Controllers/MailboxesController.php b/app/Http/Controllers/MailboxesController.php
@@ -706,25 +706,10 @@ public function ajax(Request $request)
 
                         $imap_folders = $client->getFolders();
 
+                        $response['folders'] = [];
+
                         if (count($imap_folders)) {
-                            foreach ($imap_folders as $imap_folder) {
-                                if (!empty($imap_folder->name)) {
-                                    $response['folders'][] = $imap_folder->name;
-                                }
-                                // Maybe we need a recursion here.
-                                if (!empty($imap_folder->children)) {
-                                    foreach ($imap_folder->children as $child_imap_folder) {
-                                        // Old library.
-                                        if (!empty($child_imap_folder->fullName)) {
-                                            $response['folders'][] = $child_imap_folder->fullName;
-                                        }
-                                        // New library.
-                                        if (!empty($child_imap_folder->full_name)) {
-                                            $response['folders'][] = $child_imap_folder->full_name;
-                                        }
-                                    }
-                                }
-                            }
+                            $response = $this->interateFolders($response, $imap_folders);
                         }
 
                         if (count($response['folders'])) {
@@ -813,6 +798,31 @@ public function ajax(Request $request)
         return \Response::json($response);
     }
 
+    // Recursively interate over folders.
+    public function interateFolders($response, $imap_folders) {
+        foreach ($imap_folders as $imap_folder) {
+            if (!empty($imap_folder->name)) {
+                $response['folders'][] = $imap_folder->name;
+            }
+
+            // Check for children and recurse.
+            if (!empty($imap_folder->children)) {
+                $response = $this->interateFolders($response, $imap_folder->children);
+            }
+
+            // Old library.
+            if (!empty($imap_folder->fullName)) {
+                $response['folders'][] = $imap_folder->fullName;
+            }
+            // New library.
+            if (!empty($imap_folder->full_name)) {
+                $response['folders'][] = $imap_folder->full_name;
+            }
+        }
+
+        return $response;
+    }
+
     public function oauth(Request $request)
     {
         $mailbox_id = $request->id ?? '';