holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix not working regexp mime type attribute in file widget

Browse Source
This commit is contained in:
Hadi Nategh 2020-06-02 14:39:43 +02:00
parent 1ea45e6591
commit 1a91dfab7d
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/js/etemplate/et2_widget_file.js
View File

@ -264,9 +264,7 @@ var et2_file = /** @class */ (function (_super) {
this.options.mime = mime.toLowerCase();
}
else {
// Convert into a js regex
var parts = mime.substr(1).match(/(.*)\/([igm]?)$/);
this.options.mime = new RegExp(parts[1], parts.length > 2 ? parts[2] : "");
this.options.mime = mime;
}
};
et2_file.prototype.set_multiple = function (_multiple) {
@ -283,11 +281,21 @@ var et2_file = /** @class */ (function (_super) {
* @return boolean
*/
et2_file.prototype.checkMime = function (f) {
var mime = '';
if (this.options.mime.indexOf("/") != 0) {
// Lower case it now, if it's not a regex
mime = this.options.mime.toLowerCase();
}
else {
// Convert into a js regex
var parts = this.options.mime.substr(1).match(/(.*)\/([igm]?)$/);
mime = new RegExp(parts[1], parts.length > 2 ? parts[2] : "");
}
// If missing, let the server handle it
if (!this.options.mime || !f.type)
if (!mime || !f.type)
return true;
var is_preg = (typeof this.options.mime == "object");
if (!is_preg && f.type.toLowerCase() == this.options.mime || is_preg && this.options.mime.test(f.type)) {
var is_preg = (typeof mime == "object");
if (!is_preg && f.type.toLowerCase() == mime || is_preg && mime.test(f.type)) {
return true;
}
// Not right mime

25
api/js/etemplate/et2_widget_file.ts
View File

@ -381,9 +381,7 @@ export class et2_file extends et2_inputWidget
}
else
{
// Convert into a js regex
var parts = mime.substr(1).match(/(.*)\/([igm]?)$/);
this.options.mime = new RegExp(parts[1],parts.length > 2 ? parts[2] : "");
this.options.mime = mime;
}
}
@ -405,11 +403,24 @@ export class et2_file extends et2_inputWidget
*/
checkMime(f)
{
// If missing, let the server handle it
if(!this.options.mime || !f.type) return true;
let mime: string | RegExp = '';
if(this.options.mime.indexOf("/") != 0)
{
// Lower case it now, if it's not a regex
mime = this.options.mime.toLowerCase();
}
else
{
// Convert into a js regex
var parts = this.options.mime.substr(1).match(/(.*)\/([igm]?)$/);
mime = new RegExp(parts[1],parts.length > 2 ? parts[2] : "");
}
var is_preg = (typeof this.options.mime == "object");
if(!is_preg && f.type.toLowerCase() == this.options.mime || is_preg && this.options.mime.test(f.type))
// If missing, let the server handle it
if(!mime || !f.type) return true;
var is_preg = (typeof mime == "object");
if(!is_preg && f.type.toLowerCase() == mime || is_preg && mime.test(f.type))
{
return true;
}