nextcloud / passman

controller/credentialcontroller.php

Unused Use Statements -2 removed lines

@@ -11,7 +11,6 @@ 
 
 namespace OCA\Passman\Controller;
 
-use OCA\Files_External\NotFoundException;
 use OCA\Passman\Db\SharingACL;
 use OCA\Passman\Utility\NotFoundJSONResponse;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -25,7 +24,6 @@ 
 use OCA\Passman\Service\ActivityService;
 use OCA\Passman\Service\CredentialRevisionService;
 use OCA\Passman\Service\ShareService;
-use OCP\IUser;
 
 class CredentialController extends ApiController {
 	private $userId;

Spacing +2 added lines, -2 removed lines

@@ -258,7 +258,7 @@ 
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
 		}
-		catch (DoesNotExistException $ex){
+		catch (DoesNotExistException $ex) {
 			return new NotFoundJSONResponse();
 		}
 
@@ -268,7 +268,7 @@ 
 		}
 		else {
 			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
-			if ($acl->hasPermission(SharingACL::HISTORY)){
+			if ($acl->hasPermission(SharingACL::HISTORY)) {
 				$result = $this->credentialRevisionService->getRevisions($credential->getId());
 			}
 			else {

Braces +3 added lines, -6 removed lines

@@ -257,21 +257,18 @@
 	public function getRevision($credential_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid);
-		}
-		catch (DoesNotExistException $ex){
+		} catch (DoesNotExistException $ex){
 			return new NotFoundJSONResponse();
 		}
 
 		// If the request was made by the owner of the credential
 		if ($this->userId === $credential->getUserId()) {
 			$result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
-		}
-		else {
+		} else {
 			$acl = $this->sharingService->getACL($this->userId, $credential_guid);
 			if ($acl->hasPermission(SharingACL::HISTORY)){
 				$result = $this->credentialRevisionService->getRevisions($credential->getId());
-			}
-			else {
+			} else {
 				return new NotFoundJSONResponse();
 			}
 		}

controller/sharecontroller.php

Unused Use Statements -8 removed lines

@@ -11,10 +11,7 @@ 
 
 namespace OCA\Passman\Controller;
 
-use OCA\Files_External\NotFoundException;
-use OCA\Passman\Db\ShareRequest;
 use OCA\Passman\Db\SharingACL;
-use OCA\Passman\Db\Vault;
 use OCA\Passman\Service\CredentialService;
 use OCA\Passman\Service\FileService;
 use OCA\Passman\Service\NotificationService;
@@ -26,14 +23,9 @@ 
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\ApiController;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
-
-use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUserManager;
 use OCP\IUser;
-
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Service\ActivityService;
 use OCA\Passman\Activity;

Indentation +2 added lines, -2 removed lines

@@ -409,11 +409,11 @@
 		//@TODO Check expire date
 		$acl = $this->shareService->getACL(null, $credential_guid);
 
-        if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
+		if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) {
 			return new NotFoundJSONResponse();
 		}
 
-        $views = $acl->getExpireViews();
+		$views = $acl->getExpireViews();
 		if ($views === 0) {
 			return new NotFoundJSONResponse();
 		} else if ($views != -1) {

Spacing +12 added lines, -12 removed lines

@@ -87,9 +87,9 @@ 
 	 */
 	public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) {
 
-		try{
+		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
-		} catch (DoesNotExistException $exception){
+		} catch (DoesNotExistException $exception) {
 			return new NotFoundResponse();
 		}
 
@@ -230,21 +230,21 @@ 
 	}
 
 
-	public function unshareCredentialFromUser($item_guid, $user_id){
+	public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
 			$acl = $this->shareService->getCredentialAclForUser($user_id, $item_guid);
-		} catch (DoesNotExistException $e){
+		} catch (DoesNotExistException $e) {
 
 		}
-		try{
-			$sr =  array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id));
-		} catch (DoesNotExistException $e){
+		try {
+			$sr = array_pop($this->shareService->getPendingShareRequestsForCredential($item_guid, $user_id));
+		} catch (DoesNotExistException $e) {
 
 		}
 
-		if($sr){
+		if ($sr) {
 			$this->shareService->cleanItemRequestsForUser($sr);
 			$manager = \OC::$server->getNotificationManager();
 			$notification = $manager->createNotification();
@@ -253,7 +253,7 @@ 
 				->setUser($user_id);
 			$manager->markProcessed($notification);
 		}
-		if($acl){
+		if ($acl) {
 			$this->shareService->deleteShareACL($acl);
 		}
 		return new JSONResponse(array('result' => true));
@@ -462,15 +462,15 @@ 
 	 * @return JSONResponse
 	 * @return NotFoundResponse
 	 */
-	public function getFile($item_guid, $file_guid){
+	public function getFile($item_guid, $file_guid) {
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
-		} catch (DoesNotExistException $e){
+		} catch (DoesNotExistException $e) {
 			return new NotFoundJSONResponse();
 		}
 
 		$acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid());
-		if (!$acl->hasPermission(SharingACL::FILES)){
+		if (!$acl->hasPermission(SharingACL::FILES)) {
 			return new NotFoundJSONResponse();
 		} else {
 			return $this->fileService->getFileByGuid($file_guid);

lib/AppInfo/Application.php

Unused Use Statements -3 removed lines

@@ -11,7 +11,6 @@ 
 
 namespace OCA\Passman\AppInfo;
 use OC\Files\View;
-
 use OCA\Passman\Controller\CredentialController;
 use OCA\Passman\Controller\PageController;
 use OCA\Passman\Controller\ShareController;
@@ -24,10 +23,8 @@ 
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\Utils;
 use OCA\Passman\Service\NotificationService;
-
 use OCP\AppFramework\App;
 use OCP\IL10N;
-use OCP\Util;
 class Application extends App {
 	public function __construct () {
 		parent::__construct('passman');

Indentation +5 added lines, -5 removed lines

@@ -55,10 +55,10 @@ 
 				$server->getUserManager(),
  				$c->query('ActivityService'),
  				$c->query('VaultService'),
-                $c->query('ShareService'),
-                $c->query('CredentialService'),
-                $c->query('NotificationService'),
-                $c->query('FileService')
+				$c->query('ShareService'),
+				$c->query('CredentialService'),
+				$c->query('NotificationService'),
+				$c->query('FileService')
 			);
 		});
 
@@ -94,7 +94,7 @@ 
 		$container->registerAlias('ActivityService', ActivityService::class);
 		$container->registerAlias('VaultService', VaultService::class);
 		$container->registerAlias('FileService', FileService::class);
-        $container->registerAlias('ShareService', ShareService::class);
+		$container->registerAlias('ShareService', ShareService::class);
 		$container->registerAlias('Utils', Utils::class);
 	}
 

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 use OCP\IL10N;
 use OCP\Util;
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('passman');
 		$container = $this->getContainer();
 		$server = $container->getServer();
@@ -65,7 +65,7 @@ 
 
 
 		/** Cron  **/
-		$container->registerService('CronService', function ($c) {
+		$container->registerService('CronService', function($c) {
 			return new CronService(
 				$c->query('CredentialService'),
 				$c->query('Logger'),
@@ -76,7 +76,7 @@ 
 			);
 		});
 
-		$container->registerService('Db', function () {
+		$container->registerService('Db', function() {
 			return new Db();
 		});
 
@@ -105,7 +105,7 @@ 
 		$c = $this->getContainer();
 		/** @var \OCP\IServerContainer $server */
 		$server = $c->getServer();
-		$navigationEntry = function () use ($c, $server) {
+		$navigationEntry = function() use ($c, $server) {
 			return [
 				'id' => $c->getAppName(),
 				'order' => 10,

lib/Db/SharingACL.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 namespace OCA\Passman\Db;
 
 use OCA\Passman\Utility\PermissionEntity;
-use OCP\AppFramework\Db\Entity;
 
 /**
  * @method void setId(integer $value)

Indentation +42 added lines, -42 removed lines

@@ -38,50 +38,50 @@
 class SharingACL extends PermissionEntity implements \JsonSerializable
 {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $userId,
-        $created,
-        $expire,
+	protected
+		$itemId,
+		$itemGuid,
+		$userId,
+		$created,
+		$expire,
 		$expireViews,
-        $permissions,
-        $vaultId,
-        $vaultGuid,
-        $sharedKey;
+		$permissions,
+		$vaultId,
+		$vaultGuid,
+		$sharedKey;
 
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('created', 'integer');
-        $this->addType('expire', 'integer');
-        $this->addType('expireViews', 'integer');
-        $this->addType('permissions', 'integer');
-    }
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('created', 'integer');
+		$this->addType('expire', 'integer');
+		$this->addType('expireViews', 'integer');
+		$this->addType('permissions', 'integer');
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'acl_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getUserId(),
-            'created' => $this->getCreated(),
-            'expire' => $this->getExpire(),
-            'expire_views' => $this->getExpireViews(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getVaultId(),
-            'vault_guid' => $this->getVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending' => false,
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'acl_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getUserId(),
+			'created' => $this->getCreated(),
+			'expire' => $this->getExpire(),
+			'expire_views' => $this->getExpireViews(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getVaultId(),
+			'vault_guid' => $this->getVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending' => false,
+		];
+	}
 }
\ No newline at end of file

lib/Service/CredentialService.php

Unused Use Statements -2 removed lines

@@ -14,9 +14,7 @@
 use OCA\Passman\Db\Credential;
 use OCA\Passman\Db\SharingACL;
 use OCA\Passman\Db\SharingACLMapper;
-use OCP\IConfig;
 use OCP\AppFramework\Db\DoesNotExistException;
-
 use OCA\Passman\Db\CredentialMapper;
 
 

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
         $filter = [$item_guid];
         if ($user_id == null){
             $q .= 'user_id is null';
-        }
-        else {
+        } else {
             $q .= 'user_id = ? ';
             $filter[] = $user_id;
         }

Indentation +13 added lines, -13 removed lines

@@ -81,17 +81,17 @@ 
 	}
 
 	public function getCredentialById($credential_id, $user_id) {
-        $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id) {
-            return $credential;
-        }
-        else {
-            $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
-            if ($acl->hasPermission(SharingACL::READ));
-            return $credential;
-        }
-
-        throw new DoesNotExistException("Did expect one result but found none when executing");
+		$credential = $this->credentialMapper->getCredentialById($credential_id);
+		if ($credential->getUserId() === $user_id) {
+			return $credential;
+		}
+		else {
+			$acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
+			if ($acl->hasPermission(SharingACL::READ));
+			return $credential;
+		}
+
+		throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
 
 	/**
@@ -102,6 +102,6 @@ 
 	}
 
 	public function getCredentialByGUID($credential_guid, $user_id = null){
-	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
-    }
+		return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 	/**
 	 * @param Credential $credential
 	 */
-	public function deleteCredential($credential){
+	public function deleteCredential($credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -97,11 +97,11 @@ 
 	/**
 	 * @param integer $credential_id
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}
 
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
     }
 }
\ No newline at end of file

lib/Service/NotificationService.php

Unused Use Statements -3 removed lines

@@ -11,9 +11,6 @@
 
 namespace OCA\Passman\Service;
 
-use OCP\IConfig;
-use OCP\AppFramework\Db\DoesNotExistException;
-
 use OCA\Passman\Db\FileMapper;
 
 

Spacing +9 added lines, -9 removed lines

@@ -25,18 +25,18 @@ 
 		$this->manager = \OC::$server->getNotificationManager();
 	}
 
-	function credentialExpiredNotification($credential){
+	function credentialExpiredNotification($credential) {
 		$urlGenerator = \OC::$server->getURLGenerator();
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId()));
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/vault/' . $credential->getVaultId() . '/edit/' . $credential->getId()));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
 		$notification = $this->manager->createNotification();
 		$remindAction = $notification->createAction();
 		$remindAction->setLabel('remind')
-			->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST');
+			->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST');
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('ignore')
-			->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE');
+			->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE');
 
 		$notification->setApp('passman')
 			->setUser($credential->getUserId())
@@ -51,15 +51,15 @@ 
 	}
 
 
-	function credentialSharedNotification($data){
+	function credentialSharedNotification($data) {
 		$urlGenerator = \OC::$server->getURLGenerator();
-		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
+		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/'));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
 		$notification = $this->manager->createNotification();
 
 		$declineAction = $notification->createAction();
 		$declineAction->setLabel('decline')
-			->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE');
+			->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE');
 
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
@@ -73,7 +73,7 @@ 
 	}
 
 
-	function credentialDeclinedSharedNotification($data){
+	function credentialDeclinedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
@@ -84,7 +84,7 @@ 
 	}
 
 
-	function credentialAcceptedSharedNotification($data){
+	function credentialAcceptedSharedNotification($data) {
 		$notification = $this->manager->createNotification();
 		$notification->setApp('passman')
 			->setUser($data['target_user'])

lib/Service/ShareService.php

Doc Comments +1 added lines, -2 removed lines

@@ -49,6 +49,7 @@ 
 	 * @param $target_item_guid string      The shared item GUID
 	 * @param $request_array    array
 	 * @param $permissions      integer     Must be created with a bitmask from options on the ShareRequest class
+	 * @param string $credential_owner
 	 * @return array                        Array of sharing requests
 	 */
 	public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) {
@@ -253,7 +254,6 @@ 
 	/**
 	 * Delete ACL
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function deleteShareACL(SharingACL $ACL) {
@@ -277,7 +277,6 @@ 
 	/**
 	 * Get pending share requests by guid and uid
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function getPendingShareRequestsForCredential($item_guid, $user_id) {

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 namespace OCA\Passman\Service;
 
 
-use Icewind\SMB\Share;
 use OCA\Passman\Db\CredentialMapper;
 use OCA\Passman\Db\CredentialRevision;
 use OCA\Passman\Db\ShareRequest;

Indentation +24 added lines, -24 removed lines

@@ -176,31 +176,31 @@ 
 	}
 
 
-    /**
-     * Deletes a share request by the item ID
-     * @param ShareRequest $request
-     * @return \PDOStatement
-     */
+	/**
+	 * Deletes a share request by the item ID
+	 * @param ShareRequest $request
+	 * @return \PDOStatement
+	 */
 	public function cleanItemRequestsForUser(ShareRequest $request) {
 		return $this->shareRequest->cleanItemRequestsForUser($request->getItemId(), $request->getTargetUserId());
 	}
 
-    /**
-     * Get an share request by id
-     * @param $id
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by id
+	 * @param $id
+	 * @return ShareRequest
+	 */
 	public function getShareRequestById($id) {
 		return $this->shareRequest->getShareRequestById($id);
 	}
 
-    /**
-     * Get an share request by $item_guid and $target_vault_guid
-     *
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
+	/**
+	 * Get an share request by $item_guid and $target_vault_guid
+	 *
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
 	public function getRequestByGuid($item_guid, $target_vault_guid) {
 		return $this->shareRequest->getRequestByItemAndVaultGuid($item_guid, $target_vault_guid);
 	}
@@ -260,11 +260,11 @@ 
 		return $this->sharingACL->deleteShareACL($ACL);
 	}
 
-    /**
-     * Updates the given ACL entry
-     * @param SharingACL $sharingACL
-     * @return SharingACL
-     */
+	/**
+	 * Updates the given ACL entry
+	 * @param SharingACL $sharingACL
+	 * @return SharingACL
+	 */
 	public function updateCredentialACL(SharingACL $sharingACL) {
 		return $this->sharingACL->updateCredentialACL($sharingACL);
 	}
@@ -286,6 +286,6 @@ 
 
 
 	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
-	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
-    }
+		return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
 	}
 
 
-	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions){
+	public function updatePendingShareRequestsForCredential($item_guid, $user_id, $permissions) {
 	    return $this->shareRequest->updatePendinRequestPermissions($item_guid, $user_id, $permissions);
     }
 }
\ No newline at end of file

controller/filecontroller.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	public function __construct($AppName,
 								IRequest $request,
 								$UserId,
-								FileService $fileService){
+								FileService $fileService) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->fileService = $fileService;
@@ -56,20 +56,20 @@ 
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	public function updateFile($file_id, $file_data, $filename, $mimetype, $size){
-		try{
+	public function updateFile($file_id, $file_data, $filename, $mimetype, $size) {
+		try {
 			$file = $this->fileService->getFile($file_id, $this->userId);
-		} catch (DoesNotExistException $doesNotExistException){
+		} catch (DoesNotExistException $doesNotExistException) {
 
 		}
-		if($file){
-			if($file_data) {
+		if ($file) {
+			if ($file_data) {
 				$file->setFileData($file_data);
 			}
-			if($filename) {
+			if ($filename) {
 				$file->setFilename($filename);
 			}
-			if($filename || $file_data){
+			if ($filename || $file_data) {
 				new JSONResponse($this->fileService->updateFile($file));
 			}
 		}

controller/vaultcontroller.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		try {
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
 		} catch (DoesNotExistException $e) {
-            return new NotFoundJSONResponse();
+			return new NotFoundJSONResponse();
 		}
 		$result = array();
 		if ($vault) {