nextcloud / passman

templates/settings-admin.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 		$versions = $element->getElementsByTagName("version");
 		$version = $versions->item(0)->nodeValue;
 	}
-	if($version) {
+	if ($version) {
 		$githubVersion = $version;
 	}
 	$AppInstance = new App();
@@ -30,7 +30,7 @@ 
 		Github version: <?php p($githubVersion); ?><br />
 		Local version: <?php p($localVersion); ?><br />
 		<?php
-		if(version_compare($githubVersion, $localVersion) === 1){
+		if (version_compare($githubVersion, $localVersion) === 1) {
 			p($l->t('A newer version of passman is available'));
 		}
 		?>

Braces +21 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 		Github version: <?php p($githubVersion); ?><br />
 		Local version: <?php p($localVersion); ?><br />
 		<?php
-		if(version_compare($githubVersion, $localVersion) === 1){
+		if(version_compare($githubVersion, $localVersion) === 1) {
 			p($l->t('A newer version of passman is available'));
 		}
 		?>
@@ -47,7 +47,10 @@ 
 		<p>
 			<input type="checkbox" name="passman_sharing_enabled"
 				   id="passman_sharing_enabled" class="checkbox"
-				   value="1" <?php if ($_['user_sharing_enabled']) print_unescaped('checked="checked"'); ?> />
+				   value="1" <?php if ($_['user_sharing_enabled']) {
+	print_unescaped('checked="checked"');
+}
+?> />
 			<label for="passman_sharing_enabled">
 				<?php p($l->t('Allow users on this server to share passwords with other users')); ?>
 			</label>
@@ -80,16 +83,28 @@ 
 		<p>
 			<label for="vault_key_strength">Minimum vault key strength:</label>
 			<select name="vault_key_strength" id="vault_key_strength">
-				<option value="1" <?php if ($_['vault_key_strength'] === 1) print_unescaped('selected="selected"'); ?>>
+				<option value="1" <?php if ($_['vault_key_strength'] === 1) {
+	print_unescaped('selected="selected"');
+}
+?>>
 					Poor
 				</option>
-				<option value="2" <?php if ($_['vault_key_strength'] === 2) print_unescaped('selected="selected"'); ?>>
+				<option value="2" <?php if ($_['vault_key_strength'] === 2) {
+	print_unescaped('selected="selected"');
+}
+?>>
 					Weak
 				</option>
-				<option value="3" <?php if ($_['vault_key_strength'] === 3) print_unescaped('selected="selected"'); ?>>
+				<option value="3" <?php if ($_['vault_key_strength'] === 3) {
+	print_unescaped('selected="selected"');
+}
+?>>
 					Good
 				</option>
-				<option value="4" <?php if ($_['vault_key_strength'] === 4) print_unescaped('selected="selected"'); ?>>
+				<option value="4" <?php if ($_['vault_key_strength'] === 4) {
+	print_unescaped('selected="selected"');
+}
+?>>
 					Strong
 				</option>
 			</select>

controller/internalcontroller.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 								$UserId,
 								CredentialService $credentialService,
 								IConfig $config
-                                ) {
+								) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->credentialService = $credentialService;

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * @NoCSRFRequired
 	 */
 	public function saveSettings($key, $value) {
-		if(is_numeric($value)){
+		if (is_numeric($value)) {
 			$value = intval($value);
 		}
 		$this->config->setAppValue('passman', $key, $value);

Braces +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * @NoCSRFRequired
 	 */
 	public function saveSettings($key, $value) {
-		if(is_numeric($value)){
+		if(is_numeric($value)) {
 			$value = intval($value);
 		}
 		$this->config->setAppValue('passman', $key, $value);

lib/AppInfo/Application.php

Indentation +6 added lines, -6 removed lines

@@ -68,11 +68,11 @@ 
 				$server->getUserManager(),
  				$c->query('ActivityService'),
  				$c->query('VaultService'),
-                $c->query('ShareService'),
-                $c->query('CredentialService'),
-                $c->query('NotificationService'),
-                $c->query('FileService'),
-                $c->query('IConfig')
+				$c->query('ShareService'),
+				$c->query('CredentialService'),
+				$c->query('NotificationService'),
+				$c->query('FileService'),
+				$c->query('IConfig')
 			);
 		});
 
@@ -108,7 +108,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);
 		$container->registerAlias('IDBConnection', IDBConnection::class);
 		$container->registerAlias('IConfig', IConfig::class);

controller/sharecontroller.php

Spacing +17 added lines, -17 removed lines

@@ -85,14 +85,14 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) {
-		if($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0'){
+		if ($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 
 
-		try{
+		try {
 			$credential = $this->credentialService->getCredentialByGUID($item_guid);
-		} catch (DoesNotExistException $exception){
+		} catch (DoesNotExistException $exception) {
 			return new NotFoundResponse();
 		}
 
@@ -126,7 +126,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function applyIntermediateShare($item_id, $item_guid, $vaults, $permissions) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if ($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 		/**
@@ -221,7 +221,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function unshareCredential($item_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if ($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 		$acl_list = $this->shareService->getCredentialAclList($item_guid);
@@ -242,21 +242,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();
@@ -265,7 +265,7 @@ 
 				->setUser($user_id);
 			$manager->markProcessed($notification);
 		}
-		if($acl){
+		if ($acl) {
 			$this->shareService->deleteShareACL($acl);
 		}
 		return new JSONResponse(array('result' => true));
@@ -374,7 +374,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function getVaultItems($vault_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if ($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 
@@ -428,7 +428,7 @@ 
 	 * @PublicPage
 	 */
 	public function getPublicCredentialData($credential_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if ($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new NotFoundJSONResponse();
 		}
 		//@TODO Check expire date
@@ -489,15 +489,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();
 		}
 		$userId = ($this->userId) ? $this->userId->getUID() : null;
 		$acl = $this->shareService->getACL($userId, $credential->getGuid());
-		if (!$acl->hasPermission(SharingACL::FILES)){
+		if (!$acl->hasPermission(SharingACL::FILES)) {
 			return new NotFoundJSONResponse();
 		} else {
 			return $this->fileService->getFileByGuid($file_guid);

Braces +10 added lines, -10 removed lines

@@ -85,7 +85,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) {
-		if($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0'){
+		if($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 
@@ -126,7 +126,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function applyIntermediateShare($item_id, $item_guid, $vaults, $permissions) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 		/**
@@ -221,7 +221,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function unshareCredential($item_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 		$acl_list = $this->shareService->getCredentialAclList($item_guid);
@@ -242,7 +242,7 @@ 
 	}
 
 
-	public function unshareCredentialFromUser($item_guid, $user_id){
+	public function unshareCredentialFromUser($item_guid, $user_id) {
 		$acl = null;
 		$sr = null;
 		try {
@@ -256,7 +256,7 @@ 
 
 		}
 
-		if($sr){
+		if($sr) {
 			$this->shareService->cleanItemRequestsForUser($sr);
 			$manager = \OC::$server->getNotificationManager();
 			$notification = $manager->createNotification();
@@ -265,7 +265,7 @@ 
 				->setUser($user_id);
 			$manager->markProcessed($notification);
 		}
-		if($acl){
+		if($acl) {
 			$this->shareService->deleteShareACL($acl);
 		}
 		return new JSONResponse(array('result' => true));
@@ -374,7 +374,7 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function getVaultItems($vault_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new JSONResponse(array());
 		}
 
@@ -428,7 +428,7 @@ 
 	 * @PublicPage
 	 */
 	public function getPublicCredentialData($credential_guid) {
-		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+		if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 			return new NotFoundJSONResponse();
 		}
 		//@TODO Check expire date
@@ -489,7 +489,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){
@@ -497,7 +497,7 @@ 
 		}
 		$userId = ($this->userId) ? $this->userId->getUID() : null;
 		$acl = $this->shareService->getACL($userId, $credential->getGuid());
-		if (!$acl->hasPermission(SharingACL::FILES)){
+		if (!$acl->hasPermission(SharingACL::FILES)) {
 			return new NotFoundJSONResponse();
 		} else {
 			return $this->fileService->getFileByGuid($file_guid);

controller/credentialcontroller.php

Spacing +11 added lines, -11 removed lines

@@ -89,7 +89,7 @@ 
 		);
 		$credential = $this->credentialService->createCredential($credential);
 		$link = ''; // @TODO create direct link to credential
-		if(!$credential->getHidden()) {
+		if (!$credential->getHidden()) {
 			$this->activityService->add(
 				Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId),
 				'', array(),
@@ -150,7 +150,7 @@ 
 			} else {
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
 			}
-			if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+			if ($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
 			}
 		}
@@ -212,7 +212,7 @@ 
 
 			foreach ($acl_list as $sharingACL) {
 				$target_user = $sharingACL->getUserId();
-				if($target_user === $this->userId){
+				if ($target_user === $this->userId) {
 					continue;
 				}
 				$this->activityService->add(
@@ -227,15 +227,15 @@ 
 					$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'] = '';
 		}
-		if(!$skip_revision) {
+		if (!$skip_revision) {
 			$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId);
 		}
 		$credential = $this->credentialService->updateCredential($credential);
@@ -270,7 +270,7 @@ 
 	    try {
             $credential = $this->credentialService->getCredentialByGUID($credential_guid);
         }
-        catch (DoesNotExistException $ex){
+        catch (DoesNotExistException $ex) {
             return new NotFoundJSONResponse();
         }
 
@@ -280,7 +280,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 {
@@ -304,7 +304,7 @@ 
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
 		$revision = null;
 		try {
 			$this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@@ -312,9 +312,9 @@ 
 			return new NotFoundJSONResponse();
 		}
 
-		try{
+		try {
 			$revision = $this->credentialRevisionService->getRevision($revision_id);
-		} catch(DoesNotExistException $exception){
+		} catch (DoesNotExistException $exception) {
 			return new NotFoundJSONResponse();
 		}
 

Braces +9 added lines, -12 removed lines

@@ -150,7 +150,7 @@ 
 			} else {
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
 			}
-			if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){
+			if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') {
 				return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED);
 			}
 		}
@@ -212,7 +212,7 @@ 
 
 			foreach ($acl_list as $sharingACL) {
 				$target_user = $sharingACL->getUserId();
-				if($target_user === $this->userId){
+				if($target_user === $this->userId) {
 					continue;
 				}
 				$this->activityService->add(
@@ -227,11 +227,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'] = '';
 		}
@@ -269,21 +269,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();
             }
         }
@@ -304,7 +301,7 @@ 
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function updateRevision($credential_guid, $revision_id, $credential_data){
+	public function updateRevision($credential_guid, $revision_id, $credential_data) {
 		$revision = null;
 		try {
 			$this->credentialService->getCredentialByGUID($credential_guid, $this->userId);