[Fusionforge-commits] r9563 - in trunk: gforge/cronjobs gforge/www/frs/admin tools

[Roland Mas]

Author: lolando
Date: 2010-04-21 20:21:42 +0200 (Wed, 21 Apr 2010)
New Revision: 9563

Modified:
   trunk/gforge/cronjobs/homedirs.php
   trunk/gforge/www/frs/admin/editrelease.php
   trunk/tools/unify_config.sh
Log:
Config API migration: minor fixes

Modified: trunk/gforge/cronjobs/homedirs.php
===================================================================
--- trunk/gforge/cronjobs/homedirs.php	2010-04-21 18:06:20 UTC (rev 9562)
+++ trunk/gforge/cronjobs/homedirs.php	2010-04-21 18:21:42 UTC (rev 9563)
@@ -171,7 +171,7 @@
 		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");
 }
 
 

Modified: trunk/gforge/www/frs/admin/editrelease.php
===================================================================
--- trunk/gforge/www/frs/admin/editrelease.php	2010-04-21 18:06:20 UTC (rev 9562)
+++ trunk/gforge/www/frs/admin/editrelease.php	2010-04-21 18:21:42 UTC (rev 9563)
@@ -71,11 +71,6 @@
 	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();
 
 

Modified: trunk/tools/unify_config.sh
===================================================================
--- trunk/tools/unify_config.sh	2010-04-21 18:06:20 UTC (rev 9562)
+++ trunk/tools/unify_config.sh	2010-04-21 18:21:42 UTC (rev 9563)
@@ -19,7 +19,7 @@
 
 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;