Merge pull request #31489 from owncloud/stable10-fix-phpdoc

Fix php doc so that hasAnnotation works properly
owncloud · May 21, 2018 · 2e10e7f · 2e10e7f
2 parents 4fff744 + 20e9c78
commit 2e10e7f
Showing 1 changed file with 42 additions and 42 deletions.
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
@@ -787,7 +787,7 @@ public function sendEmail($userId, $mailAddress) {
 			));
 		}
 		return true;
-    }
+	}
 
 	/**
 	 * @NoAdminRequired
@@ -867,58 +867,58 @@ public function changeMail($token, $userId) {
 			}
 		}
 		return new RedirectResponse($this->urlGenerator->linkToRoute('settings.SettingsPage.getPersonal', ['changestatus' => 'success', 'user' => $userId]));
-  }
-  
-  /*
+	}
+
+	/**
 	 * @NoAdminRequired
 	 *
 	 * @param string $id
 	 * @return DataResponse
 	 */
 	public function setEnabled($id, $enabled) {
-                $userId = $this->userSession->getUser()->getUID();
-                $user = $this->userManager->get($id);
-
-                if($userId === $id ||
-                        (!$this->isAdmin &&
-                        !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user))) {
-                        return new DataResponse(
-                                array(
-                                        'status' => 'error',
-                                        'data' => array(
-                                                'message' => (string)$this->l10n->t('Forbidden')
-                                        )
-                                ),
-                                Http::STATUS_FORBIDDEN
-                        );
-                }
-
-
-                if(!$user){
-                        return new DataResponse(
-                                array(
-                                        'status' => 'error',
-                                        'data' => array(
-                                                'message' => (string)$this->l10n->t('Invalid user')
-                                        )
-                                ),
-                                Http::STATUS_UNPROCESSABLE_ENTITY
-                        );
-                }
+		$userId = $this->userSession->getUser()->getUID();
+		$user = $this->userManager->get($id);
+
+		if($userId === $id ||
+			(!$this->isAdmin &&
+				!$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user))) {
+			return new DataResponse(
+				array(
+					'status' => 'error',
+					'data' => array(
+						'message' => (string)$this->l10n->t('Forbidden')
+					)
+				),
+				Http::STATUS_FORBIDDEN
+			);
+		}
+
+
+		if(!$user) {
+			return new DataResponse(
+				array(
+					'status' => 'error',
+					'data' => array(
+						'message' => (string)$this->l10n->t('Invalid user')
+					)
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
 
 
 		$value = filter_var($enabled, FILTER_VALIDATE_BOOLEAN);
 		if(!isset($value) || is_null($value))
 		{
-                        return new DataResponse(
-                                array(
-                                        'status' => 'error',
-                                        'data' => array(
-                                                'message' => (string)$this->l10n->t('Unable to enable/disable user.')
-                                        )
-                                ),
-                                Http::STATUS_FORBIDDEN
-                        );
+			return new DataResponse(
+				array(
+					'status' => 'error',
+					'data' => array(
+						'message' => (string)$this->l10n->t('Unable to enable/disable user.')
+					)
+				),
+				Http::STATUS_FORBIDDEN
+			);
 		}
 
 		$user->setEnabled($value);