Completed
Push — master ( 50b854...0fefb1 )
by Marcos
02:41
created
lib/Utility/Utils.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@
 block discarded – undo
32 32
      * @return string
33 33
      */
34 34
 	public static function GUID() {
35
-		if (function_exists('com_create_guid') === true)
36
-		{
35
+		if (function_exists('com_create_guid') === true) {
37 36
 			return trim(com_create_guid(), '{}');
38 37
 		}
39 38
 
Please login to merge, or discard this patch.
lib/Service/CredentialRevisionService.php 1 patch
Braces   +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/VaultService.php 1 patch
Braces   +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/NotificationService.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  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 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'));
@@ -51,7 +51,7 @@  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 56
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
57 57
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -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 1 patch
Braces   +19 added lines, -7 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
 	}
@@ -285,7 +297,7 @@  discard block
 block discarded – undo
285 297
 	}
286 298
 
287 299
 
288
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
300
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
289 301
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
290 302
     }
291 303
 }
292 304
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Service/CredentialService.php 1 patch
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		return $this->credentialMapper->upd($credential);
48 48
 	}
49 49
 
50
-	public function deleteCredential($credential){
50
+	public function deleteCredential($credential) {
51 51
 		return $this->credentialMapper->deleteCredential($credential);
52 52
 	}
53 53
 
@@ -64,12 +64,11 @@  discard block
 block discarded – undo
64 64
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
65 65
 	}
66 66
 
67
-	public function getCredentialById($credential_id, $user_id){
67
+	public function getCredentialById($credential_id, $user_id) {
68 68
         $credential = $this->credentialMapper->getCredentialById($credential_id);
69
-        if ($credential->getUserId() === $user_id){
69
+        if ($credential->getUserId() === $user_id) {
70 70
             return $credential;
71
-        }
72
-        else {
71
+        } else {
73 72
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
74 73
             if ($acl->hasPermission(SharingACL::READ));
75 74
             return $credential;
@@ -77,11 +76,11 @@  discard block
 block discarded – undo
77 76
 
78 77
         throw new DoesNotExistException("Did expect one result but found none when executing");
79 78
 	}
80
-	public function getCredentialLabelById($credential_id){
79
+	public function getCredentialLabelById($credential_id) {
81 80
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
82 81
 	}
83 82
 
84
-	public function getCredentialByGUID($credential_guid, $user_id = null){
83
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
85 84
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
86 85
     }
87 86
 }
88 87
\ No newline at end of file
Please login to merge, or discard this patch.
lib/Db/SharingACL.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@  discard block
 block discarded – undo
35 35
  * @method string getSharedKey()
36 36
  */
37 37
 
38
-class SharingACL extends PermissionEntity implements \JsonSerializable
39
-{
38
+class SharingACL extends PermissionEntity implements \JsonSerializable {
40 39
 
41 40
     protected
42 41
         $itemId,
@@ -67,8 +66,7 @@  discard block
 block discarded – undo
67 66
      * which is a value of any type other than a resource.
68 67
      * @since 5.4.0
69 68
      */
70
-    function jsonSerialize()
71
-    {
69
+    function jsonSerialize() {
72 70
         return [
73 71
             'acl_id' => $this->getId(),
74 72
             'item_id' => $this->getItemId(),
Please login to merge, or discard this patch.
lib/Db/File.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
  */
33 33
 
34 34
 
35
-class File extends Entity implements  \JsonSerializable{
35
+class File extends Entity implements  \JsonSerializable {
36 36
 
37 37
 	use EntityJSONSerializer;
38 38
 
Please login to merge, or discard this patch.
lib/Db/Credential.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
  */
64 64
 
65 65
 
66
-class Credential extends Entity implements  \JsonSerializable{
66
+class Credential extends Entity implements  \JsonSerializable {
67 67
 
68 68
 	use EntityJSONSerializer;
69 69
 
Please login to merge, or discard this patch.