Inspection of "Merge pull request #5671 from GitHubUser4234/ldap_..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c7b280...a15591 )

by Morris

created 2017-07-10 13:04 UTC

Status

Indentation +129 added lines, -129 removed lines patch added patch discarded remove patch

@@ -37,144 +37,144 @@
 block discarded – undo
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

Please login to merge, or discard this patch.

		@@ -37,144 +37,144 @@
		block discarded – undo
37	37	use OCP\IUserManager;
38	38
39	39	class RenewPasswordController extends Controller {
40		- /** @var IUserManager */
41		- private $userManager;
42		- /** @var IConfig */
43		- private $config;
44		- /** @var IL10N */
45		- protected $l10n;
46		- /** @var ISession */
47		- private $session;
48		- /** @var IURLGenerator */
49		- private $urlGenerator;
	40	+ /** @var IUserManager */
	41	+ private $userManager;
	42	+ /** @var IConfig */
	43	+ private $config;
	44	+ /** @var IL10N */
	45	+ protected $l10n;
	46	+ /** @var ISession */
	47	+ private $session;
	48	+ /** @var IURLGenerator */
	49	+ private $urlGenerator;
50	50
51		- /**
52		- * @param string $appName
53		- * @param IRequest $request
54		- * @param IUserManager $userManager
55		- * @param IConfig $config
56		- * @param IURLGenerator $urlGenerator
57		- */
58		- function __construct($appName, IRequest $request, IUserManager $userManager,
59		- IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
60		- parent::__construct($appName, $request);
61		- $this->userManager = $userManager;
62		- $this->config = $config;
63		- $this->l10n = $l10n;
64		- $this->session = $session;
65		- $this->urlGenerator = $urlGenerator;
66		- }
	51	+ /**
	52	+ * @param string $appName
	53	+ * @param IRequest $request
	54	+ * @param IUserManager $userManager
	55	+ * @param IConfig $config
	56	+ * @param IURLGenerator $urlGenerator
	57	+ */
	58	+ function __construct($appName, IRequest $request, IUserManager $userManager,
	59	+ IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
	60	+ parent::__construct($appName, $request);
	61	+ $this->userManager = $userManager;
	62	+ $this->config = $config;
	63	+ $this->l10n = $l10n;
	64	+ $this->session = $session;
	65	+ $this->urlGenerator = $urlGenerator;
	66	+ }
67	67
68		- /**
69		- * @PublicPage
70		- * @NoCSRFRequired
71		- *
72		- * @return RedirectResponse
73		- */
74		- public function cancel() {
75		- return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
76		- }
	68	+ /**
	69	+ * @PublicPage
	70	+ * @NoCSRFRequired
	71	+ *
	72	+ * @return RedirectResponse
	73	+ */
	74	+ public function cancel() {
	75	+ return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
	76	+ }
77	77
78		- /**
79		- * @PublicPage
80		- * @NoCSRFRequired
81		- * @UseSession
82		- *
83		- * @param string $user
84		- *
85		- * @return TemplateResponse\|RedirectResponse
86		- */
87		- public function showRenewPasswordForm($user) {
88		- if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
89		- return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
90		- }
91		- $parameters = [];
92		- $renewPasswordMessages = $this->session->get('renewPasswordMessages');
93		- $errors = [];
94		- $messages = [];
95		- if (is_array($renewPasswordMessages)) {
96		- list($errors, $messages) = $renewPasswordMessages;
97		- }
98		- $this->session->remove('renewPasswordMessages');
99		- foreach ($errors as $value) {
100		- $parameters[$value] = true;
101		- }
	78	+ /**
	79	+ * @PublicPage
	80	+ * @NoCSRFRequired
	81	+ * @UseSession
	82	+ *
	83	+ * @param string $user
	84	+ *
	85	+ * @return TemplateResponse\|RedirectResponse
	86	+ */
	87	+ public function showRenewPasswordForm($user) {
	88	+ if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
	89	+ return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
	90	+ }
	91	+ $parameters = [];
	92	+ $renewPasswordMessages = $this->session->get('renewPasswordMessages');
	93	+ $errors = [];
	94	+ $messages = [];
	95	+ if (is_array($renewPasswordMessages)) {
	96	+ list($errors, $messages) = $renewPasswordMessages;
	97	+ }
	98	+ $this->session->remove('renewPasswordMessages');
	99	+ foreach ($errors as $value) {
	100	+ $parameters[$value] = true;
	101	+ }
102	102
103		- $parameters['messages'] = $messages;
104		- $parameters['user'] = $user;
	103	+ $parameters['messages'] = $messages;
	104	+ $parameters['user'] = $user;
105	105
106		- $parameters['canResetPassword'] = true;
107		- $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
108		- if (!$parameters['resetPasswordLink']) {
109		- $userObj = $this->userManager->get($user);
110		- if ($userObj instanceof IUser) {
111		- $parameters['canResetPassword'] = $userObj->canChangePassword();
112		- }
113		- }
114		- $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
	106	+ $parameters['canResetPassword'] = true;
	107	+ $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
	108	+ if (!$parameters['resetPasswordLink']) {
	109	+ $userObj = $this->userManager->get($user);
	110	+ if ($userObj instanceof IUser) {
	111	+ $parameters['canResetPassword'] = $userObj->canChangePassword();
	112	+ }
	113	+ }
	114	+ $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
115	115
116		- return new TemplateResponse(
117		- $this->appName, 'renewpassword', $parameters, 'guest'
118		- );
119		- }
	116	+ return new TemplateResponse(
	117	+ $this->appName, 'renewpassword', $parameters, 'guest'
	118	+ );
	119	+ }
