Completed
Pull Request — master (#151)
by Sander
02:31
created
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($AppName, $request);
28 28
 		$this->userId = $UserId;
29 29
 		$this->fileService = $fileService;
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
57 57
 	}
58 58
 
59
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
60
-		try{
59
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
60
+		try {
61 61
 			$file = $this->fileService->getFile($file_id, $this->userId);
62
-		} catch (DoesNotExistException $doesNotExistException){
62
+		} catch (DoesNotExistException $doesNotExistException) {
63 63
 
64 64
 		}
65
-		if($file){
66
-			if($file_data) {
65
+		if ($file) {
66
+			if ($file_data) {
67 67
 				$file->setFileData($file_data);
68 68
 			}
69
-			if($filename) {
69
+			if ($filename) {
70 70
 				$file->setFilename($filename);
71 71
 			}
72
-			if($filename || $file_data){
72
+			if ($filename || $file_data) {
73 73
 				new JSONResponse($this->fileService->updateFile($file));
74 74
 			}
75 75
 		}
Please login to merge, or discard this patch.
controller/vaultcontroller.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 		try {
80 80
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
81 81
 		} catch (DoesNotExistException $e) {
82
-            return new NotFoundJSONResponse();
82
+			return new NotFoundJSONResponse();
83 83
 		}
84 84
 		$result = array();
85 85
 		if ($vault) {
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, 'label' => $title);
51 51
 		return new TemplateResponse('passman', 'bookmarklet', $params);
52 52
 	}
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 use OCP\IL10N;
30 30
 use OCP\Util;
31 31
 class Application extends App {
32
-	public function __construct () {
32
+	public function __construct() {
33 33
 		parent::__construct('passman');
34 34
 		$container = $this->getContainer();
35 35
 		$server = $container->getServer();
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 
67 67
 		/** Cron  **/
68
-		$container->registerService('CronService', function ($c) {
68
+		$container->registerService('CronService', function($c) {
69 69
 			return new CronService(
70 70
 				$c->query('CredentialService'),
71 71
 				$c->query('Logger'),
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			);
77 77
 		});
78 78
 
79
-		$container->registerService('Db', function () {
79
+		$container->registerService('Db', function() {
80 80
 			return new Db();
81 81
 		});
82 82
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		$c = $this->getContainer();
106 106
 		/** @var \OCP\IServerContainer $server */
107 107
 		$server = $c->getServer();
108
-		$navigationEntry = function () use ($c, $server) {
108
+		$navigationEntry = function() use ($c, $server) {
109 109
 			return [
110 110
 				'id' => $c->getAppName(),
111 111
 				'order' => 10,
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 				$server->getUserManager(),
69 69
  				$c->query('ActivityService'),
70 70
  				$c->query('VaultService'),
71
-                $c->query('ShareService'),
72
-                $c->query('CredentialService'),
73
-                $c->query('NotificationService'),
74
-                $c->query('FileService'),
75
-                $c->query('IConfig')
71
+				$c->query('ShareService'),
72
+				$c->query('CredentialService'),
73
+				$c->query('NotificationService'),
74
+				$c->query('FileService'),
75
+				$c->query('IConfig')
76 76
 			);
77 77
 		});
78 78
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		$container->registerAlias('ActivityService', ActivityService::class);
109 109
 		$container->registerAlias('VaultService', VaultService::class);
110 110
 		$container->registerAlias('FileService', FileService::class);
111
-        $container->registerAlias('ShareService', ShareService::class);
111
+		$container->registerAlias('ShareService', ShareService::class);
112 112
 		$container->registerAlias('Utils', Utils::class);
113 113
 		$container->registerAlias('IDBConnection', IDBConnection::class);
114 114
 		$container->registerAlias('IConfig', IConfig::class);
Please login to merge, or discard this patch.
lib/Service/VaultService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@
 block discarded – undo
47 47
 		return $this->vaultMapper->updateVault($vault);
48 48
 	}
49 49
 
50
-	public function setLastAccess($vault_id, $user_id){
50
+	public function setLastAccess($vault_id, $user_id) {
51 51
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
52 52
 	}
53 53
 
54
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
54
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
55 55
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/CredentialRevisionService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,19 +30,19 @@
 block discarded – undo
30 30
 		return $this->credentialRevisionMapper->create($credential, $userId, $credential_id, $edited_by);
31 31
 	}
32 32
 
33
-	public function getRevisions($credential_id, $user_id = null){
33
+	public function getRevisions($credential_id, $user_id = null) {
34 34
 		return $this->credentialRevisionMapper->getRevisions($credential_id, $user_id);
35 35
 	}
36 36
 
37
-	public function getRevision($credential_id, $user_id = null){
37
+	public function getRevision($credential_id, $user_id = null) {
38 38
 		return $this->credentialRevisionMapper->getRevision($credential_id, $user_id);
39 39
 	}
40 40
 
41
-	public function deleteRevision($revision_id, $user_id){
41
+	public function deleteRevision($revision_id, $user_id) {
42 42
 		return $this->credentialRevisionMapper->deleteRevision($revision_id, $user_id);
43 43
 	}
44 44
 
45
-	public function updateRevision(CredentialRevision $credentialRevision){
45
+	public function updateRevision(CredentialRevision $credentialRevision) {
46 46
 		return $this->credentialRevisionMapper->update($credentialRevision);
47 47
 	}
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/NotificationService.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
 		$this->manager = \OC::$server->getNotificationManager();
26 26
 	}
27 27
 
28
-	function credentialExpiredNotification($credential){
28
+	function credentialExpiredNotification($credential) {
29 29
 		$urlGenerator = \OC::$server->getURLGenerator();
30
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
30
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/vault/' . $credential->getVaultId() . '/edit/' . $credential->getId()));
31 31
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
32 32
 		$notification = $this->manager->createNotification();
33 33
 		$remindAction = $notification->createAction();
34 34
 		$remindAction->setLabel('remind')
35
-			->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST');
35
+			->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST');
36 36
 
37 37
 		$declineAction = $notification->createAction();
38 38
 		$declineAction->setLabel('ignore')
39
-			->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE');
39
+			->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE');
40 40
 
41 41
 		$notification->setApp('passman')
42 42
 			->setUser($credential->getUserId())
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
51 51
 	}
52 52
 
53 53
 
54
-	function credentialSharedNotification($data){
54
+	function credentialSharedNotification($data) {
55 55
 		$urlGenerator = \OC::$server->getURLGenerator();
56
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
56
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/'));
57 57
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
58 58
 		$notification = $this->manager->createNotification();
59 59
 
60 60
 		$declineAction = $notification->createAction();
61 61
 		$declineAction->setLabel('decline')
62
-			->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE');
62
+			->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE');
63 63
 
64 64
 		$notification->setApp('passman')
65 65
 			->setUser($data['target_user'])
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 
76
-	function credentialDeclinedSharedNotification($data){
76
+	function credentialDeclinedSharedNotification($data) {
77 77
 		$notification = $this->manager->createNotification();
78 78
 		$notification->setApp('passman')
79 79
 			->setUser($data['target_user'])
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	}
85 85
 
86 86
 
87
-	function credentialAcceptedSharedNotification($data){
87
+	function credentialAcceptedSharedNotification($data) {
88 88
 		$notification = $this->manager->createNotification();
89 89
 		$notification->setApp('passman')
90 90
 			->setUser($data['target_user'])
Please login to merge, or discard this patch.
lib/Service/ShareService.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 	}
286 286
 
287 287
 
288
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
288
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
289 289
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
290 290
     }
291 291
 }
292 292
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -176,31 +176,31 @@  discard block
 block discarded – undo
176 176
 	}
177 177
 
178 178
 
179
-    /**
180
-     * Deletes a share request by the item ID
181
-     * @param ShareRequest $request
182
-     * @return \PDOStatement
183
-     */
179
+	/**
180
+	 * Deletes a share request by the item ID
181
+	 * @param ShareRequest $request
182
+	 * @return \PDOStatement
183
+	 */
184 184
 	public function cleanItemRequestsForUser(ShareRequest $request) {
185 185
 		return $this->shareRequest->cleanItemRequestsForUser($request->getItemId(), $request->getTargetUserId());
186 186
 	}
187 187
 
188
-    /**
189
-     * Get an share request by id
190
-     * @param $id
191
-     * @return ShareRequest
192
-     */
188
+	/**
189
+	 * Get an share request by id
190
+	 * @param $id
191
+	 * @return ShareRequest
192
+	 */
193 193
 	public function getShareRequestById($id) {
194 194
 		return $this->shareRequest->getShareRequestById($id);
195 195
 	}
196 196
 
197
-    /**
198
-     * Get an share request by $item_guid and $target_vault_guid
199
-     *
200
-     * @param $item_guid
201
-     * @param $target_vault_guid
202
-     * @return ShareRequest
203
-     */
197
+	/**
198
+	 * Get an share request by $item_guid and $target_vault_guid
199
+	 *
200
+	 * @param $item_guid
201
+	 * @param $target_vault_guid
202
+	 * @return ShareRequest
203
+	 */
204 204
 	public function getRequestByGuid($item_guid, $target_vault_guid) {
205 205
 		return $this->shareRequest->getRequestByItemAndVaultGuid($item_guid, $target_vault_guid);
206 206
 	}
@@ -260,11 +260,11 @@  discard block
 block discarded – undo
260 260
 		return $this->sharingACL->deleteShareACL($ACL);
261 261
 	}
262 262
 
263
-    /**
264
-     * Updates the given ACL entry
265
-     * @param SharingACL $sharingACL
266
-     * @return SharingACL
267
-     */
263
+	/**
264
+	 * Updates the given ACL entry
265
+	 * @param SharingACL $sharingACL
266
+	 * @return SharingACL
267
+	 */
268 268
 	public function updateCredentialACL(SharingACL $sharingACL) {
269 269
 		return $this->sharingACL->updateCredentialACL($sharingACL);
270 270
 	}
@@ -286,6 +286,6 @@  discard block
 block discarded – undo
286 286
 
287 287
 
288 288
 	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
289
-	    return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
290
-    }
289
+		return $this->shareRequest->updatePendingRequestPermissions($item_guid, $user_id, $permissions);
290
+	}
291 291
 }
292 292
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/SharingACL.php 1 patch
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -38,50 +38,50 @@
 block discarded – undo
38 38
 class SharingACL extends PermissionEntity implements \JsonSerializable
39 39
 {
40 40
 
41
-    protected
42
-        $itemId,
43
-        $itemGuid,
44
-        $userId,
45
-        $created,
46
-        $expire,
41
+	protected
42
+		$itemId,
43
+		$itemGuid,
44
+		$userId,
45
+		$created,
46
+		$expire,
47 47
 		$expireViews,
48
-        $permissions,
49
-        $vaultId,
50
-        $vaultGuid,
51
-        $sharedKey;
48
+		$permissions,
49
+		$vaultId,
50
+		$vaultGuid,
51
+		$sharedKey;
52 52
 
53 53
 
54
-    public function __construct() {
55
-        // add types in constructor
56
-        $this->addType('itemId', 'integer');
57
-        $this->addType('created', 'integer');
58
-        $this->addType('expire', 'integer');
59
-        $this->addType('expireViews', 'integer');
60
-        $this->addType('permissions', 'integer');
61
-    }
54
+	public function __construct() {
55
+		// add types in constructor
56
+		$this->addType('itemId', 'integer');
57
+		$this->addType('created', 'integer');
58
+		$this->addType('expire', 'integer');
59
+		$this->addType('expireViews', 'integer');
60
+		$this->addType('permissions', 'integer');
61
+	}
62 62
 
63
-    /**
64
-     * Specify data which should be serialized to JSON
65
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
66
-     * @return mixed data which can be serialized by <b>json_encode</b>,
67
-     * which is a value of any type other than a resource.
68
-     * @since 5.4.0
69
-     */
70
-    function jsonSerialize()
71
-    {
72
-        return [
73
-            'acl_id' => $this->getId(),
74
-            'item_id' => $this->getItemId(),
75
-            'item_guid' => $this->getItemGuid(),
76
-            'user_id' => $this->getUserId(),
77
-            'created' => $this->getCreated(),
78
-            'expire' => $this->getExpire(),
79
-            'expire_views' => $this->getExpireViews(),
80
-            'permissions' => $this->getPermissions(),
81
-            'vault_id' => $this->getVaultId(),
82
-            'vault_guid' => $this->getVaultGuid(),
83
-            'shared_key' => $this->getSharedKey(),
84
-            'pending' => false,
85
-        ];
86
-    }
63
+	/**
64
+	 * Specify data which should be serialized to JSON
65
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
66
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
67
+	 * which is a value of any type other than a resource.
68
+	 * @since 5.4.0
69
+	 */
70
+	function jsonSerialize()
71
+	{
72
+		return [
73
+			'acl_id' => $this->getId(),
74
+			'item_id' => $this->getItemId(),
75
+			'item_guid' => $this->getItemGuid(),
76
+			'user_id' => $this->getUserId(),
77
+			'created' => $this->getCreated(),
78
+			'expire' => $this->getExpire(),
79
+			'expire_views' => $this->getExpireViews(),
80
+			'permissions' => $this->getPermissions(),
81
+			'vault_id' => $this->getVaultId(),
82
+			'vault_guid' => $this->getVaultGuid(),
83
+			'shared_key' => $this->getSharedKey(),
84
+			'pending' => false,
85
+		];
86
+	}
87 87
 }
88 88
\ No newline at end of file
Please login to merge, or discard this patch.