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

Merge pull request #5905 from nextcloud/ocp-config 

Use IConfig instead of static OCP\Config
This commit is contained in:
Morris Jobke 2017-07-31 10:54:40 +02:00 committed by GitHub
parent 3c4ac6060a c27498db71
commit 7b2c08a31a
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_versions/lib/Storage.php
View File

@ -161,7 +161,7 @@ class Storage {
* store a new version of a file. * store a new version of a file.
*/ */
public static function store($filename) { public static function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { if(\OC::$server->getConfig()->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
// if the file gets streamed we need to remove the .part extension // if the file gets streamed we need to remove the .part extension
// to get the right target // to get the right target
@ -320,7 +320,7 @@ class Storage {
*/ */
public static function rollback($file, $revision) { public static function rollback($file, $revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { if(\OC::$server->getConfig()->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
// add expected leading slash // add expected leading slash
$file = '/' . ltrim($file, '/'); $file = '/' . ltrim($file, '/');
list($uid, $filename) = self::getUidAndFilename($file); list($uid, $filename) = self::getUidAndFilename($file);

5
apps/user_ldap/appinfo/install.php
View File

@ -21,10 +21,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
*/ */
$state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); $config = \OC::$server->getConfig();
$state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet');
if($state === 'doSet') { if($state === 'doSet') {
OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
} }
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); $helper = new \OCA\User_LDAP\Helper($config);
$helper->setLDAPProvider(); $helper->setLDAPProvider();

2
apps/user_ldap/lib/Configuration.php
View File

@ -349,7 +349,7 @@ class Configuration {
*/ */
protected function getSystemValue($varName) { protected function getSystemValue($varName) {
//FIXME: if another system value is added, softcode the default value //FIXME: if another system value is added, softcode the default value
return \OCP\Config::getSystemValue($varName, false); return \OC::$server->getConfig()->getSystemValue($varName, false);
} }
/** /**

2
lib/private/Files/Cache/Scanner.php
View File

@ -88,7 +88,7 @@ class Scanner extends BasicEmitter implements IScanner {
$this->storage = $storage; $this->storage = $storage;
$this->storageId = $this->storage->getId(); $this->storageId = $this->storage->getId();
$this->cache = $storage->getCache(); $this->cache = $storage->getCache();
$this->cacheActive = !Config::getSystemValue('filesystem_cache_readonly', false); $this->cacheActive = !\OC::$server->getConfig()->getSystemValue('filesystem_cache_readonly', false);
$this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingProvider = \OC::$server->getLockingProvider();
} }

2
lib/private/Preview/Office.php
View File

@ -42,7 +42,7 @@ abstract class Office extends Provider {
$tmpDir = \OC::$server->getTempManager()->getTempBaseDir(); $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir '; $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters); $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath); $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);

5
lib/private/legacy/util.php
View File

@ -1081,7 +1081,8 @@ class OC_Util {
$location = $urlGenerator->getAbsoluteURL($defaultPage); $location = $urlGenerator->getAbsoluteURL($defaultPage);
} else { } else {
$appId = 'files'; $appId = 'files';
$defaultApps = explode(',', \OCP\Config::getSystemValue('defaultapp', 'files')); $config = \OC::$server->getConfig();
$defaultApps = explode(',', $config->getSystemValue('defaultapp', 'files'));
// find the first app that is enabled for the current user // find the first app that is enabled for the current user
foreach ($defaultApps as $defaultApp) { foreach ($defaultApps as $defaultApp) {
$defaultApp = OC_App::cleanAppId(strip_tags($defaultApp)); $defaultApp = OC_App::cleanAppId(strip_tags($defaultApp));
@ -1091,7 +1092,7 @@ class OC_Util {
} }
} }
if(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') { if($config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') {
$location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/'); $location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
} else { } else {
$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/'); $location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');

2
tests/lib/UtilTest.php
View File

@ -305,7 +305,7 @@ class UtilTest extends \Test\TestCase {
* @group DB * @group DB
*/ */
function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) { function testDefaultApps($defaultAppConfig, $expectedPath, $enabledApps) {
$oldDefaultApps = \OCP\Config::getSystemValue('defaultapp', ''); $oldDefaultApps = \OC::$server->getConfig()->getSystemValue('defaultapp', '');
// CLI is doing messy stuff with the webroot, so need to work it around // CLI is doing messy stuff with the webroot, so need to work it around
$oldWebRoot = \OC::$WEBROOT; $oldWebRoot = \OC::$WEBROOT;
\OC::$WEBROOT = ''; \OC::$WEBROOT = '';