Skip to content

Commit

Permalink
Fixed issue: reverted accidental change from develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@lacrioque
lacrioque committed Jan 24, 2018
1 parent 9ade868 commit aba5cc3
Showing 1 changed file with 89 additions and 26 deletions.
115 changes: 89 additions & 26 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -2340,7 +2340,6 @@ function do_file_upload($ia)
$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['fieldname'] = $ia[1];
$scriptloc = Yii::app()->getController()->createUrl('uploader/index');
$bPreview = Yii::app()->request->getParam('action') == "previewgroup" || Yii::app()->request->getParam('action') == "previewquestion" || $thissurvey['active'] != "Y";

if ($bPreview) {
$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['preview'] = 1;
$questgrppreview = 1; // Preview is launched from Question or group level
Expand All @@ -2351,49 +2350,113 @@ function do_file_upload($ia)
$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['preview'] = 0;
$questgrppreview = 0;
}

$uploadurl = $scriptloc."?sid=".Yii::app()->getConfig('surveyID')."&fieldname=".$ia[1]."&qid=".$ia[0];
$uploadurl .= "&preview=".$questgrppreview."&show_title=".$aQuestionAttributes['show_title'];
$uploadurl .= "&show_comment=".$aQuestionAttributes['show_comment'];
$uploadurl .= "&minfiles=".$aQuestionAttributes['min_num_of_files']; // TODO: Regression here? Should use LEMval(minfiles) like above
$uploadurl .= "&maxfiles=".$aQuestionAttributes['max_num_of_files']; // Same here.

$answer = "<script type='text/javascript'>
function upload_$ia[1]() {
var uploadurl = '{$scriptloc}?sid=".Yii::app()->getConfig('surveyID')."&fieldname={$ia[1]}&qid={$ia[0]}';
uploadurl += '&preview={$questgrppreview}&show_title={$aQuestionAttributes['show_title']}';
uploadurl += '&show_comment={$aQuestionAttributes['show_comment']}';
uploadurl += '&minfiles=' + LEMval('{$aQuestionAttributes['min_num_of_files']}');
uploadurl += '&maxfiles=' + LEMval('{$aQuestionAttributes['max_num_of_files']}');
$('#upload_$ia[1]').attr('href',uploadurl);
}
var uploadLang = {
title: '".gT('Upload your files', 'js')."',
returnTxt: '" . gT('Return to survey', 'js')."',
headTitle: '" . gT('Title', 'js')."',
headComment: '" . gT('Comment', 'js')."',
headFileName: '" . gT('File name', 'js')."',
deleteFile : '".gT('Delete')."',
editFile : '".gT('Edit')."'
};
var imageurl = '".Yii::app()->getConfig('imageurl')."';
var uploadurl = '".$scriptloc."';
</script>\n";
Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."modaldialog.js", LSYii_ClientScript::POS_BEGIN);
Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl')."uploader-files.css");
// Modal dialog
//$answer .= $uploadbutton;

$filecountvalue = '0';
if (array_key_exists($ia[1]."_filecount", $_SESSION['survey_'.Yii::app()->getConfig('surveyID')])) {
$tempval = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]."_filecount"];
if (is_numeric($tempval)) {
$filecountvalue = $tempval;
}
}
$surveyId = Yii::app()->getConfig('surveyID');
$fileuploadData = array(
'surveyId' => $surveyId,
'qid' => $ia[0],
'fileid' => $ia[1],
'value' => $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]],
'filecountvalue'=>$filecountvalue,
'coreClass'=>$coreClass,
'basename' => $ia[1],
'maxFiles' => $aQuestionAttributes['max_num_of_files'],
'minFiles' => $aQuestionAttributes['min_num_of_files'],
'uploadurl' => $uploadurl,
'showTitle' => $aQuestionAttributes["show_title"],
'showComment' => $aQuestionAttributes["show_comment"],
);
App()->getClientScript()->registerCssFile(Yii::app()->getConfig("publicstyleurl")."uploader.css");
App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl')."uploader-files.css");
// App()->getClientScript()->registerScript('sNeededScriptVar', $sNeededScriptVar, LSYii_ClientScript::POS_BEGIN);
// App()->getClientScript()->registerScript('sLangScriptVar', $sLangScriptVar, LSYii_ClientScript::POS_BEGIN);
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'ajaxupload.js', LSYii_ClientScript::POS_END);
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'uploader.js', LSYii_ClientScript::POS_END);

$answer = doRender('/survey/questions/answer/file_upload/answer', $fileuploadData, true);

$answer .= doRender('/survey/questions/answer/file_upload/answer', $fileuploadData, true);
$answer .= '<script type="text/javascript">
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 show_title = "'.$aQuestionAttributes["show_title"].'";
var show_comment = "'.$aQuestionAttributes["show_comment"].'";
displayUploadedFiles(json, filecount, fieldname, show_title, show_comment);
});
</script>';
$answer .= '<script type="text/javascript">
$(".basic_'.$ia[1].'").change(function() {
var i;
var jsonstring = "[";
for (i = 1, filecount = 0; i <= LEMval("'.$aQuestionAttributes['max_num_of_files'].'"); i++)
{
if ($("#'.$ia[1].'_"+i).val() == "")
continue;
filecount++;
if (i != 1)
jsonstring += ", ";
if ($("#answer'.$ia[1].'_"+i).val() != "")
jsonstring += "{ ';
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['show_title'])) {
$answer .= '\"title\":\""+$("#'.$ia[1].'_title_"+i).val()+"\",';
} else {
$answer .= '\"title\":\"\",';
}
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['show_comment'])) {
$answer .= '\"comment\":\""+$("#'.$ia[1].'_comment_"+i).val()+"\",';
} else {
$answer .= '\"comment\":\"\",';
}
$answer .= '\"size\":\"\",\"name\":\"\",\"ext\":\"\"}";
}
jsonstring += "]";
$("#'.$ia[1].'").val(jsonstring);
$("#'.$ia[1].'_filecount").val(filecount);
});
</script>';
$uploadurl = $scriptloc."?sid=".Yii::app()->getConfig('surveyID')."&fieldname=".$ia[1]."&qid=".$ia[0];
$uploadurl .= "&preview=".$questgrppreview."&show_title=".$aQuestionAttributes['show_title'];
$uploadurl .= "&show_comment=".$aQuestionAttributes['show_comment'];
$uploadurl .= "&minfiles=".$aQuestionAttributes['min_num_of_files']; // TODO: Regression here? Should use LEMval(minfiles) like above
$uploadurl .= "&maxfiles=".$aQuestionAttributes['max_num_of_files']; // Same here.
$answer .= '
<!-- Trigger the modal with a button -->
<!-- Modal -->
<div id="file-upload-modal-' . $ia[1].'" class="modal fade file-upload-modal" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header file-upload-modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<div class="h4 modal-title">' . ngT("Upload file|Upload files", $aQuestionAttributes['max_num_of_files']).'</div>
</div>
<div class="modal-body file-upload-modal-body">
<iframe id="uploader' . $ia[1].'" name="uploader'.$ia[1].'" class="uploader-frame" src="'.$uploadurl.'" title="'.gT("Upload").'"></iframe>
</div>
<div class="modal-footer file-upload-modal-footer">
<button type="button" class="btn btn-success" data-dismiss="modal">' . gT("Save changes").'</button>
</div>
</div>
</div>
</div>
';
$inputnames = array();
$inputnames[] = $ia[1];
$inputnames[] = $ia[1]."_filecount";
Expand Down

0 comments on commit aba5cc3

Please sign in to comment.