Decode HTML entities in project files and library files before compilation

Author: fpapadopou

Symfony/src/Codebender/CompilerBundle/Handler/CompilerHandler.php

@@ -67,6 +67,12 @@ function main($request, $compiler_config)
 		$clang_target_arch = "-D".MCUHandler::$MCU[$mcu]." -DARDUINO=$version -DF_CPU=$f_cpu";
 		$autocc_clang_target_arch = "-D".MCUHandler::$MCU[$mcu]." -DARDUINO=$version -DF_CPU=$f_cpu -DUSB_VID=$vid -DUSB_PID=$pid";
 
+        /*
+         * Decode any HTML entities found in project/libraries files
+         */
+        $request['files'] = $this->utility->htmlDecodeFiles($request['files']);
+        $request['libraries'] = $this->utility->htmlDecodeLibraries($request['libraries']);
+
 		// Step 1(part 1): Extract the project files included in the request.
 		$files = array();
 		$tmpVar = $this->extractFiles($request["files"], $TEMP_DIR, $compiler_dir, $files["sketch_files"], "files");

Symfony/src/Codebender/CompilerBundle/Handler/UtilityHandler.php

@@ -142,4 +142,47 @@ function execWithDebugging($command, /** @noinspection PhpUnusedParameterInspect
 		echo "$ $command\n";
 		passthru("$command 2>&1");
 	}
+
+    /**
+     * Decodes any HTML entities found in the list of provided files and returns the list of decoded
+     * files. Each of the files should have the following format
+     * ['filename' => filename, 'content' => code]
+     *
+     * @param $files
+     * @return array
+     */
+    function htmlDecodeFiles($files)
+    {
+        if (empty($files)) {
+            return array();
+        }
+
+        $htmlDecodedFiles = array();
+        foreach ($files as $file) {
+            $htmlDecodedFiles[] = array(
+                'filename' => $file['filename'],
+                'content' => htmlspecialchars_decode($file['content'])
+            );
+        }
+        return $htmlDecodedFiles;
+    }
+
+    /**
+     * Applies the htmlDecodeFiles method to the files of each one of the provided libraries.
+     *
+     * @param $libraries
+     * @return array
+     */
+    function htmlDecodeLibraries($libraries)
+    {
+        if (empty($libraries)) {
+            return array();
+        }
+        $htmlDecodedLibraries = array();
+        foreach ($libraries as $libraryName => $libraryFiles) {
+            $htmlDecodedLibraries[$libraryName] = $this->htmlDecodeFiles($libraryFiles);
+        }
+
+        return $htmlDecodedLibraries;
+    }
 }