nextcloud / passman

lib/Service/ActivityService.php

Spacing +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
 	 * @param $type string
 	 * @return array
 	 */
-	public function add($subject,$subjectParams=array(),
-						$message='',$messageParams=array(),
-						$link='',$user=null,$type='') {
-		if($user) {
+	public function add($subject, $subjectParams = array(),
+						$message = '', $messageParams = array(),
+						$link = '', $user = null, $type = '') {
+		if ($user) {
 			$activity = $this->manager->generateEvent();
 			$activity->setType($type);
 			$activity->setApp('passman');

controller/credentialcontroller.php

Spacing +2 added lines, -2 removed lines

@@ -163,13 +163,13 @@
 				$activity . '_self', array($label, $this->userId, $revision_created),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
 			$activity = 'item_deleted';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
 			$activity = 'item_recovered';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),

Indentation +14 added lines, -14 removed lines

@@ -36,13 +36,13 @@ 
 	private $settings;
 
 	public function __construct($AppName,
-	                            IRequest $request,
+								IRequest $request,
 								$userId,
-		                        CredentialService $credentialService,
-		                        ActivityService $activityService,
-		                        CredentialRevisionService $credentialRevisionService,
-		                        ShareService $sharingService,
-		                        SettingsService $settings
+								CredentialService $credentialService,
+								ActivityService $activityService,
+								CredentialRevisionService $credentialRevisionService,
+								ShareService $sharingService,
+								SettingsService $settings
 
 	) {
 		parent::__construct(
@@ -65,10 +65,10 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function createCredential($changed, $created,
-	                                 $credential_id, $custom_fields, $delete_time,
-	                                 $description, $email, $expire_time, $favicon, $files, $guid,
-	                                 $hidden, $icon, $label, $otp, $password, $renew_interval,
-	                                 $tags, $url, $username, $vault_id, $compromised) {
+									 $credential_id, $custom_fields, $delete_time,
+									 $description, $email, $expire_time, $favicon, $files, $guid,
+									 $hidden, $icon, $label, $otp, $password, $renew_interval,
+									 $tags, $url, $username, $vault_id, $compromised) {
 		$credential = array(
 			'credential_id' => $credential_id,
 			'guid' => $guid,
@@ -121,10 +121,10 @@ 
 	 * @NoCSRFRequired
 	 */
 	public function updateCredential($changed, $created,
-	                                 $credential_id, $custom_fields, $delete_time, $credential_guid,
-	                                 $description, $email, $expire_time, $icon, $files, $guid,
-	                                 $hidden, $label, $otp, $password, $renew_interval,
-	                                 $tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action, $set_share_key, $skip_revision, $compromised) {
+									 $credential_id, $custom_fields, $delete_time, $credential_guid,
+									 $description, $email, $expire_time, $icon, $files, $guid,
+									 $hidden, $label, $otp, $password, $renew_interval,
+									 $tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action, $set_share_key, $skip_revision, $compromised) {
 
 
 		$storedCredential = $this->credentialService->getCredentialByGUID($credential_guid);

lib/Service/EncryptService.php

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,9 @@
 	protected function unpad($data) {
 		$length = $this->getKeySize();
 		$last = ord($data[strlen($data) - 1]);
-		if ($last > $length) return false;
+		if ($last > $length) {
+			return false;
+		}
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
 			return false;
 		}

middleware/sharemiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
 			$sharing_enabled = ($this->settings->isEnabled($setting));
 
-			if(in_array($methodName, $user_pub_methods)){
+			if (in_array($methodName, $user_pub_methods)) {
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
 			}
 

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
 			$sharing_enabled = ($this->settings->isEnabled($setting));
 
-			if(in_array($methodName, $user_pub_methods)){
+			if(in_array($methodName, $user_pub_methods)) {
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
 			}
 

middleware/apimiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 	}
 
 	public function afterController($controller, $methodName, Response $response) {
-		if($response instanceof JSONResponse){
-			if(isset($this->request->server['HTTP_ORIGIN'])) {
+		if ($response instanceof JSONResponse) {
+			if (isset($this->request->server['HTTP_ORIGIN'])) {
 				$response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']);
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	}
 
 	public function afterController($controller, $methodName, Response $response) {
-		if($response instanceof JSONResponse){
+		if($response instanceof JSONResponse) {
 			if(isset($this->request->server['HTTP_ORIGIN'])) {
 				$response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']);
 			}

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

@@ -52,19 +52,19 @@
 		//Sharing stuff
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
-        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
-        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
-        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
-        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
-        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
-        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
-        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
-        ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
-        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
-        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
-        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
+		['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
+		['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+		['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
+		['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
+		['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
+		['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
+		['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
+		['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
+		['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
+		['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
+		['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
 		['name' => 'internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'],
 
 		//Settings

lib/Db/DeleteVaultRequest.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  */
 
 
-class DeleteVaultRequest extends Entity implements  \JsonSerializable{
+class DeleteVaultRequest extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  */
 
 
-class DeleteVaultRequest extends Entity implements  \JsonSerializable{
+class DeleteVaultRequest extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

lib/Service/IconService.php

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 	}
 
 
-	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href){
+	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href) {
 		if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
 			$link_tag = $matches[0];
 			$this->debugInfo['link_tag'] = $link_tag;

Braces +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 	}
 
 
-	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href){
+	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href) {
 		if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
 			$link_tag = $matches[0];
 			$this->debugInfo['link_tag'] = $link_tag;

controller/translationcontroller.php

Indentation +20 added lines, -20 removed lines

@@ -140,8 +140,8 @@ 
 			'password.r' => $this->trans->t('Repeat password'),
 			'add.tag' => $this->trans->t('Add tag'),
 			'pick.icon' => $this->trans->t('Pick an icon'),
-            'pick.icon.search' => $this->trans->t('Search icons'),
-            'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'),
+			'pick.icon.search' => $this->trans->t('Search icons'),
+			'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'),
 			'use.icon' => $this->trans->t('Use this icon'),
 			'use.icon.delete' => $this->trans->t('Delete current icon'),
 			'use.icon.refresh' => $this->trans->t('Get icon from page'),
@@ -351,15 +351,15 @@ 
 			'decline' => $this->trans->t('Decline'),
 			'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'),
 			'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'),
-            'vault.hint.hello' => $this->trans->t('Hello there!'),
-            'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
-            'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
-            'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
-            'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
-            'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
-            'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
-            'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
-            'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
+			'vault.hint.hello' => $this->trans->t('Hello there!'),
+			'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
+			'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
+			'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
+			'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
+			'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
+			'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
+			'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
+			'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
 
 
 			// templates/views/vaults.html
@@ -405,15 +405,15 @@ 
 			'deleted.credentials' => $this->trans->t('Deleted credentials'),
 			'logout' => $this->trans->t('Logout'),
 			'donate' => $this->trans->t('Donate'),
-            'navigation.show.all' => $this->trans->t('Show All'),
-            'navigation.tags' => $this->trans->t('Tags'),
-            'navigation.tags.search' => $this->trans->t('Search Tags'),
-            'navigation.strength.good' => $this->trans->t('Good Strength'),
-            'navigation.strength.medium' => $this->trans->t('Medium Strength'),
-            'navigation.strength.bad' => $this->trans->t('Bad Strength'),
-            'navigation.expired' => $this->trans->t('Expired'),
-            'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
-            'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
+			'navigation.show.all' => $this->trans->t('Show All'),
+			'navigation.tags' => $this->trans->t('Tags'),
+			'navigation.tags.search' => $this->trans->t('Search Tags'),
+			'navigation.strength.good' => $this->trans->t('Good Strength'),
+			'navigation.strength.medium' => $this->trans->t('Medium Strength'),
+			'navigation.strength.bad' => $this->trans->t('Bad Strength'),
+			'navigation.expired' => $this->trans->t('Expired'),
+			'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
+			'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
 
 
 			// templates/public_share.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	public function getLanguageStrings() {
 		$translations = array(
 			// js/app/controllers/bookmarklet.js
-			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys (%s/2)','%step'),
+			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys (%s/2)', '%step'),
 			'invalid.vault.key' => $this->trans->t('Incorrect vault password!'),
 			'password.do.not.match' => $this->trans->t('Passwords do not match'),
 			'general' => $this->trans->t('General'),