Completed
Pull Request — master (#5649)
by Blizzz
16:32
created
apps/encryption/templates/settings-personal.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -7,49 +7,49 @@  discard block
 block discarded – undo
7 7
 <form id="ocDefaultEncryptionModule" class="section">
8 8
 	<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
9 9
 
10
-	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
10
+	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
11 11
 
12 12
 	<?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
13 13
 
14
-	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
14
+	<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
15 15
 		<p>
16 16
 			<a name="changePKPasswd" />
17 17
 			<label for="changePrivateKeyPasswd">
18
-				<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
18
+				<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
19 19
 			</label>
20 20
 			<br />
21
-			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
22
-			<?php if (  $_["recoveryEnabledForUser"] ):
23
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
21
+			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
22
+			<?php if ($_["recoveryEnabledForUser"]):
23
+					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
24 24
 			endif; ?>
25 25
 			<br />
26 26
 			<input
27 27
 				type="password"
28 28
 				name="changePrivateKeyPassword"
29 29
 				id="oldPrivateKeyPassword" />
30
-			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
30
+			<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
31 31
 			<br />
32 32
 			<input
33 33
 				type="password"
34 34
 				name="changePrivateKeyPassword"
35 35
 				id="newPrivateKeyPassword" />
36
-			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
36
+			<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
37 37
 			<br />
38 38
 			<button
39 39
 				type="button"
40 40
 				name="submitChangePrivateKeyPassword"
41
-				disabled><?php p($l->t( "Update Private Key Password" )); ?>
41
+				disabled><?php p($l->t("Update Private Key Password")); ?>
42 42
 			</button>
43 43
 			<span class="msg"></span>
44 44
 		</p>
45 45
 
46
-	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
46
+	<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
47 47
 		<br />
48 48
 		<p id="userEnableRecovery">
49
-			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
49
+			<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
50 50
 			<span class="msg"></span>
51 51
 			<br />
52
-			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
52
+			<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
53 53
 			<br />
54 54
 			<input
55 55
 			type='radio'
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
 			id='userEnableRecoveryCheckbox'
58 58
 			name='userEnableRecovery'
59 59
 			value='1'
60
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
61
-			<label class="radio" for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
60
+			<?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
61
+			<label class="radio" for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
62 62
 			<br />
63 63
 
64 64
 			<input
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 			id='userDisableRecoveryCheckbox'
68 68
 			name='userEnableRecovery'
69 69
 			value='0'
70
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
71
-			<label class='radio' for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
70
+			<?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
71
+			<label class='radio' for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
72 72
 		</p>
73 73
 	<?php endif; ?>
74 74
 </form>
Please login to merge, or discard this patch.
settings/templates/settings/admin/encryption.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
58 58
 		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
59 59
 			<?php
60
-			if (empty($_['encryptionModules'])) {
61
-				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
62
-			} else { ?>
60
+            if (empty($_['encryptionModules'])) {
61
+                p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
62
+            } else { ?>
63 63
 				<h3><?php p($l->t('Select default encryption module:')) ?></h3>
64 64
 				<fieldset id='encryptionModules'>
65 65
 					<?php foreach ($_['encryptionModules'] as $id => $module): ?>
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 							   name="default_encryption_module"
68 68
 							   value="<?php p($id) ?>"
69 69
 							<?php if ($module['default']) {
70
-								p('checked');
71
-							} ?>>
70
+                                p('checked');
71
+                            } ?>>
72 72
 						<label class="radio"
73 73
 							for="<?php p($id) ?>"><?php p($module['displayName']) ?></label>
74 74
 						<br/>
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 		</div>
79 79
 		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
80 80
 			<?php
81
-			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
82
-				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
83
-			} elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
84
-				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?>
81
+            if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
82
+                p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
83
+            } elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) {
84
+                p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?>
85 85
 				<input type="submit" name="startmigration" id="startmigration"
86 86
 					   value="<?php p($l->t('Start migration')); ?>"/>
87 87
 			<?php } ?>
Please login to merge, or discard this patch.