open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11630 from owncloud/kill-some-legacy

Browse Source 
remove legacy class OC_Updater
remotes/origin/fix-10825
Lukas Reschke 12 years ago
parent 3e499d1ac4 d9907b6fa3
commit cb36666600
8 changed files with 30 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      apps/files_sharing/ajax/list.php
  2. 22
      apps/files_sharing/tests/api.php
  3. 15
      core/ajax/appconfig.php
  4. 6
      cron.php
  5. 2
      lib/base.php
  6. 19
      lib/private/legacy/updater.php
  7. 2
      lib/private/templatelayout.php
  8. 6
      lib/private/updater.php

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

@ -76,7 +76,7 @@ $data['dirToken'] = $linkItem['token'];
$permissions = $linkItem['permissions'];
// 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
$permissions = \OCP\PERMISSION_READ;
}

22
apps/files_sharing/tests/api.php
Unescape 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
// to no
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
$_POST['path'] = $this->filename;
$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
@ -204,8 +204,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result);
// exclude groups, but not the group the user belongs to. Sharing should still work
\OC_Appconfig::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', 'yes');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
$_POST['path'] = $this->filename;
$_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);
// 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['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());
// cleanup
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
\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() {
\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
\OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'yes');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'yes');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '2');
// default expire date is set to 2 days
// 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
$result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
$this->assertTrue($result);
\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'no');
\OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'no');
}
}

15
core/ajax/appconfig.php
Unescape View File

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

6
cron.php
Unescape View File

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

2
lib/base.php
Unescape View File

@ -573,7 +573,7 @@ class OC {
register_shutdown_function(array('OC_Helper', 'cleanTmp'));
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');
}
}

19
lib/private/legacy/updater.php
Unescape View File

@ -1,19 +0,0 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
/**
* provides an interface to all search providers
*
* @deprecated use \OC\Updater instead
*/
class OC_Updater {
public static function check() {
$updater = new \OC\Updater();
return $updater->check('http://apps.owncloud.com/updater.php');
}
}

2
lib/private/templatelayout.php
Unescape View File

@ -46,7 +46,7 @@ class OC_TemplateLayout extends OC_Template {
if($this->config->getSystemValue('updatechecker', true) === true &&
OC_User::isAdminUser(OC_User::getUser())) {
$updater = new \OC\Updater();
$data = $updater->check('http://apps.owncloud.com/updater.php');
$data = $updater->check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
$this->assign('updateAvailable', true);

6
lib/private/updater.php
Unescape View File

@ -66,13 +66,17 @@ class Updater extends BasicEmitter {
* @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
* @return array|bool
*/
public function check($updaterUrl) {
public function check($updaterUrl = null) {
// Look up the cache - it is invalidated all 30 minutes
if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
}
if (is_null($updaterUrl)) {
$updaterUrl = 'https://apps.owncloud.com/updater.php';
}
\OC_Appconfig::setValue('core', 'lastupdatedat', time());
if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {

Write Preview
Loading…
Cancel
Save