[Fusionforge-commits] r9949 - in trunk/gforge: common/include cronjobs debian packaging/dirs packaging/install utils www/docman www/docman/admin www/frs/admin www/include

Roland Mas lolando at libremir.placard.fr.eu.org
Fri May 28 17:59:57 CEST 2010


Author: lolando
Date: 2010-05-28 17:59:57 +0200 (Fri, 28 May 2010)
New Revision: 9949

Modified:
   trunk/gforge/common/include/config-vars.php
   trunk/gforge/cronjobs/homedirs.php
   trunk/gforge/debian/rules
   trunk/gforge/packaging/dirs/common
   trunk/gforge/packaging/install/common
   trunk/gforge/utils/forge_get_config
   trunk/gforge/utils/migrate-to-ini-files.sh
   trunk/gforge/www/docman/admin/index.php
   trunk/gforge/www/docman/new.php
   trunk/gforge/www/frs/admin/editrelease.php
   trunk/gforge/www/frs/admin/qrs.php
   trunk/gforge/www/include/pre.php
Log:
Bugfixes in config system and the migration code

Modified: trunk/gforge/common/include/config-vars.php
===================================================================
--- trunk/gforge/common/include/config-vars.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/common/include/config-vars.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -24,11 +24,11 @@
 
 forge_define_config_item ('forge_name', 'core', $GLOBALS['sys_name']) ;
 forge_define_config_item ('force_login', 'core', $GLOBALS['sys_force_login']) ;
-forge_config_item_bool ('force_login', 'core') ;
+forge_set_config_item_bool ('force_login', 'core') ;
 forge_define_config_item ('user_registration_restricted', 'core', $GLOBALS['sys_user_reg_restricted']) ;
-forge_config_item_bool ('user_registration_restricted', 'core') ;
+forge_set_config_item_bool ('user_registration_restricted', 'core') ;
 forge_define_config_item ('project_registration_restricted', 'core', $GLOBALS['sys_project_reg_restricted']) ;
-forge_config_item_bool ('project_registration_restricted', 'core') ;
+forge_set_config_item_bool ('project_registration_restricted', 'core') ;
 forge_define_config_item ('web_host', 'core', $GLOBALS['sys_default_domain']) ;
 forge_define_config_item ('apache_user', 'core', $GLOBALS['sys_apache_user']) ;
 forge_define_config_item ('apache_group', 'core', $GLOBALS['sys_apache_group']) ;
@@ -41,52 +41,51 @@
 forge_define_config_item ('default_timezone', 'core', $GLOBALS['sys_default_timezone']) ;
 forge_define_config_item ('default_country_code', 'core', $GLOBALS['sys_default_country_code']) ;
 forge_define_config_item ('use_scm', 'core', $GLOBALS['sys_use_scm']) ;
-forge_config_item_bool ('use_scm', 'core') ;
+forge_set_config_item_bool ('use_scm', 'core') ;
 forge_define_config_item ('use_tracker', 'core', $GLOBALS['sys_use_tracker']) ;
-forge_config_item_bool ('use_tracker', 'core') ;
+forge_set_config_item_bool ('use_tracker', 'core') ;
 forge_define_config_item ('use_forum', 'core', $GLOBALS['sys_use_forum']) ;
-forge_config_item_bool ('use_forum', 'core') ;
-forge_item_bool_bool ('use_forum', 'core') ;
-forge_define_config_item ('use_pm') ;
-forge_config_item_bool ('use_pm') ;
-forge_define_config_item ('use_docman', 'core') ;
-forge_config_item_bool ('use_docman', 'core') ;
+forge_set_config_item_bool ('use_forum', 'core') ;
+forge_define_config_item ('use_pm', 'core', $GLOBALS['sys_use_pm']) ;
+forge_set_config_item_bool ('use_pm', 'core') ;
+forge_define_config_item ('use_docman', 'core', $GLOBALS['sys_use_docman']) ;
+forge_set_config_item_bool ('use_docman', 'core') ;
 forge_define_config_item ('use_news', 'core', $GLOBALS['sys_use_news']) ;
-forge_config_item_bool ('use_news', 'core') ;
+forge_set_config_item_bool ('use_news', 'core') ;
 forge_define_config_item ('use_mail', 'core', $GLOBALS['sys_use_mail']) ;
-forge_config_item_bool ('use_mail', 'core') ;
+forge_set_config_item_bool ('use_mail', 'core') ;
 forge_define_config_item ('use_survey', 'core', $GLOBALS['sys_use_survey']) ;
