Page MenuHomePhorge
Files F117686652

D3668.1774877380.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D3668.1774877380.diff
View Options

diff --git a/src/app/Jobs/User/CreateJob.php b/src/app/Jobs/User/CreateJob.php
--- a/src/app/Jobs/User/CreateJob.php
+++ b/src/app/Jobs/User/CreateJob.php
@@ -31,6 +31,11 @@
return;
}
+ if ($user->role) {
+ // Admins/resellers don't reside in LDAP (for now)
+ return;
+ }
+
// sanity checks
if ($user->isDeleted()) {
$this->fail(new \Exception("User {$this->userId} is marked as deleted."));
diff --git a/src/app/Jobs/User/DeleteJob.php b/src/app/Jobs/User/DeleteJob.php
--- a/src/app/Jobs/User/DeleteJob.php
+++ b/src/app/Jobs/User/DeleteJob.php
@@ -19,6 +19,11 @@
return;
}
+ if ($user->role) {
+ // Admins/resellers don't reside in LDAP (for now)
+ return;
+ }
+
// sanity checks
if ($user->isDeleted()) {
$this->fail(new \Exception("User {$this->userId} is already marked as deleted."));
diff --git a/src/app/Jobs/User/UpdateJob.php b/src/app/Jobs/User/UpdateJob.php
--- a/src/app/Jobs/User/UpdateJob.php
+++ b/src/app/Jobs/User/UpdateJob.php
@@ -19,6 +19,11 @@
return;
}
+ if ($user->role) {
+ // Admins/resellers don't reside in LDAP (for now)
+ return;
+ }
+
if (!$user->isLdapReady()) {
$this->delete();
return;
diff --git a/src/app/Jobs/User/VerifyJob.php b/src/app/Jobs/User/VerifyJob.php
--- a/src/app/Jobs/User/VerifyJob.php
+++ b/src/app/Jobs/User/VerifyJob.php
@@ -19,6 +19,11 @@
return;
}
+ if ($user->role) {
+ // Admins/resellers don't reside in IMAP (for now)
+ return;
+ }
+
// sanity checks
if (!$user->hasSku('mailbox')) {
$this->fail(new \Exception("User {$this->userId} has no mailbox SKU."));
diff --git a/src/app/User.php b/src/app/User.php
--- a/src/app/User.php
+++ b/src/app/User.php
@@ -25,6 +25,7 @@
* @property int $id
* @property string $password
* @property string $password_ldap
+ * @property string $role
* @property int $status
* @property int $tenant_id
*/

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 1:29 PM (5 d, 10 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18761052
Default Alt Text
D3668.1774877380.diff (2 KB)

Event Timeline