@@ -78,7 +78,7 @@ |
||
| 78 | 78 | ]; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - function asACLJson(){ |
|
| 81 | + function asACLJson() { |
|
| 82 | 82 | return [ |
| 83 | 83 | 'item_id' => $this->getItemId(), |
| 84 | 84 | 'item_guid' => $this->getItemGuid(), |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | trait EntityJSONSerializer { |
| 13 | 13 | public function serializeFields($properties) { |
| 14 | 14 | $result = []; |
| 15 | - foreach($properties as $property) { |
|
| 15 | + foreach ($properties as $property) { |
|
| 16 | 16 | $result[$property] = $this->$property; |
| 17 | 17 | } |
| 18 | 18 | return $result; |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | use OCP\AppFramework\Db\Entity; |
| 14 | 14 | |
| 15 | 15 | class PermissionEntity extends Entity { |
| 16 | - CONST READ = 0b00000001; |
|
| 17 | - CONST WRITE = 0b00000010; |
|
| 18 | - CONST FILES = 0b00000100; |
|
| 16 | + CONST READ = 0b00000001; |
|
| 17 | + CONST WRITE = 0b00000010; |
|
| 18 | + CONST FILES = 0b00000100; |
|
| 19 | 19 | CONST HISTORY = 0b00001000; |
| 20 | - CONST OWNER = 0b10000000; |
|
| 20 | + CONST OWNER = 0b10000000; |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * Checks wether a user matches one or more permissions at once |
@@ -241,7 +241,7 @@ |
||
| 241 | 241 | array( |
| 242 | 242 | 'id' => 'passman', |
| 243 | 243 | 'name' => (string) $l->t('Passwords'), |
| 244 | - 'url' => '',//FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')), |
|
| 244 | + 'url' => '', //FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')), |
|
| 245 | 245 | ), |
| 246 | 246 | ), |
| 247 | 247 | ); |
@@ -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,8 +67,8 @@ discard block |
||
| 67 | 67 | * @param $user_id |
| 68 | 68 | * @return ShareRequest[] |
| 69 | 69 | */ |
| 70 | - public function getUserPendingRequests($user_id){ |
|
| 71 | - $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
| 70 | + public function getUserPendingRequests($user_id) { |
|
| 71 | + $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?"; |
|
| 72 | 72 | return $this->findEntities($q, [$user_id]); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -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 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @param Credential $credential |
| 76 | 76 | * @return \OCP\AppFramework\Db\Entity |
| 77 | 77 | */ |
| 78 | - public function deleteCredential(Credential $credential){ |
|
| 78 | + public function deleteCredential(Credential $credential) { |
|
| 79 | 79 | return $this->credentialMapper->deleteCredential($credential); |
| 80 | 80 | } |
| 81 | 81 | |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | * @return Credential |
| 117 | 117 | * @throws DoesNotExistException |
| 118 | 118 | */ |
| 119 | - public function getCredentialById($credential_id, $user_id){ |
|
| 119 | + public function getCredentialById($credential_id, $user_id) { |
|
| 120 | 120 | $credential = $this->credentialMapper->getCredentialById($credential_id); |
| 121 | - if ($credential->getUserId() === $user_id){ |
|
| 121 | + if ($credential->getUserId() === $user_id) { |
|
| 122 | 122 | return $credential; |
| 123 | 123 | } |
| 124 | 124 | else { |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * @param $credential_id |
| 136 | 136 | * @return Credential |
| 137 | 137 | */ |
| 138 | - public function getCredentialLabelById($credential_id){ |
|
| 138 | + public function getCredentialLabelById($credential_id) { |
|
| 139 | 139 | return $this->credentialMapper->getCredentialLabelById($credential_id); |
| 140 | 140 | } |
| 141 | 141 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * @param null $user_id |
| 146 | 146 | * @return Credential |
| 147 | 147 | */ |
| 148 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 148 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 149 | 149 | return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id); |
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | \ No newline at end of file |
@@ -48,10 +48,10 @@ |
||
| 48 | 48 | * @param $type string |
| 49 | 49 | * @return array |
| 50 | 50 | */ |
| 51 | - public function add($subject,$subjectParams=array(), |
|
| 52 | - $message='',$messageParams=array(), |
|
| 53 | - $link='',$user=null,$type='') { |
|
| 54 | - if($user) { |
|
| 51 | + public function add($subject, $subjectParams = array(), |
|
| 52 | + $message = '', $messageParams = array(), |
|
| 53 | + $link = '', $user = null, $type = '') { |
|
| 54 | + if ($user) { |
|
| 55 | 55 | $activity = $this->manager->generateEvent(); |
| 56 | 56 | $activity->setType($type); |
| 57 | 57 | $activity->setApp('passman'); |
@@ -163,13 +163,13 @@ |
||
| 163 | 163 | $activity . '_self', array($label, $this->userId, $revision_created), |
| 164 | 164 | '', array(), |
| 165 | 165 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 166 | - } else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) { |
|
| 166 | + } else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) { |
|
| 167 | 167 | $activity = 'item_deleted'; |
| 168 | 168 | $this->activityService->add( |
| 169 | 169 | $activity . '_self', array($label, $this->userId), |
| 170 | 170 | '', array(), |
| 171 | 171 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 172 | - } else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) { |
|
| 172 | + } else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) { |
|
| 173 | 173 | $activity = 'item_recovered'; |
| 174 | 174 | $this->activityService->add( |
| 175 | 175 | $activity . '_self', array($label, $this->userId), |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 58 | 58 | 'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20'; |
| 59 | 59 | $entities = $this->findEntities($sql, [$user_id, $vault_id]); |
| 60 | - $count = count($entities)-1; |
|
| 60 | + $count = count($entities) - 1; |
|
| 61 | 61 | $entities = array_splice($entities, rand(0, $count), 1); |
| 62 | 62 | return $entities; |
| 63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param $timestamp |
| 68 | 68 | * @return Credential[] |
| 69 | 69 | */ |
| 70 | - public function getExpiredCredentials($timestamp){ |
|
| 70 | + public function getExpiredCredentials($timestamp) { |
|
| 71 | 71 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 72 | 72 | 'WHERE `expire_time` > 0 AND `expire_time` < ?'; |
| 73 | 73 | return $this->findEntities($sql, [$timestamp]); |
@@ -80,16 +80,16 @@ discard block |
||
| 80 | 80 | * @param null $user_id |
| 81 | 81 | * @return Credential |
| 82 | 82 | */ |
| 83 | - public function getCredentialById($credential_id, $user_id = null){ |
|
| 83 | + public function getCredentialById($credential_id, $user_id = null) { |
|
| 84 | 84 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
| 85 | 85 | 'WHERE `id` = ?'; |
| 86 | 86 | // If we want to check the owner, add it to the query |
| 87 | 87 | $params = [$credential_id]; |
| 88 | - if ($user_id !== null){ |
|
| 88 | + if ($user_id !== null) { |
|
| 89 | 89 | $sql .= ' and `user_id` = ? '; |
| 90 | 90 | array_push($params, $user_id); |
| 91 | 91 | } |
| 92 | - return $this->findEntity($sql,$params); |
|
| 92 | + return $this->findEntity($sql, $params); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -97,10 +97,10 @@ discard block |
||
| 97 | 97 | * @param $credential_id |
| 98 | 98 | * @return Credential |
| 99 | 99 | */ |
| 100 | - public function getCredentialLabelById($credential_id){ |
|
| 100 | + public function getCredentialLabelById($credential_id) { |
|
| 101 | 101 | $sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' . |
| 102 | 102 | 'WHERE `id` = ? '; |
| 103 | - return $this->findEntity($sql,[$credential_id]); |
|
| 103 | + return $this->findEntity($sql, [$credential_id]); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param $raw_credential |
| 109 | 109 | * @return Credential |
| 110 | 110 | */ |
| 111 | - public function create($raw_credential){ |
|
| 111 | + public function create($raw_credential) { |
|
| 112 | 112 | $credential = new Credential(); |
| 113 | 113 | |
| 114 | 114 | $credential->setGuid($this->utils->GUID()); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $credential->setCustomFields($raw_credential['custom_fields']); |
| 132 | 132 | $credential->setOtp($raw_credential['otp']); |
| 133 | 133 | $credential->setHidden($raw_credential['hidden']); |
| 134 | - if(isset($raw_credential['shared_key'])) { |
|
| 134 | + if (isset($raw_credential['shared_key'])) { |
|
| 135 | 135 | $credential->setSharedKey($raw_credential['shared_key']); |
| 136 | 136 | } |
| 137 | 137 | return parent::insert($credential); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @param $raw_credential array An array containing all the credential fields |
| 143 | 143 | * @return Credential The updated credential |
| 144 | 144 | */ |
| 145 | - public function updateCredential($raw_credential){ |
|
| 145 | + public function updateCredential($raw_credential) { |
|
| 146 | 146 | $original = $this->getCredentialByGUID($raw_credential['guid']); |
| 147 | 147 | $credential = new Credential(); |
| 148 | 148 | $credential->setId($original->getId()); |
@@ -170,11 +170,11 @@ discard block |
||
| 170 | 170 | return parent::update($credential); |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - public function deleteCredential(Credential $credential){ |
|
| 173 | + public function deleteCredential(Credential $credential) { |
|
| 174 | 174 | return $this->delete($credential); |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - public function upd(Credential $credential){ |
|
| 177 | + public function upd(Credential $credential) { |
|
| 178 | 178 | $this->update($credential); |
| 179 | 179 | } |
| 180 | 180 | |
@@ -183,10 +183,10 @@ discard block |
||
| 183 | 183 | * @param $credential_guid |
| 184 | 184 | * @return Credential |
| 185 | 185 | */ |
| 186 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 186 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 187 | 187 | $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? '; |
| 188 | 188 | $params = [$credential_guid]; |
| 189 | - if ($user_id !== null){ |
|
| 189 | + if ($user_id !== null) { |
|
| 190 | 190 | $q .= ' and `user_id` = ? '; |
| 191 | 191 | array_push($params, $user_id); |
| 192 | 192 | } |