Reduced if/else complexity, removed not require else conditions (#1866)

* Reduced if/else complexity, removed not require else conditions

* Fix indentation

* Fix indentation

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Admin theme no longer exists

* Code style

* Use null-coalesce operator to simplify logic

1 files changed, 7 insertions, 5 deletions

diff --git a/app/Auth.php b/app/Auth.php
index d6eb9074d6..5101491dfd 100644
--- a/app/Auth.php
+++ b/app/Auth.php
@@ -126,11 +126,13 @@ class Auth
 
         if (self::isManager($tree, $user)) {
             return self::PRIV_NONE;
-        } elseif (self::isMember($tree, $user)) {
+        }
+
+        if (self::isMember($tree, $user)) {
             return self::PRIV_USER;
-        } else {
-            return self::PRIV_PRIVATE;
         }
+
+        return self::PRIV_PRIVATE;
     }
 
     /**
@@ -160,9 +162,9 @@ class Auth
             $visitor->email     = '';
 
             return new User($visitor);
-        } else {
-            return $user;
         }
+
+        return $user;
     }
 
     /**