From: Roland Mas <lolando@debian.org>
Date: Mon, 15 Mar 2010 13:03:01 +0000 (+0000)
Subject: Implemented a sample fusionforge.ini file with a real function to read it
X-Git-Tag: v5.1~2894
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=b3d8993617953395a358f4f975258b5d42cb4a1f

Implemented a sample fusionforge.ini file with a real function to read it
---

diff --git a/.gitattributes b/.gitattributes
index 8917ec6730..8b80831482 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -129,6 +129,7 @@ gforge/docs/docbook/docbook/entities/xinclude.ent -text svneol=unset#application
 gforge/docs/docbook/docbook/user_guide/project_functions/activity.xml -text
 gforge/docs/images/sflogo2-105a.png -text
 gforge/docs/phpdoc/phpDocumentor.ini.patch -text
+gforge/etc/fusionforge.ini -text
 gforge/etc/httpd.d/01common.ssl -text
 gforge/etc/httpd.d/060maindirhttp.vhost -text
 gforge/etc/httpd.d/06zmaindirhttp.vhost -text
diff --git a/gforge/common/include/config.php b/gforge/common/include/config.php
index e3f1b22239..d928a2adbf 100644
--- a/gforge/common/include/config.php
+++ b/gforge/common/include/config.php
@@ -49,22 +49,17 @@ function fusionforge_define_config_item ($section, $var, $default) {
 	}
 }
 
-function read_config_file ($file) {
+function fusionforge_read_config_file ($file) {
 	global $fusionforge_config ;
 
-	// Initial implementation reuses values from local.inc:
-	$fusionforge_config['core']['forge_name'] = fusionforge_get_config ('core', 'forge_name') ;
-	return ;
-
-	// Real implementation should read *.ini files
-	/* Pseudo-code:
-	 $sections = ini_parse ($file) ;
-	 foreach ($sections as $sectname => $options) {
+	$sections = parse_ini_file ($file, true) ;
+	foreach ($sections as $sectname => $options) {
 	 	foreach ($options as $key => $value) {
 			$fusionforge_config[$sectname][$key] = $value ;
 	 	}
-	 }
-	*/
+	}
+
+	return ;
 }
 
 // Local Variables:
diff --git a/gforge/etc/fusionforge.ini b/gforge/etc/fusionforge.ini
new file mode 100644
index 0000000000..3d3b75448a
--- /dev/null
+++ b/gforge/etc/fusionforge.ini
@@ -0,0 +1,3 @@
+[core]
+forge_name = FusionForge
+user_registration_required = false
diff --git a/gforge/packaging/install/common b/gforge/packaging/install/common
index ddc3180523..f2c9fd5748 100644
--- a/gforge/packaging/install/common
+++ b/gforge/packaging/install/common
@@ -1,3 +1,4 @@
+etc/fusionforge.ini                    etc/fusionforge/
 etc/httpd.d/[0-1,6-9][0-9]*            usr/share/gforge/etc/httpd.d/
 etc/httpd.d/httpd*                     usr/share/gforge/etc/httpd.d/
 etc/local.d/[0-9][0-9]*                usr/share/gforge/etc/local.d/
diff --git a/gforge/www/include/pre.php b/gforge/www/include/pre.php
index 40bdb45946..2d3309fba0 100644
--- a/gforge/www/include/pre.php
+++ b/gforge/www/include/pre.php
@@ -35,7 +35,7 @@ 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']) ;
-read_config ($gfconfig.'/fusionforge.ini') ;
+fusionforge_read_config_file ($gfconfig.'/fusionforge.ini') ;
 
 // get constants used for flags or status
 require $gfcommon.'include/constants.php';