Code standard for app code

owncloud · Aug 21, 2018 · 9467ac3 · 9467ac3
1 parent 0a5f6e1
commit 9467ac3
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 33 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -72,9 +72,8 @@
 // only load notification JS code in the logged in layout page (not public links not login page)
 $request = \OC::$server->getRequest();
 if (\OC::$server->getUserSession() !== null && \OC::$server->getUserSession()->getUser() !== null
-	&& substr($request->getScriptName(), 0 - strlen('/index.php')) === '/index.php'
-	&& substr($request->getPathInfo(), 0, strlen('/s/')) !== '/s/'
-	&& substr($request->getPathInfo(), 0, strlen('/login')) !== '/login') {
-
+	&& \substr($request->getScriptName(), 0 - \strlen('/index.php')) === '/index.php'
+	&& \substr($request->getPathInfo(), 0, \strlen('/s/')) !== '/s/'
+	&& \substr($request->getPathInfo(), 0, \strlen('/login')) !== '/login') {
 	\OCP\Util::addScript('password_policy', 'notification');
 }
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -25,8 +25,7 @@
 use OCA\PasswordPolicy\Notifier;
 
 class Application extends App {
-
-	public function __construct (array $urlParams = []) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct('password_policy', $urlParams);
 	}
 

diff --git a/lib/Authentication/AccountModule.php b/lib/Authentication/AccountModule.php
@@ -62,7 +62,7 @@ public function check(IUser $user) {
 		if ($forcePasswordChange) {
 			$redirectUrl = $this->request->getRequestUri();
 			$response = new RedirectResponse(
-				$this->urlGenerator->linkToRoute( 'password_policy.password.show', [
+				$this->urlGenerator->linkToRoute('password_policy.password.show', [
 						'redirect_url' => $redirectUrl
 					])
 			);

diff --git a/lib/Command/ExpirePassword.php b/lib/Command/ExpirePassword.php
@@ -35,7 +35,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use OCP\AppFramework\Utility\ITimeFactory;
 
-
 class ExpirePassword extends Command {
 	/**
 	 * Catchall for general errors
@@ -64,7 +63,6 @@ class ExpirePassword extends Command {
 	/** @var OldPasswordMapper */
 	private $mapper;
 
-
 	/**
 	 * ExpirePassword constructor.
 	 *
@@ -200,7 +198,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 	 * @param $inputExpireDate
 	 * @param IUser $user
 	 */
-	protected function setPasswordExpiry(\DateTime $expireDate, \DateTime $oldDate, \DateTimeZone $timeZone, $inputExpireDate , IUser $user) {
+	protected function setPasswordExpiry(\DateTime $expireDate, \DateTime $oldDate, \DateTimeZone $timeZone, $inputExpireDate, IUser $user) {
 		$expireDate->setTimezone($timeZone);
 		$expireDate->setTimestamp($this->timeFactory->getTime());
 		$expireDate->modify($inputExpireDate);

diff --git a/lib/Controller/PasswordController.php b/lib/Controller/PasswordController.php
@@ -146,7 +146,7 @@ public function show($redirect_url) {
 	 */
 	public function update($current_password, $new_password, $confirm_password, $redirect_url) {
 		$user = $this->userSession->getUser();
-		if(($user !== null) && !$this->userManager->checkPassword($user->getUID(), $current_password)) {
+		if (($user !== null) && !$this->userManager->checkPassword($user->getUID(), $current_password)) {
 			return $this->createPasswordTemplateResponse(
 				$redirect_url,
 				$this->l10n->t('Old password is wrong.')

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -109,7 +109,7 @@ public function getPriority() {
 
 	public function getPanel() {
 		$template = new Template('password_policy', 'admin');
-		foreach(self::DEFAULTS as $key => $default) {
+		foreach (self::DEFAULTS as $key => $default) {
 			$value = $this->config->getAppValue('password_policy', $key, $default);
 			if (isset(self::CONVERSIONS[$key]['out'])) {
 				$convertFuncName = self::CONVERSIONS[$key]['out'];

diff --git a/lib/Db/OldPassword.php b/lib/Db/OldPassword.php
@@ -23,6 +23,7 @@
 namespace OCA\PasswordPolicy\Db;
 
 use OCP\AppFramework\Db\Entity;
+
 /**
  * @method int getId()
  * @method void setId(\int $id)
@@ -33,7 +34,6 @@
  * @method void setChangeTime(\int $changeTime)
  */
 class OldPassword extends Entity {
-
 	const EXPIRED = 'expired';
 
 	/** @var string $uid */
@@ -48,4 +48,4 @@ class OldPassword extends Entity {
 	public function getPassword() {
 		return $this->password;
 	}
-}
+}
diff --git a/lib/Db/OldPasswordMapper.php b/lib/Db/OldPasswordMapper.php
@@ -27,7 +27,6 @@
 use OCP\IDBConnection;
 
 class OldPasswordMapper extends Mapper {
-
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'user_password_history');
 	}

diff --git a/lib/HooksHandler.php b/lib/HooksHandler.php
@@ -188,7 +188,7 @@ public function updateLinkExpiry($params) {
 
 		if ($days !== null) {
 			$date = new \DateTime();
-			$date->setTime(0,0,0);
+			$date->setTime(0, 0, 0);
 			$date->add(new \DateInterval('P'.$days.'D'));
 
 			if ($params['expirationDate'] === null) {
@@ -272,7 +272,7 @@ protected function forcePasswordChange($firstLogin = null, IUser $user = null) {
 	 */
 	private function getUser(GenericEvent $event) {
 		$user = $event->getArgument('user');
-		if(!$user instanceof IUser) {
+		if (!$user instanceof IUser) {
 			throw new \UnexpectedValueException("'$user' is not an instance of IUser.");
 		}
 		return $user;
@@ -319,7 +319,7 @@ public function checkAdminRequestedPasswordChange(GenericEvent $event) {
 	public function checkForcePasswordChangeOnFirstLogin(GenericEvent $event) {
 		$this->fixDI();
 		$user = $event->getSubject();
-		if(!$user instanceof IUser) {
+		if (!$user instanceof IUser) {
 			throw new \UnexpectedValueException("'$user' is not an instance of IUser.");
 		}
 		// If option is enabled in security settings check first login

diff --git a/lib/Rules/Base.php b/lib/Rules/Base.php
@@ -34,6 +34,4 @@ class Base {
 	public function __construct(IL10N $l10n) {
 		$this->l10n = $l10n;
 	}
-
 }
-
diff --git a/lib/Rules/Length.php b/lib/Rules/Length.php
@@ -34,5 +34,4 @@ public function verify($password, $val) {
 				$this->l10n->t('The password is too short. At least %d characters are required.', [$val]));
 		}
 	}
-
 }
diff --git a/lib/Rules/Lowercase.php b/lib/Rules/Lowercase.php
@@ -51,5 +51,4 @@ private function countLowercase($s) {
 		}
 		return $count;
 	}
-
 }
diff --git a/lib/Rules/Numbers.php b/lib/Rules/Numbers.php
@@ -40,7 +40,7 @@ public function verify($password, $val) {
 		}
 	}
 
-	private function countDigits( $str ) {
-		return \preg_match_all( '/[0-9]/', $str );
+	private function countDigits($str) {
+		return \preg_match_all('/[0-9]/', $str);
 	}
 }
diff --git a/lib/Rules/PasswordHistory.php b/lib/Rules/PasswordHistory.php
@@ -55,14 +55,14 @@ public function __construct(
 	 * @throws PolicyException
 	 */
 	public function verify($password, $val, $uid) {
-		if(empty($uid)) {
+		if (empty($uid)) {
 			return;
 		}
 		$oldPasswords = $this->mapper->getOldPasswords(
 			$uid,
 			$val
 		);
-		foreach($oldPasswords as $oldPassword) {
+		foreach ($oldPasswords as $oldPassword) {
 			if ($this->hasher->verify($password, $oldPassword->getPassword())) {
 				throw new PolicyException(
 					$this->l10n->t('The password must be different than your previous %d passwords.', [$val])

diff --git a/lib/Rules/Special.php b/lib/Rules/Special.php
@@ -33,7 +33,7 @@ public function verify($password, $val, $allowedSpecialChars) {
 		$special = $this->stripAlphaNumeric($password);
 		if (!empty($allowedSpecialChars) && !empty($special)) {
 			$allowedSpecialCharsAsArray = \str_split($allowedSpecialChars);
-			$s = \array_filter(\str_split($special), function($char) use ($allowedSpecialCharsAsArray){
+			$s = \array_filter(\str_split($special), function ($char) use ($allowedSpecialCharsAsArray) {
 				return !\in_array($char, $allowedSpecialCharsAsArray, true);
 			});
 			if (\count($s) > 0) {
@@ -63,9 +63,7 @@ public function verify($password, $val, $allowedSpecialChars) {
 		}
 	}
 
-	private function stripAlphaNumeric( $string ) {
-		return \preg_replace( '/[a-z0-9]/i', '', $string );
+	private function stripAlphaNumeric($string) {
+		return \preg_replace('/[a-z0-9]/i', '', $string);
 	}
-
 }
-
diff --git a/lib/Rules/Uppercase.php b/lib/Rules/Uppercase.php
@@ -51,5 +51,4 @@ private function countUppercase($s) {
 		}
 		return $count;
 	}
-
 }
diff --git a/templates/password.php b/templates/password.php
@@ -50,7 +50,9 @@
 				?>
 			</div>
 		</h1>
-		<?php if (isset($_['error'])) { ?><div id="error" class="warning"><?php p($_['error']) ?></div> <?php } ?>
+		<?php if (isset($_['error'])) {
+					?><div id="error" class="warning"><?php p($_['error']) ?></div> <?php
+				} ?>
 		<input type="hidden" name="redirect_url" value="<?php p($_['redirect_url']) ?>" />
 		<input type="hidden" name="app" value="oca-password-policy" />
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,4 @@ class Base { @@
     	public function __construct(IL10N $l10n) {
     		$this->l10n = $l10n;
     	}
     }