Completed
Push — master ( 197620...ce588f )
by Sander
02:30
created
controller/credentialcontroller.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -255,26 +255,26 @@
 block discarded – undo
255 255
 	 * @NoAdminRequired
256 256
 	 */
257 257
 	public function getRevision($credential_guid) {
258
-	    try {
259
-            $credential = $this->credentialService->getCredentialByGUID($credential_guid);
260
-        }
261
-        catch (DoesNotExistException $ex){
262
-            return new NotFoundJSONResponse();
263
-        }
258
+		try {
259
+			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
260
+		}
261
+		catch (DoesNotExistException $ex){
262
+			return new NotFoundJSONResponse();
263
+		}
264 264
 
265
-        // If the request was made by the owner of the credential
266
-        if ($this->userId === $credential->getUserId()) {
267
-            $result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
268
-        }
269
-        else {
270
-            $acl = $this->sharingService->getACL($this->userId, $credential_guid);
271
-            if ($acl->hasPermission(SharingACL::HISTORY)){
272
-                $result = $this->credentialRevisionService->getRevisions($credential->getId());
273
-            }
274
-            else {
275
-                return new NotFoundJSONResponse();
276
-            }
277
-        }
265
+		// If the request was made by the owner of the credential
266
+		if ($this->userId === $credential->getUserId()) {
267
+			$result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
268
+		}
269
+		else {
270
+			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
271
+			if ($acl->hasPermission(SharingACL::HISTORY)){
272
+				$result = $this->credentialRevisionService->getRevisions($credential->getId());
273
+			}
274
+			else {
275
+				return new NotFoundJSONResponse();
276
+			}
277
+		}
278 278
 
279 279
 		return new JSONResponse($result);
280 280
 	}
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 		);
85 85
 		$credential = $this->credentialService->createCredential($credential);
86 86
 		$link = ''; // @TODO create direct link to credential
87
-		if(!$credential->getHidden()) {
87
+		if (!$credential->getHidden()) {
88 88
 			$this->activityService->add(
89 89
 				Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId),
90 90
 				'', array(),
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 
203 203
 			foreach ($acl_list as $sharingACL) {
204 204
 				$target_user = $sharingACL->getUserId();
205
-				if($target_user === $this->userId){
205
+				if ($target_user === $this->userId) {
206 206
 					continue;
207 207
 				}
208 208
 				$this->activityService->add(
@@ -217,15 +217,15 @@  discard block
 block discarded – undo
217 217
 					$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
218 218
 			}
219 219
 		}
220
-		if($set_share_key === true){
220
+		if ($set_share_key === true) {
221 221
 			$storedCredential->setSharedKey($shared_key);
222 222
 			$credential['shared_key'] = $shared_key;
223 223
 		}
224
-		if($unshare_action === true){
224
+		if ($unshare_action === true) {
225 225
 			$storedCredential->setSharedKey('');
226 226
 			$credential['shared_key'] = '';
227 227
 		}
228
-		if(!$skip_revision) {
228
+		if (!$skip_revision) {
229 229
 			$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId);
230 230
 		}
231 231
 		$credential = $this->credentialService->updateCredential($credential);
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	    try {
259 259
             $credential = $this->credentialService->getCredentialByGUID($credential_guid);
260 260
         }
261
-        catch (DoesNotExistException $ex){
261
+        catch (DoesNotExistException $ex) {
262 262
             return new NotFoundJSONResponse();
263 263
         }
264 264
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
         }
269 269
         else {
270 270
             $acl = $this->sharingService->getACL($this->userId, $credential_guid);
271
-            if ($acl->hasPermission(SharingACL::HISTORY)){
271
+            if ($acl->hasPermission(SharingACL::HISTORY)) {
272 272
                 $result = $this->credentialRevisionService->getRevisions($credential->getId());
273 273
             }
274 274
             else {
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	/**
291 291
 	 * @NoAdminRequired
292 292
 	 */
293
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
293
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
294 294
 		$revision = null;
295 295
 		try {
296 296
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
 			return new NotFoundJSONResponse();
299 299
 		}
300 300
 
301
-		try{
301
+		try {
302 302
 			$revision = $this->credentialRevisionService->getRevision($revision_id);
303
-		} catch(DoesNotExistException $exception){
303
+		} catch (DoesNotExistException $exception) {
304 304
 			return new NotFoundJSONResponse();
305 305
 		}
306 306
 
Please login to merge, or discard this patch.