cleaner code

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Oct 5, 2020 · e6993c9 · e6993c9
1 parent bd24105
commit e6993c9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -407,10 +407,14 @@ public function isAccountOnly() {
 	 * @return bool
 	 */
 	public function isContactsBackend(): bool {
-		return ($this->getAppValue(ConfigService::CIRCLES_CONTACT_BACKEND) !== '0');
+		return ($this->getAppValue(ConfigService::CIRCLES_CONTACT_BACKEND) !== '0'
+				&& $this->getAppValue(ConfigService::CIRCLES_CONTACT_BACKEND) !== '');
 	}
 
 
+	/**
+	 * @return int
+	 */
 	public function contactsBackendType(): int {
 		return (int)$this->getAppValue(ConfigService::CIRCLES_CONTACT_BACKEND);
 	}
@@ -420,7 +424,7 @@ public function contactsBackendType(): int {
 	 * @return bool
 	 */
 	public function stillFrontEnd(): bool {
-		if ($this->getAppValue(self::CIRCLES_CONTACT_BACKEND) !== '1') {
+		if (!$this->isContactsBackend()) {
 			return true;
 		}
 
@@ -438,7 +442,7 @@ public function stillFrontEnd(): bool {
 	 * @return bool
 	 */
 	public function sendPasswordByMail() {
-		if ($this->getAppValue(self::CIRCLES_CONTACT_BACKEND) === '1') {
+		if ($this->isContactsBackend()) {
 			return false;
 		}
 
@@ -453,7 +457,7 @@ public function sendPasswordByMail() {
 	 * @return bool
 	 */
 	public function enforcePasswordProtection(Circle $circle) {
-		if ($this->getAppValue(self::CIRCLES_CONTACT_BACKEND) === '1') {
+		if ($this->isContactsBackend()) {
 			return false;
 		}
 
@@ -552,7 +556,7 @@ public function configureRequest(NC19Request $request) {
 		}
 
 //		if ($this->getAppValue(ConfigService::CIRCLES_NON_SSL_LOCAL) === '1') {
-			$request->setLocalAddressAllowed(true);
+		$request->setLocalAddressAllowed(true);
 //		}
 	}