summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2012-08-01 10:37:21 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2012-08-01 10:37:21 +0200
commita7f3a67bc2c7b923316ab440f7a76f32531e42fd (patch)
tree8858ec8af04a2297744617799f14c04d414bcd32
parent82f5f73dff8e2d35fb450aea7d9b34bab34f002f (diff)
downloadnextcloud-server-a7f3a67bc2c7b923316ab440f7a76f32531e42fd.tar.gz
nextcloud-server-a7f3a67bc2c7b923316ab440f7a76f32531e42fd.zip
get settings from DB and check the right checkbox in the settings
-rw-r--r--apps/files_encryption/settings.php2
-rw-r--r--apps/files_encryption/templates/settings.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 0a0d4d1abba..a4e91627dd9 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -10,7 +10,7 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings');
$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
$tmpl->assign('blacklist',$blackList);
-$tmpl->assign('encryption_enabled',$enabled);
+$tmpl->assign('encryption_mode',\OC_Appconfig::getValue('files_encryption', 'mode', 'none'));
OCP\Util::addscript('files_encryption','settings');
OCP\Util::addscript('core','multiselect');
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 80b3da84caa..38c89ecde34 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -4,9 +4,9 @@
<strong>Choose encryption mode:</strong>
<p>
- <input type="radio" name="encryption_mode" value="client" style="width:20px;" /> Client side encryption (most secure but makes it impossible to access your data from the web interface)<br />
- <input type="radio" name="encryption_mode" value="server" style="width:20px;" /> Server side encryption (allows you to access your files from the web interface and the desktop client)<br />
- <input type="radio" name="encryption_mode" value="none" style="width:20px; checked="checked" /> None (no encryption at all)<br/>
+ <input type="radio" name="encryption_mode" value="client" style="width:20px;" <?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>/> Client side encryption (most secure but makes it impossible to access your data from the web interface)<br />
+ <input type="radio" name="encryption_mode" value="server" style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?> /> Server side encryption (allows you to access your files from the web interface and the desktop client)<br />
+ <input type="radio" name="encryption_mode" value="none" style="width:20px;" <?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"?>/> None (no encryption at all)<br/>
</p>
<p>
<strong><?php echo $l->t('Encryption'); ?></strong>