Code style fixes

controller/admincontroller.php

@@ -11,6 +11,7 @@
 
 namespace OCA\Passman\Controller;
 
+use OCA\Passman\Db\Credential;
 use OCA\Passman\Db\CredentialRevision;
 use OCA\Passman\Db\DeleteVaultRequest;
 use OCA\Passman\Service\CredentialRevisionService;
@@ -23,8 +24,7 @@ use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\ApiController;
 use OCA\Passman\Service\CredentialService;
-use \OCP\App;
+
-use OCP\JSON;
 
 class AdminController extends ApiController {
 	private $userId;
@@ -130,17 +130,20 @@ class AdminController extends ApiController {
 
 		if(isset($vault)){
 			$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by);
-
 			foreach($credentials as $credential){
 				$revisions = $this->revisionService->getRevisions($credential->getId());
 				foreach($revisions as $revision){
 					$this->revisionService->deleteRevision($revision['revision_id'], $requested_by);
 				}
-				$this->credentialService->deleteCredential($credential);
+				if($credential instanceof Credential){
+					$this->credentialService->deleteCredential($credential);
+				}
 			}
 			$this->vaultService->deleteVault($vault_guid, $requested_by);
 		}
-		$this->deleteVaultRequestService->removeDeleteRequestForVault($req);
+		if($req instanceof DeleteVaultRequest) {
+			$this->deleteVaultRequestService->removeDeleteRequestForVault($req);
+		}
 
 		return new JSONResponse(array('result' => true));
 	}
@@ -179,7 +182,7 @@ class AdminController extends ApiController {
 			// Ignore it
 		}
 
-		if ($delete_request) {
+		if ($delete_request instanceof DeleteVaultRequest) {
 			$this->deleteVaultRequestService->removeDeleteRequestForVault($delete_request);
 			$result = true;
 		}

js/app/controllers/credential.js

@@ -248,7 +248,7 @@
 				$scope.deleteCredential = function (credential) {
 					var _credential = angular.copy(credential);
 					try {
-						_credential = CredentialService.decryptCredential(angular.copy(credential));
+						_credential = CredentialService.decryptCredential(_credential);
 					} catch (e) {
 
 					}
@@ -263,7 +263,7 @@
 						NotificationService.hideNotification(notification);
 					}
 					var key = CredentialService.getSharedKeyFromCredential(_credential);
-					CredentialService.updateCredential(_credential, false, key).then(function (result) {
+					CredentialService.updateCredential(_credential, false, key).then(function () {
 						notification = NotificationService.showNotification($translate.instant('credential.deleted'), 5000);
 					});
 				};
@@ -271,7 +271,7 @@
 				$scope.recoverCredential = function (credential) {
 					var _credential = angular.copy(credential);
 					try {
-						_credential = CredentialService.decryptCredential(angular.copy(credential));
+						_credential = CredentialService.decryptCredential(_credential);
 					} catch (e) {
 
 					}

js/app/controllers/generic-csv-importer.js

@@ -104,9 +104,7 @@
 								});
 							} else if(field === 'tags'){
 								if( row[k]) {
-									console.log(row, k);
 									var tags = row[k].split(',');
-									console.log();
 									_credential.tags = tags.map(tagMapper);
 								}
 							} else{
@@ -129,6 +127,7 @@
 					$scope.skipFirstRow = false;
 					var file_data = file.data.split(',');
 					file_data = decodeURIComponent(escape(window.atob(file_data[1])));
+					/** global: Papa */
 					Papa.parse(file_data, {
 						complete: function(results) {
 							if(results.data) {

js/app/controllers/vaultreqdeletion.js

@@ -44,7 +44,7 @@
 						reason: $scope.reason
 					};
 
-					$http.post(queryUrl, params).then(function (response) {
+					$http.post(queryUrl, params).then(function () {
 						NotificationService.showNotification($translate.instant('deletion.requested'), 5000);
 						$location.path('#/');
 					});
@@ -52,7 +52,7 @@
 
 				$scope.removeRequestDeletion = function () {
 					var queryUrl = OC.generateUrl('apps/passman/admin/request-deletion/' + $routeParams.vault_id);
-					$http.delete(queryUrl).then(function (response) {
+					$http.delete(queryUrl).then(function () {
 						NotificationService.showNotification($translate.instant('deletion.removed'), 5000);
 						$location.path('#/');
 					});

js/app/directives/clickdisable.js

@@ -31,8 +31,8 @@
 	 */
 	angular.module('passmanApp')
 		.directive('clickDisable', function () {
-			return function (scope, element, attrs) {
+			return function (scope, element) {
-				element.bind("click", function (event) {
+				element.bind("click", function () {
 					element.prepend('<i class="fa fa-spin fa-spinner"></i>&nbsp;');
 					element.attr('disabled','disabled');
 				});

js/settings-admin.js

@@ -153,7 +153,7 @@ $(document).ready(function () {
 					$('#moveStatus').fadeIn();
 					setTimeout(function () {
 						$('#moveStatus').fadeOut();
-					}, 3500)
+					}, 3500);
 				}
 			});
 		}
@@ -191,17 +191,16 @@ $(document).ready(function () {
 		if (!confirm(OC.L10N.translate('passman', "Are you really sure?\nThis will delete the vault and all credentials in it!"))) {
 			return;
 		}
-		$.post(OC.generateUrl('apps/passman/admin/accept-delete-request'), req, function (result) {
+		$.post(OC.generateUrl('apps/passman/admin/accept-delete-request'), req, function () {
-			console.log(result);
 			$(el).parent().parent().remove();
-		})
+		});
 	}
 
 	function ignoreDeleteRequest (el, req) {
 		$.ajax({
 			url: OC.generateUrl('apps/passman/admin/request-deletion/' + req.vault_guid),
 			type: 'DELETE',
-			success: function (result) {
+			success: function () {
 				$(el).parent().parent().remove();
 			}
 		});
@@ -225,7 +224,7 @@ $(document).ready(function () {
 			var cols = $('<td>' + request.id + '</td><td>' + request.displayName + '</td><td>' + request.reason + '</td><td>' + format_date(request.created * 1000 )+ '</td>');
 			var actions = $('<td></td>').append(accept).append(ignore);
 			table.append($('<tr></tr>').append(cols).append(actions));
-		})
+		});
 	});
 
 	$('#passman-tabs').tabs();

lib/Db/DeleteVaultRequestMapper.php

@@ -67,7 +67,7 @@ class DeleteVaultRequestMapper extends Mapper {
 
 	/**
 	 * Deletes the given delete request
-	 * @param DeleteVaultRequest $shareRequest    Request to delete
+	 * @param DeleteVaultRequest $request    Request to delete
 	 * @return DeleteVaultRequest                 The deleted request
 	 */
 	public function removeDeleteVaultRequest(DeleteVaultRequest $request){