diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-24 20:54:13 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-24 20:54:13 +0200 |
| commit | 946e9ccc0ade60bb9ff34ace9e94e85cce6af96c (patch) | |
| tree | 4770fb73b25d6eb50caa2149df8fb06dd8928a45 /apps/files_encryption/settings.php | |
| parent | 5076c0d392f6eb17e368a9382cf5b0abe7408889 (diff) | |
| parent | ae9adcaf8cc1f2b279494cfdd30a1d62d41f5060 (diff) | |
| download | nextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.tar.gz nextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.zip | |
Merge branch 'master' into fix_for_2377
Diffstat (limited to 'apps/files_encryption/settings.php')
| -rw-r--r-- | apps/files_encryption/settings.php | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php deleted file mode 100644 index d1260f44e9f..00000000000 --- a/apps/files_encryption/settings.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -\OC_Util::checkAdminUser(); - -$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' ) ); - -$tmpl->assign( 'blacklist', $blackList ); -$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) ); - -\OCP\Util::addscript( 'files_encryption', 'settings' ); -\OCP\Util::addscript( 'core', 'multiselect' ); - -return $tmpl->fetchPage(); |