nextcloud / passman

lib/Service/ShareService.php

Braces +18 added lines, -6 removed lines

@@ -71,7 +71,9 @@ 
 	}
 
 	public function createACLEntry(SharingACL $acl) {
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
+		if ($acl->getCreated() === null) {
+			$acl->setCreated((new \DateTime())->getTimestamp());
+		}
 		return $this->sharingACL->createACLEntry($acl);
 	}
 
@@ -124,12 +126,16 @@ 
 		$return = [];
 		foreach ($entries as $entry) {
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
+			if (!$entry->hasPermission(SharingACL::READ)) {
+				continue;
+			}
 
 			$tmp = $entry->jsonSerialize();
 			$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
 
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+			if (!$entry->hasPermission(SharingACL::FILES)) {
+				unset($tmp['credential_data']['files']);
+			}
 			unset($tmp['credential_data']['shared_key']);
 			$return[] = $tmp;
 		}
@@ -150,12 +156,16 @@ 
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
 
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
+		if (!$acl->hasPermission(SharingACL::READ)) {
+			throw new DoesNotExistException("Item not found or wrong access level");
+		}
 
 		$tmp = $acl->jsonSerialize();
 		$tmp['credential_data'] = $this->credential->getCredentialById($acl->getItemId())->jsonSerialize();
 
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+		if (!$acl->hasPermission(SharingACL::FILES)) {
+			unset($tmp['credential_data']['files']);
+		}
 		unset($tmp['credential_data']['shared_key']);
 
 		return $tmp;
@@ -170,7 +180,9 @@ 
 	 */
 	public function getItemHistory($user_id, $item_guid) {
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
+			return [];
+		}
 
 		return $this->revisions->getRevisions($acl->getItemId());
 	}

lib/Service/EncryptService.php

Doc Comments +9 added lines, -5 removed lines

@@ -213,6 +213,10 @@ 
 		return array($cipherKey, $macKey, $iv);
 	}
 
+	/**
+	 * @param string $a
+	 * @param string $b
+	 */
 	function hash_equals($a, $b) {
 		$key = openssl_random_pseudo_bytes(128);
 		return hash_hmac('sha512', $a, $key) === hash_hmac('sha512', $b, $key);
@@ -250,7 +254,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -266,8 +270,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();
@@ -284,7 +288,7 @@ 
 	 * Encrypt a credential
 	 *
 	 * @param array|Credential $credential the credential to decrypt
-	 * @return Credential|array
+	 * @return string
 	 */
 	public function decryptCredential($credential) {
 
@@ -380,7 +384,7 @@ 
 	/**
 	 * Decrypt a file
 	 *
-	 * @param  File|array $file
+	 * @param  File $file
 	 * @return File|array
 	 */
 

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,9 @@
 	protected function unpad($data) {
 		$length = $this->getKeySize();
 		$last = ord($data[strlen($data) - 1]);
-		if ($last > $length) return false;
+		if ($last > $length) {
+			return false;
+		}
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
 			return false;
 		}

migration/serversideencryption.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		}
 	}
 
-	private function fetchAll($sql){
+	private function fetchAll($sql) {
 		return $this->db->executeQuery($sql)->fetchAll();
 	}
 

Braces +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		}
 	}
 
-	private function fetchAll($sql){
+	private function fetchAll($sql) {
 		return $this->db->executeQuery($sql)->fetchAll();
 	}
 

controller/credentialcontroller.php

Spacing +3 added lines, -3 removed lines

@@ -167,13 +167,13 @@ 
 				$activity . '_self', array($label, $this->userId, $revision_created),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
 			$activity = 'item_deleted';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
 			$activity = 'item_recovered';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),
@@ -241,7 +241,7 @@ 
 			$credential['shared_key'] = '';
 		}
 
-		if(!isset($credential['shared_key'])){
+		if (!isset($credential['shared_key'])) {
 			$credential['shared_key'] = $storedCredential->getSharedKey();
 		}
 

Braces +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
 			$credential['shared_key'] = '';
 		}
 
-		if(!isset($credential['shared_key'])){
+		if(!isset($credential['shared_key'])) {
 			$credential['shared_key'] = $storedCredential->getSharedKey();
 		}
 

lib/Service/SettingsService.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * Check if an setting is enabled (value of 1)
 	 *
-	 * @param $setting
+	 * @param string $setting
 	 * @return bool
 	 */
 	public function isEnabled($setting) {