Completed
Pull Request — master (#151)
by Sander
02:32
created
templates/settings-admin.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 		$versions = $element->getElementsByTagName("version");
17 17
 		$version = $versions->item(0)->nodeValue;
18 18
 	}
19
-	if($version) {
19
+	if ($version) {
20 20
 		$githubVersion = $version;
21 21
 	}
22 22
 	$AppInstance = new App();
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		Github version: <?php p($githubVersion); ?><br />
31 31
 		Local version: <?php p($localVersion); ?><br />
32 32
 		<?php
33
-		if(version_compare($githubVersion, $localVersion) === 1){
33
+		if (version_compare($githubVersion, $localVersion) === 1) {
34 34
 			p($l->t('A newer version of passman is available'));
35 35
 		}
36 36
 		?>
Please login to merge, or discard this patch.
Braces   +21 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		Github version: <?php p($githubVersion); ?><br />
31 31
 		Local version: <?php p($localVersion); ?><br />
32 32
 		<?php
33
-		if(version_compare($githubVersion, $localVersion) === 1){
33
+		if(version_compare($githubVersion, $localVersion) === 1) {
34 34
 			p($l->t('A newer version of passman is available'));
35 35
 		}
36 36
 		?>
@@ -47,7 +47,10 @@  discard block
 block discarded – undo
47 47
 		<p>
48 48
 			<input type="checkbox" name="passman_sharing_enabled"
49 49
 				   id="passman_sharing_enabled" class="checkbox"
50
-				   value="1" <?php if ($_['user_sharing_enabled']) print_unescaped('checked="checked"'); ?> />
50
+				   value="1" <?php if ($_['user_sharing_enabled']) {
51
+	print_unescaped('checked="checked"');
52
+}
53
+?> />
51 54
 			<label for="passman_sharing_enabled">
52 55
 				<?php p($l->t('Allow users on this server to share passwords with other users')); ?>
53 56
 			</label>
@@ -80,16 +83,28 @@  discard block
 block discarded – undo
80 83
 		<p>
81 84
 			<label for="vault_key_strength">Minimum vault key strength:</label>
82 85
 			<select name="vault_key_strength" id="vault_key_strength">
83
-				<option value="1" <?php if ($_['vault_key_strength'] === 1) print_unescaped('selected="selected"'); ?>>
86
+				<option value="1" <?php if ($_['vault_key_strength'] === 1) {
87
+	print_unescaped('selected="selected"');
88
+}
89
+?>>
84 90
 					Poor
85 91
 				</option>
86
-				<option value="2" <?php if ($_['vault_key_strength'] === 2) print_unescaped('selected="selected"'); ?>>
92
+				<option value="2" <?php if ($_['vault_key_strength'] === 2) {
93
+	print_unescaped('selected="selected"');
94
+}
95
+?>>
87 96
 					Weak
88 97
 				</option>
89
-				<option value="3" <?php if ($_['vault_key_strength'] === 3) print_unescaped('selected="selected"'); ?>>
98
+				<option value="3" <?php if ($_['vault_key_strength'] === 3) {
99
+	print_unescaped('selected="selected"');
100
+}
101
+?>>
90 102
 					Good
91 103
 				</option>
92
-				<option value="4" <?php if ($_['vault_key_strength'] === 4) print_unescaped('selected="selected"'); ?>>
104
+				<option value="4" <?php if ($_['vault_key_strength'] === 4) {
105
+	print_unescaped('selected="selected"');
106
+}
107
+?>>
93 108
 					Strong
94 109
 				</option>
95 110
 			</select>
Please login to merge, or discard this patch.
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.