Remove usage of legacy OC_Appconfig
This commit is contained in:
parent
4b84e3a7e8
commit
181bbd4325
|
@ -79,6 +79,8 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne
|
||||||
$needUpgrade = false;
|
$needUpgrade = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$config = \OC::$server->getConfig();
|
||||||
|
|
||||||
// Make breadcrumb
|
// Make breadcrumb
|
||||||
$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
|
$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
|
||||||
|
|
||||||
|
@ -104,7 +106,7 @@ if ($needUpgrade) {
|
||||||
$freeSpace=$storageInfo['free'];
|
$freeSpace=$storageInfo['free'];
|
||||||
$uploadLimit=OCP\Util::uploadLimit();
|
$uploadLimit=OCP\Util::uploadLimit();
|
||||||
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
|
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
|
||||||
$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
|
$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
|
||||||
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
|
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
|
||||||
$encryptionInitStatus = 2;
|
$encryptionInitStatus = 2;
|
||||||
if (OC_App::isEnabled('files_encryption')) {
|
if (OC_App::isEnabled('files_encryption')) {
|
||||||
|
@ -143,8 +145,8 @@ if ($needUpgrade) {
|
||||||
$tmpl->assign('isPublic', false);
|
$tmpl->assign('isPublic', false);
|
||||||
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
|
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
|
||||||
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
|
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
|
||||||
$tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
|
$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
|
||||||
$tmpl->assign("allowShareWithLink", \OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
|
$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
|
||||||
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
|
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
|
||||||
$tmpl->assign('disableSharing', false);
|
$tmpl->assign('disableSharing', false);
|
||||||
$tmpl->assign('ajaxLoad', $ajaxLoad);
|
$tmpl->assign('ajaxLoad', $ajaxLoad);
|
||||||
|
|
|
@ -18,7 +18,7 @@ $l = OC_L10N::get('files_encryption');
|
||||||
$return = false;
|
$return = false;
|
||||||
// Enable recoveryAdmin
|
// Enable recoveryAdmin
|
||||||
|
|
||||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId');
|
||||||
|
|
||||||
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
|
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
|
||||||
|
|
||||||
|
|
|
@ -111,10 +111,11 @@ class Helper {
|
||||||
public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
|
public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
|
||||||
|
|
||||||
$view = new \OC\Files\View('/');
|
$view = new \OC\Files\View('/');
|
||||||
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
|
|
||||||
if ($recoveryKeyId === null) {
|
if ($recoveryKeyId === null) {
|
||||||
$recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
|
$recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
|
||||||
\OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
|
$appConfig->setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$view->is_dir('/owncloud_private_key')) {
|
if (!$view->is_dir('/owncloud_private_key')) {
|
||||||
|
@ -147,7 +148,7 @@ class Helper {
|
||||||
\OC_FileProxy::$enabled = true;
|
\OC_FileProxy::$enabled = true;
|
||||||
|
|
||||||
// Set recoveryAdmin as enabled
|
// Set recoveryAdmin as enabled
|
||||||
\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
|
$appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1);
|
||||||
|
|
||||||
$return = true;
|
$return = true;
|
||||||
|
|
||||||
|
@ -155,7 +156,7 @@ class Helper {
|
||||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
|
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
|
||||||
$return = $util->checkRecoveryPassword($recoveryPassword);
|
$return = $util->checkRecoveryPassword($recoveryPassword);
|
||||||
if ($return) {
|
if ($return) {
|
||||||
\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
|
$appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -218,7 +219,7 @@ class Helper {
|
||||||
|
|
||||||
if ($return) {
|
if ($return) {
|
||||||
// Set recoveryAdmin as disabled
|
// Set recoveryAdmin as disabled
|
||||||
\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
|
\OC::$server->getAppConfig()->setValue('files_encryption', 'recoveryAdminEnabled', 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $return;
|
return $return;
|
||||||
|
|
|
@ -51,11 +51,13 @@ class Session {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
|
|
||||||
|
$publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId');
|
||||||
|
|
||||||
if ($publicShareKeyId === null) {
|
if ($publicShareKeyId === null) {
|
||||||
$publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
|
$publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
|
||||||
\OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
|
$appConfig->setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|
|
@ -63,8 +63,10 @@ class Util {
|
||||||
$this->client = $client;
|
$this->client = $client;
|
||||||
$this->userId = $userId;
|
$this->userId = $userId;
|
||||||
|
|
||||||
$this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
$this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
|
||||||
|
$this->publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId');
|
||||||
|
$this->recoveryKeyId = $appConfig->getValue('files_encryption', 'recoveryKeyId');
|
||||||
|
|
||||||
$this->userDir = '/' . $this->userId;
|
$this->userDir = '/' . $this->userId;
|
||||||
$this->fileFolderName = 'files';
|
$this->fileFolderName = 'files';
|
||||||
|
@ -1113,9 +1115,11 @@ class Util {
|
||||||
*/
|
*/
|
||||||
public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
|
public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
|
||||||
|
|
||||||
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
|
|
||||||
// Check if key recovery is enabled
|
// Check if key recovery is enabled
|
||||||
if (
|
if (
|
||||||
\OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
|
$appConfig->getValue('files_encryption', 'recoveryAdminEnabled')
|
||||||
&& $this->recoveryEnabledForUser()
|
&& $this->recoveryEnabledForUser()
|
||||||
) {
|
) {
|
||||||
$recoveryEnabled = true;
|
$recoveryEnabled = true;
|
||||||
|
@ -1144,7 +1148,7 @@ class Util {
|
||||||
// Admin UID to list of users to share to
|
// Admin UID to list of users to share to
|
||||||
if ($recoveryEnabled) {
|
if ($recoveryEnabled) {
|
||||||
// Find recoveryAdmin user ID
|
// Find recoveryAdmin user ID
|
||||||
$recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
$recoveryKeyId = $appConfig->getValue('files_encryption', 'recoveryKeyId');
|
||||||
// Add recoveryAdmin to list of users sharing
|
// Add recoveryAdmin to list of users sharing
|
||||||
$userIds[] = $recoveryKeyId;
|
$userIds[] = $recoveryKeyId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
$tmpl = new OCP\Template('files_encryption', 'settings-admin');
|
$tmpl = new OCP\Template('files_encryption', 'settings-admin');
|
||||||
|
|
||||||
// Check if an adminRecovery account is enabled for recovering files after lost pwd
|
// Check if an adminRecovery account is enabled for recovering files after lost pwd
|
||||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled', '0');
|
$recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled', '0');
|
||||||
|
|
||||||
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
|
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ $privateKeySet = $session->getPrivateKey() !== false;
|
||||||
// did we tried to initialize the keys for this session?
|
// did we tried to initialize the keys for this session?
|
||||||
$initialized = $session->getInitialized();
|
$initialized = $session->getInitialized();
|
||||||
|
|
||||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
$recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled');
|
||||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||||
|
|
||||||
$result = false;
|
$result = false;
|
||||||
|
|
|
@ -61,7 +61,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
\OC_User::useBackend('database');
|
\OC_User::useBackend('database');
|
||||||
|
|
||||||
// enable resharing
|
// enable resharing
|
||||||
\OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
|
\OC::$server->getAppConfig()->setValue('core', 'shareapi_allow_resharing', 'yes');
|
||||||
|
|
||||||
// clear share hooks
|
// clear share hooks
|
||||||
\OC_Hook::clear('OCP\\Share');
|
\OC_Hook::clear('OCP\\Share');
|
||||||
|
@ -531,7 +531,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
// login as admin
|
// login as admin
|
||||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||||
|
|
||||||
$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
|
$publicShareKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'publicShareKeyId');
|
||||||
|
|
||||||
// check if share key for public exists
|
// check if share key for public exists
|
||||||
$this->assertTrue($this->view->file_exists(
|
$this->assertTrue($this->view->file_exists(
|
||||||
|
@ -662,7 +662,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||||
|
|
||||||
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
||||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId');
|
||||||
|
|
||||||
// login as admin
|
// login as admin
|
||||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
|
||||||
|
@ -755,7 +755,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
$this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
|
$this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
|
||||||
$this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
|
$this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
|
||||||
$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
|
$this->assertEquals(0, \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -769,7 +769,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
$result = \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
$result = \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
||||||
$this->assertTrue($result);
|
$this->assertTrue($result);
|
||||||
|
|
||||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId');
|
||||||
|
|
||||||
// login as user2
|
// login as user2
|
||||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
|
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
|
||||||
|
@ -863,7 +863,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
||||||
$this->assertTrue($util->setRecoveryForUser(0));
|
$this->assertTrue($util->setRecoveryForUser(0));
|
||||||
|
|
||||||
\OCA\Encryption\Helper::adminDisableRecovery('test123');
|
\OCA\Encryption\Helper::adminDisableRecovery('test123');
|
||||||
$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
|
$this->assertEquals(0, \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -524,6 +524,7 @@ class Google extends \OC\Files\Storage\Common {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasUpdated($path, $time) {
|
public function hasUpdated($path, $time) {
|
||||||
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
if ($this->is_file($path)) {
|
if ($this->is_file($path)) {
|
||||||
return parent::hasUpdated($path, $time);
|
return parent::hasUpdated($path, $time);
|
||||||
} else {
|
} else {
|
||||||
|
@ -533,7 +534,7 @@ class Google extends \OC\Files\Storage\Common {
|
||||||
if ($folder) {
|
if ($folder) {
|
||||||
$result = false;
|
$result = false;
|
||||||
$folderId = $folder->getId();
|
$folderId = $folder->getId();
|
||||||
$startChangeId = \OC_Appconfig::getValue('files_external', $this->getId().'cId');
|
$startChangeId = $appConfig->getValue('files_external', $this->getId().'cId');
|
||||||
$params = array(
|
$params = array(
|
||||||
'includeDeleted' => true,
|
'includeDeleted' => true,
|
||||||
'includeSubscribed' => true,
|
'includeSubscribed' => true,
|
||||||
|
@ -578,7 +579,7 @@ class Google extends \OC\Files\Storage\Common {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
\OC_Appconfig::setValue('files_external', $this->getId().'cId', $largestChangeId);
|
$appConfig->setValue('files_external', $this->getId().'cId', $largestChangeId);
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,7 +218,7 @@ class Api {
|
||||||
//allow password protection
|
//allow password protection
|
||||||
$shareWith = isset($_POST['password']) ? $_POST['password'] : null;
|
$shareWith = isset($_POST['password']) ? $_POST['password'] : null;
|
||||||
//check public link share
|
//check public link share
|
||||||
$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
|
$publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes');
|
||||||
if(isset($_POST['publicUpload']) && $publicUploadEnabled !== 'yes') {
|
if(isset($_POST['publicUpload']) && $publicUploadEnabled !== 'yes') {
|
||||||
return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
|
return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
|
||||||
}
|
}
|
||||||
|
@ -317,7 +317,7 @@ class Api {
|
||||||
$shareType = $share['share_type'];
|
$shareType = $share['share_type'];
|
||||||
$permissions = isset($params['_put']['permissions']) ? (int)$params['_put']['permissions'] : null;
|
$permissions = isset($params['_put']['permissions']) ? (int)$params['_put']['permissions'] : null;
|
||||||
|
|
||||||
$publicUploadStatus = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
|
$publicUploadStatus = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes');
|
||||||
$publicUploadEnabled = ($publicUploadStatus === 'yes') ? true : false;
|
$publicUploadEnabled = ($publicUploadStatus === 'yes') ? true : false;
|
||||||
|
|
||||||
|
|
||||||
|
@ -356,7 +356,7 @@ class Api {
|
||||||
*/
|
*/
|
||||||
private static function updatePublicUpload($share, $params) {
|
private static function updatePublicUpload($share, $params) {
|
||||||
|
|
||||||
$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
|
$publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes');
|
||||||
if($publicUploadEnabled !== 'yes') {
|
if($publicUploadEnabled !== 'yes') {
|
||||||
return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
|
return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
// Load other apps for file previews
|
// Load other apps for file previews
|
||||||
OC_App::loadApps();
|
OC_App::loadApps();
|
||||||
|
|
||||||
if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
|
|
||||||
|
if ($appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
|
||||||
header('HTTP/1.0 404 Not Found');
|
header('HTTP/1.0 404 Not Found');
|
||||||
$tmpl = new OCP\Template('', '404', 'guest');
|
$tmpl = new OCP\Template('', '404', 'guest');
|
||||||
$tmpl->printPage();
|
$tmpl->printPage();
|
||||||
|
@ -151,7 +153,7 @@ if (isset($path)) {
|
||||||
$tmpl->assign('dirToken', $linkItem['token']);
|
$tmpl->assign('dirToken', $linkItem['token']);
|
||||||
$tmpl->assign('sharingToken', $token);
|
$tmpl->assign('sharingToken', $token);
|
||||||
$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
|
$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
|
||||||
if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
|
if ($appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
|
||||||
$allowPublicUploadEnabled = false;
|
$allowPublicUploadEnabled = false;
|
||||||
}
|
}
|
||||||
if ($linkItem['item_type'] !== 'folder') {
|
if ($linkItem['item_type'] !== 'folder') {
|
||||||
|
|
|
@ -722,7 +722,7 @@ class Trashbin {
|
||||||
$quota = \OC_Preferences::getValue($user, 'files', 'quota');
|
$quota = \OC_Preferences::getValue($user, 'files', 'quota');
|
||||||
$view = new \OC\Files\View('/' . $user);
|
$view = new \OC\Files\View('/' . $user);
|
||||||
if ($quota === null || $quota === 'default') {
|
if ($quota === null || $quota === 'default') {
|
||||||
$quota = \OC_Appconfig::getValue('files', 'default_quota');
|
$quota = \OC::$server->getAppConfig()->getValue('files', 'default_quota');
|
||||||
}
|
}
|
||||||
if ($quota === null || $quota === 'none') {
|
if ($quota === null || $quota === 'none') {
|
||||||
$quota = \OC\Files\Filesystem::free_space('/');
|
$quota = \OC\Files\Filesystem::free_space('/');
|
||||||
|
|
|
@ -487,7 +487,7 @@ class Storage {
|
||||||
$softQuota = true;
|
$softQuota = true;
|
||||||
$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
|
$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
|
||||||
if ( $quota === null || $quota === 'default') {
|
if ( $quota === null || $quota === 'default') {
|
||||||
$quota = \OC_Appconfig::getValue('files', 'default_quota');
|
$quota = \OC::$server->getAppConfig()->getValue('files', 'default_quota');
|
||||||
}
|
}
|
||||||
if ( $quota === null || $quota === 'none' ) {
|
if ( $quota === null || $quota === 'none' ) {
|
||||||
$quota = \OC\Files\Filesystem::free_space('/');
|
$quota = \OC\Files\Filesystem::free_space('/');
|
||||||
|
|
|
@ -81,13 +81,14 @@ class FileGlobal {
|
||||||
}
|
}
|
||||||
|
|
||||||
static public function gc() {
|
static public function gc() {
|
||||||
$last_run = \OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0);
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
|
$last_run = $appConfig->getValue('core', 'global_cache_gc_lastrun', 0);
|
||||||
$now = time();
|
$now = time();
|
||||||
if (($now - $last_run) < 300) {
|
if (($now - $last_run) < 300) {
|
||||||
// only do cleanup every 5 minutes
|
// only do cleanup every 5 minutes
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
\OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now);
|
$appConfig->setValue('core', 'global_cache_gc_lastrun', $now);
|
||||||
$cache_dir = self::getCacheDir();
|
$cache_dir = self::getCacheDir();
|
||||||
if($cache_dir and is_dir($cache_dir)) {
|
if($cache_dir and is_dir($cache_dir)) {
|
||||||
$dh=opendir($cache_dir);
|
$dh=opendir($cache_dir);
|
||||||
|
|
|
@ -94,10 +94,11 @@ class OC_Setup {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($error) == 0) {
|
if(count($error) == 0) {
|
||||||
OC_Appconfig::setValue('core', 'installedat', microtime(true));
|
$appConfig = \OC::$server->getAppConfig();
|
||||||
OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
|
$appConfig->setValue('core', 'installedat', microtime(true));
|
||||||
OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
|
$appConfig->setValue('core', 'lastupdatedat', microtime(true));
|
||||||
OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
|
$appConfig->setValue('core', 'remote_core.css', '/core/minimizer.php');
|
||||||
|
$appConfig->setValue('core', 'remote_core.js', '/core/minimizer.php');
|
||||||
|
|
||||||
OC_Group::createGroup('admin');
|
OC_Group::createGroup('admin');
|
||||||
OC_Group::addToGroup($username, 'admin');
|
OC_Group::addToGroup($username, 'admin');
|
||||||
|
|
|
@ -91,9 +91,10 @@ class OC_Util {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getUserQuota($user){
|
public static function getUserQuota($user){
|
||||||
$userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default');
|
$config = \OC::$server->getConfig();
|
||||||
|
$userQuota = $config->getUserValue($user, 'files', 'quota', 'default');
|
||||||
if($userQuota === 'default') {
|
if($userQuota === 'default') {
|
||||||
$userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none');
|
$userQuota = $config->getAppValue('files', 'default_quota', 'none');
|
||||||
}
|
}
|
||||||
if($userQuota === 'none') {
|
if($userQuota === 'none') {
|
||||||
return \OC\Files\SPACE_UNLIMITED;
|
return \OC\Files\SPACE_UNLIMITED;
|
||||||
|
|
|
@ -14,7 +14,7 @@ try {
|
||||||
}
|
}
|
||||||
$service=substr($path_info, 1, $pos-1);
|
$service=substr($path_info, 1, $pos-1);
|
||||||
|
|
||||||
$file = OC_AppConfig::getValue('core', 'remote_' . $service);
|
$file = \OC::$server->getAppConfig()->getValue('core', 'remote_' . $service);
|
||||||
|
|
||||||
if(is_null($file)) {
|
if(is_null($file)) {
|
||||||
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
||||||
|
|
Loading…
Reference in New Issue