@@ -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 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
42 | 42 | 'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20'; |
43 | 43 | $entities = $this->findEntities($sql, [$user_id, $vault_id]); |
44 | - $count = count($entities)-1; |
|
44 | + $count = count($entities) - 1; |
|
45 | 45 | $entities = array_splice($entities, rand(0, $count), 1); |
46 | 46 | return $entities; |
47 | 47 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * @param $timestamp |
51 | 51 | * @return Credential[] |
52 | 52 | */ |
53 | - public function getExpiredCredentials($timestamp){ |
|
53 | + public function getExpiredCredentials($timestamp) { |
|
54 | 54 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
55 | 55 | 'WHERE `expire_time` > 0 AND `expire_time` < ?'; |
56 | 56 | return $this->findEntities($sql, [$timestamp]); |
@@ -61,33 +61,33 @@ discard block |
||
61 | 61 | * @param null $user_id |
62 | 62 | * @return Credential |
63 | 63 | */ |
64 | - public function getCredentialById($credential_id, $user_id = null){ |
|
64 | + public function getCredentialById($credential_id, $user_id = null) { |
|
65 | 65 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
66 | 66 | 'WHERE `id` = ?'; |
67 | 67 | // If we want to check the owner, add it to the query |
68 | 68 | $params = [$credential_id]; |
69 | - if ($user_id !== null){ |
|
69 | + if ($user_id !== null) { |
|
70 | 70 | $sql .= ' and `user_id` = ? '; |
71 | 71 | array_push($params, $user_id); |
72 | 72 | } |
73 | - return $this->findEntity($sql,$params); |
|
73 | + return $this->findEntity($sql, $params); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
77 | 77 | * @param $credential_id |
78 | 78 | * @return Credential |
79 | 79 | */ |
80 | - public function getCredentialLabelById($credential_id){ |
|
80 | + public function getCredentialLabelById($credential_id) { |
|
81 | 81 | $sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' . |
82 | 82 | 'WHERE `id` = ? '; |
83 | - return $this->findEntity($sql,[$credential_id]); |
|
83 | + return $this->findEntity($sql, [$credential_id]); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
87 | 87 | * @param $raw_credential |
88 | 88 | * @return Credential |
89 | 89 | */ |
90 | - public function create($raw_credential){ |
|
90 | + public function create($raw_credential) { |
|
91 | 91 | $credential = new Credential(); |
92 | 92 | |
93 | 93 | $credential->setGuid($this->utils->GUID()); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | * @param $raw_credential array An array containing all the credential fields |
119 | 119 | * @return Credential The updated credential |
120 | 120 | */ |
121 | - public function updateCredential($raw_credential){ |
|
121 | + public function updateCredential($raw_credential) { |
|
122 | 122 | $original = $this->getCredentialByGUID($raw_credential['guid']); |
123 | 123 | $credential = new Credential(); |
124 | 124 | $credential->setId($original->getId()); |
@@ -146,11 +146,11 @@ discard block |
||
146 | 146 | return parent::update($credential); |
147 | 147 | } |
148 | 148 | |
149 | - public function deleteCredential(Credential $credential){ |
|
149 | + public function deleteCredential(Credential $credential) { |
|
150 | 150 | return $this->delete($credential); |
151 | 151 | } |
152 | 152 | |
153 | - public function upd(Credential $credential){ |
|
153 | + public function upd(Credential $credential) { |
|
154 | 154 | $this->update($credential); |
155 | 155 | } |
156 | 156 | |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | * @param $credential_guid |
160 | 160 | * @return Credential |
161 | 161 | */ |
162 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
162 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
163 | 163 | $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? '; |
164 | 164 | $params = [$credential_guid]; |
165 | - if ($user_id !== null){ |
|
165 | + if ($user_id !== null) { |
|
166 | 166 | $q .= ' and `user_id` = ? '; |
167 | 167 | array_push($params, $user_id); |
168 | 168 | } |
@@ -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 |
@@ -50,23 +50,23 @@ |
||
50 | 50 | public function expireCredentials() { |
51 | 51 | $this->logger->info('Passman cron test', array('app' => 'passman')); |
52 | 52 | $expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime()); |
53 | - foreach($expired_credentials as $credential){ |
|
53 | + foreach ($expired_credentials as $credential) { |
|
54 | 54 | $link = ''; // @TODO create direct link to credential |
55 | 55 | |
56 | 56 | $sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?'; |
57 | 57 | $id = $credential->getId(); |
58 | 58 | $result = $this->db->executeQuery($sql, array($id)); |
59 | - $this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman')); |
|
59 | + $this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman')); |
|
60 | 60 | $notifications = intval($result->fetch()['rows']); |
61 | - if($notifications === 0) { |
|
62 | - $this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman')); |
|
61 | + if ($notifications === 0) { |
|
62 | + $this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman')); |
|
63 | 63 | $this->activityService->add( |
64 | 64 | Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()), |
65 | 65 | '', array(), |
66 | 66 | $link, $credential->getUserId(), Activity::TYPE_ITEM_EXPIRED); |
67 | 67 | $this->notificationService->credentialExpiredNotification($credential); |
68 | 68 | } else { |
69 | - $this->logger->debug($credential->getLabel() .' is expired, already notified!', array('app' => 'passman')); |
|
69 | + $this->logger->debug($credential->getLabel() . ' is expired, already notified!', array('app' => 'passman')); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | public function __construct($AppName, |
22 | 22 | IRequest $request, |
23 | 23 | IL10N $trans |
24 | - ){ |
|
24 | + ) { |
|
25 | 25 | parent::__construct($AppName, $request); |
26 | 26 | $this->trans = $trans; |
27 | 27 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @NoAdminRequired |
32 | 32 | * @NoCSRFRequired |
33 | 33 | */ |
34 | - public function getLanguageStrings($lang){ |
|
34 | + public function getLanguageStrings($lang) { |
|
35 | 35 | $translations = array( |
36 | 36 | // templates/views/partials/edit_credential/basics.html |
37 | 37 | 'username' => $this->trans->t('Username'), |