Merge pull request #6 from outlandishideas/s3-skip-blank-files

Skip "security" blank files when using S3 Uploads

.gitignore

@@ -1 +1,3 @@
 .idea
+
+composer.lock

common.php

@@ -162,6 +162,12 @@ public static function format_number( $number, $number_format, $currency = '', $
 	}
 
 	public static function recursive_add_index_file( $dir ) {
+        if (defined('S3_UPLOADS_BUCKET')) {
+            // Neither classic filesystem security measure is relevant on S3. When this constant is
+            // set, we assume that S3 Uploads is intended to be used for Gravity Forms uploads.
+            return;
+        }
+
 		if ( ! is_dir( $dir ) || is_link( $dir ) ) {
 			return;
 		}

composer.json

@@ -2,7 +2,7 @@
   "name": "wp-premium/gravityforms",
   "type": "wordpress-plugin",
   "description": "Gravity Forms, composer-ified",
-  "version": "2.4.20.1",
+  "version": "2.4.20.2",
   "minimum-stability": "stable",
   "require": {
     "composer/installers": "~2.0|~1.0"

forms_model.php

@@ -5493,17 +5493,19 @@ public static function get_file_upload_path( $form_id, $file_name ) {
 				return false;
 			}
 
-			// Adding index.html files to all subfolders.
-			if ( $default_target_root != $target_root && ! file_exists( $target_root . 'index.html' ) ) {
-				GFCommon::recursive_add_index_file( $target_root );
-			} elseif ( ! file_exists( self::get_upload_root() . '/index.html' ) ) {
-				GFCommon::recursive_add_index_file( self::get_upload_root() );
-			} elseif ( ! file_exists( self::get_upload_path( $form_id ) . '/index.html' ) ) {
-				GFCommon::recursive_add_index_file( self::get_upload_path( $form_id ) );
-			} elseif ( ! file_exists( self::get_upload_path( $form_id ) . "/$y/index.html" ) ) {
-				GFCommon::recursive_add_index_file( self::get_upload_path( $form_id ) . "/$y" );
-			} else {
-				GFCommon::recursive_add_index_file( self::get_upload_path( $form_id ) . "/$y/$m" );
+			// Adding index.html files to all subfolders, except when S3 houses uploads.
+			if (!defined('S3_UPLOADS_BUCKET')) {
+				if ($default_target_root != $target_root && !file_exists($target_root . 'index.html')) {
+					GFCommon::recursive_add_index_file($target_root);
+				} elseif (!file_exists(self::get_upload_root() . '/index.html')) {
+					GFCommon::recursive_add_index_file(self::get_upload_root());
+				} elseif (!file_exists(self::get_upload_path($form_id) . '/index.html')) {
+					GFCommon::recursive_add_index_file(self::get_upload_path($form_id));
+				} elseif (!file_exists(self::get_upload_path($form_id) . "/$y/index.html")) {
+					GFCommon::recursive_add_index_file(self::get_upload_path($form_id) . "/$y");
+				} else {
+					GFCommon::recursive_add_index_file(self::get_upload_path($form_id) . "/$y/$m");
+				}
 			}
 		}