Page MenuHomePhorge
Files F15405984

D4935.diff
No OneTemporary
Actions

D4935.diff
View Options

diff --git a/src/app/Backends/IMAP.php b/src/app/Backends/IMAP.php
--- a/src/app/Backends/IMAP.php
+++ b/src/app/Backends/IMAP.php
@@ -140,43 +140,49 @@
}
/**
- * Delete a mailbox.
+ * Delete a mailbox
*
- * @param \App\User $user User
- *
- * @return bool True if a mailbox was deleted successfully, False otherwise
- * @throws \Exception
+ * @param string $mailbox Folder name
*/
- public static function deleteUser(User $user): bool
+ protected static function deleteMailbox($mailbox): bool
{
$config = self::getConfig();
$imap = self::initIMAP($config);
- $mailbox = self::toUTF7('user/' . $user->email);
-
// To delete the mailbox cyrus-admin needs extra permissions
- $imap->setACL($mailbox, $config['user'], 'c');
-
- // Delete the mailbox (no need to delete subfolders?)
- $result = $imap->deleteFolder($mailbox);
+ $result = $imap->setACL($mailbox, $config['user'], 'c');
- if (!$result) {
- // Ignore the error if the folder doesn't exist (maybe it was removed already).
- if (!self::folderExists($imap, $mailbox)) {
- \Log::info("The mailbox to delete was already removed: $mailbox");
- $result = true;
- }
+ // Ignore the error if the folder doesn't exist (maybe it was removed already).
+ if ($result === false && $imap->errornum == $imap::ERROR_NO
+ && strpos($imap->error, 'Mailbox does not exist') !== false
+ ) {
+ \Log::info("The mailbox to delete was already removed: $mailbox");
+ $result = true;
+ } else {
+ // Delete the mailbox (no need to delete subfolders?)
+ $result = $imap->deleteFolder($mailbox);
}
$imap->closeConnection();
- // Cleanup ACL
- // Commented out in favor of a nightly cleanup job, for performance reasons
- // \App\Jobs\IMAP\AclCleanupJob::dispatch($user->email);
-
return $result;
}
+ /**
+ * Delete a user mailbox.
+ *
+ * @param \App\User $user User
+ *
+ * @return bool True if a mailbox was deleted successfully, False otherwise
+ * @throws \Exception
+ */
+ public static function deleteUser(User $user): bool
+ {
+ $mailbox = self::toUTF7('user/' . $user->email);
+
+ return self::deleteMailbox($mailbox);
+ }
+
/**
* Update a mailbox (quota).
*
@@ -289,21 +295,10 @@
*/
public static function deleteResource(Resource $resource): bool
{
- $config = self::getConfig();
- $imap = self::initIMAP($config);
-
$settings = $resource->getSettings(['folder']);
$mailbox = self::toUTF7($settings['folder']);
- // To delete the mailbox cyrus-admin needs extra permissions
- $imap->setACL($mailbox, $config['user'], 'c');
-
- // Delete the mailbox (no need to delete subfolders?)
- $result = $imap->deleteFolder($mailbox);
-
- $imap->closeConnection();
-
- return $result;
+ return self::deleteMailbox($mailbox);
}
/**
@@ -381,21 +376,10 @@
*/
public static function deleteSharedFolder(SharedFolder $folder): bool
{
- $config = self::getConfig();
- $imap = self::initIMAP($config);
-
$settings = $folder->getSettings(['folder']);
$mailbox = self::toUTF7($settings['folder']);
- // To delete the mailbox cyrus-admin needs extra permissions
- $imap->setACL($mailbox, $config['user'], 'c');
-
- // Delete the mailbox
- $result = $imap->deleteFolder($mailbox);
-
- $imap->closeConnection();
-
- return $result;
+ return self::deleteMailbox($mailbox);
}
/**

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 9:33 AM (4 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
9471360
Default Alt Text
D4935.diff (3 KB)

Event Timeline