Added automatic conversion to Base 64 of binary file upon submission, if there...

Added automatic conversion to Base 64 of binary file upon submission, if there is a corresponding .b64 required file

amd/src/vplutil.js

@@ -126,7 +126,7 @@ define(['jquery',
     (function() {
         var regExt = /\.([^.]*)$/;
         var regImg = /^(gif|jpg|jpeg|png|ico)$/i;
-        var regBin = /^(zip|jar|pdf|tar|bin|7z|arj|deb|gzip|rar|rpm|dat|db|rtf|doc|docx|odt)$/i;
+        var regBin = /^(zip|jar|pdf|tar|bin|7z|arj|deb|gzip|rar|rpm|dat|db|rtf|doc|docx|odt|xls|xlsx)$/i;
         var regBlk = /^blockly[0123]?$/;
         VPLUtil.fileExtension = function(fileName) {
             var res = regExt.exec(fileName);

forms/submission.php

@@ -73,8 +73,8 @@ if ($fromform = $mform->get_data()) {
                     $error, 'error' );
         die();
     }
-    $rfn = $vpl->get_fgm('required'); 
-    $minfiles = count( $rfn->getFilelist() );
+    $rfn = $vpl->get_fgm('required');
+    $reqfiles = $rfn->getFileList();
     $files = array ();
     for ($i = 0; $i < $instance->maxfiles; $i ++) {
         $attribute = 'file' . $i;
@@ -87,8 +87,16 @@ if ($fromform = $mform->get_data()) {
                 if ($encode > '') { // If code detected.
                     $data = iconv( $encode, 'UTF-8', $data );
                 }
+                $files [$name] = $data;
+            }
+            else {
+                if (in_array($name . '.b64', $reqfiles)) {
+                    $files [$name . '.b64'] = base64_encode($data);
+                }
+                else {
+                    $files [$name] = $data;
+                }
             }
-            $files [$name] = $data;
         }
     }
     $errormessage = '';