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

Revert "Can't determine if debug mode is defined until we read the config" 

This reverts commit 969e43c87b.
This commit is contained in:
Bart Visscher 2013-06-27 22:24:17 +02:00
parent ae2b3732de
commit 194b61b4c5
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/config.php
View File

@ -47,8 +47,11 @@ class Config {
protected $configDir;
protected $configFilename;
public function __construct($configDir) {
protected $debugMode;
public function __construct($configDir, $debugMode) {
$this->configDir = $configDir;
$this->debugMode = $debugMode;
$this->configFilename = $this->configDir.'config.php';
$this->readData();
}
@ -149,7 +152,7 @@ class Config {
private function writeData() {
// Create a php file ...
$content = "<?php\n";
if (defined('DEBUG') && DEBUG) {
if ($this->debugMode) {
$content .= "define('DEBUG',true);\n";
}
$content .= '$CONFIG = ';
@ -164,7 +167,7 @@ class Config {
'You can usually fix this by giving the webserver user write access'
.' to the config directory in ownCloud');
}
// Prevent others from reading the config
// Prevent others not to read the config
@chmod($this->configFilename, 0640);
\OC_Util::clearOpcodeCache();
}

2
lib/legacy/config.php
View File

@ -38,7 +38,7 @@
* This class is responsible for reading and writing config.php, the very basic
* configuration file of ownCloud.
*/
OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/');
OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/', defined('DEBUG') && DEBUG);
class OC_Config {
public static $object;

18
tests/lib/config.php
View File

@ -13,25 +13,25 @@ class Test_Config extends PHPUnit_Framework_TestCase {
public function testReadData()
{
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$this->assertAttributeEquals(array(), 'cache', $config);
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$this->assertAttributeEquals(array('foo'=>'bar'), 'cache', $config);
}
public function testGetKeys()
{
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$this->assertEquals(array('foo'), $config->getKeys());
}
public function testGetValue()
{
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$this->assertEquals('bar', $config->getValue('foo'));
$this->assertEquals(null, $config->getValue('bar'));
$this->assertEquals('moo', $config->getValue('bar', 'moo'));
@ -40,7 +40,7 @@ class Test_Config extends PHPUnit_Framework_TestCase {
public function testSetValue()
{
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$config->setValue('foo', 'moo');
$this->assertAttributeEquals(array('foo'=>'moo'), 'cache', $config);
$content = file_get_contents(self::CONFIG_FILE);
@ -69,7 +69,7 @@ EOL
public function testDeleteKey()
{
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, false);
$config->deleteKey('foo');
$this->assertAttributeEquals(array(), 'cache', $config);
$content = file_get_contents(self::CONFIG_FILE);
@ -84,11 +84,11 @@ EOL
public function testSavingDebugMode()
{
define('DEBUG',true);
file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
$config = new OC\Config(self::CONFIG_DIR);
$config = new OC\Config(self::CONFIG_DIR, true);
$config->deleteKey('foo'); // change something so we save to the config file
$this->assertAttributeEquals(array(), 'cache', $config);
$this->assertAttributeEquals(true, 'debug_mode', $config);
$content = file_get_contents(self::CONFIG_FILE);
$this->assertEquals(<<<EOL
<?php
@ -102,7 +102,7 @@ EOL
public function testWriteData()
{
$config = new OC\Config('/non-writable');
$config = new OC\Config('/non-writable', false);
try {
$config->setValue('foo', 'bar');
} catch (\OC\HintException $e) {