fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in jennydmz/processmaker/BUG-14990 (pull request #764)

Browse Source 
BUG-14990 - NEW FEATURE, permitir especificar extensiones para los inputdocs.
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-09 11:27:12 -04:00
parent e5b020b7c3 d85de79efe
commit 388125e2f2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gulliver/system/class.g.php
View File

@@ -5367,26 +5367,27 @@ class G
foreach ($allowedTypes as $types => $val) {
if((preg_match('/^\*\.?[a-z]{2,8}$/', $val)) || ($val == '*.*')){
$allowedDocTypes = substr($val, 2);
$dtype = explode(".", $filesName);
switch($allowedDocTypes){
case '*':
$res->status = true;
return $res;
break;
case 'xls':
if($docType[1] != 'vnd.ms-excel'){
$flag = 1;
if($docType[1] == 'vnd.ms-excel' || ($dtype[count($dtype) - 1] == 'xls' && $docType[1] == 'plain')){
$res->status = true;
return $res;
} else {
$res->status = true;
return $res;
$flag = 1;
}
break;
case 'doc':
if($docType[1] != 'msword'){
$flag = 1;
if($docType[1] == 'msword' || ($dtype[count($dtype) - 1] == 'doc' && $docType[1] == 'html')){
$res->status = true;
return $res;
} else {
$res->status = true;
return $res;
$flag = 1;
}
break;
case 'ppt':
@@ -5475,12 +5476,11 @@ class G
if ($docType[1] != $allowedDocTypes){
$flag = 1;
} else {
$res->status = true;
return $res;
$res->status = true;
return $res;
}
break;
default:
$dtype = explode(".", $filesName);
if(($dtype[count($dtype) - 1]) != $allowedDocTypes){
$flag = 1;
} else {