Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: file uploader not always working #94

Merged
merged 1 commit into from
Sep 9, 2024
Merged

fix: file uploader not always working #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions source/php/Submission.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ public static function uploadFiles($fileslist, $formId)
$fileslist = self::sanitizeFilesList($fileslist);

foreach ($fileslist as $key => $files) {
// Sanitizes the key to the field name (ex. removes id-1-)
$sanitizedKey = preg_replace('/id-\d+-/', '', $key);

if (!is_array($files['name'])) {
$files = self::convertItemToArray($files);
}
Expand All @@ -278,31 +281,29 @@ public static function uploadFiles($fileslist, $formId)
$fileName = pathinfo((string)$files['name'][$i], PATHINFO_FILENAME);
$fileext = strtolower(pathinfo((string)$files['name'][$i], PATHINFO_EXTENSION));


//Validate that image is in correct format
if (in_array('image/*', $fields[$key]['filetypes'])) {
$fields[$key]['filetypes'] = array_unique(array_merge($fields[$key]['filetypes'], $allowedImageTypes));
if (in_array('image/*', $fields[$sanitizedKey]['filetypes'])) {
$fields[$sanitizedKey]['filetypes'] = array_unique(array_merge($fields[$sanitizedKey]['filetypes'], $allowedImageTypes));
}

//Validate that video is in correct format
if (in_array('video/*', $fields[$key]['filetypes'])) {
$fields[$key]['filetypes'] = array_unique(array_merge($fields[$key]['filetypes'], $allowedVideoTypes));
if (in_array('video/*', $fields[$sanitizedKey]['filetypes'])) {
$fields[$sanitizedKey]['filetypes'] = array_unique(array_merge($fields[$sanitizedKey]['filetypes'], $allowedVideoTypes));
}


//Not a valid filetype at all
if (!in_array('.' . $fileext, $fields[$key]['filetypes'])) {
if (!in_array('.' . $fileext, $fields[$sanitizedKey]['filetypes'])) {
error_log('Filetype not allowed');
$uploaded['error'] = true;
$uploaded['errorData'] = new \WP_Error('filetype-not-allowed', __('Filetype not allowed', 'modularity-form-builder'));
continue;
}


$encryptionConfigDefined = defined('ENCRYPT_SECRET_VI') && defined('ENCRYPT_SECRET_KEY') && defined('ENCRYPT_METHOD');

//Encrypt file if encryption is enabled
if (get_option('options_mod_form_crypt') && empty($fields[$key]['upload_videos_external']) && $encryptionConfigDefined) {
if (get_option('options_mod_form_crypt') && empty($fields[$sanitizedKey]['upload_videos_external']) && $encryptionConfigDefined) {
$encrypted = file_put_contents(
$files['tmp_name'][$i],
\ModularityFormBuilder\App::encryptDecryptFile(
Expand Down Expand Up @@ -397,7 +398,7 @@ public static function maybeCreateFolder(string $path): string
public function getMailDownloadLink($filePath)
{
//Check if encrypted
if (strpos($filePath, sanitize_file_name("-enc-" . ENCRYPT_METHOD)) !== false) {
if (defined('ENCRYPT_METHOD') && strpos($filePath, sanitize_file_name("-enc-" . ENCRYPT_METHOD)) !== false) {
return home_url("/") . '?modFormDownloadEncFilePublic=' . urlencode(basename($filePath)) . '&token=' . $this->createToken($filePath);
}

Expand Down