Failed Conditions
Pull Request — master (#160)
by Sander
02:55
created
lib/Service/ShareService.php 1 patch
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,7 +71,9 @@  discard block
 block discarded – undo
71 71
 	}
72 72
 
73 73
 	public function createACLEntry(SharingACL $acl) {
74
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
74
+		if ($acl->getCreated() === null) {
75
+			$acl->setCreated((new \DateTime())->getTimestamp());
76
+		}
75 77
 		return $this->sharingACL->createACLEntry($acl);
76 78
 	}
77 79
 
@@ -124,12 +126,16 @@  discard block
 block discarded – undo
124 126
 		$return = [];
125 127
 		foreach ($entries as $entry) {
126 128
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
127
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
129
+			if (!$entry->hasPermission(SharingACL::READ)) {
130
+				continue;
131
+			}
128 132
 
129 133
 			$tmp = $entry->jsonSerialize();
130 134
 			$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
131 135
 
132
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
136
+			if (!$entry->hasPermission(SharingACL::FILES)) {
137
+				unset($tmp['credential_data']['files']);
138
+			}
133 139
 			unset($tmp['credential_data']['shared_key']);
134 140
 			$return[] = $tmp;
135 141
 		}
@@ -150,12 +156,16 @@  discard block
 block discarded – undo
150 156
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
151 157
 
152 158
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
153
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
159
+		if (!$acl->hasPermission(SharingACL::READ)) {
160
+			throw new DoesNotExistException("Item not found or wrong access level");
161
+		}
154 162
 
155 163
 		$tmp = $acl->jsonSerialize();
156 164
 		$tmp['credential_data'] = $this->credential->getCredentialById($acl->getItemId())->jsonSerialize();
157 165
 
158
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
166
+		if (!$acl->hasPermission(SharingACL::FILES)) {
167
+			unset($tmp['credential_data']['files']);
168
+		}
159 169
 		unset($tmp['credential_data']['shared_key']);
160 170
 
161 171
 		return $tmp;
@@ -170,7 +180,9 @@  discard block
 block discarded – undo
170 180
 	 */
171 181
 	public function getItemHistory($user_id, $item_guid) {
172 182
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
173
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
183
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
184
+			return [];
185
+		}
174 186
 
175 187
 		return $this->revisions->getRevisions($acl->getItemId());
176 188
 	}
Please login to merge, or discard this patch.
lib/Service/EncryptService.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -264,7 +264,9 @@  discard block
 block discarded – undo
264 264
 	protected function unpad($data) {
265 265
 		$length = $this->getKeySize();
266 266
 		$last = ord($data[strlen($data) - 1]);
267
-		if ($last > $length) return false;
267
+		if ($last > $length) {
268
+			return false;
269
+		}
268 270
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
269 271
 			return false;
270 272
 		}
@@ -308,7 +310,7 @@  discard block
 block discarded – undo
308 310
 			$userKey = (isset($sk)) ? $sk : $credential->getUserId();
309 311
 		}
310 312
 		
311
-		if(is_array($credential)){
313
+		if(is_array($credential)) {
312 314
 			$userSuppliedKey = $credential['label'];
313 315
 			$userKey = (isset($credential['shared_key'])) ? $credential['shared_key'] : $credential['user_id'];
314 316
 		}
Please login to merge, or discard this patch.