@@ -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; |
@@ -56,20 +56,20 @@ discard block |
||
| 56 | 56 | return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId)); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function updateFile($file_id, $file_data, $filename, $mimetype, $size){ |
|
| 60 | - try{ |
|
| 59 | + public function updateFile($file_id, $file_data, $filename, $mimetype, $size) { |
|
| 60 | + try { |
|
| 61 | 61 | $file = $this->fileService->getFile($file_id, $this->userId); |
| 62 | - } catch (DoesNotExistException $doesNotExistException){ |
|
| 62 | + } catch (DoesNotExistException $doesNotExistException) { |
|
| 63 | 63 | |
| 64 | 64 | } |
| 65 | - if($file){ |
|
| 66 | - if($file_data) { |
|
| 65 | + if ($file) { |
|
| 66 | + if ($file_data) { |
|
| 67 | 67 | $file->setFileData($file_data); |
| 68 | 68 | } |
| 69 | - if($filename) { |
|
| 69 | + if ($filename) { |
|
| 70 | 70 | $file->setFilename($filename); |
| 71 | 71 | } |
| 72 | - if($filename || $file_data){ |
|
| 72 | + if ($filename || $file_data) { |
|
| 73 | 73 | new JSONResponse($this->fileService->updateFile($file)); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | ); |
| 85 | 85 | $credential = $this->credentialService->createCredential($credential); |
| 86 | 86 | $link = ''; // @TODO create direct link to credential |
| 87 | - if(!$credential->getHidden()) { |
|
| 87 | + if (!$credential->getHidden()) { |
|
| 88 | 88 | $this->activityService->add( |
| 89 | 89 | Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId), |
| 90 | 90 | '', array(), |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | foreach ($acl_list as $sharingACL) { |
| 204 | 204 | $target_user = $sharingACL->getUserId(); |
| 205 | - if($target_user == $this->userId){ |
|
| 205 | + if ($target_user == $this->userId) { |
|
| 206 | 206 | continue; |
| 207 | 207 | } |
| 208 | 208 | $this->activityService->add( |
@@ -217,15 +217,15 @@ discard block |
||
| 217 | 217 | $link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION); |
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | - if($set_share_key == true){ |
|
| 220 | + if ($set_share_key == true) { |
|
| 221 | 221 | $storedCredential->setSharedKey($shared_key); |
| 222 | 222 | $credential['shared_key'] = $shared_key; |
| 223 | 223 | } |
| 224 | - if($unshare_action == true){ |
|
| 224 | + if ($unshare_action == true) { |
|
| 225 | 225 | $storedCredential->setSharedKey(''); |
| 226 | 226 | $credential['shared_key'] = ''; |
| 227 | 227 | } |
| 228 | - if(!$skip_revision) { |
|
| 228 | + if (!$skip_revision) { |
|
| 229 | 229 | $this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId); |
| 230 | 230 | } |
| 231 | 231 | $credential = $this->credentialService->updateCredential($credential); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | try { |
| 259 | 259 | $credential = $this->credentialService->getCredentialByGUID($credential_guid); |
| 260 | 260 | } |
| 261 | - catch (DoesNotExistException $ex){ |
|
| 261 | + catch (DoesNotExistException $ex) { |
|
| 262 | 262 | return new NotFoundJSONResponse(); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | else { |
| 270 | 270 | $acl = $this->sharingService->getACL($this->userId, $credential_guid); |
| 271 | - if ($acl->hasPermission(SharingACL::HISTORY)){ |
|
| 271 | + if ($acl->hasPermission(SharingACL::HISTORY)) { |
|
| 272 | 272 | $result = $this->credentialRevisionService->getRevisions($credential->getId()); |
| 273 | 273 | } |
| 274 | 274 | else { |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | /** |
| 291 | 291 | * @NoAdminRequired |
| 292 | 292 | */ |
| 293 | - public function updateRevision($credential_guid, $revision_id, $credential_data){ |
|
| 293 | + public function updateRevision($credential_guid, $revision_id, $credential_data) { |
|
| 294 | 294 | $revision = null; |
| 295 | 295 | try { |
| 296 | 296 | $credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId); |
@@ -298,9 +298,9 @@ discard block |
||
| 298 | 298 | return new NotFoundJSONResponse(); |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - try{ |
|
| 301 | + try { |
|
| 302 | 302 | $revision = $this->credentialRevisionService->getRevision($revision_id); |
| 303 | - } catch(DoesNotExistException $exception){ |
|
| 303 | + } catch (DoesNotExistException $exception) { |
|
| 304 | 304 | return new NotFoundJSONResponse(); |
| 305 | 305 | } |
| 306 | 306 | |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) { |
| 89 | 89 | |
| 90 | - try{ |
|
| 90 | + try { |
|
| 91 | 91 | $credential = $this->credentialService->getCredentialByGUID($item_guid); |
| 92 | - } catch (DoesNotExistException $exception){ |
|
| 92 | + } catch (DoesNotExistException $exception) { |
|
| 93 | 93 | return new NotFoundResponse(); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -230,21 +230,21 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | |
| 233 | - public function unshareCredentialFromUser($item_guid, $user_id){ |
|
| 233 | + public function unshareCredentialFromUser($item_guid, $user_id) { |
|
| 234 | 234 | $acl = null; |
| 235 | 235 | $sr = null; |
| 236 | 236 | try { |
| 237 | 237 | $acl = $this->shareService->getCredentialAclForUser($user_id, $item_guid); |
| 238 | - } catch (DoesNotExistException $e){ |
|
| 238 | + } catch (DoesNotExistException $e) { |
|
| 239 | 239 | |
| 240 | 240 | } |
| 241 | - try{ |
|
| 242 | - $sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id)); |
|
| 243 | - } catch (DoesNotExistException $e){ |
|
| 241 | + try { |
|
| 242 | + $sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id)); |
|
| 243 | + } catch (DoesNotExistException $e) { |
|
| 244 | 244 | |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - if($sr){ |
|
| 247 | + if ($sr) { |
|
| 248 | 248 | $this->shareService->cleanItemRequestsForUser($sr); |
| 249 | 249 | $manager = \OC::$server->getNotificationManager(); |
| 250 | 250 | $notification = $manager->createNotification(); |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | ->setUser($user_id); |
| 254 | 254 | $manager->markProcessed($notification); |
| 255 | 255 | } |
| 256 | - if($acl){ |
|
| 256 | + if ($acl) { |
|
| 257 | 257 | $this->shareService->deleteShareACL($acl); |
| 258 | 258 | } |
| 259 | 259 | return new JSONResponse(array('result' => true)); |
@@ -462,15 +462,15 @@ discard block |
||
| 462 | 462 | * @return JSONResponse |
| 463 | 463 | * @return NotFoundResponse |
| 464 | 464 | */ |
| 465 | - public function getFile($item_guid, $file_guid){ |
|
| 465 | + public function getFile($item_guid, $file_guid) { |
|
| 466 | 466 | try { |
| 467 | 467 | $credential = $this->credentialService->getCredentialByGUID($item_guid); |
| 468 | - } catch (DoesNotExistException $e){ |
|
| 468 | + } catch (DoesNotExistException $e) { |
|
| 469 | 469 | return new NotFoundJSONResponse(); |
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | $acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid()); |
| 473 | - if (!$acl->hasPermission(SharingACL::FILES)){ |
|
| 473 | + if (!$acl->hasPermission(SharingACL::FILES)) { |
|
| 474 | 474 | return new NotFoundJSONResponse(); |
| 475 | 475 | } else { |
| 476 | 476 | return $this->fileService->getFileByGuid($file_guid); |
@@ -21,7 +21,7 @@ discard block |
||
| 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 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function index() { |
| 40 | 40 | $params = ['user' => $this->userId]; |
| 41 | - return new TemplateResponse('passman', 'main', $params); // templates/main.php |
|
| 41 | + return new TemplateResponse('passman', 'main', $params); // templates/main.php |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @NoAdminRequired |
| 47 | 47 | * @NoCSRFRequired |
| 48 | 48 | */ |
| 49 | - public function bookmarklet($url='',$title='') { |
|
| 49 | + public function bookmarklet($url = '', $title = '') { |
|
| 50 | 50 | $params = array('url' => $url, 'label' => $title); |
| 51 | 51 | return new TemplateResponse('passman', 'bookmarklet', $params); |
| 52 | 52 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | use OCP\IL10N; |
| 30 | 30 | use OCP\Util; |
| 31 | 31 | class Application extends App { |
| 32 | - public function __construct () { |
|
| 32 | + public function __construct() { |
|
| 33 | 33 | parent::__construct('passman'); |
| 34 | 34 | $container = $this->getContainer(); |
| 35 | 35 | $server = $container->getServer(); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | /** Cron **/ |
| 68 | - $container->registerService('CronService', function ($c) { |
|
| 68 | + $container->registerService('CronService', function($c) { |
|
| 69 | 69 | return new CronService( |
| 70 | 70 | $c->query('CredentialService'), |
| 71 | 71 | $c->query('Logger'), |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ); |
| 77 | 77 | }); |
| 78 | 78 | |
| 79 | - $container->registerService('Db', function () { |
|
| 79 | + $container->registerService('Db', function() { |
|
| 80 | 80 | return new Db(); |
| 81 | 81 | }); |
| 82 | 82 | |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $c = $this->getContainer(); |
| 106 | 106 | /** @var \OCP\IServerContainer $server */ |
| 107 | 107 | $server = $c->getServer(); |
| 108 | - $navigationEntry = function () use ($c, $server) { |
|
| 108 | + $navigationEntry = function() use ($c, $server) { |
|
| 109 | 109 | return [ |
| 110 | 110 | 'id' => $c->getAppName(), |
| 111 | 111 | 'order' => 10, |
@@ -47,11 +47,11 @@ |
||
| 47 | 47 | return $this->vaultMapper->updateVault($vault); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function setLastAccess($vault_id, $user_id){ |
|
| 50 | + public function setLastAccess($vault_id, $user_id) { |
|
| 51 | 51 | return $this->vaultMapper->setLastAccess($vault_id, $user_id); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function updateSharingKeys($vault_id, $privateKey, $publicKey){ |
|
| 54 | + public function updateSharingKeys($vault_id, $privateKey, $publicKey) { |
|
| 55 | 55 | return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | \ No newline at end of file |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | return $this->credentialMapper->upd($credential); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function deleteCredential($credential){ |
|
| 50 | + public function deleteCredential($credential) { |
|
| 51 | 51 | return $this->credentialMapper->deleteCredential($credential); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | return $this->credentialMapper->getExpiredCredentials($timestamp); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function getCredentialById($credential_id, $user_id){ |
|
| 67 | + public function getCredentialById($credential_id, $user_id) { |
|
| 68 | 68 | $credential = $this->credentialMapper->getCredentialById($credential_id); |
| 69 | - if ($credential->getUserId() == $user_id){ |
|
| 69 | + if ($credential->getUserId() == $user_id) { |
|
| 70 | 70 | return $credential; |
| 71 | 71 | } |
| 72 | 72 | else { |
@@ -77,11 +77,11 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | throw new DoesNotExistException("Did expect one result but found none when executing"); |
| 79 | 79 | } |
| 80 | - public function getCredentialLabelById($credential_id){ |
|
| 80 | + public function getCredentialLabelById($credential_id) { |
|
| 81 | 81 | return $this->credentialMapper->getCredentialLabelById($credential_id); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 84 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 85 | 85 | return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id); |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | \ No newline at end of file |
@@ -49,9 +49,9 @@ |
||
| 49 | 49 | * @type = Can be passman_password or passman_password_shared |
| 50 | 50 | * @priority = Int -> [10,20,30,40,50] |
| 51 | 51 | */ |
| 52 | - public function add($subject,$subjectParams=array(), |
|
| 53 | - $message='',$messageParams=array(), |
|
| 54 | - $link='',$user=null,$type='') { |
|
| 52 | + public function add($subject, $subjectParams = array(), |
|
| 53 | + $message = '', $messageParams = array(), |
|
| 54 | + $link = '', $user = null, $type = '') { |
|
| 55 | 55 | $activity = $this->manager->generateEvent(); |
| 56 | 56 | $activity->setType($type); |
| 57 | 57 | $activity->setApp('passman'); |
@@ -37,7 +37,7 @@ discard block |
||
| 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=?'; |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | $id = $credential->getId(); |
| 46 | 46 | $query->bindParam(1, $id, \PDO::PARAM_INT); |
| 47 | 47 | $result = $query->execute(); |
| 48 | - $this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman')); |
|
| 49 | - if($result->fetchRow()['rows'] == 0) { |
|
| 50 | - $this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman')); |
|
| 48 | + $this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman')); |
|
| 49 | + if ($result->fetchRow()['rows'] == 0) { |
|
| 50 | + $this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman')); |
|
| 51 | 51 | |
| 52 | 52 | $this->activityService->add( |
| 53 | 53 | Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()), |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $link, $credential->getUserId(), Activity::TYPE_ITEM_EXPIRED); |
| 56 | 56 | $this->notificationService->credentialExpiredNotification($credential); |
| 57 | 57 | } else { |
| 58 | - $this->logger->debug($credential->getLabel() .' is expired, already notified!', array('app' => 'passman')); |
|
| 58 | + $this->logger->debug($credential->getLabel() . ' is expired, already notified!', array('app' => 'passman')); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | } |