Completed
Pull Request — master (#236)
by Sander
03:25
created
middleware/apimiddleware.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@
 block discarded – undo
16 16
 	}
17 17
 
18 18
 	public function afterController($controller, $methodName, Response $response) {
19
-		if($response instanceof JSONResponse){
20
-			if(isset($this->request->server['HTTP_ORIGIN'])) {
19
+		if ($response instanceof JSONResponse) {
20
+			if (isset($this->request->server['HTTP_ORIGIN'])) {
21 21
 				$response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']);
22 22
 			}
23 23
 		}
Please login to merge, or discard this patch.
controller/filecontroller.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	public function __construct($AppName,
24 24
 								IRequest $request,
25 25
 								$UserId,
26
-								FileService $fileService){
26
+								FileService $fileService) {
27 27
 		parent::__construct(
28 28
 			$AppName,
29 29
 			$request,
@@ -65,20 +65,20 @@  discard block
 block discarded – undo
65 65
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
66 66
 	}
67 67
 
68
-	public function updateFile($file_id, $file_data, $filename){
69
-		try{
68
+	public function updateFile($file_id, $file_data, $filename) {
69
+		try {
70 70
 			$file = $this->fileService->getFile($file_id, $this->userId);
71
-		} catch (\Exception $doesNotExistException){
71
+		} catch (\Exception $doesNotExistException) {
72 72
 
73 73
 		}
74
-		if($file){
75
-			if($file_data) {
74
+		if ($file) {
75
+			if ($file_data) {
76 76
 				$file->setFileData($file_data);
77 77
 			}
78
-			if($filename) {
78
+			if ($filename) {
79 79
 				$file->setFilename($filename);
80 80
 			}
81
-			if($filename || $file_data){
81
+			if ($filename || $file_data) {
82 82
 				new JSONResponse($this->fileService->updateFile($file));
83 83
 			}
84 84
 		}
Please login to merge, or discard this patch.
controller/pagecontroller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	private $userId;
23 23
 
24
-	public function __construct($AppName, IRequest $request, $UserId){
24
+	public function __construct($AppName, IRequest $request, $UserId) {
25 25
 		parent::__construct($AppName, $request);
26 26
 		$this->userId = $UserId;
27 27
 	}
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function index() {
40 40
 		$params = ['user' => $this->userId];
41
-		return new TemplateResponse('passman', 'main', $params);  // templates/main.php
41
+		return new TemplateResponse('passman', 'main', $params); // templates/main.php
42 42
 	}
43 43
 
44 44
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @NoAdminRequired
47 47
 	 * @NoCSRFRequired
48 48
 	 */
49
-	public function bookmarklet($url='',$title='') {
49
+	public function bookmarklet($url = '', $title = '') {
50 50
 		$params = array('url' => $url, 'title' => $title);
51 51
 		return new TemplateResponse('passman', 'bookmarklet', $params);
52 52
 	}
Please login to merge, or discard this patch.
controller/credentialcontroller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
 				$activity . '_self', array($label, $this->userId, $revision_created),
175 175
 				'', array(),
176 176
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
177
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
177
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
178 178
 			$activity = 'item_deleted';
179 179
 			$this->activityService->add(
180 180
 				$activity . '_self', array($label, $this->userId),
181 181
 				'', array(),
182 182
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
183
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
183
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
184 184
 			$activity = 'item_recovered';
185 185
 			$this->activityService->add(
186 186
 				$activity . '_self', array($label, $this->userId),
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		$this->sharingService->unshareCredential($credential->getGuid());
294 294
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
295 295
 				$id = $revision->getId();
296
-				if(isset($id)){
296
+				if (isset($id)) {
297 297
 					$this->credentialRevisionService->deleteRevision($id, $this->userId);
298 298
 				}
299 299
 		}
Please login to merge, or discard this patch.