From 1a095fffe50437dbe7814c52886a58b6309ce8eb Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 28 May 2009 02:19:53 -0700 Subject: Prepend all code files we copy from Gallery2 and put into var with our code preamble for security. Update File_Structure_Test::code_files_start_with_preamble_test to check all the php files in var, too. --- modules/g2_import/helpers/g2_import.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/g2_import/helpers') diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 60dd593f..51dc8705 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -79,7 +79,8 @@ class g2_import_Core { array( "require_once('$base_dir/modules/core/classes/GalleryDataCache.class');", "require('$base_dir/modules/core/classes/GalleryEmbed.class');"), - file("$base_dir/embed.php"))); + array_merge(array("\n"), + file("$base_dir/embed.php")))); file_put_contents( "$mod_path/main.php", @@ -90,7 +91,8 @@ class g2_import_Core { array( "include(dirname(__FILE__) . '/bootstrap.inc');", "require_once('$base_dir/init.inc');"), - file("$base_dir/main.php"))); + array_merge(array("\n"), + file("$base_dir/main.php")))); file_put_contents( "$mod_path/bootstrap.inc", @@ -103,7 +105,8 @@ class g2_import_Core { "require_once('$base_dir/modules/core/classes/GalleryDataCache.class');", "define('GALLERY_CONFIG_DIR', '$base_dir');", "\$gallery =& new G2_Gallery();"), - file("$base_dir/bootstrap.inc"))); + array_merge(array("\n"), + file("$base_dir/bootstrap.inc")))); file_put_contents( "$mod_path/Gallery.class", @@ -112,7 +115,8 @@ class g2_import_Core { "function Gallery"), array("class G2_Gallery", "function G2_Gallery"), - file("$base_dir/modules/core/classes/Gallery.class"))); + array_merge(array("\n"), + file("$base_dir/modules/core/classes/Gallery.class")))); } require("$mod_path/embed.php"); -- cgit v1.2.3