From: Roland Mas Date: Mon, 15 Mar 2010 13:10:07 +0000 (+0000) Subject: Three more s/fusionforge/forge/ renamings of config-related functions X-Git-Tag: v5.1~2877 X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=1e1cd76ddc92b0a1cce95e60addd21b8bd3b698a Three more s/fusionforge/forge/ renamings of config-related functions --- diff --git a/gforge/common/include/config.php b/gforge/common/include/config.php index ce815c908e..120e3c26bd 100644 --- a/gforge/common/include/config.php +++ b/gforge/common/include/config.php @@ -102,7 +102,7 @@ function forge_get_config_array () { return $ret ; } -function fusionforge_set_vars_from_config () { +function forge_set_vars_from_config () { $c = FusionForgeConfig::get_instance () ; foreach (func_get_args() as $item) { @@ -125,13 +125,13 @@ function fusionforge_set_vars_from_config () { } -function fusionforge_define_config_item ($var, $section, $default) { +function forge_define_config_item ($var, $section, $default) { $c = FusionForgeConfig::get_instance () ; return $c->set_value ($section, $var, $default) ; } -function fusionforge_read_config_file ($file) { +function forge_read_config_file ($file) { $c = FusionForgeConfig::get_instance () ; return $c->read_config_file ($file) ; diff --git a/gforge/www/include/pre.php b/gforge/www/include/pre.php index 1c0941da61..4278a12e74 100644 --- a/gforge/www/include/pre.php +++ b/gforge/www/include/pre.php @@ -34,15 +34,15 @@ if (!isset($no_gz_buffer) || !$no_gz_buffer) { require $gfcgfile; require $gfcommon.'include/config.php'; -fusionforge_define_config_item ('core', 'forge_name', $GLOBALS['sys_name']) ; -fusionforge_define_config_item ('core', 'user_registration_restricted', $GLOBALS['sys_user_reg_restricted']) ; +forge_define_config_item ('core', 'forge_name', $GLOBALS['sys_name']) ; +forge_define_config_item ('core', 'user_registration_restricted', $GLOBALS['sys_user_reg_restricted']) ; /* Long-term: require_once $gfcommon.'include/FusionForge.class.php'; $forge = new FusionForge() ; - fusionforge_define_config_item ('core', 'forge_name', $forge->software_name) ; - fusionforge_define_config_item ('core', 'user_registration_restricted', false) ; + forge_define_config_item ('core', 'forge_name', $forge->software_name) ; + forge_define_config_item ('core', 'user_registration_restricted', false) ; */ -fusionforge_read_config_file ($gfconfig.'/config.ini') ; +forge_read_config_file ($gfconfig.'/config.ini') ; // get constants used for flags or status require $gfcommon.'include/constants.php'; diff --git a/tests/unit/config/ConfigTests.php b/tests/unit/config/ConfigTests.php index 8286c58bcb..0f2b101219 100644 --- a/tests/unit/config/ConfigTests.php +++ b/tests/unit/config/ConfigTests.php @@ -18,14 +18,14 @@ class Config_Tests extends PHPUnit_Framework_TestCase */ public function testBasicConfig() { - fusionforge_define_config_item ('forge_name', 'core', 'default') ; - fusionforge_define_config_item ('user_registration_restricted', 'core', true) ; + forge_define_config_item ('forge_name', 'core', 'default') ; + forge_define_config_item ('user_registration_restricted', 'core', true) ; $this->assertEquals('default', forge_get_config ('forge_name')); $this->assertEquals('default', forge_get_config ('forge_name', 'core')); $this->assertTrue(forge_get_config ('user_registration_restricted')); - fusionforge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/config.ini') ; + forge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/config.ini') ; $this->assertEquals('FusionForge', forge_get_config ('forge_name')); $this->assertEquals('FusionForge', forge_get_config ('forge_name', 'core')); @@ -35,7 +35,7 @@ class Config_Tests extends PHPUnit_Framework_TestCase $this->assertEquals('FusionForge', $arr[0]); $this->assertFalse(!!$arr[1]); - fusionforge_set_vars_from_config ('forge_name', array ('user_registration_restricted', 'core')) ; + forge_set_vars_from_config ('forge_name', array ('user_registration_restricted', 'core')) ; global $forge_name, $core__user_registration_restricted ; $this->assertEquals('FusionForge', $forge_name); $this->assertFalse(!!$core__user_registration_restricted); @@ -48,13 +48,13 @@ class Config_Tests extends PHPUnit_Framework_TestCase public function testMockConfig() { MockConfig::insinuate () ; - fusionforge_define_config_item ('forge_name', 'core', 'default') ; + forge_define_config_item ('forge_name', 'core', 'default') ; $this->assertEquals('core/forge_name', forge_get_config ('forge_name')); $this->assertEquals('core/forge_name', forge_get_config ('forge_name', 'core')); MockConfig::cleanup () ; - fusionforge_define_config_item ('forge_name', 'core', 'default') ; + forge_define_config_item ('forge_name', 'core', 'default') ; $this->assertEquals('default', forge_get_config ('forge_name')); }