From d85de79efea6b68c0034a5812fb0b8e6e556f73f Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Tue, 9 Sep 2014 10:51:11 -0400
Subject: [PATCH] BUG-14990 - NEW FEATURE, permitir especificar extensiones
 para los inputdocs.

Nuevo campo en Input Documents, dicho campo acepta las extensiones de los inputdocs permitidos.

Se agregaron validaciones para que funcione correctamente
---
 gulliver/system/class.g.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 674306e83..50d1c5dcb 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -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 {