Completed
Pull Request — master (#151)
by Sander
02:52
created
lib/AppInfo/Application.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 				$server->getUserManager(),
69 69
  				$c->query('ActivityService'),
70 70
  				$c->query('VaultService'),
71
-                $c->query('ShareService'),
72
-                $c->query('CredentialService'),
73
-                $c->query('NotificationService'),
74
-                $c->query('FileService'),
75
-                $c->query('IConfig')
71
+				$c->query('ShareService'),
72
+				$c->query('CredentialService'),
73
+				$c->query('NotificationService'),
74
+				$c->query('FileService'),
75
+				$c->query('IConfig')
76 76
 			);
77 77
 		});
78 78
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		$container->registerAlias('ActivityService', ActivityService::class);
109 109
 		$container->registerAlias('VaultService', VaultService::class);
110 110
 		$container->registerAlias('FileService', FileService::class);
111
-        $container->registerAlias('ShareService', ShareService::class);
111
+		$container->registerAlias('ShareService', ShareService::class);
112 112
 		$container->registerAlias('Utils', Utils::class);
113 113
 		$container->registerAlias('IDBConnection', IDBConnection::class);
114 114
 		$container->registerAlias('IConfig', IConfig::class);
Please login to merge, or discard this patch.
controller/credentialcontroller.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,13 +163,13 @@
 block discarded – undo
163 163
 				$activity . '_self', array($label, $this->userId, $revision_created),
164 164
 				'', array(),
165 165
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
166
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
166
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
167 167
 			$activity = 'item_deleted';
168 168
 			$this->activityService->add(
169 169
 				$activity . '_self', array($label, $this->userId),
170 170
 				'', array(),
171 171
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
172
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
172
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
173 173
 			$activity = 'item_recovered';
174 174
 			$this->activityService->add(
175 175
 				$activity . '_self', array($label, $this->userId),
Please login to merge, or discard this patch.
templates/settings-admin.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 		<h2><?php p($l->t('Passman Settings')); ?></h2>
31 31
 		<?php
32 32
 		if ($checkVersion) {
33
-			p($l->t('Github version:'). ' '. $githubVersion);
33
+			p($l->t('Github version:') . ' ' . $githubVersion);
34 34
 			print '<br />';
35 35
 		} ?>
36 36
 		Local version: <?php p($localVersion); ?><br/>
Please login to merge, or discard this patch.
Braces   +20 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,7 +52,10 @@  discard block
 block discarded – undo
52 52
 		<p>
53 53
 			<input type="checkbox" name="passman_sharing_enabled"
54 54
 				   id="passman_sharing_enabled" class="checkbox"
55
-				   value="1" <?php if ($_['user_sharing_enabled']) print_unescaped('checked="checked"'); ?> />
55
+				   value="1" <?php if ($_['user_sharing_enabled']) {
56
+	print_unescaped('checked="checked"');
57
+}
58
+?> />
56 59
 			<label for="passman_sharing_enabled">
57 60
 				<?php p($l->t('Allow users on this server to share passwords with other users')); ?>
58 61
 			</label>
@@ -85,16 +88,28 @@  discard block
 block discarded – undo
85 88
 		<p>
86 89
 			<label for="vault_key_strength">Minimum vault key strength:</label>
87 90
 			<select name="vault_key_strength" id="vault_key_strength">
88
-				<option value="1" <?php if ($_['vault_key_strength'] === 1) print_unescaped('selected="selected"'); ?>>
91
+				<option value="1" <?php if ($_['vault_key_strength'] === 1) {
92
+	print_unescaped('selected="selected"');
93
+}
94
+?>>
89 95
 					Poor
90 96
 				</option>
91
-				<option value="2" <?php if ($_['vault_key_strength'] === 2) print_unescaped('selected="selected"'); ?>>
97
+				<option value="2" <?php if ($_['vault_key_strength'] === 2) {
98
+	print_unescaped('selected="selected"');
99
+}
100
+?>>
92 101
 					Weak
93 102
 				</option>
94
-				<option value="3" <?php if ($_['vault_key_strength'] === 3) print_unescaped('selected="selected"'); ?>>
103
+				<option value="3" <?php if ($_['vault_key_strength'] === 3) {
104
+	print_unescaped('selected="selected"');
105
+}
106
+?>>
95 107
 					Good
96 108
 				</option>
97
-				<option value="4" <?php if ($_['vault_key_strength'] === 4) print_unescaped('selected="selected"'); ?>>
109
+				<option value="4" <?php if ($_['vault_key_strength'] === 4) {
110
+	print_unescaped('selected="selected"');
111
+}
112
+?>>
98 113
 					Strong
99 114
 				</option>
100 115
 			</select>
Please login to merge, or discard this patch.