@@ -21,7 +21,7 @@ |
||
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 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | public function expireCredentials() { |
38 | 38 | $this->logger->info('Passman cron test', array('app' => 'passman')); |
39 | 39 | $expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime()); |
40 | - foreach($expired_credentials as $credential){ |
|
40 | + foreach($expired_credentials as $credential) { |
|
41 | 41 | $link = ''; // @TODO create direct link to credential |
42 | 42 | |
43 | 43 | $sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?'; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct($db, self::TABLE_NAME); |
23 | 23 | } |
24 | 24 | |
25 | - public function createRequest(ShareRequest $request){ |
|
25 | + public function createRequest(ShareRequest $request) { |
|
26 | 26 | return $this->insert($request); |
27 | 27 | } |
28 | 28 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param $target_vault_guid |
33 | 33 | * @return ShareRequest |
34 | 34 | */ |
35 | - public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
35 | + public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) { |
|
36 | 36 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
37 | 37 | return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @param $item_guid |
43 | 43 | * @return ShareRequest[] |
44 | 44 | */ |
45 | - public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
46 | - if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
45 | + public function getRequestsByItemGuidGroupedByUser($item_guid) { |
|
46 | + if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') { |
|
47 | 47 | $this->db->executeQuery("SET sql_mode = '';"); |
48 | 48 | } |
49 | 49 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param $target_user_id The target user |
57 | 57 | * @return \PDOStatement The result of running the db query |
58 | 58 | */ |
59 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
59 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
60 | 60 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
61 | 61 | $this->execute($q, [$item_id, $target_user_id]); |
62 | 62 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | * @param $user_id |
68 | 68 | * @return ShareRequest[] |
69 | 69 | */ |
70 | - public function getUserPendingRequests($user_id){ |
|
70 | + public function getUserPendingRequests($user_id) { |
|
71 | 71 | $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
72 | 72 | return $this->findEntities($q, [$user_id]); |
73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param ShareRequest $shareRequest Request to delete |
78 | 78 | * @return ShareRequest The deleted request |
79 | 79 | */ |
80 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
80 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
81 | 81 | return $this->delete($shareRequest); |
82 | 82 | } |
83 | 83 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @return ShareRequest |
88 | 88 | * @throws DoesNotExistException |
89 | 89 | */ |
90 | - public function getShareRequestById($id){ |
|
90 | + public function getShareRequestById($id) { |
|
91 | 91 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
92 | 92 | return $this->findEntity($q, [$id]); |
93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param $item_guid |
98 | 98 | * @return ShareRequest[] |
99 | 99 | */ |
100 | - public function getShareRequestsByItemGuid($item_guid){ |
|
100 | + public function getShareRequestsByItemGuid($item_guid) { |
|
101 | 101 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
102 | 102 | return $this->findEntities($q, [$item_guid]); |
103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @param ShareRequest $shareRequest |
108 | 108 | * @return ShareRequest |
109 | 109 | */ |
110 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
110 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
111 | 111 | return $this->update($shareRequest); |
112 | 112 | } |
113 | 113 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * @param $user_id |
118 | 118 | * @return ShareRequest[] |
119 | 119 | */ |
120 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
120 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
121 | 121 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
122 | 122 | return $this->findEntities($q, [$item_guid, $user_id]); |
123 | 123 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * @param $permissions The new permissions to apply |
130 | 130 | * @return \PDOStatement The result of the operation |
131 | 131 | */ |
132 | - public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){ |
|
132 | + public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) { |
|
133 | 133 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
134 | 134 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
135 | 135 | } |
@@ -83,7 +83,7 @@ |
||
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
86 | - private function fetchAll($sql){ |
|
86 | + private function fetchAll($sql) { |
|
87 | 87 | return $this->db->executeQuery($sql)->fetchAll(); |
88 | 88 | } |
89 | 89 |
@@ -264,7 +264,9 @@ discard block |
||
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 | } |
@@ -295,7 +297,7 @@ discard block |
||
295 | 297 | |
296 | 298 | |
297 | 299 | |
298 | - private function extractKeysFromCredential($credential){ |
|
300 | + private function extractKeysFromCredential($credential) { |
|
299 | 301 | $userKey = ''; |
300 | 302 | $userSuppliedKey = ''; |
301 | 303 | if ($credential instanceof Credential) { |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled'; |
27 | 27 | $sharing_enabled = ($this->settings->isEnabled($setting)); |
28 | 28 | |
29 | - if(in_array($methodName, $user_pub_methods)){ |
|
29 | + if(in_array($methodName, $user_pub_methods)) { |
|
30 | 30 | $sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled')); |
31 | 31 | } |
32 | 32 |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | parent::__construct($db, 'passman_sharing_acl'); |
37 | 37 | } |
38 | 38 | |
39 | - public function createACLEntry(SharingACL $acl){ |
|
39 | + public function createACLEntry(SharingACL $acl) { |
|
40 | 40 | return $this->insert($acl); |
41 | 41 | } |
42 | 42 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
62 | 62 | $filter = [$item_guid]; |
63 | 63 | $q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? '; |
64 | - if ($user_id !== null){ |
|
64 | + if ($user_id !== null) { |
|
65 | 65 | $filter[] = $user_id; |
66 | 66 | } |
67 | 67 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | return $this->findEntities($q, [$item_guid]); |
90 | 90 | } |
91 | 91 | |
92 | - public function deleteShareACL(SharingACL $ACL){ |
|
92 | + public function deleteShareACL(SharingACL $ACL) { |
|
93 | 93 | return $this->delete($ACL); |
94 | 94 | } |
95 | 95 | } |
96 | 96 | \ No newline at end of file |
@@ -23,7 +23,7 @@ discard block |
||
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; |
@@ -59,20 +59,20 @@ discard block |
||
59 | 59 | return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId)); |
60 | 60 | } |
61 | 61 | |
62 | - public function updateFile($file_id, $file_data, $filename){ |
|
62 | + public function updateFile($file_id, $file_data, $filename) { |
|
63 | 63 | try{ |
64 | 64 | $file = $this->fileService->getFile($file_id, $this->userId); |
65 | 65 | } catch (\Exception $doesNotExistException){ |
66 | 66 | |
67 | 67 | } |
68 | - if($file){ |
|
68 | + if($file) { |
|
69 | 69 | if($file_data) { |
70 | 70 | $file->setFileData($file_data); |
71 | 71 | } |
72 | 72 | if($filename) { |
73 | 73 | $file->setFilename($filename); |
74 | 74 | } |
75 | - if($filename || $file_data){ |
|
75 | + if($filename || $file_data) { |
|
76 | 76 | new JSONResponse($this->fileService->updateFile($file)); |
77 | 77 | } |
78 | 78 | } |