[Pkg-owncloud-commits] [owncloud] 40/122: don't let the the user disable encryption once it was activated

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 6dc3682cc2fde9a508747f4af1e017a77d01faae
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon May 4 13:00:17 2015 +0200

    don't let the the user disable encryption once it was activated
---
 settings/css/settings.css    | 4 ++++
 settings/js/admin.js         | 1 +
 settings/templates/admin.php | 6 +++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 583e880..4e398c6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -494,3 +494,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 #encryptionModules {
 	padding: 10px;
 }
+
+#warning {
+	color: red;
+}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 9cdb7f5..e10e1f9 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -55,6 +55,7 @@ $(document).ready(function(){
 	});
 
 	$('#encryptionEnabled').change(function() {
+		$('#encryptionAPI div#EncryptionWarning').toggleClass('hidden');
 		$('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden');
 	});
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5edf4e2..9938b6d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -321,11 +321,15 @@ if ($_['cronErrors']) {
 	<p id="enable">
 		<input type="checkbox" name="encryption_enabled"
 			   id="encryptionEnabled"
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
 		<label
 			for="encryptionEnabled"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
 	</p>
 
+	<div id="EncryptionWarning" class="warning hidden">
+		<?php p($l->t('Once encryption is enabled there is no way to disable it again. This is your last chance to disable it again.')) ?>
+	</div>
+
 	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
 		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
 			<?php

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git