@@ -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 | } |
@@ -272,7 +272,9 @@ |
||
| 272 | 272 | protected function unpad($data) { |
| 273 | 273 | $length = $this->getKeySize(); |
| 274 | 274 | $last = ord($data[strlen($data) - 1]); |
| 275 | - if ($last > $length) return false; |
|
| 275 | + if ($last > $length) { |
|
| 276 | + return false; |
|
| 277 | + } |
|
| 276 | 278 | if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) { |
| 277 | 279 | return false; |
| 278 | 280 | } |
@@ -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 | |
@@ -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 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result |
| 63 | 63 | * @return Vault[] |
| 64 | 64 | */ |
| 65 | - public function findVaultsFromUser($userId){ |
|
| 65 | + public function findVaultsFromUser($userId) { |
|
| 66 | 66 | $sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' . |
| 67 | 67 | 'WHERE `user_id` = ? '; |
| 68 | 68 | $params = [$userId]; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @param $userId |
| 76 | 76 | * @return Vault |
| 77 | 77 | */ |
| 78 | - public function create($vault_name, $userId){ |
|
| 78 | + public function create($vault_name, $userId) { |
|
| 79 | 79 | $vault = new Vault(); |
| 80 | 80 | $vault->setName($vault_name); |
| 81 | 81 | $vault->setUserId($userId); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * @param $vault_id |
| 91 | 91 | * @param $user_id |
| 92 | 92 | */ |
| 93 | - public function setLastAccess($vault_id, $user_id){ |
|
| 93 | + public function setLastAccess($vault_id, $user_id) { |
|
| 94 | 94 | $vault = new Vault(); |
| 95 | 95 | $vault->setId($vault_id); |
| 96 | 96 | $vault->setUserId($user_id); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | * Update vault |
| 103 | 103 | * @param Vault $vault |
| 104 | 104 | */ |
| 105 | - public function updateVault(Vault $vault){ |
|
| 105 | + public function updateVault(Vault $vault) { |
|
| 106 | 106 | $this->update($vault); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * @param $privateKey |
| 113 | 113 | * @param $publicKey |
| 114 | 114 | */ |
| 115 | - public function updateSharingKeys($vault_id, $privateKey, $publicKey){ |
|
| 115 | + public function updateSharingKeys($vault_id, $privateKey, $publicKey) { |
|
| 116 | 116 | $vault = new Vault(); |
| 117 | 117 | $vault->setId($vault_id); |
| 118 | 118 | $vault->setPrivateSharingKey($privateKey); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * Delete a vault |
| 126 | 126 | * @param Vault $vault |
| 127 | 127 | */ |
| 128 | - public function deleteVault(Vault $vault){ |
|
| 128 | + public function deleteVault(Vault $vault) { |
|
| 129 | 129 | $this->delete($vault); |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | \ No newline at end of file |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * @param $vault_id |
| 93 | 93 | * @param $user_id |
| 94 | 94 | */ |
| 95 | - public function setLastAccess($vault_id, $user_id){ |
|
| 95 | + public function setLastAccess($vault_id, $user_id) { |
|
| 96 | 96 | return $this->vaultMapper->setLastAccess($vault_id, $user_id); |
| 97 | 97 | } |
| 98 | 98 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | * @param $privateKey |
| 103 | 103 | * @param $publicKey |
| 104 | 104 | */ |
| 105 | - public function updateSharingKeys($vault_id, $privateKey, $publicKey){ |
|
| 105 | + public function updateSharingKeys($vault_id, $privateKey, $publicKey) { |
|
| 106 | 106 | return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param string $vault_guid |
| 112 | 112 | * @param string $user_id |
| 113 | 113 | */ |
| 114 | - public function deleteVault($vault_guid, $user_id){ |
|
| 114 | + public function deleteVault($vault_guid, $user_id) { |
|
| 115 | 115 | $vault = $this->getByGuid($vault_guid, $user_id); |
| 116 | 116 | if($vault instanceof Vault) { |
| 117 | 117 | $this->vaultMapper->deleteVault($vault); |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function afterController($controller, $methodName, Response $response) { |
| 19 | - if($response instanceof JSONResponse){ |
|
| 19 | + if($response instanceof JSONResponse) { |
|
| 20 | 20 | $origin = $this->request->server['HTTP_ORIGIN']; |
| 21 | 21 | if($origin) { |
| 22 | 22 | $response->addHeader('Access-Control-Allow-Origin', $origin); |