120	120
121		- /**
122		- * @PublicPage
123		- * @UseSession
124		- *
125		- * @param string $user
126		- * @param string $oldPassword
127		- * @param string $newPassword
128		- *
129		- * @return RedirectResponse
130		- */
131		- public function tryRenewPassword($user, $oldPassword, $newPassword) {
132		- if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
133		- return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
134		- }
135		- $args = !is_null($user) ? ['user' => $user] : [];
136		- $loginResult = $this->userManager->checkPassword($user, $oldPassword);
137		- if ($loginResult === false) {
138		- $this->session->set('renewPasswordMessages', [
139		- ['invalidpassword'], []
140		- ]);
141		- return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
142		- }
	121	+ /**
	122	+ * @PublicPage
	123	+ * @UseSession
	124	+ *
	125	+ * @param string $user
	126	+ * @param string $oldPassword
	127	+ * @param string $newPassword
	128	+ *
	129	+ * @return RedirectResponse
	130	+ */
	131	+ public function tryRenewPassword($user, $oldPassword, $newPassword) {
	132	+ if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
	133	+ return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
	134	+ }
	135	+ $args = !is_null($user) ? ['user' => $user] : [];
	136	+ $loginResult = $this->userManager->checkPassword($user, $oldPassword);
	137	+ if ($loginResult === false) {
	138	+ $this->session->set('renewPasswordMessages', [
	139	+ ['invalidpassword'], []
	140	+ ]);
	141	+ return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
	142	+ }
143	143
144		- try {
145		- if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
146		- $this->session->set('loginMessages', [
147		- [], [$this->l10n->t("Please login with the new password")]
148		- ]);
149		- $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
150		- return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
151		- } else {
152		- $this->session->set('renewPasswordMessages', [
153		- ['internalexception'], []
154		- ]);
155		- }
156		- } catch (HintException $e) {
157		- $this->session->set('renewPasswordMessages', [
158		- [], [$e->getHint()]
159		- ]);
160		- }
	144	+ try {
	145	+ if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
	146	+ $this->session->set('loginMessages', [
	147	+ [], [$this->l10n->t("Please login with the new password")]
	148	+ ]);
	149	+ $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
	150	+ return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
	151	+ } else {
	152	+ $this->session->set('renewPasswordMessages', [
	153	+ ['internalexception'], []
	154	+ ]);
	155	+ }
	156	+ } catch (HintException $e) {
	157	+ $this->session->set('renewPasswordMessages', [
	158	+ [], [$e->getHint()]
	159	+ ]);
	160	+ }
161	161
162		- return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
163		- }
	162	+ return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
	163	+ }
164	164
165		- /**
166		- * @PublicPage
167		- * @NoCSRFRequired
168		- * @UseSession
169		- *
170		- * @return RedirectResponse
171		- */
172		- public function showLoginFormInvalidPassword($user) {
173		- $args = !is_null($user) ? ['user' => $user] : [];
174		- $this->session->set('loginMessages', [
175		- ['invalidpassword'], []
176		- ]);
177		- return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
178		- }
	165	+ /**
	166	+ * @PublicPage
	167	+ * @NoCSRFRequired
	168	+ * @UseSession
	169	+ *
	170	+ * @return RedirectResponse
	171	+ */
	172	+ public function showLoginFormInvalidPassword($user) {
	173	+ $args = !is_null($user) ? ['user' => $user] : [];
	174	+ $this->session->set('loginMessages', [
	175	+ ['invalidpassword'], []
	176	+ ]);
	177	+ return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
	178	+ }
179	179
180	180	}

nextcloud / server

Push — master ( c7b280...a15591 )

Status

Category

Indentation +129 added lines, -129 removed lines patch added patch discarded remove patch