Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v14.0.0beta1
@@ -25,7 +25,7 @@ | |||
$config = \OC::$server->getConfig(); | |||
$state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet'); | |||
if($state === 'doSet') { | |||
OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); | |||
\OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false); | |||
} | |||
$helper = new \OCA\User_LDAP\Helper($config); |
@@ -372,7 +372,7 @@ class Configuration { | |||
if(is_null($defaults)) { | |||
$defaults = $this->getDefaults(); | |||
} | |||
return \OCP\Config::getAppValue('user_ldap', | |||
return \OC::$server->getConfig()->getAppValue('user_ldap', | |||
$this->configPrefix.$varName, | |||
$defaults[$varName]); | |||
} |
@@ -85,7 +85,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { | |||
*/ | |||
static private function getRefreshInterval() { | |||
//defaults to every hour | |||
return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600); | |||
return \OC::$server->getConfig()->getAppValue('user_ldap', 'bgjRefreshInterval', 3600); | |||
} | |||
/** |
@@ -38,7 +38,6 @@ class DeprecationCheck extends AbstractCheck implements ICheck { | |||
return [ | |||
'OC_JSON' => '8.2.0', | |||
'OCP\Config' => '8.0.0', | |||
'OCP\Contacts' => '8.1.0', | |||
'OCP\DB' => '8.1.0', | |||
'OCP\IHelper' => '8.1.0', |
@@ -36,7 +36,6 @@ namespace OC\Files\Cache; | |||
use OC\Files\Filesystem; | |||
use OC\Hooks\BasicEmitter; | |||
use OCP\Config; | |||
use OCP\Files\Cache\IScanner; | |||
use OCP\Files\ForbiddenException; | |||
use OCP\Lock\ILockingProvider; |
@@ -763,7 +763,7 @@ class Share extends Constants { | |||
// initialize max date with share time | |||
$maxDate = new \DateTime(); | |||
$maxDate->setTimestamp($shareTime); | |||
$maxDays = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); | |||
$maxDays = \OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7'); | |||
$maxDate->add(new \DateInterval('P' . $maxDays . 'D')); | |||
if ($date > $maxDate) { | |||
$warning = 'Cannot set expiration date. Shares cannot expire later than ' . $maxDays . ' after they have been shared'; | |||
@@ -2152,7 +2152,7 @@ class Share extends Constants { | |||
* @return bool | |||
*/ | |||
public static function isDefaultExpireDateEnabled() { | |||
$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no'); | |||
$defaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no'); | |||
return ($defaultExpireDateEnabled === "yes") ? true : false; | |||
} | |||
@@ -2160,7 +2160,7 @@ class Share extends Constants { | |||
* @return bool | |||
*/ | |||
public static function enforceDefaultExpireDate() { | |||
$enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no'); | |||
$enforceDefaultExpireDate = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no'); | |||
return ($enforceDefaultExpireDate === "yes") ? true : false; | |||
} | |||
@@ -2168,7 +2168,7 @@ class Share extends Constants { | |||
* @return int | |||
*/ | |||
public static function getExpireInterval() { | |||
return (int)\OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); | |||
return (int)\OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7'); | |||
} | |||
/** |
@@ -341,10 +341,10 @@ class OC_Util { | |||
* @suppress PhanDeprecatedFunction | |||
*/ | |||
public static function isDefaultExpireDateEnforced() { | |||
$isDefaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no'); | |||
$isDefaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no'); | |||
$enforceDefaultExpireDate = false; | |||
if ($isDefaultExpireDateEnabled === 'yes') { | |||
$value = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no'); | |||
$value = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no'); | |||
$enforceDefaultExpireDate = ($value === 'yes') ? true : false; | |||
} | |||
@@ -1,164 +0,0 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||
* | |||
* @author Bart Visscher <bartv@thisnet.nl> | |||
* @author Frank Karlitschek <frank@karlitschek.de> | |||
* @author Georg Ehrke <oc.list@georgehrke.com> | |||
* @author Jörn Friedrich Dreyer <jfd@butonic.de> | |||
* @author Lukas Reschke <lukas@statuscode.ch> | |||
* @author Morris Jobke <hey@morrisjobke.de> | |||
* @author Robin Appelman <robin@icewind.nl> | |||
* @author Thomas Müller <thomas.mueller@tmit.eu> | |||
* | |||
* @license AGPL-3.0 | |||
* | |||
* This code is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License, version 3, | |||
* as published by the Free Software Foundation. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License, version 3, | |||
* along with this program. If not, see <http://www.gnu.org/licenses/> | |||
* | |||
*/ | |||
/** | |||
* Public interface of ownCloud for apps to use. | |||
* Config Class | |||
* | |||
*/ | |||
/** | |||
* Use OCP namespace for all classes that are considered public. | |||
* | |||
* Classes that use this namespace are for use by apps, and not for use by internal | |||
* OC classes | |||
*/ | |||
namespace OCP; | |||
/** | |||
* This class provides functions to read and write configuration data. | |||
* configuration can be on a system, application or user level | |||
* @deprecated 8.0.0 use methods of \OCP\IConfig | |||
*/ | |||
class Config { | |||
/** | |||
* Gets a value from config.php | |||
* @param string $key key | |||
* @param mixed $default = null default value | |||
* @return mixed the value or $default | |||
* @deprecated 8.0.0 use method getSystemValue of \OCP\IConfig | |||
* | |||
* This function gets the value from config.php. If it does not exist, | |||
* $default will be returned. | |||
*/ | |||
public static function getSystemValue( $key, $default = null ) { | |||
return \OC::$server->getConfig()->getSystemValue( $key, $default ); | |||
} | |||
/** | |||
* Sets a value | |||
* @param string $key key | |||
* @param mixed $value value | |||
* @return bool | |||
* @deprecated 8.0.0 use method setSystemValue of \OCP\IConfig | |||
* | |||
* This function sets the value and writes the config.php. If the file can | |||
* not be written, false will be returned. | |||
*/ | |||
public static function setSystemValue( $key, $value ) { | |||
try { | |||
\OC::$server->getConfig()->setSystemValue( $key, $value ); | |||
} catch (\Exception $e) { | |||
return false; | |||
} | |||
return true; | |||
} | |||
/** | |||
* Deletes a value from config.php | |||
* @param string $key key | |||
* @deprecated 8.0.0 use method deleteSystemValue of \OCP\IConfig | |||
* | |||
* This function deletes the value from config.php. | |||
*/ | |||
public static function deleteSystemValue( $key ) { | |||
\OC::$server->getConfig()->deleteSystemValue( $key ); | |||
} | |||
/** | |||
* Gets the config value | |||
* @param string $app app | |||
* @param string $key key | |||
* @param string $default = null, default value if the key does not exist | |||
* @return string the value or $default | |||
* @deprecated 8.0.0 use method getAppValue of \OCP\IConfig | |||
* | |||
* This function gets a value from the appconfig table. If the key does | |||
* not exist the default value will be returned | |||
*/ | |||
public static function getAppValue( $app, $key, $default = null ) { | |||
return \OC::$server->getConfig()->getAppValue( $app, $key, $default ); | |||
} | |||
/** | |||
* Sets a value in the appconfig | |||
* @param string $app app | |||
* @param string $key key | |||
* @param string $value value | |||
* @return boolean true/false | |||
* @deprecated 8.0.0 use method setAppValue of \OCP\IConfig | |||
* | |||
* Sets a value. If the key did not exist before it will be created. | |||
*/ | |||
public static function setAppValue( $app, $key, $value ) { | |||
try { | |||
\OC::$server->getConfig()->setAppValue( $app, $key, $value ); | |||
} catch (\Exception $e) { | |||
return false; | |||
} | |||
return true; | |||
} | |||
/** | |||
* Gets the preference | |||
* @param string $user user | |||
* @param string $app app | |||
* @param string $key key | |||
* @param string $default = null, default value if the key does not exist | |||
* @return string the value or $default | |||
* @deprecated 8.0.0 use method getUserValue of \OCP\IConfig | |||
* | |||
* This function gets a value from the preferences table. If the key does | |||
* not exist the default value will be returned | |||
*/ | |||
public static function getUserValue( $user, $app, $key, $default = null ) { | |||
return \OC::$server->getConfig()->getUserValue( $user, $app, $key, $default ); | |||
} | |||
/** | |||
* Sets a value in the preferences | |||
* @param string $user user | |||
* @param string $app app | |||
* @param string $key key | |||
* @param string $value value | |||
* @return bool | |||
* @deprecated 8.0.0 use method setUserValue of \OCP\IConfig | |||
* | |||
* Adds a value to the preferences. If the key did not exist before, it | |||
* will be added automagically. | |||
*/ | |||
public static function setUserValue( $user, $app, $key, $value ) { | |||
try { | |||
\OC::$server->getConfig()->setUserValue( $user, $app, $key, $value ); | |||
} catch (\Exception $e) { | |||
return false; | |||
} | |||
return true; | |||
} | |||
} |
@@ -1,38 +0,0 @@ | |||
<?php | |||
/** | |||
* ownCloud | |||
* | |||
* @author Thomas Müller | |||
* @copyright 2014 Thomas Müller thomas.mueller@tmit.eu | |||
* | |||
* This library is free software; you can redistribute it and/or | |||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE | |||
* License as published by the Free Software Foundation; either | |||
* version 3 of the License, or any later version. | |||
* | |||
* This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public | |||
* License along with this library. If not, see <http://www.gnu.org/licenses/>. | |||
*/ | |||
namespace Test\PublicNamespace; | |||
class OCPConfigTest extends \Test\TestCase { | |||
public function testSetAppValueIfSetToNull() { | |||
$key = $this->getUniqueID('key-'); | |||
$result = \OCP\Config::setAppValue('unit-test', $key, null); | |||
$this->assertTrue($result); | |||
$result = \OCP\Config::setAppValue('unit-test', $key, '12'); | |||
$this->assertTrue($result); | |||
} | |||
} |
@@ -304,12 +304,12 @@ class UtilTest extends \Test\TestCase { | |||
// need to set a user id to make sure enabled apps are read from cache | |||
\OC_User::setUserId($this->getUniqueID()); | |||
\OCP\Config::setSystemValue('defaultapp', $defaultAppConfig); | |||
\OC::$server->getConfig()->setSystemValue('defaultapp', $defaultAppConfig); | |||
$this->assertEquals('http://localhost/' . $expectedPath, Dummy_OC_Util::getDefaultPageUrl()); | |||
// restore old state | |||
\OC::$WEBROOT = $oldWebRoot; | |||
\OCP\Config::setSystemValue('defaultapp', $oldDefaultApps); | |||
\OC::$server->getConfig()->setSystemValue('defaultapp', $oldDefaultApps); | |||
\OC_User::setUserId(null); | |||
} | |||