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;

Braces +8 added lines, -11 removed lines

@@ -202,7 +202,7 @@ 
 
 			foreach ($acl_list as $sharingACL) {
 				$target_user = $sharingACL->getUserId();
-				if($target_user === $this->userId){
+				if($target_user === $this->userId) {
 					continue;
 				}
 				$this->activityService->add(
@@ -217,11 +217,11 @@ 
 					$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
 			}
 		}
-		if($set_share_key === true){
+		if($set_share_key === true) {
 			$storedCredential->setSharedKey($shared_key);
 			$credential['shared_key'] = $shared_key;
 		}
-		if($unshare_action === true){
+		if($unshare_action === true) {
 			$storedCredential->setSharedKey('');
 			$credential['shared_key'] = '';
 		}
@@ -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)){
+            if ($acl->hasPermission(SharingACL::HISTORY)) {
                 $result = $this->credentialRevisionService->getRevisions($credential->getId());
-            }
-            else {
+            } else {
                 return new NotFoundJSONResponse();
             }
         }
@@ -290,7 +287,7 @@ 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
 		$revision = null;
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);

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;

Braces +5 added lines, -5 removed lines

@@ -230,7 +230,7 @@ 
 	}
 
 
-	public function unshareCredentialFromUser($item_guid, $user_id){
+	public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
@@ -244,7 +244,7 @@ 
 
 		}
 
-		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,7 +462,7 @@ 
 	 * @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){
@@ -470,7 +470,7 @@ 
 		}
 
 		$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');

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)

Braces +2 added lines, -4 removed lines

@@ -35,8 +35,7 @@ 
  * @method string getSharedKey()
  */
 
-class SharingACL extends PermissionEntity implements \JsonSerializable
-{
+class SharingACL extends PermissionEntity implements \JsonSerializable {
 
     protected
         $itemId,
@@ -67,8 +66,7 @@ 
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    function jsonSerialize()
-    {
+    function jsonSerialize() {
         return [
             'acl_id' => $this->getId(),
             'item_id' => $this->getItemId(),

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 +6 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 		return $this->credentialMapper->upd($credential);
 	}
 
-	public function deleteCredential($credential){
+	public function deleteCredential($credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -64,12 +64,11 @@ 
 		return $this->credentialMapper->getExpiredCredentials($timestamp);
 	}
 
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
-        }
-        else {
+        } else {
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
             if ($acl->hasPermission(SharingACL::READ));
             return $credential;
@@ -77,11 +76,11 @@ 
 
         throw new DoesNotExistException("Did expect one result but found none when executing");
 	}
-	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;
 
 

Braces +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 		$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()));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -51,7 +51,7 @@ 
 	}
 
 
-	function credentialSharedNotification($data){
+	function credentialSharedNotification($data) {
 		$urlGenerator = \OC::$server->getURLGenerator();
 		$link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/'));
 		$api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman'));
@@ -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

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;

Braces +19 added lines, -7 removed lines

@@ -71,7 +71,9 @@ 
 	}
 
 	public function createACLEntry(SharingACL $acl) {
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
+		if ($acl->getCreated() === null) {
+			$acl->setCreated((new \DateTime())->getTimestamp());
+		}
 		return $this->sharingACL->createACLEntry($acl);
 	}
 
@@ -124,12 +126,16 @@ 
 		$return = [];
 		foreach ($entries as $entry) {
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
+			if (!$entry->hasPermission(SharingACL::READ)) {
+				continue;
+			}
 
 			$tmp = $entry->jsonSerialize();
 			$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
 
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+			if (!$entry->hasPermission(SharingACL::FILES)) {
+				unset($tmp['credential_data']['files']);
+			}
 			unset($tmp['credential_data']['shared_key']);
 			$return[] = $tmp;
 		}
@@ -150,12 +156,16 @@ 
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
 
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
+		if (!$acl->hasPermission(SharingACL::READ)) {
+			throw new DoesNotExistException("Item not found or wrong access level");
+		}
 
 		$tmp = $acl->jsonSerialize();
 		$tmp['credential_data'] = $this->credential->getCredentialById($acl->getItemId())->jsonSerialize();
 
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+		if (!$acl->hasPermission(SharingACL::FILES)) {
+			unset($tmp['credential_data']['files']);
+		}
 		unset($tmp['credential_data']['shared_key']);
 
 		return $tmp;
@@ -170,7 +180,9 @@ 
 	 */
 	public function getItemHistory($user_id, $item_guid) {
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
+			return [];
+		}
 
 		return $this->revisions->getRevisions($acl->getItemId());
 	}
@@ -285,7 +297,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

lib/Db/ShareRequest.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)

Braces +2 added lines, -3 removed lines

@@ -62,8 +62,7 @@ 
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    function jsonSerialize()
-    {
+    function jsonSerialize() {
         return [
             'req_id' => $this->getId(),
             'item_id' => $this->getItemId(),
@@ -78,7 +77,7 @@ 
         ];
     }
 
-    function asACLJson(){
+    function asACLJson() {
         return [
             'item_id' => $this->getItemId(),
             'item_guid' => $this->getItemGuid(),

lib/Utility/Utils.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      * @return string
      */
 	public static function GUID() {
-		if (function_exists('com_create_guid') === true)
-		{
+		if (function_exists('com_create_guid') === true) {
 			return trim(com_create_guid(), '{}');
 		}