Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed issue #18562: Upload question type partially broken (#2811)
Co-authored-by: lapiudevgit <devgit@lapiu.biz>
  • Loading branch information
gabrieljenik and lapiudevgit committed Jan 26, 2023
1 parent 2221f2d commit 2b24b71
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
Expand Up @@ -17,5 +17,5 @@
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['templateapiversion'] = 3;
$config['assetsversionnumber'] = '30274';
$config['assetsversionnumber'] = '30275';
return $config;
3 changes: 2 additions & 1 deletion application/controllers/UploaderController.php
Expand Up @@ -41,7 +41,7 @@ public function run($actionID)
$aFieldMap = createFieldMap($oSurvey, 'short', false, false, $sLanguage);
if (!isset($aFieldMap[$sFieldName])) {
throw new CHttpException(400); // See for debug > 1
}
}
$sFileName = Yii::app()->request->getParam('filename', ''); // The file to delete fu_ or fu_tmp
$sOriginalFileName = Yii::app()->request->getParam('name', ''); // Used for javascript return only
$sMode = Yii::app()->request->getParam('mode');
Expand Down Expand Up @@ -130,6 +130,7 @@ public function run($actionID)
//$filename = sanitize_filename($_FILES['uploadfile']['name']);// This remove all non alpha numeric characters and replaced by _ . Leave only one dot .
$size = $_FILES['uploadfile']['size'] / 1024;
$preview = Yii::app()->session['preview'];
// TODO: Remove this validation. It's already done at the start.
$aFieldMap = createFieldMap($oSurvey, 'short', false, false, $sLanguage);
if (!isset($aFieldMap[$sFieldName])) {
throw new CHttpException(400); // See for debug > 1
Expand Down
4 changes: 2 additions & 2 deletions application/helpers/qanda_helper.php
Expand Up @@ -2335,8 +2335,8 @@ function upload_$ia[1]() {
var surveyid = '.Yii::app()->getConfig('surveyID').';
$(document).on("ready pjax:scriptcomplete", function(){
var fieldname = "'.$ia[1].'";
var filecount = $("#"+fieldname+"_filecount").val();
var json = $("#"+fieldname).val();
var filecount = $("#java"+fieldname+"_filecount").val();
var json = $("#java"+fieldname).val();
var show_title = "'.$aQuestionAttributes["show_title"].'";
var show_comment = "'.$aQuestionAttributes["show_comment"].'";
displayUploadedFiles(json, filecount, fieldname, show_title, show_comment);
Expand Down
2 changes: 1 addition & 1 deletion assets/scripts/modaldialog.js
Expand Up @@ -118,7 +118,7 @@ function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show
for (i = 0; i < filecount; i++)
{
if (isValueInArray(image_extensions, jsonobj[i].ext))
display += '<tr><td class="upload image"><img src="' + uploadurl + '/filegetcontents/'+decodeURIComponent(jsonobj[i].filename)+'" class="uploaded" /></td>';
display += '<tr><td class="upload image"><img src="' + uploadurl + '/filegetcontents/'+decodeURIComponent(jsonobj[i].filename+'/fieldname/'+fieldname)+'" class="uploaded" /></td>';
else
display += '<tr><td class="upload placeholder"><div class="upload-placeholder" /></td>';

Expand Down
4 changes: 2 additions & 2 deletions assets/scripts/uploader.js
Expand Up @@ -54,7 +54,7 @@ function doFileUpload()
var previewblock = "<li id='" + fieldname + "_li_" + i + "' class='previewblock file-element'>";
previewblock += "<div class='file-preview'>";
if (isValueInArray(image_extensions, json[i - 1].ext.toLowerCase()))
previewblock += "<img src='" + uploadurl + "/filegetcontents/" + json[i - 1].filename + "' class='uploaded' onload='fixParentHeigth(fieldname)' />";
previewblock += "<img src='" + uploadurl + "/filegetcontents/" + json[i - 1].filename + "/fieldname/" + fieldname + "' class='uploaded' onload='fixParentHeigth(fieldname)' />";
else
previewblock += "<div class='upload-placeholder' />";

Expand Down Expand Up @@ -189,7 +189,7 @@ function doFileUpload()

previewblock += "<div class='file-preview'>";
if (isValueInArray(image_extensions, metadata.ext.toLowerCase()))
previewblock += "<img src='" + uploadurl + "/filegetcontents/" + decodeURIComponent(metadata.filename) + "' class='uploaded' onload='fixParentHeigth(fieldname)' />";
previewblock += "<img src='" + uploadurl + "/filegetcontents/" + decodeURIComponent(metadata.filename) + "/fieldname/" + fieldname + "' class='uploaded' onload='fixParentHeigth(fieldname)' />";
else
previewblock += "<div class='upload-placeholder' />";
previewblock += "<span class='file-name'>" + escapeHtml(decodeURIComponent(metadata.name)) + "<span>";
Expand Down

0 comments on commit 2b24b71

Please sign in to comment.