Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-02 16:11:29 +0400
committerFrank Karlitschek <frank@owncloud.org>2012-05-02 16:11:29 +0400
commitff66600bc060dd2713b88b4af88e5a0a291710e0 (patch)
treec1b796ddf938025ac1cc31d0f8414c55a31840aa /apps/files_encryption
parent8e99475886fa3fc23dd576cce7eaefd532c3fe5c (diff)
port appconfig
Diffstat (limited to 'apps/files_encryption')
-rwxr-xr-xapps/files_encryption/lib/proxy.php4
-rwxr-xr-xapps/files_encryption/settings.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index ba357f23502..06f963fc981 100755
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -36,13 +36,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
*/
private static function shouldEncrypt($path){
if(is_null(self::$enableEncryption)){
- self::$enableEncryption=(OC_Appconfig::getValue('files_encryption','enable_encryption','true')=='true');
+ self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
}
if(!self::$enableEncryption){
return false;
}
if(is_null(self::$blackList)){
- self::$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+ self::$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
}
if(self::isEncrypted($path)){
return true;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index facd6580f00..aed9079529c 100755
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -7,8 +7,8 @@
*/
$tmpl = new OC_Template( 'files_encryption', 'settings');
-$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
-$enabled=(OC_Appconfig::getValue('files_encryption','enable_encryption','true')=='true');
+$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);