diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 17:06:15 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 17:06:15 +0000 |
| commit | b84e83261ec8caf2ce128017d703e4139e3f6211 (patch) | |
| tree | 2e79b558d897ac2c9afeb5b8f9fadb2b7155266c /apps/files_encryption | |
| parent | 680c5b3dad9f83b912da3a0629060525d08c2165 (diff) | |
| download | nextcloud-server-b84e83261ec8caf2ce128017d703e4139e3f6211.tar.gz nextcloud-server-b84e83261ec8caf2ce128017d703e4139e3f6211.zip | |
Added notice to personal settings indicating what filetypes are not encrypted
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 5 | ||||
| -rw-r--r-- | apps/files_encryption/settings-personal.php | 24 | ||||
| -rw-r--r-- | apps/files_encryption/templates/settings-personal.php | 42 |
3 files changed, 23 insertions, 48 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 20045f34b08..e426f237bbe 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -43,7 +43,6 @@ if ( } +// Reguster settings scripts OCP\App::registerAdmin( 'files_encryption', 'settings' ); - -// This is disabled until client-side encryption is supported: -// OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
\ No newline at end of file +OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
\ No newline at end of file diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php index 014288f2efe..6fe4ea6d564 100644 --- a/apps/files_encryption/settings-personal.php +++ b/apps/files_encryption/settings-personal.php @@ -1,29 +1,19 @@ <?php
/**
- * Copyright (c) 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ * Copyright (c) 2013 Sam Tuke <samtuke@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
-$sysEncMode = \OC_Appconfig::getValue('files_encryption', 'mode', 'none');
+$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
-if ($sysEncMode == 'user') {
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
- $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
+$tmpl->assign( 'blacklist', $blackList );
- $query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
- $result = $query->execute(array(\OCP\User::getUser()));
-
- if ($row = $result->fetchRow()){
- $mode = $row['mode'];
- } else {
- $mode = 'none';
- }
-
- OCP\Util::addscript('files_encryption','settings-personal');
- $tmpl->assign('encryption_mode', $mode);
- return $tmpl->fetchPage();
-}
+OCP\Util::addscript('files_encryption','settings-personal');
+
+return $tmpl->fetchPage();
return null;
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php index ad34a0d78b9..5931a4cdeb0 100644 --- a/apps/files_encryption/templates/settings-personal.php +++ b/apps/files_encryption/templates/settings-personal.php @@ -1,34 +1,20 @@ <form id="encryption">
<fieldset class="personalblock">
- <strong><?php echo $l->t( 'Choose encryption mode:' ); ?></strong>
+ <legend>
+ <?php echo $l->t( 'Encryption' ); ?>
+ </legend>
<p>
- <input
- type="hidden"
- name="prev_encryption_mode"
- id="prev_encryption_mode"
- value="<?php echo $_['encryption_mode']; ?>"
- >
-
- <input
- type="radio"
- name="encryption_mode"
- value="server"
- id='server_encryption'
- style="width:20px;" <?php if ( $_['encryption_mode'] == 'server' ) echo "checked='checked'" ?>
- />
- <?php echo $l->t( 'Server side encryption (allows you to access your files from the web interface)' ); ?>
- <br />
-
- <input
- type="radio"
- name="encryption_mode"
- value="none"
- id='none_encryption'
- style="width:20px;"
- <?php if ( $_['encryption_mode'] == 'none' ) echo "checked='checked'" ?>
- />
- <?php echo $l->t( 'None (no encryption at all)' ); ?>
- <br/>
+ <?php echo $l->t( 'File encryption is enabled.' ); ?>
</p>
+ <?php if ( ! empty( $_["blacklist"] ) ): ?>
+ <p>The following file types will not be encrypted:</p>
+ <ul>
+ <?php foreach( $_["blacklist"] as $type ): ?>
+ <li>
+ <?php echo $type; ?>
+ </li>
+ <?php endforeach; ?>
+ </p>
+ <?php endif; ?>
</fieldset>
</form>
|