-forge_config_item_bool ('use_survey', 'core') ;
+forge_set_config_item_bool ('use_survey', 'core') ;
 forge_define_config_item ('use_frs', 'core', $GLOBALS['sys_use_frs']) ;
-forge_config_item_bool ('use_frs', 'core') ;
+forge_set_config_item_bool ('use_frs', 'core') ;
 forge_define_config_item ('use_fti', 'core', $GLOBALS['sys_use_fti']) ;
-forge_config_item_bool ('use_fti', 'core') ;
+forge_set_config_item_bool ('use_fti', 'core') ;
 forge_define_config_item ('use_ftp', 'core', $GLOBALS['sys_use_ftp']) ;
-forge_config_item_bool ('use_ftp', 'core') ;
+forge_set_config_item_bool ('use_ftp', 'core') ;
 forge_define_config_item ('use_trove', 'core', $GLOBALS['sys_use_trove']) ;
-forge_config_item_bool ('use_trove', 'core') ;
+forge_set_config_item_bool ('use_trove', 'core') ;
 forge_define_config_item ('use_snippet', 'core', $GLOBALS['sys_use_snippet']) ;
-forge_config_item_bool ('use_snippet', 'core') ;
+forge_set_config_item_bool ('use_snippet', 'core') ;
 forge_define_config_item ('use_ssl', 'core', $GLOBALS['sys_use_ssl']) ;
-forge_config_item_bool ('use_ssl', 'core') ;
+forge_set_config_item_bool ('use_ssl', 'core') ;
 forge_define_config_item ('use_people', 'core', $GLOBALS['sys_use_people']) ;
-forge_config_item_bool ('use_people', 'core') ;
+forge_set_config_item_bool ('use_people', 'core') ;
 forge_define_config_item ('use_shell', 'core', $GLOBALS['sys_use_shell']) ;
-forge_config_item_bool ('use_shell', 'core') ;
+forge_set_config_item_bool ('use_shell', 'core') ;
 forge_define_config_item ('use_ratings', 'core', $GLOBALS['sys_use_ratings']) ;
-forge_config_item_bool ('use_ratings', 'core') ;
-forge_define_config_item ('use_ftpuploads', 'core', $GLOBALS['sys_use_ftpuploads']) ;
-forge_config_item_bool ('use_ftpuploads', 'core') ;
+forge_set_config_item_bool ('use_ratings', 'core') ;
+forge_define_config_item ('use_ftp_uploads', 'core', $GLOBALS['sys_use_ftpuploads']) ;
+forge_set_config_item_bool ('use_ftp_uploads', 'core') ;
 forge_define_config_item ('use_manual_uploads', 'core', $GLOBALS['sys_use_manual_uploads']) ;
-forge_config_item_bool ('use_manual_uploads', 'core') ;
+forge_set_config_item_bool ('use_manual_uploads', 'core') ;
 forge_define_config_item ('use_gateways', 'core', $GLOBALS['sys_use_gateways']) ;
-forge_config_item_bool ('use_gateways', 'core') ;
+forge_set_config_item_bool ('use_gateways', 'core') ;
 forge_define_config_item ('use_project_vhost', 'core', $GLOBALS['sys_use_project_vhost']) ;
-forge_config_item_bool ('use_project_vhost', 'core') ;
+forge_set_config_item_bool ('use_project_vhost', 'core') ;
 forge_define_config_item ('use_project_database', 'core', $GLOBALS['sys_use_project_database']) ;
-forge_config_item_bool ('use_project_database', 'core') ;
+forge_set_config_item_bool ('use_project_database', 'core') ;
 forge_define_config_item ('use_project_multimedia', 'core', $GLOBALS['sys_use_project_multimedia']) ;
-forge_config_item_bool ('use_project_multimedia', 'core') ;
+forge_set_config_item_bool ('use_project_multimedia', 'core') ;
 forge_define_config_item ('download_host', 'core', $GLOBALS['sys_download_host']) ;
 forge_define_config_item ('shell_host', 'core', $GLOBALS['sys_shell_host']) ;
 forge_define_config_item ('users_host', 'core', $GLOBALS['sys_users_host']) ;
@@ -94,7 +93,7 @@
 forge_define_config_item ('scm_host', 'core', $GLOBALS['sys_scm_host']) ;
 forge_define_config_item ('forum_return_domain', 'core', $GLOBALS['sys_forum_return_domain']) ;
 forge_define_config_item ('use_jabber', 'core', $GLOBALS['sys_use_jabber']) ;
