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

Jump to bottom

Håndtering af maksimal filstørrelse i forbindelse med upload #161 #162

Merged
merged 6 commits into from
Apr 10, 2018
Merged

Håndtering af maksimal filstørrelse i forbindelse med upload #161 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a0d7ec
Merge pull request #1 from Septima/master
dk-moelgaard75 Feb 4, 2018
e752905
Fjerned backup fil
sweco-dkkrer Apr 3, 2018
c921fdc
Håndtering af parametre i forbindelse med page
sweco-dkkrer Apr 3, 2018
a35340d
Håndtering af filstørrelse ved upload
sweco-dkkrer Apr 3, 2018
d6358fa
Fjerne fejl i gitignore
sweco-dkkrer Apr 6, 2018
c15dbb5
Opdateret removeInvalidFileNotice
sweco-dkkrer Apr 6, 2018
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
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ I filen er der angivet én eller flere formular konfigurationer. Hver konfigurat

<!-- input - type="file" -->
<!-- Felt til at vedhæfte en fil -->
<input type="file" displayname="Vedhæft tegning:" urlparam="filnavn"/>
<!-- maxfilesize angiver i Mb, hvor stor filen maksimalt må være -->
<input type="file" displayname="Vedhæft tegning:" urlparam="filnavn" maxfilesize="5"/>

