nextcloud / passman

controller/translationcontroller.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'),

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

controller/internalcontroller.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
 	private $appManager;
 
 	public function __construct($AppName,
-	                            IRequest $request,
-	                            $UserId,
-	                            CredentialService $credentialService,
-	                            IConfig $config,
-	                            IManager $IManager,
-	                            IAppManager $appManager
+								IRequest $request,
+								$UserId,
+								CredentialService $credentialService,
+								IConfig $config,
+								IManager $IManager,
+								IAppManager $appManager
 	) {
 		parent::__construct(
 			$AppName,

migration/serversideencryption.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	private $fileService;
 
 	public function __construct(EncryptService $encryptService, IDBConnection $db, LoggerInterface $logger, CredentialService $credentialService, CredentialRevisionService $revisionService,
-	                            FileService $fileService, IConfig $config) {
+								FileService $fileService, IConfig $config) {
 		$this->encryptService = $encryptService;
 		$this->db = $db;
 		$this->logger = $logger;

lib/Service/ShareService.php

Braces +18 added lines, -6 removed lines

@@ -101,7 +101,9 @@ 
 	 * @return Entity
 	 */
 	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);
 	}
 
@@ -159,13 +161,17 @@ 
 		$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();
 			$credential = $this->credential->getCredentialById($entry->getItemId());
 			$credential = $this->encryptService->decryptCredential($credential);
 			$tmp['credential_data'] = $credential->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;
 		}
@@ -194,7 +200,9 @@ 
 		$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();
 		$credential = $this->credential->getCredentialById($acl->getItemId());
@@ -202,7 +210,9 @@ 
 
 		$tmp['credential_data'] = $credential->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;
@@ -217,7 +227,9 @@ 
 	 */
 	public function getItemHistory(string $user_id, string $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());
 	}

lib/Settings/Admin.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				}
 
 				if ($data !== false) {
-					$version = (string)$data->version;
+					$version = (string) $data->version;
 				} else {
 					libxml_clear_errors();
 				}

lib/Activity.php

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 			'apps' => array(self::FILTER_PASSMAN =>
 				array(
 					'id' => 'passman',
-					'name' => (string)$l->t('Passwords'),
+					'name' => (string) $l->t('Passwords'),
 					'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_PASSMAN]),
 				),
 			),

lib/Notifier.php

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
 			// Deal with known subjects
 			case 'credential_expired':
 				$notification->setParsedSubject(
-					(string)$l->t('Your credential "%s" expired, click here to update the credential.', $notification->getSubjectParameters())
+					(string) $l->t('Your credential "%s" expired, click here to update the credential.', $notification->getSubjectParameters())
 				);
 
 				// Deal with the actions for a known subject
@@ -60,13 +60,13 @@ 
 					switch ($action->getLabel()) {
 						case 'remind':
 							$action->setParsedLabel(
-								(string)$l->t('Remind me later')
+								(string) $l->t('Remind me later')
 							);
 							break;
 
 						case 'ignore':
 							$action->setParsedLabel(
-								(string)$l->t('Ignore')
+								(string) $l->t('Ignore')
 							);
 							break;
 					}
@@ -78,7 +78,7 @@ 
 
 			case 'credential_shared':
 				$notification->setParsedSubject(
-					(string)$l->t('%s shared "%s" with you. Click here to accept', $notification->getSubjectParameters())
+					(string) $l->t('%s shared "%s" with you. Click here to accept', $notification->getSubjectParameters())
 				);
 
 				// Deal with the actions for a known subject
@@ -86,7 +86,7 @@ 
 					switch ($action->getLabel()) {
 						case 'decline':
 							$action->setParsedLabel(
-								(string)$l->t('Decline')
+								(string) $l->t('Decline')
 							);
 							break;
 					}
@@ -97,13 +97,13 @@ 
 
 			case 'credential_share_denied':
 				$notification->setParsedSubject(
-					(string)$l->t('%s has declined your share request for "%s".', $notification->getSubjectParameters())
+					(string) $l->t('%s has declined your share request for "%s".', $notification->getSubjectParameters())
 				);
 				return $notification;
 
 			case 'credential_share_accepted':
 				$notification->setParsedSubject(
-					(string)$l->t('%s has accepted your share request for "%s".', $notification->getSubjectParameters())
+					(string) $l->t('%s has accepted your share request for "%s".', $notification->getSubjectParameters())
 				);
 				return $notification;
 			default:

lib/AppInfo/Application.php

Spacing +6 added lines, -6 removed lines

@@ -74,18 +74,18 @@ 
 
 		$context->registerSearchProvider(Provider::class);
 