-forge_config_item_bool ('use_jabber', 'core') ;
+forge_set_config_item_bool ('use_jabber', 'core') ;
 forge_define_config_item ('jabber_host', 'core', $GLOBALS['sys_jabber_server']) ;
 forge_define_config_item ('jabber_port', 'core', $GLOBALS['sys_jabber_port']) ;
 forge_define_config_item ('jabber_user', 'core', $GLOBALS['sys_jabber_user']) ;
@@ -136,9 +135,7 @@
 forge_define_config_item ('chroot', 'core', $GLOBALS['sys_chroot']) ;
 forge_define_config_item ('config_path', 'core', $GLOBALS['sys_etc_path']) ;
 
-$pm = plugin_manager_get_object () ;
-
-if ($pm->PluginIsInstalled ('scmarch')) {
+if (file_exists ($gfconfig.'plugins/scmarch/config.php')) {
 	require_once $gfconfig.'plugins/scmarch/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmarch', $default_arch_server) ;
@@ -150,7 +147,7 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmbzr')) {
+if (file_exists ($gfconfig.'plugins/scmbzr/config.php')) {
 	require_once $gfconfig.'plugins/scmbzr/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmbzr', $default_bzr_server) ;
@@ -162,14 +159,14 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmccase')) {
+if (file_exists ($gfconfig.'plugins/scmccase/config.php')) {
 	require_once $gfconfig.'plugins/scmccase/config.php' ;
 	forge_define_config_item ('default_server', 'scmccase', $default_ccase_server) ;
 	forge_define_config_item ('this_server', 'scmccase', $this_server) ;
 	forge_define_config_item ('tag_pattern', 'scmccase', $tag_pattern) ;
 }
 
-if ($pm->PluginIsInstalled ('scmcvs')) {
+if (file_exists ($gfconfig.'plugins/scmcvs/config.php')) {
 	require_once $gfconfig.'plugins/scmcvs/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmcvs', $default_cvs_server) ;
@@ -183,7 +180,7 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmdarcs')) {
+if (file_exists ($gfconfig.'plugins/scmdarcs/config.php')) {
 	require_once $gfconfig.'plugins/scmdarcs/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmdarcs', $default_darcs_server) ;
@@ -195,7 +192,7 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmgit')) {
+if (file_exists ($gfconfig.'plugins/scmgit/config.php')) {
 	require_once $gfconfig.'plugins/scmgit/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmgit', $default_git_server) ;
@@ -207,7 +204,7 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmhg')) {
+if (file_exists ($gfconfig.'plugins/scmhg/config.php')) {
 	require_once $gfconfig.'plugins/scmhg/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmhg', $default_hg_server) ;
@@ -219,7 +216,7 @@
 	}
 }
 
-if ($pm->PluginIsInstalled ('scmsvn')) {
+if (file_exists ($gfconfig.'plugins/scmsvn/config.php')) {
 	require_once $gfconfig.'plugins/scmsvn/config.php' ;
 	
 	forge_define_config_item ('default_server', 'scmsvn', $default_svn_server) ;
@@ -231,11 +228,11 @@
 	}
 
 	forge_define_config_item ('use_ssh', 'scmsvn', $use_ssh ? 1 : 0) ;
-	forge_config_item_bool ('use_ssh', 'scmsvn') ;
+	forge_set_config_item_bool ('use_ssh', 'scmsvn') ;
 	forge_define_config_item ('use_dav', 'scmsvn', $use_dav ? 1 : 0) ;
-	forge_config_item_bool ('use_dav', 'scmsvn') ;
+	forge_set_config_item_bool ('use_dav', 'scmsvn') ;
 	forge_define_config_item ('use_ssl', 'scmsvn', $use_ssl ? 1 : 0) ;
-	forge_config_item_bool ('use_ssl', 'scmsvn') ;
+	forge_set_config_item_bool ('use_ssl', 'scmsvn') ;
 }
 
 // forge_define_config_item ('', 'core', $GLOBALS['sys_']) ;

Modified: trunk/gforge/cronjobs/homedirs.php
===================================================================
--- trunk/gforge/cronjobs/homedirs.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/cronjobs/homedirs.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -119,7 +119,7 @@
 	}
 	
 	//create an FTP upload dir for this project
