@@ -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 | } |
@@ -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'); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $versions = $element->getElementsByTagName("version"); |
17 | 17 | $version = $versions->item(0)->nodeValue; |
18 | 18 | } |
19 | - if($version) { |
|
19 | + if ($version) { |
|
20 | 20 | $githubVersion = $version; |
21 | 21 | } |
22 | 22 | $AppInstance = new App(); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | Github version: <?php p($githubVersion); ?><br /> |
31 | 31 | Local version: <?php p($localVersion); ?><br /> |
32 | 32 | <?php |
33 | - if(version_compare($githubVersion, $localVersion) === 1){ |
|
33 | + if (version_compare($githubVersion, $localVersion) === 1) { |
|
34 | 34 | p($l->t('A newer version of passman is available')); |
35 | 35 | } |
36 | 36 | ?> |
@@ -105,7 +105,7 @@ |
||
105 | 105 | * @NoCSRFRequired |
106 | 106 | */ |
107 | 107 | public function saveSettings($key, $value) { |
108 | - if(is_numeric($value)){ |
|
108 | + if (is_numeric($value)) { |
|
109 | 109 | $value = intval($value); |
110 | 110 | } |
111 | 111 | $this->config->setAppValue('passman', $key, $value); |