mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move some deprecated usage of OC_Config and OC_AppConfig to \OC::server

This commit is contained in:
Thomas Müller 2014-10-17 12:08:31 +02:00
parent 6af0e76a03
commit d9907b6fa3
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/ajax/list.php
View File

@ -76,7 +76,7 @@ $data['dirToken'] = $linkItem['token'];
$permissions = $linkItem['permissions']; $permissions = $linkItem['permissions'];
// if globally disabled // if globally disabled
if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') { if (\OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
// only allow reading // only allow reading
$permissions = \OCP\PERMISSION_READ; $permissions = \OCP\PERMISSION_READ;
} }

22
apps/files_sharing/tests/api.php
View File

@ -180,7 +180,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
// sharing file to a user should work if shareapi_exclude_groups is set // sharing file to a user should work if shareapi_exclude_groups is set
// to no // to no
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
$_POST['path'] = $this->filename; $_POST['path'] = $this->filename;
$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER; $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
@ -204,8 +204,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result); $this->assertTrue($result);
// exclude groups, but not the group the user belongs to. Sharing should still work // exclude groups, but not the group the user belongs to. Sharing should still work
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'yes');
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
$_POST['path'] = $this->filename; $_POST['path'] = $this->filename;
$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
@ -230,7 +230,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result); $this->assertTrue($result);
// now we exclude the group the user belongs to ('group'), sharing should fail now // now we exclude the group the user belongs to ('group'), sharing should fail now
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
$_POST['path'] = $this->filename; $_POST['path'] = $this->filename;
$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2; $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
@ -241,8 +241,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertFalse($result->succeeded()); $this->assertFalse($result->succeeded());
// cleanup // cleanup
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', ''); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', '');
} }
@ -1209,9 +1209,9 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
public function testDefaultExpireDate() { public function testDefaultExpireDate() {
\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1); \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'yes');
\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'yes');
\OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '2');
// default expire date is set to 2 days // default expire date is set to 2 days
// the time when the share was created is set to 3 days in the past // the time when the share was created is set to 3 days in the past
@ -1255,8 +1255,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
//cleanup //cleanup
$result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); $result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
$this->assertTrue($result); $this->assertTrue($result);
\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'no');
\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no'); \OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'no');
} }
} }

15
core/ajax/appconfig.php
View File

@ -24,27 +24,28 @@ if($app === 'core' && isset($_POST['key']) &&(substr($_POST['key'],0,7) === 'rem
} }
$result=false; $result=false;
$appConfig = \OC::$server->getAppConfig();
switch($action) { switch($action) {
case 'getValue': case 'getValue':
$result=OC_Appconfig::getValue($app, $_GET['key'], $_GET['defaultValue']); $result=$appConfig->getValue($app, $_GET['key'], $_GET['defaultValue']);
break; break;
case 'setValue': case 'setValue':
$result=OC_Appconfig::setValue($app, $_POST['key'], $_POST['value']); $result=$appConfig->setValue($app, $_POST['key'], $_POST['value']);
break; break;
case 'getApps': case 'getApps':
$result=OC_Appconfig::getApps(); $result=$appConfig->getApps();
break; break;
case 'getKeys': case 'getKeys':
$result=OC_Appconfig::getKeys($app); $result=$appConfig->getKeys($app);
break; break;
case 'hasKey': case 'hasKey':
$result=OC_Appconfig::hasKey($app, $_GET['key']); $result=$appConfig->hasKey($app, $_GET['key']);
break; break;
case 'deleteKey': case 'deleteKey':
$result=OC_Appconfig::deleteKey($app, $_POST['key']); $result=$appConfig->deleteKey($app, $_POST['key']);
break; break;
case 'deleteApp': case 'deleteApp':
$result=OC_Appconfig::deleteApp($app); $result=$appConfig->deleteApp($app);
break; break;
} }
OC_JSON::success(array('data'=>$result)); OC_JSON::success(array('data'=>$result));

6
cron.php
View File

@ -132,9 +132,9 @@ try {
// done! // done!
TemporaryCronClass::$sent = true; TemporaryCronClass::$sent = true;
// Log the successfull cron exec // Log the successful cron execution
if (OC_Config::getValue('cron_log', true)) { if (\OC::$server->getConfig()->getSystemValue('cron_log', true)) {
OC_Appconfig::setValue('core', 'lastcron', time()); \OC::$server->getAppConfig()->setValue('core', 'lastcron', time());
} }
exit(); exit();

2
lib/base.php
View File

@ -573,7 +573,7 @@ class OC {
register_shutdown_function(array('OC_Helper', 'cleanTmp')); register_shutdown_function(array('OC_Helper', 'cleanTmp'));
if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) { if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { if (\OC::$server->getAppConfig()->getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
OC_Util::addScript('backgroundjobs'); OC_Util::addScript('backgroundjobs');
} }
} }