-	if (forge_get_config('use_ftpuploads')) { 
+	if (forge_get_config('use_ftp_uploads')) { 
 		if (!is_dir(forge_get_config('ftp_upload_dir').'/'.$group)) {
 			@mkdir(forge_get_config('ftp_upload_dir').'/'.$group); 
 		}

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/debian/rules	2010-05-28 15:59:57 UTC (rev 9949)
@@ -154,6 +154,9 @@
 	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scm*/usr/share/*/plugins/scm*/*/README
 	chmod 755 $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scmcvs/usr/share/*/plugins/scmcvs/sbin/*
 
+# Rename config file
+	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini
+
 # Remove Windows files
 	rm -rf $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/windows
 

Modified: trunk/gforge/packaging/dirs/common
===================================================================
--- trunk/gforge/packaging/dirs/common	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/packaging/dirs/common	2010-05-28 15:59:57 UTC (rev 9949)
@@ -1,4 +1,5 @@
 bin
+etc/fusionforge/config.ini.d
 etc/gforge/templates
 etc/gforge/local.d
 etc/gforge/httpd.d

Modified: trunk/gforge/packaging/install/common
===================================================================
--- trunk/gforge/packaging/install/common	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/packaging/install/common	2010-05-28 15:59:57 UTC (rev 9949)
@@ -1,4 +1,4 @@
-etc/config.ini-fhs                    etc/fusionforge/config.ini
+etc/config.ini-fhs                    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/
@@ -12,6 +12,7 @@
 deb-specific/gforge-config             usr/sbin/
 utils/include.pl                       usr/share/gforge/lib/
 utils/forge_get_config                 usr/share/gforge/bin/
+utils/migrate-to-ini-files.sh	       usr/share/gforge/bin/
 #
 deb-specific/user_dump_update.pl       usr/share/gforge/bin/
 deb-specific/group_dump_update.pl      usr/share/gforge/bin/

Modified: trunk/gforge/utils/forge_get_config
===================================================================
--- trunk/gforge/utils/forge_get_config	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/utils/forge_get_config	2010-05-28 15:59:57 UTC (rev 9949)
@@ -27,9 +27,21 @@
 require_once $gfwww.'include/pre.php';
 
 if (count ($argv) == 3) {
-	echo forge_get_config ($argv[1], $argv[2]) . "\n" ;
+	$v = forge_get_config ($argv[1], $argv[2]) ;
+	if ($v === true) {
+		$v = 'yes' ;
+	} elseif ($v === false) {
+		$v = 'no' ;
+	}
+	echo "$v\n" ;
 } elseif (count($argv) == 2) {
-	echo forge_get_config ($argv[1]) . "\n" ;
+	$v = forge_get_config ($argv[1]) ;
+	if ($v === true) {
+		$v = 'yes' ;
+	} elseif ($v === false) {
+		$v = 'no' ;
+	}
+	echo "$v\n" ;
 } else {
 	echo "Usage: .../forge-get-config <variable> [ <section> ]
 For instance: .../forge-get-config web_host

Modified: trunk/gforge/utils/migrate-to-ini-files.sh
===================================================================
--- trunk/gforge/utils/migrate-to-ini-files.sh	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/utils/migrate-to-ini-files.sh	2010-05-28 15:59:57 UTC (rev 9949)
@@ -3,18 +3,23 @@
 set -e
 
 lastsection=''
-config_path=$(forge_get_config config_path)
+config_dir=$(forge_get_config extra_config_dirs | xargs -n 1 echo | head -1)
+if [ "$config_dir" = "" ] ; then
+    config_path=$(forge_get_config config_path)/config.ini.d
+else
+    config_path=$config_dir
+fi
 
 add_config () {
     section=$1
     var=$2
 
     value=$(forge_get_config $var $section)
-    if [ $value = '' ] ; then
+    if [ "$value" = '' ] ; then
 	return
     fi
 
-    if [ $section != $lastsection ] ; then
+    if [ "$section" != "$lastsection" ] ; then
 	echo
 	echo "[$section]"
 	lastsection=$section
@@ -41,7 +46,6 @@
 add_config core default_theme >> $tmp
 add_config core default_timezone >> $tmp
 add_config core default_trove_cat >> $tmp
-add_config core enable_uploads >> $tmp
 add_config core extra_config_dirs >> $tmp
 add_config core extra_config_files >> $tmp
 add_config core force_login >> $tmp
@@ -81,7 +85,6 @@
 add_config core use_frs >> $tmp
 add_config core use_fti >> $tmp
 add_config core use_ftp >> $tmp
-add_config core use_ftpuploads >> $tmp
 add_config core use_ftp_uploads >> $tmp
 add_config core use_gateways >> $tmp
 add_config core use_jabber >> $tmp
@@ -134,9 +137,11 @@
 add_config scmsvn use_ssh >> $tmp
 add_config scmsvn use_ssl >> $tmp
 
-mv $tmp $config_path/config.ini.d/zzz-migrated-old-config.ini
-chmod 644 $config_path/config.ini.d/zzz-migrated-old-config.ini
+add_config mediawiki enable_uploads >> $tmp
 
+mv $tmp $config_path/zzz-migrated-old-config.ini
+chmod 644 $config_path/zzz-migrated-old-config.ini
+
 tmp=$(mktemp)
 cat > $tmp <<EOF
 # This is a generated file with values migrated from your previous configuration
@@ -159,5 +164,5 @@
 add_config core ldap_version >> $tmp
 add_config core session_key >> $tmp
 
-mv $tmp $config_path/config.ini.d/zzz-migrated-old-secrets.ini
-chmod 600 $config_path/config.ini.d/zzz-migrated-old-secrets.ini
+mv $tmp $config_path/zzz-migrated-old-secrets.ini
+chmod 600 $config_path/zzz-migrated-old-secrets.ini


Property changes on: trunk/gforge/utils/migrate-to-ini-files.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/gforge/www/docman/admin/index.php
===================================================================
--- trunk/gforge/www/docman/admin/index.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/www/docman/admin/index.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -100,7 +100,7 @@
 			$filename=$file_url;
 			$filetype='URL';
 		/*
-		} elseif (forge_get_config('use_ftpuploads') && $ftp_filename!=100) { //100==None
+		} elseif (forge_get_config('use_ftp_uploads') && $ftp_filename!=100) { //100==None
 			$filename=$upload_dir.'/'.$ftp_filename;
 			$data = fread(fopen($filename, 'r'), filesize($filename));
 			$filetype=$uploaded_data_type;
@@ -331,7 +331,7 @@
 		<strong><?php echo _('OPTIONAL: Upload new file') ?></strong><br />
 		<input type="file" name="uploaded_data" size="30" /><br/><br />
 			<?php 
-			if (forge_get_config('use_ftpuploads')) {
+			if (forge_get_config('use_ftp_uploads')) {
 				echo '<strong>' ;
 				printf(_('OR choose one form FTP %1$s.'), forge_get_config('ftp_upload_host'));
 				echo '</strong><br />' ;

Modified: trunk/gforge/www/docman/new.php
===================================================================
--- trunk/gforge/www/docman/new.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/www/docman/new.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -165,7 +165,7 @@
 				break;
 			}
 			case 'ftpupload' : {
-				if (forge_get_config('use_ftpuploads')) {
+				if (forge_get_config('use_ftp_uploads')) {
 					echo '
 						<tr>
 							<td>

Modified: trunk/gforge/www/frs/admin/editrelease.php
===================================================================
--- trunk/gforge/www/frs/admin/editrelease.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/www/frs/admin/editrelease.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -287,7 +287,7 @@
 <input type="hidden" name="step2" value="1" />
 <fieldset><legend><strong><?php echo _("File Name") ?></strong></legend>
 <?php echo _("Upload a new file") ?>: <input type="file" name="userfile"  size="30" />
-<?php if (forge_get_config('use_ftpuploads')) {
+<?php if (forge_get_config('use_ftp_uploads')) {
 	echo '<p>';
 	  printf(_('Alternatively, you can use FTP to upload a new file at %1$s.'), forge_get_config('ftp_upload_host'));
 	echo '<br />';

Modified: trunk/gforge/www/frs/admin/qrs.php
===================================================================
--- trunk/gforge/www/frs/admin/qrs.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/www/frs/admin/qrs.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -184,7 +184,7 @@
 		<?php echo _('NOTE: In some browsers you must select the file in the file-upload dialog and click "OK". Double-clicking doesn\'t register the file.')?>
 		</span><br />
 		<?php echo _('Upload a new file') ?>: <input type="file" name="userfile"  size="30" />
-		<?php if (forge_get_config('use_ftpuploads')) {
+		<?php if (forge_get_config('use_ftp_uploads')) {
 
 			echo '<p>';
 			printf(_('Alternatively, you can use FTP to upload a new file at %1$s.'), forge_get_config('ftp_upload_host'));

Modified: trunk/gforge/www/include/pre.php
===================================================================
--- trunk/gforge/www/include/pre.php	2010-05-28 13:37:42 UTC (rev 9948)
+++ trunk/gforge/www/include/pre.php	2010-05-28 15:59:57 UTC (rev 9949)
@@ -60,7 +60,7 @@
 	$ecda = explode (',', $ecd) ;
 	foreach ($ecda as $cd) {
 		$cd = trim ($cd) ;
-		forge_read_config_file ($cd) ;
+		forge_read_config_dir ($cd) ;
 	}
 }
 




More information about the Fusionforge-commits mailing list