From 0f8fb1e146f11b305c16e7f0270467fe73182233 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 15 Feb 2020 21:43:08 +0100 Subject: [PATCH] refactoring --- lam/lib/modules/imapAccess.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lam/lib/modules/imapAccess.inc b/lam/lib/modules/imapAccess.inc index f9bc9633..811b8633 100644 --- a/lam/lib/modules/imapAccess.inc +++ b/lam/lib/modules/imapAccess.inc @@ -354,14 +354,14 @@ class imapAccess extends baseModule { } $prefix = $this->getMailboxPrefix(); - $user = $this->getAdminUser(); + $adminUser = $this->getAdminUser(); if (isset($_POST['ImapAdminPassword']) && isset($_POST['enterPasswordButton'])) { $errors = $this->doLogin(); } - $password = $this->getAdminPassword(); + $adminPassword = $this->getAdminPassword(); try { - $client = $this->connect($user, $password); + $client = $this->connect($adminUser, $adminPassword); $this->extractUserAndEmail(); $email_domain = substr(strstr($this->email, '@'), 1); @@ -372,7 +372,7 @@ class imapAccess extends baseModule { else { $root = $prefix . $this->getSep() . $this->user; try { - $client->setACL($root, $user, array('rights' => 'c', 'action' => 'add')); + $client->setACL($root, $adminUser, array('rights' => 'c', 'action' => 'add')); $client->deleteMailbox($root); } catch (Exception $e) {