From bf3a39db385a861d87f48e67eff4004f26cdf106 Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Wed, 21 Apr 2010 18:21:42 +0000
Subject: [PATCH] Config API migration: minor fixes

---
 gforge/cronjobs/homedirs.php         | 2 +-
 gforge/www/frs/admin/editrelease.php | 5 -----
 tools/unify_config.sh                | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gforge/cronjobs/homedirs.php b/gforge/cronjobs/homedirs.php
index 83e9888..d39e81b 100644
--- a/gforge/cronjobs/homedirs.php
+++ b/gforge/cronjobs/homedirs.php
@@ -171,7 +171,7 @@ foreach($groups as $group) {
 		fwrite($fw,$contents);
 		fclose($fw);
 	}
-	system("chown -R forge_get_config('apache_user'):forge_get_config('apache_group') $groupdir_prefix/$group");
+	system("chown -R ".forge_get_config('apache_user').":".forge_get_config('apache_group')." $groupdir_prefix/$group");
 }
 
 
diff --git a/gforge/www/frs/admin/editrelease.php b/gforge/www/frs/admin/editrelease.php
index 72ed36f..70b0478 100644
--- a/gforge/www/frs/admin/editrelease.php
+++ b/gforge/www/frs/admin/editrelease.php
@@ -71,11 +71,6 @@ if (!$frsr || !is_object($frsr)) {
 	exit_error('Error',$frsr->getErrorMessage());
 }
 
-//we make sure we are not receiving forge_get_config('ftp_upload_dir') by POST or GET, to prevent security problems
-
-if (!forge_get_config('ftp_upload_dir')) {
-	exit_error('Error','External sys_ftp_upload_dir detected');
-}
 $upload_dir = forge_get_config('ftp_upload_dir') . "/" . $g->getUnixName();
 
 
diff --git a/tools/unify_config.sh b/tools/unify_config.sh
index da03728..f8a1078 100755
--- a/tools/unify_config.sh
+++ b/tools/unify_config.sh
@@ -19,7 +19,7 @@ find_files () {
 
 find_files | xargs perl -pi -e"
 s/^\\s*global +\\\$$old *;//;
-s/^(\\s*global +)\\\$$old *,/\\1/;
+s/^(\\s*global) +\\\$$old *,/\\1 /;
 s/^(\\s*global .*), *\\\$$old/\\1/;
 s,\\\$GLOBALS\['$old'\](?"\!"\\s*=),$newstr,g;
 s,\\\$GLOBALS\[$old\](?"\!"\\s*=),$newstr,g;
-- 
2.1.4