Rev 1576 | Rev 1734 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1576 | Rev 1701 | ||
|---|---|---|---|
| Line 218... | Line 218... | ||
| 218 | logger.error("MAX FILE UPLOAD EXCEEDED"); |
218 | logger.error("MAX FILE UPLOAD EXCEEDED"); |
| 219 | addMessage(errors, httpServletRequest, "errors.file.too.long", "20MB"); |
219 | addMessage(errors, httpServletRequest, "errors.file.too.long", "20MB"); |
| 220 | return errors; |
220 | return errors; |
| 221 | } |
221 | } |
| 222 | 222 | ||
| 223 | if(getUploadFile().getFileSize() > Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES) |
223 | if(getUploadFile() == null || getUploadFile().getFileSize() == 0) |
| 224 | { |
224 | { |
| 225 | addMessage(errors, httpServletRequest, "errors.file.too.long", Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES + "MB"); |
225 | addMessageAsString(errors,"Um Ficheiro esta Vazio"); |
| 226 | return errors; |
226 | return errors; |
| 227 | } |
227 | } |
| 228 | 228 | ||
| - | 229 | //tod verificar |
|
| - | 230 | try{ |
|
| - | 231 | double fileSize = getUploadFile().getFileSize(); |
|
| - | 232 | fileSize = fileSize / 1024.0 / 1024.0; |
|
| - | 233 | if(fileSize > Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES) |
|
| - | 234 | { |
|
| - | 235 | addMessage(errors, httpServletRequest, "errors.file.too.long", Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES + "MB"); |
|
| - | 236 | return errors; |
|
| - | 237 | } |
|
| - | 238 | }catch(1.5.0/docs/api/java/lang/Throwable.html">Throwable e) |
|
| - | 239 | { |
|
| - | 240 | //muito pequeno se dividir por 0 nao faz mal |
|
| - | 241 | } |
|
| - | 242 | ||
| 229 | if(courseUnitAssignementView.getDeliverDate() == null || courseUnitAssignementView.getDeliverDate().length() == 0) |
243 | if(courseUnitAssignementView.getDeliverDate() == null || courseUnitAssignementView.getDeliverDate().length() == 0) |
| 230 | { |
244 | { |
| 231 | addMessageWithKeys(errors,httpServletRequest,"errors.required","courseunit.assignement.deliver.date"); |
245 | addMessageWithKeys(errors,httpServletRequest,"errors.required","courseunit.assignement.deliver.date"); |
| 232 | } |
246 | } |
| 233 | if(courseUnitAssignementView.getTitle() == null || courseUnitAssignementView.getTitle().trim().length() == 0) |
247 | if(courseUnitAssignementView.getTitle() == null || courseUnitAssignementView.getTitle().trim().length() == 0) |
| Line 246... | Line 260... | ||
| 246 | ActionErrors errors = new ActionErrors(); |
260 | ActionErrors errors = new ActionErrors(); |
| 247 | if(uploadFile == null || uploadFile.getFileSize() == 0) |
261 | if(uploadFile == null || uploadFile.getFileSize() == 0) |
| 248 | { |
262 | { |
| 249 | addMessage(errors,httpServletRequest,"errors.courseunit.assignement.deliver.file"); |
263 | addMessage(errors,httpServletRequest,"errors.courseunit.assignement.deliver.file"); |
| 250 | } |
264 | } |
| - | 265 | ||
| - | 266 | //tod verificar |
|
| - | 267 | try{ |
|
| - | 268 | double fileSize = uploadFile.getFileSize(); |
|
| - | 269 | fileSize = fileSize / 1024.0 / 1024.0; |
|
| - | 270 | if(fileSize > Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES) |
|
| - | 271 | { |
|
| - | 272 | addMessage(errors, httpServletRequest, "errors.file.too.long", Globals.MAX_FILE_UPOLOAD_SIZE_MBYTES + "MB"); |
|
| - | 273 | return errors; |
|
| - | 274 | } |
|
| - | 275 | }catch(1.5.0/docs/api/java/lang/Throwable.html">Throwable e) |
|
| - | 276 | { |
|
| - | 277 | //muito pequeno se dividir por 0 nao faz mal |
|
| - | 278 | } |
|
| 251 | // if(uploadFile != null && uploadFile.getFileName() !=null && !uploadFile.getFileName().endsWith(".zip")) |
279 | // if(uploadFile != null && uploadFile.getFileName() !=null && !uploadFile.getFileName().endsWith(".zip")) |
| 252 | // { |
280 | // { |
| 253 | // addMessage(errors,httpServletRequest,"errors.courseunit.assignement.deliver.zip"); |
281 | // addMessage(errors,httpServletRequest,"errors.courseunit.assignement.deliver.zip"); |
| 254 | // } |
282 | // } |
| 255 | return errors; |
283 | return errors; |