-		$context->registerService(View::class, function () {
+		$context->registerService(View::class, function() {
 			return new View('');
 		}, false);
 
-		$context->registerService('isCLI', function () {
+		$context->registerService('isCLI', function() {
 			return \OC::$CLI;
 		});
 
 		$context->registerMiddleware(ShareMiddleware::class);
 		$context->registerMiddleware(APIMiddleware::class);
 
-		$context->registerService('ShareController', function (ContainerInterface $c) {
+		$context->registerService('ShareController', function(ContainerInterface $c) {
 			/** @var IUserManager $userManager */
 			$userManager = $c->get(IUserManager::class);
 			/** @var IGroupManager $groupManager */
@@ -111,7 +111,7 @@ 
 		});
 
 
-		$context->registerService('CronService', function (ContainerInterface $c) {
+		$context->registerService('CronService', function(ContainerInterface $c) {
 			return new CronService(
 				$c->get(CredentialService::class),
 				$c->get(LoggerInterface::class),
@@ -122,7 +122,7 @@ 
 			);
 		});
 
-		$context->registerService('Logger', function (ContainerInterface $c) {
+		$context->registerService('Logger', function(ContainerInterface $c) {
 			return $c->get(ServerContainer::class)->getLogger();
 		});
 	}
@@ -143,7 +143,7 @@ 
 		/** @var INavigationManager $navigationManager */
 		$navigationManager = $c->get(INavigationManager::class);
 
-		$navigationEntry = function () use ($c) {
+		$navigationEntry = function() use ($c) {
 			/** @var IURLGenerator $urlGenerator */
 			$urlGenerator = $c->get(IURLGenerator::class);
 			return [

lib/Utility/Utils.php

Indentation +8 added lines, -8 removed lines

@@ -26,10 +26,10 @@ 
 use OCP\IUserManager;
 
 class Utils {
-    /**
-     * Gets the unix epoch UTC timestamp
-     * @return int
-     */
+	/**
+	 * Gets the unix epoch UTC timestamp
+	 * @return int
+	 */
 	public static function getTime() {
 		return (new \DateTime())->getTimestamp();
 	}
@@ -40,10 +40,10 @@ 
 		return microtime(true);
 	}
 
-    /**
-     * Generates a Globally Unique ID
-     * @return string
-     */
+	/**
+	 * Generates a Globally Unique ID
+	 * @return string
+	 */
 	public static function GUID() {
 		if (function_exists('com_create_guid') === true)
 		{

Spacing +6 added lines, -6 removed lines

@@ -58,7 +58,7 @@ 
 	 * @param IUserManager $userManager
 	 * @return string
 	 */
-	public static function getNameByUid(string $uid, IUserManager $userManager){
+	public static function getNameByUid(string $uid, IUserManager $userManager) {
 		$u = $userManager->get($uid);
 		return $u->getDisplayName();
 	}
@@ -68,14 +68,14 @@ 
 	 * @param array $results
 	 * @return array|mixed
 	 */
-	public static function getDirContents(string $dir, &$results = array()){
+	public static function getDirContents(string $dir, &$results = array()) {
 		$files = scandir($dir);
 
-		foreach($files as $value){
-			$path = realpath($dir.DIRECTORY_SEPARATOR.$value);
-			if(!is_dir($path)) {
+		foreach ($files as $value) {
+			$path = realpath($dir . DIRECTORY_SEPARATOR . $value);
+			if (!is_dir($path)) {
 				$results[] = $path;
-			} else if($value != "." && $value != "..") {
+			} else if ($value != "." && $value != "..") {
 				Utils::getDirContents($path, $results);
 				$results[] = $path;
 			}

Braces +4 added lines, -5 removed lines

@@ -45,8 +45,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(), '{}');
 		}
 
@@ -58,7 +57,7 @@ 
 	 * @param IUserManager $userManager
 	 * @return string
 	 */
-	public static function getNameByUid(string $uid, IUserManager $userManager){
+	public static function getNameByUid(string $uid, IUserManager $userManager) {
 		$u = $userManager->get($uid);
 		return $u->getDisplayName();
 	}
@@ -68,10 +67,10 @@ 
 	 * @param array $results
 	 * @return array|mixed
 	 */
-	public static function getDirContents(string $dir, &$results = array()){
+	public static function getDirContents(string $dir, &$results = array()) {
 		$files = scandir($dir);
 
-		foreach($files as $value){
+		foreach($files as $value) {
 			$path = realpath($dir.DIRECTORY_SEPARATOR.$value);
 			if(!is_dir($path)) {
 				$results[] = $path;