<!-- input - type="checkbox" -->
<!-- En check boks hvor brugeren kan vælge til eller fra. Serveren modtager "true", hvis brugeren har valgt at klikke den til, ellers sendes "false".
Expand Down
39 changes: 32 additions & 7 deletions js/formular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Formular = SpatialMap.Class ({
groupedLayers: [],

_listeners: [],
maxUploadFileSize: 100,

initialize: function (options) {
SpatialMap.Util.extend (this, options);
Expand Down Expand Up @@ -1390,11 +1391,12 @@ Formular = SpatialMap.Class ({
jQuery('#'+id).datepicker(options);

} else if (type=='file') {
this.maxUploadFileSize = typeof node.attr('maxfilesize') === 'undefined' ? 100 : parseInt(node.attr('maxfilesize'));
if (this.bootstrap === true) {
contentcontainer.append('<div id="'+id+'_row" class="form-group'+(className ? ' '+className : '')+'"><label for="'+id+'">'+node.attr('displayname')+(req ? ' <span class="required">*</span>':'')+'</label><input type="hidden" id="'+id+'" value="'+(value || '')+'"/><input type="hidden" id="'+id+'_org" value="'+(value || '')+'"/><div class="fileupload'+(req ? ' required-enabled':'')+'"><form id="form_'+id+'" method="POST" target="uploadframe_'+id+'" enctype="multipart/form-data" action="/jsp/modules/formular/upload.jsp"><input '+(postparam.disabled ? 'disabled':'')+' type="file" name="file_'+id+'" id="file_'+id+'" /><span class="filupload-delete" title="Fjern vedhæftet fil"></span><input type="hidden" name="callbackhandler" value="parent.formular.fileupload"/><input type="hidden" name="id" value="'+id+'"/><input type="hidden" name="sessionid" value="'+this.sessionid+'"/><input type="hidden" name="formular" value="'+this.name+'"/></form><iframe name="uploadframe_'+id+'" id="uploadframe_'+id+'" frameborder="0" style="display:none;"></iframe></div></div>');
contentcontainer.append('<div id="'+id+'_row" class="form-group'+(className ? ' '+className : '')+'"><label for="'+id+'">'+node.attr('displayname')+(req ? ' <span class="required">*</span>':'')+'</label><input type="hidden" id="'+id+'" value="'+(value || '')+'"/><input type="hidden" id="'+id+'_org" value="'+(value || '')+'"/><div class="fileupload'+(req ? ' required-enabled':'')+'"><form id="form_'+id+'" method="POST" target="uploadframe_'+id+'" enctype="multipart/form-data" action="/jsp/modules/formular/upload.jsp"><input '+(postparam.disabled ? 'disabled':'')+' type="file" name="file_'+id+'" id="file_'+id+'" /><span class="filupload-delete" title="Fjern vedhæftet fil"></span><input type="hidden" name="callbackhandler" value="parent.formular.fileupload"/><input type="hidden" name="id" value="'+id+'"/><input type="hidden" name="sessionid" value="'+this.sessionid+'"/><input type="hidden" name="formular" value="'+this.name+'"/> <input type="hidden" name="maxfilesize" value="'+this.maxUploadFileSize+'"/> </form><iframe name="uploadframe_'+id+'" id="uploadframe_'+id+'" frameborder="0" style="display:none;"></iframe></div></div>');
contentcontainer.find('#'+id+'_row .filupload-delete').click(SpatialMap.Function.bind(this.deleteFileUpload,this,id)).hide();
} else {
contentcontainer.append('<tr id="'+id+'_row"><td><input type="hidden" id="'+id+'" value="'+(value || '')+'"/><input type="hidden" id="'+id+'_org" value="'+(value || '')+'"/><div class="labeldiv'+(className ? ' '+className : '')+'" id="'+id+'_displayname">'+node.attr('displayname')+'</div></td><td><div class="valuediv"><form id="form_'+id+'" method="POST" target="uploadframe_'+id+'" enctype="multipart/form-data" action="/jsp/modules/formular/upload.jsp"><input type="file" name="file_'+id+'" id="file_'+id+'" /><input type="hidden" name="callbackhandler" value="parent.formular.fileupload"/><input type="hidden" name="id" value="'+id+'"/><input type="hidden" name="sessionid" value="'+this.sessionid+'"/><input type="hidden" name="formular" value="'+this.name+'"/></form><iframe name="uploadframe_'+id+'" id="uploadframe_'+id+'" frameborder="0" style="display:none;"></iframe></div></td></tr>');
contentcontainer.append('<tr id="'+id+'_row"><td><input type="hidden" id="'+id+'" value="'+(value || '')+'"/><input type="hidden" id="'+id+'_org" value="'+(value || '')+'"/><div class="labeldiv'+(className ? ' '+className : '')+'" id="'+id+'_displayname">'+node.attr('displayname')+'</div></td><td><div class="valuediv"><form id="form_'+id+'" method="POST" target="uploadframe_'+id+'" enctype="multipart/form-data" action="/jsp/modules/formular/upload.jsp"><input type="file" name="file_'+id+'" id="file_'+id+'" /><input type="hidden" name="callbackhandler" value="parent.formular.fileupload"/><input type="hidden" name="id" value="'+id+'"/><input type="hidden" name="sessionid" value="'+this.sessionid+'"/><input type="hidden" name="formular" value="'+this.name+'"/> <input type="hidden" name="maxfilesize" value="'+this.maxUploadFileSize+'"/> </form><iframe name="uploadframe_'+id+'" id="uploadframe_'+id+'" frameborder="0" style="display:none;"></iframe></div></td></tr>');
}
jQuery('#file_'+id).change (SpatialMap.Function.bind(function (id) {
this.startFileUpload(id);
Expand Down Expand Up @@ -3601,11 +3603,27 @@ Formular = SpatialMap.Class ({
jQuery('#'+id+'_row .filupload-delete').hide();
},

fileupload: function (filename,id,orgfilename) {
removeInvalidFileNotice: function (id) {
jQuery('#'+id+'_invalidfile').remove();
},

fileupload: function (filename,id,orgfilename,filesize) {
this.endFileUpload();
jQuery('#'+id).val(filename);
jQuery('#'+id+'_org').val(orgfilename);
jQuery('#'+id+'_row .filupload-delete').show();
this.removeInvalidFileNotice(id);
if (typeof filesize !== 'undefined' && (parseInt(filesize) <= this.maxUploadFileSize)) {
jQuery('#'+id).val(filename);
jQuery('#'+id+'_org').val(orgfilename);
jQuery('#'+id+'_row .filupload-delete').show();
} else {
this.deleteFileUpload(id);
var inputRow = jQuery('#'+id+'_row');
var destinationTd = inputRow.children()[1];
jQuery('<div/>', {
id: id+'_invalidfile',
text: 'Filen overskride den maksimale størrelse!'
}).appendTo(destinationTd)

}
},

start: function (options) {
Expand Down Expand Up @@ -3848,8 +3866,15 @@ Formular = SpatialMap.Class ({
}
}
}
}
},

paramHasValue: function (param) {
var curParam = this.currentParams[param];
if (typeof curParam !== 'undefined' && curParam != null && curParam.length > 0) {
return true;
}
return false;
}
});


Expand Down
30 changes: 20 additions & 10 deletions jsp/upload.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
String callbackID = "";
String formular = "formular";
String orgFileName = "";
double fileSize = -1;
int maxFileSize = 0;
FileItem fileUpload = null;
request.setCharacterEncoding("UTF-8");
ServletRequestContext src = new ServletRequestContext(request);
Expand Down Expand Up @@ -80,29 +82,37 @@
sessionID = value;
if (name.equalsIgnoreCase("formular"))
formular = value;
if (name.equalsIgnoreCase("maxfilesize"))
maxFileSize = Integer.parseInt(value);
}
}
}

if(fileUpload != null)
{
Random rand = new Random(System.currentTimeMillis()) ;
long n = Math.abs(rand.nextLong() % 1000000);
orgFileName = uploadedFilename;
filename = formular+"_" + n +"_"+uploadedFilename;
filename = filename.replaceAll(",", "_");
filename = filename.replaceAll(";", "_");
uploadedFilename = tmpDir + File.separator + filename;
File uploadedFile = new File(uploadedFilename);
fileUpload.write(uploadedFile);
//1024*1024 is the size for megbytes
if (fileUpload.getSize() <= (maxFileSize *1024 *1024)) {
Random rand = new Random(System.currentTimeMillis()) ;
long n = Math.abs(rand.nextLong() % 1000000);
orgFileName = uploadedFilename;
filename = formular+"_" + n +"_"+uploadedFilename;
filename = filename.replaceAll(",", "_");
filename = filename.replaceAll(";", "_");
uploadedFilename = tmpDir + File.separator + filename;
File uploadedFile = new File(uploadedFilename);
fileUpload.write(uploadedFile);
fileSize = uploadedFile.length()/(1024*1024);
} else {
fileSize = fileUpload.getSize();
}
}

if (callbackID == null)
callbackID = "fileupload";
if (callbackHandler == null)
callbackHandler = "parent.uploadFilename";

out.println("<body onload=\"" + callbackHandler + "('" + filename.replace('\\', '/') + "','"+callbackID+"','"+orgFileName+"');\">");
out.println("<body onload=\"" + callbackHandler + "('" + filename.replace('\\', '/') + "','"+callbackID+"','"+orgFileName+"','" + fileSize + "');\">");
// out.println("Fil uploadet og skrevet til: " + uploadedFilename);
out.println("</body>");
%>
Expand Down