From b4ff11ddecc7cc2ede19862956d50ea19dc27470 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Thu, 3 Jul 2014 16:37:24 -0400
Subject: [PATCH 01/48] BUG-14986 Authorization Bypass via Forceful Browsing
 IMPROVEMENT

---
 workflow/engine/methods/users/usersNew.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index a81603d06..dff07aee6 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -1,4 +1,6 @@
 <?php
+global $RBAC;
+$RBAC->requirePermissions( 'PM_USERS' );
 
 //calculating the max upload file size;
 $POST_MAX_SIZE = ini_get( 'post_max_size' );

From 692a1917e2cd369aa493056b848a6e2d4b586e4f Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 8 Jul 2014 10:46:55 -0400
Subject: [PATCH 02/48] Initializing vars correctly to avoid warnings messages

---
 workflow/engine/classes/class.case.php          | 2 +-
 workflow/engine/classes/model/AppDelegation.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 8285ba92d..c0b58a134 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -577,7 +577,7 @@ class Cases
                     if ($jump != '') {
                         $aCases = $oAppDel->LoadParallel($sAppUid);
                         $aFields['TAS_UID'] = '';
-                        $aFields['CURRENT_USER'] = '';
+                        $aFields['CURRENT_USER'] = array();
                         foreach ($aCases as $key => $value) {
                             $oCurUser->load($value['USR_UID']);
                             $aFields['CURRENT_USER'][]= $oCurUser->getUsrFirstname() . ' ' . $oCurUser->getUsrLastname();
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index c0aba5826..4fcaf98d4 100755
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -211,6 +211,8 @@ class AppDelegation extends BaseAppDelegation
 
     public function LoadParallel ($AppUid)
     {
+        $aCases = array();
+
         $c = new Criteria( 'workflow' );
         $c->addSelectColumn( AppDelegationPeer::APP_UID );
         $c->addSelectColumn( AppDelegationPeer::DEL_INDEX );

From ff6ff61c00920df8a8c39ef08d08c326aa6c92ca Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 11 Jul 2014 12:07:24 -0400
Subject: [PATCH 03/48] BUG 15419 Notificaciones incorrectas aplicando
 PPP_FAILED_LOGINS SOLVED

- The message was overwrited with the standard message
- Now the message is displayed correctly and I made some improvements in the PPP functionality
---
 .../engine/methods/login/authentication.php   | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index c25eb35e5..be9903e58 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -93,7 +93,7 @@ try {
         }
 
         if (!isset($uid) || $uid < 0) {
-            if (isset($_SESSION['FAILED_LOGINS'])) {
+            if (isset($_SESSION['FAILED_LOGINS']) && ($uid == -1 || $uid == -2)) {
                 $_SESSION['FAILED_LOGINS']++;
             }
             if (!defined('PPP_FAILED_LOGINS')) {
@@ -113,8 +113,13 @@ try {
                         $oStatement  = $oConnection->prepareStatement("UPDATE USERS SET USR_STATUS = 'INACTIVE' WHERE USR_UID = '" . $sUserUID . "'");
                         $oStatement->executeQuery();
                         unset($_SESSION['FAILED_LOGINS']);
-                        G::SendMessageText(G::LoadTranslation('ID_ACCOUNT') . ' "' . $usr . '" ' . G::LoadTranslation('ID_ACCOUNT_DISABLED_CONTACT_ADMIN'), 'warning');
+                        $errLabel = G::LoadTranslation('ID_ACCOUNT') . ' "' . $usr . '" ' . G::LoadTranslation('ID_ACCOUNT_DISABLED_CONTACT_ADMIN');
                     }
+                    //Log failed authentications
+            	    $message  = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . G::getIpAddress() . " |  WS: " . SYS_SYS;
+            	    $message .= " | BROWSER: " . $_SERVER['HTTP_USER_AGENT'] ." | \n" ;
+
+            	    G::log($message, PATH_DATA, 'loginFailed.log');
                 }
             }
 
@@ -131,20 +136,6 @@ try {
                 }
             }
 
-            //LOG Filed authentications
-            $filedTimes = (defined(PPP_FAILED_LOGINS)) ? PPP_FAILED_LOGINS : 3;
-
-            if($_SESSION['FAILED_LOGINS'] > $filedTimes){
-            	$ip = G::getIpAddress();
-            	$browser = $_SERVER['HTTP_USER_AGENT'];
-
-            	$path = PATH_DATA;
-            	$message = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . $ip . " |  WS: " . SYS_SYS . " | BROWSER: " .$browser ." | \n" ;
-            	$file = "loginFailed.log";
-
-            	G::log($message, $path, $file);
-            }
-
             G::header("location: $loginUrl");
             die;
         }

From 904819f15f6e274fdcf8896759095e4428bf5197 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 11 Jul 2014 12:36:20 -0400
Subject: [PATCH 04/48] BUG 15400 La opcion Process Information del Case
 Information Menu no funciona SOLVED

- "Configuration" class not included
- Include "Configuration" class in the requested function
---
 workflow/engine/methods/cases/ajaxListener.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php
index f3a5f210d..534dd0063 100755
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -334,6 +334,7 @@ class Ajax
             $processData['PRO_AUTHOR'] = '(USER DELETED)';
         }
 
+        G::LoadClass('configuration');
         $conf = new Configurations();
         $conf->getFormats();
         $processData['PRO_CREATE_DATE'] = $conf->getSystemDate($processData['PRO_CREATE_DATE']);

From cd1e1886ff7a0bf9b949f9245182ad7f17858fa2 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 11 Jul 2014 15:30:27 -0400
Subject: [PATCH 05/48] Improvemenet in the preview of forms in case history

---
 workflow/engine/methods/cases/ajaxListener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php
index 534dd0063..9b99f8e98 100755
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -810,7 +810,7 @@ class Ajax
     public function dynaformViewFromHistory()
     {
         ?>
-        <link rel="stylesheet" type="text/css" href="/css/classic.css" />
+        <link rel="stylesheet" type="text/css" href="/css/<?php echo SYS_SKIN; ?>.css" />
 
         <script type="text/javascript">
             //!Code that simulated reload library javascript maborak

From 2ff5c02eb371d2981b52124875afa7e032588063 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Fri, 11 Jul 2014 15:55:55 -0400
Subject: [PATCH 06/48] BUG_14198 PMPOWERUP Input Document viewer no funciona
 con grillas.

La herramienta 'Input Documet Viewer' del plugin pmPowerUp no funcionaba con grillas ya q no se estaba tomando en cuenta que el campo file dentro de una grilla tenga un inputDocument asociado y se le asignaba un -1 por defecto en ves del UID del iput document asociado.

Se agrego en la variable POST los datos del inputDoc asociado a cada file field en la grilla.
---
 gulliver/system/class.form.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php
index 4e7e6a1c0..caaae0936 100755
--- a/gulliver/system/class.form.php
+++ b/gulliver/system/class.form.php
@@ -548,6 +548,15 @@ class Form extends XmlForm
                                 //This value is added when the user does not mark any checkbox
                                 $values[$k] = "__NULL__";
                                 break;
+                            case "grid":
+                                $values[$k] = $_FILES["form"]["name"][$k];
+                                foreach ($values[$k] as $inp => $ii){
+                                	foreach ($ii as $oo => $ee){
+                                		$x = $v->fields;
+                                		$_POST["INPUTS"][$k][$oo] = $x[$oo]->input;
+                                	}
+                                }
+                                break;
                         }
                     }
                 } else {

From 3b0584fb49ff8c632610365d26ff23fc9cd67e1e Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 14 Jul 2014 11:50:56 -0400
Subject: [PATCH 07/48] BUG-15399 Paginacion en listado de usuarios no funciona
 bien.

Cuando se realiza una busqueda en el listado de usuarios, y el resultado es de mas de una pagina, al avanzar a la siguiente pagina el filtro se pierde mostrando de nuevo el total de usuarios original.

Se agrego el filtro cuando se avanza entre las paginas, para q este sea tomado en cuenta.
---
 workflow/engine/templates/users/usersList.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js
index 6060efb18..4cb3965fb 100755
--- a/workflow/engine/templates/users/usersList.js
+++ b/workflow/engine/templates/users/usersList.js
@@ -622,12 +622,14 @@ render_lastlogin = function(v){
 //Load Grid By Default
 GridByDefault = function(){
   searchText.reset();
-  infoGrid.store.load();
+  store.setBaseParam( 'textFilter', '');
+  store.load();
 };
 
 //Do Search Function
 DoSearch = function(){
-  infoGrid.store.load({params: {textFilter: searchText.getValue()}});
+  store.setBaseParam( 'textFilter', searchText.getValue());
+  store.load();
 };
 
 //Delete User Function

From 3eca73789869df23a50920e0d5f884bc6196c497 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 14 Jul 2014 15:13:23 -0400
Subject: [PATCH 08/48] BUG_13887 Permite eliminacion del lenguaje actual.

El lengujae actual podia ser borrado.
El lenguaje por defecto 'en' tambien podia ser borrado.

Se agrego validaciones para que el lenguaje por defecto de PM (en) no sea eliminado jamas y tambien para que el lenguaje que se esta usando actualmente tampoco sea eliminado.
---
 .../engine/methods/setup/language_Ajax.php    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index c645ff3a3..b30a0488a 100755
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -152,17 +152,28 @@ try {
             $oContent = new Content();
             $aRow = $oDataset->getRow();
 
-            //THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
-            if ($aRow[0] == 0) { //so we can delete this language
-                try {
-                    Content::removeLanguageContent( $locale );
-                    $trn->removeTranslationEnvironment( $locale );
-                    echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' );
-                } catch (Exception $e) {
-                    echo $e->getMessage();
-                }
+            $actualLanguage = $_ENV['REQUEST_URI'];
+            $actualLanguage = explode("/", $actualLanguage);
+
+            if($locale != "en"){ //Default Lengage 'en'
+            	if($locale != $actualLanguage[2]){ //Current lenguage
+            		//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
+            		if ($aRow[0] == 0) { //so we can delete this language
+            			try {
+            				Content::removeLanguageContent( $locale );
+            				$trn->removeTranslationEnvironment( $locale );
+            				echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' );
+            			} catch (Exception $e) {
+            				echo $e->getMessage();
+            			}
+            		} else {
+            			echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) );
+            		}
+            	} else {
+            		echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE_CURRENTLY' ) );
+            	}
             } else {
-                echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) );
+            	echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE_DEFAULT' ) );
             }
             break;
     }

From 37c9f9d3606271e136595a5c22e1b79d1cc8dc23 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Tue, 15 Jul 2014 15:35:44 -0400
Subject: [PATCH 09/48] BUG_13887 Permite eliminacion del lenguaje actual.

El lenguaje actual podia ser borrado.
El lenguaje por defecto 'en' tambien podia ser borrado.

Se agrego validaciones para que el lenguaje por defecto de PM (en) no sea eliminado jamas y tambien para que el lenguaje que se esta usando actualmente tampoco sea eliminado.
---
 workflow/engine/methods/setup/language_Ajax.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index b30a0488a..3bb445ee6 100755
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -152,11 +152,8 @@ try {
             $oContent = new Content();
             $aRow = $oDataset->getRow();
 
-            $actualLanguage = $_ENV['REQUEST_URI'];
-            $actualLanguage = explode("/", $actualLanguage);
-
             if($locale != "en"){ //Default Lengage 'en'
-            	if($locale != $actualLanguage[2]){ //Current lenguage
+            	if($locale != SYS_LANG){ //Current lenguage
             		//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE
             		if ($aRow[0] == 0) { //so we can delete this language
             			try {

From c9a90446fa551fb8f78c92f7bbf46d720449ef0e Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 17 Jul 2014 11:24:44 -0400
Subject: [PATCH 10/48] BUG 13546 "Creacion de una nueva plantilla sin..."
 SOLVED

- Creacion de una nueva plantilla sin nombre.
- Problema resuelto, cuando se crea una nueva plantilla y no se coloca nada en la caja de texto, al hacer click en el boton
  "create" le mostrara un mensaje indicando que introduzca un nombre. Cuando se tiene creado varios plantillas y se quiere
  crear uno que ya existe, se mostrara un mensaje indicando que el file ya existe.
---
 .../methods/processes/processes_Ajax.php      | 22 +++++++
 .../processes/processes_FilesOptions.xml      | 57 +++++++++++++------
 2 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index e8bb90191..dec6593ef 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -695,6 +695,28 @@ try {
             //$json = new Services_JSON();
             $sOutput = Bootstrap::json_encode($response);
             break;
+        case "verifyNameFile":
+            $response = array();
+            $status = "OK";
+
+            $filename = $_POST["filename"];
+            $pathDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST["pro_uid"] . PATH_SEP;
+
+            if (is_dir($pathDirectory)) {
+                $myDirectory = opendir($pathDirectory);
+
+                while ($myFile = readdir($myDirectory)) {
+                    if ($myFile == $filename) {
+                        $status = "ERROR";
+                    }
+                }
+
+                closedir($myDirectory);
+            }
+
+            $response["status"] = $status;
+            echo Bootstrap::json_encode($response);
+            break;
     }
     if (isset($sOutput)) {
         die($sOutput);
diff --git a/workflow/engine/xmlform/processes/processes_FilesOptions.xml b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
index 2ea24df15..a8d6a7247 100755
--- a/workflow/engine/xmlform/processes/processes_FilesOptions.xml
+++ b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
@@ -152,25 +152,48 @@ function showCreateEmptyOptions(e, MAIN_DIRECTORY){
 }
 
 function saveEmptyFile(){
-	var fileName = getField('emptyfilename').value + ".html";
-	fileName = fileName.trim();
+     var fileName = getField("emptyfilename").value.trim();
 
-	var oRPC = new leimnud.module.rpc.xmlhttp({
-	  	url : 'processes_Ajax',
-	  	args: 'action=saveFile&filename='+fileName+'&pro_uid='+CURRENT_PRO_UID+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='
-  	});
+     if(fileName != "") {
+         fileName = fileName + ".html";
+         fileName = fileName.trim();
 
-  	oRPC.callback = function(rpc){
-		showCreateEmptyOptionsPanel.remove();
-		/// goToDirectory(CURRENT_PRO_UID, 'mailTemplates', '');
-    if(typeof(CURRENT_MAIN_DIRECTORY) != "undefined" ) {
-      goToDirectory(CURRENT_PRO_UID, CURRENT_MAIN_DIRECTORY, '');
-    } else {
-      goToDirectory(CURRENT_PRO_UID, 'mailTemplates', '');
-    }
-		editFile(CURRENT_PRO_UID, fileName)
-	}.extend(this);
-	oRPC.make();
+         var rpcAjax = new leimnud.module.rpc.xmlhttp({
+             url:    "processes_Ajax",
+             method: "POST",
+             args:   "action=verifyNameFile&filename=" + fileName + "&pro_uid=" + CURRENT_PRO_UID + "&MAIN_DIRECTORY=" + CURRENT_MAIN_DIRECTORY + "&fcontent="
+         });
+
+         rpcAjax.callback = function (rpc)
+         {
+             var response = rpc.xmlhttp.responseText.parseJSON();
+             var status = response.status;
+
+             if (status == "OK") {
+	               var oRPC = new leimnud.module.rpc.xmlhttp({
+	                   url : 'processes_Ajax',
+                    args: 'action=saveFile&filename='+fileName+'&pro_uid='+CURRENT_PRO_UID+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='
+                });
+
+                oRPC.callback = function(rpc){
+                    showCreateEmptyOptionsPanel.remove();
+                    /// goToDirectory(CURRENT_PRO_UID, 'mailTemplates', '');
+                    if(typeof(CURRENT_MAIN_DIRECTORY) != "undefined" ) {
+                        goToDirectory(CURRENT_PRO_UID, CURRENT_MAIN_DIRECTORY, '');
+                    } else {
+                        goToDirectory(CURRENT_PRO_UID, 'mailTemplates', '');
+                    }
+                    editFile(CURRENT_PRO_UID, fileName)
+                }.extend(this);
+	               oRPC.make();
+             } else {
+                 new leimnud.module.app.alert().make({label: "The file exists."});
+             }
+         }.extend(this);
+         rpcAjax.make();
+     } else {
+         new leimnud.module.app.alert().make({label: "File name required."});
+     }
 }
 
 function xReaload(){

From 2e48193d8c7270cba64c2278053768d876bfff63 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 17 Jul 2014 15:05:43 -0400
Subject: [PATCH 11/48] BUG 13546 "Creacion de una nueva plantilla sin..."
 SOLVED

- Creacion de una nueva plantilla sin nombre.
- Problema resuelto, cuando se crea una nueva plantilla y no se coloca nada en la caja de texto, al hacer click en el boton
  "create" le mostrara un mensaje indicando que introduzca un nombre. Cuando se tiene creado varios plantillas y se quiere
  crear uno que ya existe, se mostrara un mensaje indicando que el file ya existe.
---
 .../engine/methods/processes/processes_Ajax.php     | 13 +++----------
 .../xmlform/processes/processes_FilesOptions.xml    |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index dec6593ef..3014d4fed 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -700,18 +700,11 @@ try {
             $status = "OK";
 
             $filename = $_POST["filename"];
+
             $pathDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST["pro_uid"] . PATH_SEP;
 
-            if (is_dir($pathDirectory)) {
-                $myDirectory = opendir($pathDirectory);
-
-                while ($myFile = readdir($myDirectory)) {
-                    if ($myFile == $filename) {
-                        $status = "ERROR";
-                    }
-                }
-
-                closedir($myDirectory);
+            if (file_exists($pathDirectory . PATH_SEP . $filename)) {
+                $status = "ERROR";
             }
 
             $response["status"] = $status;
diff --git a/workflow/engine/xmlform/processes/processes_FilesOptions.xml b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
index a8d6a7247..88efc785b 100755
--- a/workflow/engine/xmlform/processes/processes_FilesOptions.xml
+++ b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
@@ -187,12 +187,12 @@ function saveEmptyFile(){
                 }.extend(this);
 	               oRPC.make();
              } else {
-                 new leimnud.module.app.alert().make({label: "The file exists."});
+                 new leimnud.module.app.alert().make({label: _("ID_EXISTS_FILES")});
              }
          }.extend(this);
          rpcAjax.make();
      } else {
-         new leimnud.module.app.alert().make({label: "File name required."});
+         new leimnud.module.app.alert().make({label: _("ID_FILENAME_REQUIRED")});
      }
 }
 

From 045dfb52c82bcef7fda399099f08337c849c7901 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 18 Jul 2014 13:25:38 -0400
Subject: [PATCH 12/48] Add little validation on class form

---
 gulliver/system/class.form.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php
index caaae0936..3d3322ad8 100755
--- a/gulliver/system/class.form.php
+++ b/gulliver/system/class.form.php
@@ -548,14 +548,14 @@ class Form extends XmlForm
                                 //This value is added when the user does not mark any checkbox
                                 $values[$k] = "__NULL__";
                                 break;
-                            case "grid":
-                                $values[$k] = $_FILES["form"]["name"][$k];
-                                foreach ($values[$k] as $inp => $ii){
-                                	foreach ($ii as $oo => $ee){
-                                		$x = $v->fields;
-                                		$_POST["INPUTS"][$k][$oo] = $x[$oo]->input;
-                                	}
-                                }
+                            case "grid":
+                                $values[$k] = $_FILES["form"]["name"][$k];
+                                foreach ($values[$k] as $inp => $ii){
+                                	foreach ($ii as $oo => $ee){
+                                		$x = $v->fields;
+                                		$_POST["INPUTS"][$k][$oo] = $x[$oo]->input;
+                                	}
+                                }
                                 break;
                         }
                     }
@@ -699,6 +699,9 @@ class Form extends XmlForm
                         break;
                     case "grid":
                         $i = 0;
+                        if (!is_array($data[$v->name])) {
+                            $data[$v->name] = array();
+                        }
                         foreach ($data[$v->name] as $dataGrid) {
                             $i = $i + 1;
 

From 3481b35af3bac9f3fe8d99c5af5de4f4716a16bb Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Fri, 18 Jul 2014 14:58:07 -0400
Subject: [PATCH 13/48] BUG-14033 No existe validacion para el titulo de
 dashboards.

Se agrego la validacion de longitud y la grilla del listado de dashboards.
---
 workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css   | 6 ++++++
 .../engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css  | 6 ++++++
 workflow/engine/templates/dashboard/dashletInstanceForm.js | 1 +
 workflow/engine/templates/dashboard/dashletsList.js        | 7 ++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
index a352daa6e..c4d0dca6f 100755
--- a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
+++ b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
@@ -1589,4 +1589,10 @@ td.x-cnotes-label {
   padding-bottom: 15px;
   padding-left: 3px;
   padding-right: 3px;
+}
+
+.title-dashboard-text {
+  margin:5px  !important;
+  white-space:pre-wrap !important;
+  display:inline-block;
 }
\ No newline at end of file
diff --git a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
index 830bba415..3f8b18adf 100644
--- a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
+++ b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
@@ -1673,3 +1673,9 @@ td.x-cnotes-label {
 #ext-comp-1010.xtb-text {
   font-size: 9px;
 }
+
+.title-dashboard-text {
+  margin:5px  !important;
+  white-space:pre-wrap !important;
+  display:inline-block;
+}
\ No newline at end of file
diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js
index d1317e6a5..923bdb63c 100644
--- a/workflow/engine/templates/dashboard/dashletInstanceForm.js
+++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js
@@ -66,6 +66,7 @@ Ext.onReady(function() {
     name:       'DAS_INS_TITLE',
     fieldLabel: _('ID_TITLE'),
     allowBlank: false,
+    maxLength: 200,
     width:      320,
     listeners:  {
       blur: function() {
diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js
index f4b11e8d2..dd583174e 100644
--- a/workflow/engine/templates/dashboard/dashletsList.js
+++ b/workflow/engine/templates/dashboard/dashletsList.js
@@ -185,6 +185,11 @@ Ext.onReady(function(){
     }
   });
 
+  function formatLineWrap(value){
+      str = '<div class="title-dashboard-text">'+value+'</div>';
+      return str;
+  }
+
   cmodel = new Ext.grid.ColumnModel({
     defaults: {
       width: 50,
@@ -192,7 +197,7 @@ Ext.onReady(function(){
     },
     columns: [
       {id:'DAS_INS_UID', dataIndex: 'DAS_INS_UID', hidden:true, hideable:false},
-      {header: _("ID_TITLE"), dataIndex: "DAS_INS_TITLE", width: 150, hidden: false, align: "left"},
+      {header: _("ID_TITLE"), dataIndex: "DAS_INS_TITLE", width: 150, hidden: false, align: "left", renderer : formatLineWrap},
       {header: _("ID_DASHLET"), dataIndex: "DAS_TITLE", width: 200, hidden: false, align: "left"},
       {header: _('ID_VERSION'), dataIndex: 'DAS_VERSION', width: 60, hidden: false, align: 'center'},
       {header: _('ID_ASSIGNED_TO'), dataIndex: 'DAS_INS_OWNER_TITLE', width: 200, hidden: false, align: 'center'},

From 9920e99c0458ef39afe564419cbca18c8881df55 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 21 Jul 2014 12:56:18 -0400
Subject: [PATCH 14/48] BUG-15198 Text field con query en modo view sigue
 ejecutando el query.

Todos los campos que tienen habillitada la opcion de query se ejecutaban en modo view cambiando el valor escogido o ingresado por el usuario a el valor que devuelve el query.

Se agrego una validacion para evitar que cuando el form esta en modo view se ejecute el query para los siguientes fields: text, currency, percentage, textarea, hidden, suggest.
---
 gulliver/system/class.xmlform.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 7faef22e7..7630e2c46 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -319,6 +319,11 @@ class XmlForm_Field
         if ($this->sql === '') {
             return 1;
         }
+
+        if($this->renderMode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
+        	return 1;
+        }
+
         if (! $this->sqlConnection) {
             $this->sqlConnection = 'workflow';
         }

From 373da58a505549535c29b67c071542d2141f6761 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 21 Jul 2014 17:05:15 -0400
Subject: [PATCH 15/48] =?UTF-8?q?BUG=2013239=20"Al=20crearte=20un=20field?=
 =?UTF-8?q?=20con=20caracter=20'=C3=B1e=20visualiza=20un=20error=20en=20la?=
 =?UTF-8?q?=20pesta=C3=B1review"=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Al crearte un field con caracter 'ñe visualiza un error en la pestañreview
- Problema resuelto, se agrega validacion para las teclas en la validacion de los campos con el atributo "NodeName"
  en el archivo form.js

  Disponible para la version 2.5.3 de ProcessMaker.
---
 gulliver/js/form/core/form.js       | 19 ++++++++++++++-----
 gulliver/js/maborak/core/maborak.js |  4 +++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index ce374db8c..3807c7954 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -1213,8 +1213,17 @@ function G_Text(form, element, name)
     if (me.validate == 'Any' && me.mask == '') return true;
 
     var pressKey = (window.event)? window.event.keyCode : event.which;
-    if (pressKey == 107 || pressKey == 187 || pressKey == 191 || pressKey == 192 || pressKey == 172 || pressKey == 171 || pressKey == 226 || pressKey == 220 || pressKey == 226 || pressKey == 0 || pressKey == 221 || pressKey == 222 || pressKey == 186) {
-        pressKey = 43;
+
+    if (me.validate == "NodeName" && (pressKey == 189 || pressKey == 173)) {
+        return true;
+    }
+
+    if (me.validate == "NodeName" && (pressKey == 0 || pressKey == 192 ||  pressKey == 109)) {
+        return false;
+    }
+
+    if (pressKey == 107 || pressKey == 187 || pressKey == 191 || pressKey == 172 || pressKey == 171 || pressKey == 226 || pressKey == 220 || pressKey == 226 || pressKey == 221 || pressKey == 222 || pressKey == 186) {
+       pressKey = 43;
     }
 
     switch(pressKey){
@@ -3930,15 +3939,15 @@ function dropDownSetOption(elem, arrayOption)
 function dynaFormChanged(frm)
 {
     for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) {
-        
+
         if((frm.elements[i1].type=="radio" || frm.elements[i1].type=="checkbox") && (frm.elements[i1].checked!=frm.elements[i1].defaultChecked)) {
           return true;
         }
-        
+
         if((frm.elements[i1].type=="textarea" || frm.elements[i1].type=="text" || frm.elements[i1].type=="file") && (frm.elements[i1].value!=frm.elements[i1].defaultValue)) {
           return true;
         }
-        
+
 
         if (frm.elements[i1].tagName.toLowerCase() == "select") {
             var selectDefaultValue = frm.elements[i1].value;
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index 5457d1b7f..bb3a88df7 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1024,7 +1024,9 @@ switch(action){case'mask':case'move':dataNewMask=me.replaceMasks(newValue,newCur
 break;case 256:newValue=currentValue.substring(0,cursorStart);newValue+='.';newValue+=currentValue.substring(cursorEnd,currentValue.length);newCursor=cursorStart+1;break;case 35:case 36:case 37:case 38:case 39:case 40:newValue=currentValue;switch(keyCode){case 36:newCursor=0;break;case 35:newCursor=currentValue.length;break;case 37:newCursor=cursorStart-1;break;case 39:newCursor=cursorStart+1;break;}
 break;default:newKey=String.fromCharCode(keyCode);newValue=currentValue.substring(0,cursorStart);newValue+=newKey;newValue+=currentValue.substring(cursorEnd,currentValue.length);newCursor=cursorStart+1;break;}
 if(newCursor<0)newCursor=0;me.element.value=newValue;me.setSelectionRange(newCursor,newCursor);}};this.sendOnChange=function(){if(me.element.fireEvent){me.element.fireEvent("onchange");}else{var evObj=document.createEvent('HTMLEvents');evObj.initEvent('change',true,true);me.element.dispatchEvent(evObj);}};this.handleKeyDown=function(event){if(me.element.readOnly){return true;}
-if(me.validate=='Any'&&me.mask=='')return true;var pressKey=(window.event)?window.event.keyCode:event.which;if(pressKey==107||pressKey==187||pressKey==191||pressKey==192||pressKey==172||pressKey==171||pressKey==226||pressKey==220||pressKey==226||pressKey==0||pressKey==221||pressKey==222||pressKey==186){pressKey=43;}
+if(me.validate=='Any'&&me.mask=='')return true;var pressKey=(window.event)?window.event.keyCode:event.which;if(me.validate=="NodeName"&&(pressKey==189||pressKey==173)){return true;}
+if(me.validate=="NodeName"&&(pressKey==0||pressKey==192||pressKey==109)){return false;}
+if(pressKey==107||pressKey==187||pressKey==191||pressKey==172||pressKey==171||pressKey==226||pressKey==220||pressKey==226||pressKey==221||pressKey==222||pressKey==186){pressKey=43;}
 switch(pressKey){case 8:case 46:case 35:case 36:case 37:case 38:case 39:case 40:case 43:if((pressKey==8||pressKey==46)&&me.validate=="NodeName"){return true;}
 if(pressKey==46&&me.validate=="Email"){return true;}
 if(me.validate=="Email"&&pressKey!=8&&(me.element.value.length>me.element.maxLength-1)){return false;}

From 07b5034247fe7d02358adcfcfc713a1ac8739987 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 22 Jul 2014 13:24:22 -0400
Subject: [PATCH 16/48] Update .po file 2014-07-22

---
 .../translations/english/processmaker.en.po    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 9fd837158..8944b8fb5 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ProcessMaker 2.5.2.3\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2014-07-03 12:29:08\n"
+"PO-Revision-Date: 2014-07-22 13:19:57\n"
 "Last-Translator: \n"
 "Language-Team: Colosa Developers Team <developers@colosa.com>\n"
 "MIME-Version: 1.0\n"
@@ -5032,8 +5032,8 @@ msgstr "To delete a language you should select a item from the list first."
 # TRANSLATION
 # LABEL/ID_DELETE_LANGUAGE_CONFIRM
 #: LABEL/ID_DELETE_LANGUAGE_CONFIRM
-msgid "Do you want remove the language \"{0}\" ?"
-msgstr "Do you want remove the language \"{0}\" ?"
+msgid "Are you sure you want to delete the language \"{0}\"?"
+msgstr "Are you sure you want to delete the language \"{0}\"?"
 
 # TRANSLATION
 # LABEL/ID_DELETE_LANGUAGE
@@ -16339,6 +16339,18 @@ msgstr "The variable \"{0}\" required the variables \"{1}\" for the query."
 msgid "The Output Document with {0}: {1} it's assigned in \"{2}\"."
 msgstr "The Output Document with {0}: {1} it's assigned in \"{2}\"."
 
+# TRANSLATION
+# LABEL/ID_EXISTS_FILES
+#: LABEL/ID_EXISTS_FILES
+msgid "The file exists."
+msgstr "The file exists."
+
+# TRANSLATION
+# LABEL/ID_FILENAME_REQUIRED
+#: LABEL/ID_FILENAME_REQUIRED
+msgid "The filename is required."
+msgstr "The filename is required."
+
 # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
 # additionalTables/additionalTablesData.xml
 #: text - ADD_TAB_NAME

From 15de9859eca20ba23ea65476a6a2887c961eab78 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 23 Jul 2014 09:20:31 -0400
Subject: [PATCH 17/48] Improvement Plugin EnhancedLogin

- A validation was added validation for login.
---
 workflow/engine/methods/login/authentication.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index be9903e58..8dd5a21bc 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -310,6 +310,17 @@ try {
 
     $oHeadPublisher->addExtJsScript('login/init', false);    //adding a javascript file .js
     $oHeadPublisher->assign('uriReq', $sLocation);
+
+    $sFilename = PATH_PLUGINS . 'pmEnhancedLogin.php' ;
+
+    if (file_exists($sFilename)) {
+        require_once $sFilename;
+
+        if (class_exists( 'pmEnhancedLoginplugin' )) {
+            $oPlugin = new pmEnhancedLoginplugin( 'pmEnhancedLogin', $sFilename );
+            $oPlugin->authenticationandcontrolWS();
+        }
+    }
     G::RenderPage('publish', 'extJs');
     //G::header('Location: ' . $sLocation);
     die;

From ca204e22ec5f846dbe0eff7ce86f9d38c51e16c1 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 23 Jul 2014 11:02:39 -0400
Subject: [PATCH 18/48] BUG-15384 Issue in the field check-box from Dynaform
 with the label.

When a label in a required field has a line break, a js error happens.

When the eval function is applied to the label's string, the line break is taked as the conclusion of the string, and js searchs " (double quotes) which closes the string without finding it and giving the error: "SintaxError: unterminated string literal"

So I use the replace function to change the break line to a simple space, this solves the problem and the error does not happend again.
---
 gulliver/js/form/core/form.js       | 1 +
 gulliver/js/maborak/core/maborak.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 3807c7954..d3cc86ab7 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -2969,6 +2969,7 @@ var validateForm = function(sRequiredFields) {
          *  i.ei <form onsubmit="myaction(MyjsString)" ...   with var MyjsString = "some string that is into a variable, so this broke the html";
         */
 
+        sRequiredFields = sRequiredFields.replace(/\n/g, " ");
         if( typeof(sRequiredFields) != 'object' || sRequiredFields.indexOf("%27") > 0 ) {
             sRequiredFields = sRequiredFields.replace(/%27/gi, '"');
         }
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index bb3a88df7..e1d94c894 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1209,7 +1209,7 @@ dropdowns=grids[j].getElementsByTagName('select');for(i=0;i<dropdowns.length;i++
 fieldGridName=$label[1]+"["+$label[2]+"["+$label[3].split("]")[0];if(!notValidateThisFields.inArray(fieldGridName)){invalidFields.push($fieldName);}
 vtext.failed();}else{vtext.passed();}}}
 return(invalidFields);};var swSubmitValidateForm=1;var validateForm=function(sRequiredFields){if(swSubmitValidateForm==1){swSubmitValidateForm=0;sFormName=document.getElementById('__DynaformName__');if(typeof(__dynaformSVal__)!='undefined'&&(typeof(sFormName)!='undefined'&&sFormName!='login')&&(typeof(__usernameLogged__)!='undefined'&&__usernameLogged__!='')){if(!sessionPersits()){showPromptLogin('session');swSubmitValidateForm=1;return false;}}
-if(typeof(sRequiredFields)!='object'||sRequiredFields.indexOf("%27")>0){sRequiredFields=sRequiredFields.replace(/%27/gi,'"');}
+sRequiredFields=sRequiredFields.replace(/\n/g," ");if(typeof(sRequiredFields)!='object'||sRequiredFields.indexOf("%27")>0){sRequiredFields=sRequiredFields.replace(/%27/gi,'"');}
 if(typeof(sRequiredFields)!='object'||sRequiredFields.indexOf("%39")>0){sRequiredFields=sRequiredFields.replace(/%39/gi,"'");}
 aRequiredFields=eval(sRequiredFields);var sMessage='';var invalid_fields=Array();var fielEmailInvalid=Array();for(var i=0;i<aRequiredFields.length;i++){aRequiredFields[i].label=(aRequiredFields[i].label=='')?aRequiredFields[i].name:aRequiredFields[i].label;if(!notValidateThisFields.inArray(aRequiredFields[i].name)){if(typeof aRequiredFields[i].required!='undefined'){required=aRequiredFields[i].required;}else{required=1;}
 if(typeof aRequiredFields[i].validate!='undefined'){validate=aRequiredFields[i].validate;}else{validate='';}

From 16b66055e45903d0c3b39de306c6366fb548aaa4 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 23 Jul 2014 12:12:50 -0400
Subject: [PATCH 19/48] Improvement Plugin EnhancedLogin

- A validation was added validation for login.
---
 workflow/engine/methods/login/authentication.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 8dd5a21bc..64278e30b 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -311,16 +311,11 @@ try {
     $oHeadPublisher->addExtJsScript('login/init', false);    //adding a javascript file .js
     $oHeadPublisher->assign('uriReq', $sLocation);
 
-    $sFilename = PATH_PLUGINS . 'pmEnhancedLogin.php' ;
-
-    if (file_exists($sFilename)) {
-        require_once $sFilename;
-
-        if (class_exists( 'pmEnhancedLoginplugin' )) {
-            $oPlugin = new pmEnhancedLoginplugin( 'pmEnhancedLogin', $sFilename );
-            $oPlugin->authenticationandcontrolWS();
-        }
+    $oPluginRegistry =& PMPluginRegistry::getSingleton();
+    if ($oPluginRegistry->existsTrigger ( PM_AFTER_LOGIN )) {
+        $oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] );
     }
+
     G::RenderPage('publish', 'extJs');
     //G::header('Location: ' . $sLocation);
     die;

From 09c83fc7bbc495d5f2bb42360d562d80481324da Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 23 Jul 2014 12:35:31 -0400
Subject: [PATCH 20/48] Improvement Plugin EnhancedLogin

- A validation was added validation for login.
---
 workflow/engine/classes/class.plugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workflow/engine/classes/class.plugin.php b/workflow/engine/classes/class.plugin.php
index 415e048be..10700d3c5 100755
--- a/workflow/engine/classes/class.plugin.php
+++ b/workflow/engine/classes/class.plugin.php
@@ -42,6 +42,7 @@ define('PM_CREATE_NEW_DELEGATION',   1013);
 define('PM_SINGLE_SIGN_ON',          1014);
 define('PM_GET_CASES_AJAX_LISTENER', 1015);
 define('PM_BEFORE_CREATE_USER',      1016);
+define('PM_AFTER_LOGIN',             1017);
 
 
 

From afba4f5fc608c3ef4a06724ead5fee4b3d8e029f Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 23 Jul 2014 12:52:51 -0400
Subject: [PATCH 21/48] Fixing Notice in fields handler by an empty variable
 usage.

---
 gulliver/system/class.xmlform.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 7630e2c46..a3022abaa 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -320,8 +320,8 @@ class XmlForm_Field
             return 1;
         }
 
-        if($this->renderMode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
-        	return 1;
+        if(isset($this->renderMode) && $this->renderMode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
+        	return 1;
         }
 
         if (! $this->sqlConnection) {

From f2df12faec997accc6eb532dd3765233574cf31f Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 28 Jul 2014 09:50:40 -0400
Subject: [PATCH 22/48] BUG UPGRADE MORE THAN 160 WS.

When you try to upgrade more than 160 ws in a single PM instalation a TO MANY CONNECTIONS ERROR happens, and this stop the ws upgrade.

When you make the upgrade of many ws, each ws opens a new connection to the DB, and this is closed only at the end of all ws upgrade, so this cause the TO MANY CONNECTIONS error.

To solve the problem I kill the connection to the DB at the end of each ws upgrade.
---
 workflow/engine/classes/class.wsTools.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index d7ee43a30..952be1584 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -525,6 +525,18 @@ class workspaceTools
         $oCriteria->add(ConfigurationPeer::OBJ_UID, array("todo", "draft", "sent", "unassigned", "paused", "cancelled"), Criteria::NOT_IN);
         ConfigurationPeer::doDelete($oCriteria);
         // end of reset
+        
+        //close connection
+        $connection = Propel::getConnection( 'workflow' );
+        $sql = "SELECT * FROM information_schema.processlist WHERE user = SUBSTRING_INDEX(USER(),'@',1) and db = DATABASE() ORDER BY id;";
+        $stmt = $connection->createStatement();
+        $rs = $stmt->executeQuery( $sql, ResultSet::FETCHMODE_ASSOC );
+        while ($rs->next()) {
+        	$row = $rs->getRow();
+        	$oStatement = $connection->prepareStatement( "kill ". $row['ID'] );
+        	$oStatement->executeQuery();
+        }
+       
     }
 
     /**

From 8e4317499a714d02d8a63da50fa7a0c43ba649ad Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 28 Jul 2014 13:57:14 -0400
Subject: [PATCH 23/48] BUG-15198 Text field con query en modo view sigue
 ejecutando el query.

Todos los campos que tienen habillitada la opcion de query se ejecutaban en modo view cambiando el valor escogido o ingresado por el usuario a el valor que devuelve el query.

Se agrego una validacion para evitar que cuando el form esta en modo view se ejecute el query para los siguientes fields: text, currency, percentage, textarea, hidden, suggest.
---
 gulliver/system/class.xmlform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index a3022abaa..21c64f3ee 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -320,7 +320,7 @@ class XmlForm_Field
             return 1;
         }
 
-        if(isset($this->renderMode) && $this->renderMode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
+        if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
         	return 1;
         }
 

From a41095dc29d01a384d57ec252cf817b3b04285b5 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 29 Jul 2014 15:22:57 -0400
Subject: [PATCH 24/48] BUG-14033 Multiline grid in Dashboards for IE8 and IE9

Dashboard Titles with validation
---
 .../engine/skinEngine/base/css/pmos-xtheme-gray.css   | 11 ++++++-----
 .../skinEngine/neoclassic/css/pmos-xtheme-gray.css    | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
index c4d0dca6f..868f5602b 100755
--- a/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
+++ b/workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
@@ -1591,8 +1591,9 @@ td.x-cnotes-label {
   padding-right: 3px;
 }
 
-.title-dashboard-text {
-  margin:5px  !important;
-  white-space:pre-wrap !important;
-  display:inline-block;
-}
\ No newline at end of file
+.x-grid3-cell-inner, .x-grid3-hd-inner {
+overflow:hidden;
+padding:3px 3px 3px 5px;
+white-space:normal;
+}
+
diff --git a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
index 3f8b18adf..f48c9554d 100644
--- a/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
+++ b/workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
@@ -1673,9 +1673,9 @@ td.x-cnotes-label {
 #ext-comp-1010.xtb-text {
   font-size: 9px;
 }
+.x-grid3-cell-inner, .x-grid3-hd-inner {
+overflow:hidden;
+padding:3px 3px 3px 5px;
+white-space:normal;
+}
 
-.title-dashboard-text {
-  margin:5px  !important;
-  white-space:pre-wrap !important;
-  display:inline-block;
-}
\ No newline at end of file

From 8bf52449c49940284124061e8be2e6134c6734d4 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 30 Jul 2014 10:02:08 -0400
Subject: [PATCH 25/48] =?UTF-8?q?BUG-15495=20c=C3=B3digo=20basura=20en=20e?=
 =?UTF-8?q?ditor=20html=20de=20documentos=20de=20salida=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- It don't have the functionality.
- A validation was added for change tag of grid in file processes_Ajax.php
---
 .../methods/processes/processes_Ajax.php      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 3014d4fed..202f1cc6b 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -488,6 +488,26 @@ try {
             //            ';
             //            $oHeadPublisher->addScriptCode($jscriptCode);
             $_REQUEST['fcontent'] = $fcontent;
+
+            preg_match('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$coincidencias);
+            foreach ($coincidencias as $key => $value) {
+                if ($key % 3 == 0) {
+                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $coincidencia);
+                    if (count($coincidencia)==0) {
+                        $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
+                    }
+                }
+            }
+            preg_match('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$coincidencias);
+            foreach ($coincidencias as $key => $value) {
+                if ($key % 3 == 0) {
+                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $coincidencia);
+                    if (count($coincidencia)==0) {
+                        $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
+                    }
+                }
+            }
+
             //if($extion[count($extion)-1]=='html' || $extion[count($extion)-1]=='txt'){
             $aData = Array('pro_uid' => $_REQUEST['pro_uid'], 'fcontent' => $fcontent, 'filename' => $_REQUEST['filename']);
             $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_FileEdit', '', $aData);

From 788a21051f8cc1ea1687893cd309502f43774385 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 30 Jul 2014 11:36:04 -0400
Subject: [PATCH 26/48] =?UTF-8?q?BUG-15495=20c=C3=B3digo=20basura=20en=20e?=
 =?UTF-8?q?ditor=20html=20de=20documentos=20de=20salida=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-It don't have the functionality.
-A validation was added for change tag of grid in file processes_Ajax.php
---
 .../engine/methods/processes/processes_Ajax.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 202f1cc6b..d771d9050 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -489,20 +489,20 @@ try {
             //            $oHeadPublisher->addScriptCode($jscriptCode);
             $_REQUEST['fcontent'] = $fcontent;
 
-            preg_match('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$coincidencias);
-            foreach ($coincidencias as $key => $value) {
+            preg_match('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            foreach ($matches as $key => $value) {
                 if ($key % 3 == 0) {
-                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $coincidencia);
-                    if (count($coincidencia)==0) {
+                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
+                    if (count($match)==0) {
                         $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
                     }
                 }
             }
-            preg_match('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$coincidencias);
-            foreach ($coincidencias as $key => $value) {
+            preg_match('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            foreach ($matches as $key => $value) {
                 if ($key % 3 == 0) {
-                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $coincidencia);
-                    if (count($coincidencia)==0) {
+                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
+                    if (count($match)==0) {
                         $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
                     }
                 }

From f7c59280cac6a41079aaf54829b27e9f77e308e5 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 30 Jul 2014 16:48:31 -0400
Subject: [PATCH 27/48] =?UTF-8?q?BUG-15495=20c=C3=B3digo=20basura=20en=20e?=
 =?UTF-8?q?ditor=20html=20de=20documentos=20de=20salida=20IMPROVEMENT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    -It don't have the functionality.
    -A validation was added for change tag of grid in file processes_Ajax.php
---
 .../methods/processes/processes_Ajax.php      | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index d771d9050..7f70d7ddd 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -489,23 +489,19 @@ try {
             //            $oHeadPublisher->addScriptCode($jscriptCode);
             $_REQUEST['fcontent'] = $fcontent;
 
-            preg_match('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
-            foreach ($matches as $key => $value) {
-                if ($key % 3 == 0) {
-                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
-                    if (count($match)==0) {
-                        $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
-                    }
+            preg_match_all('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            foreach ($matches[0] as $key => $value) {
+                preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
+                if (count($match)==0) {
+                    $fcontent = preg_replace ('/'.$value.'/i','<!--'.$value.'-->',$fcontent);
                 }
             }
-            preg_match('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
-            foreach ($matches as $key => $value) {
-                if ($key % 3 == 0) {
+            preg_match_all('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            foreach ($matches[0] as $key => $value) {
                     preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
                     if (count($match)==0) {
-                        $fcontent = preg_replace('/'.$value.'/','<!--'.$value.'-->',$fcontent);
+                        $fcontent = preg_replace ('/'.$value.'/i','<!--'.$value.'-->',$fcontent);
                     }
-                }
             }
 
             //if($extion[count($extion)-1]=='html' || $extion[count($extion)-1]=='txt'){

From f6f124eaee4247ffec9537d2bfe02f02b98e5819 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Thu, 31 Jul 2014 13:44:13 -0400
Subject: [PATCH 28/48] =?UTF-8?q?BUG-15505=20M=C3=A1scaras=20de=20campos?=
 =?UTF-8?q?=20tipo=20fecha=20en=20grillas=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The mask is not respected in a field type date in a grid.
- A validation was added for field date in file grid.js.
---
 gulliver/js/grid/core/grid.js       | 7 +++++++
 gulliver/js/maborak/core/maborak.js | 1 +
 2 files changed, 8 insertions(+)

diff --git a/gulliver/js/grid/core/grid.js b/gulliver/js/grid/core/grid.js
index bea3a816b..7905c876b 100755
--- a/gulliver/js/grid/core/grid.js
+++ b/gulliver/js/grid/core/grid.js
@@ -98,6 +98,13 @@ var G_Grid = function(oForm, sGridName){
                             this.aElements[this.aElements.length - 1].mask = this.aFields[j].oProperties.sMask;
                         }
                         break;
+                    case "date":
+                        this.aElements.push(new G_Date(oForm, elem, elemName));
+
+                        if (this.aFields[j].oProperties) {
+                            this.aElements[this.aElements.length - 1].mask = dateSetMask(this.aFields[j].oProperties.mask);
+                        }
+                        break;
                     default:
                         this.aElements.push(new G_Field(oForm, elem, elemName));
 
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index e1d94c894..4165b3453 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1357,6 +1357,7 @@ this.aElements[this.aElements.length-1].validate=this.aFields[j].oProperties.val
 break;case"percentage":this.aElements.push(new G_Percentage(oForm,elem,elemName));if(this.aFields[j].oProperties){if(this.aFields[j].oProperties.comma_separator){this.aElements[this.aElements.length-1].comma_separator=this.aFields[j].oProperties.comma_separator;}
 this.aElements[this.aElements.length-1].validate=this.aFields[j].oProperties.validate;this.aElements[this.aElements.length-1].mask=this.aFields[j].oProperties.mask;}
 break;case"dropdown":this.aElements.push(new G_DropDown(oForm,elem,elemName));if(this.aFields[j].oProperties){this.aElements[this.aElements.length-1].mask=this.aFields[j].oProperties.sMask;}
+break;case"date":this.aElements.push(new G_Date(oForm,elem,elemName));if(this.aFields[j].oProperties){this.aElements[this.aElements.length-1].mask=dateSetMask(this.aFields[j].oProperties.mask);}
 break;default:this.aElements.push(new G_Field(oForm,elem,elemName));if(this.aFields[j].oProperties){this.aElements[this.aElements.length-1].mask=this.aFields[j].oProperties.sMask;}
 break;}}}}
 var sw=false;if(this.allDependentFields==""){sw=true;}

From ac5f0925d061851d3a8f927c2d5951e8805d2cca Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 31 Jul 2014 17:00:31 -0400
Subject: [PATCH 29/48] BUG UPGRADE MORE THAN 160 WS.

When you try to upgrade more than 160 ws in a single PM instalation a TO MANY CONNECTIONS ERROR happens, and this stop the ws upgrade.

When you make the upgrade of many ws, each ws opens a new connection to the DB, and this is closed only at the end of all ws upgrade, so this cause the TO MANY CONNECTIONS error.

To solve the problem I kill the connection to the DB at the end of each ws upgrade.
---
 workflow/engine/classes/class.wsTools.php | 33 +++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 952be1584..f9b1bf2ce 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -525,18 +525,29 @@ class workspaceTools
         $oCriteria->add(ConfigurationPeer::OBJ_UID, array("todo", "draft", "sent", "unassigned", "paused", "cancelled"), Criteria::NOT_IN);
         ConfigurationPeer::doDelete($oCriteria);
         // end of reset
-        
-        //close connection
-        $connection = Propel::getConnection( 'workflow' );
-        $sql = "SELECT * FROM information_schema.processlist WHERE user = SUBSTRING_INDEX(USER(),'@',1) and db = DATABASE() ORDER BY id;";
-        $stmt = $connection->createStatement();
-        $rs = $stmt->executeQuery( $sql, ResultSet::FETCHMODE_ASSOC );
-        while ($rs->next()) {
-        	$row = $rs->getRow();
-        	$oStatement = $connection->prepareStatement( "kill ". $row['ID'] );
-        	$oStatement->executeQuery();
+
+        //close connection
+        $connection = Propel::getConnection( 'workflow' );
+
+        $sql_sleep = "SELECT * FROM information_schema.processlist WHERE command = 'Sleep' and user = SUBSTRING_INDEX(USER(),'@',1) and db = DATABASE() ORDER BY id;";
+        $stmt_sleep = $connection->createStatement();
+        $rs_sleep = $stmt_sleep->executeQuery( $sql_sleep, ResultSet::FETCHMODE_ASSOC );
+
+        while ($rs_sleep->next()) {
+            $row_sleep = $rs_sleep->getRow();
+            $oStatement_sleep = $connection->prepareStatement( "kill ". $row_sleep['ID'] );
+            $oStatement_sleep->executeQuery();
+        }
+
+        $sql_query = "SELECT * FROM information_schema.processlist WHERE user = SUBSTRING_INDEX(USER(),'@',1) and db = DATABASE() ORDER BY id;";
+        $stmt_query = $connection->createStatement();
+        $rs_query = $stmt_query->executeQuery( $sql_query, ResultSet::FETCHMODE_ASSOC );
+
+        while ($rs_query->next()) {
+            $row_query = $rs_query->getRow();
+            $oStatement_query = $connection->prepareStatement( "kill ". $row_query['ID'] );
+            $oStatement_query->executeQuery();
         }
-       
     }
 
     /**

From 0ac0ef1856ebf871ae16d21e2a875418a48ac777 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 1 Aug 2014 10:47:54 -0400
Subject: [PATCH 30/48] BUG 0000 "En el instalador de PM, el boton...." SOLVED

- En el instalador de PM, el boton "Check Workspace Configuration" aparece incompleto o desaparece.
- Problema resuelto, en la instalacion de processmaker en los pasos 1 y 5 puede existir textos largos esto debido a
  la configuracion que se pueda tener al momento de la instalacion, si es el caso se mostrara scroll el cual permitira
  mostrara correctamente los botones.
---
 workflow/engine/templates/installer/installer_cards.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js
index e91a21bd5..071fe6207 100644
--- a/workflow/engine/templates/installer/installer_cards.js
+++ b/workflow/engine/templates/installer/installer_cards.js
@@ -275,6 +275,7 @@ Ext.onReady(function(){
             region: 'center',
             xtype : 'fieldset',
             labelWidth: 200,
+            autoScroll: true,
             items:[
               {
                 xtype     : 'displayfield',
@@ -683,6 +684,7 @@ Ext.onReady(function(){
             region: 'center',
             xtype : 'panel',
             bodyStyle : 'background:none;padding-left:20px;padding-right:20px;padding-top:20px;padding-bottom:20px;font-size:1.2em;',
+            autoScroll: true,
             items:[
               {
                 xtype:'fieldset',

From 0a6a3e308c2880ea5d27354d3a862697f057deb1 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Fri, 1 Aug 2014 16:42:25 -0400
Subject: [PATCH 31/48] BUG-14575 "Cuando se genera un Documento de salida
 haciendo..." SOLVED

- No se muestra caracteres chinos en un OutputDocument (TCPDF)
- Problema resuelto:
    * Al encontrarse un tipo de fuente complejo (caracteres Japanese, Chinese, etc)
    se esta seteando un origen de fuente especifico (arialuni.ttf).
    * Vea la siguiente URL "http://wiki.processmaker.com"
    seccion "III. Configuration" punto "12. Fonts for non-Western languages".
    * Entonces el archivo "arialuni.ttf" debera ser copiando en "/path/to/processmaker/gulliver/thirdparty/tcpdf/fonts"
    Nota.- El procedimiento anterior no esta documentado para "TCPDF", solo esta para "HTML2PDF (Old Version)"
---
 workflow/engine/classes/model/OutputDocument.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php
index e2061789b..af1e3ad1e 100755
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -844,7 +844,9 @@ class OutputDocument extends BaseOutputDocument
         //$pdf->SetFont('dejavusans', '', 14, '', true);
         // Detect chinese, japanese, thai
         if (preg_match('/[\x{30FF}\x{3040}-\x{309F}\x{4E00}-\x{9FFF}\x{0E00}-\x{0E7F}]/u', $sContent, $matches)) {
-            $pdf->SetFont('kozminproregular');
+            $fileArialunittf = PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "fonts" . PATH_SEP . "arialuni.ttf";
+
+            $pdf->SetFont((!file_exists($fileArialunittf))? "kozminproregular" : $pdf->addTTFfont($fileArialunittf, "TrueTypeUnicode", "", 32));
         }
 
         // Add a page

From 2624ce14b9713fc84ab009c80651612878a69b8b Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 4 Aug 2014 10:02:54 -0400
Subject: [PATCH 32/48] BUG 15524 "Mantener el Idioma de la URL..." SOLVED

- Mantener el Idioma de la URL al iniciar sesion.
- Problema resuelto, al iniciar sesion con un determinado idioma en la url y cerrar sesion, al iniciar sesion nuevamente
  en el login el idioma se mantendra al idioma definido en la url.
---
 workflow/engine/methods/login/login.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 9e0b91ab0..715481171 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -147,11 +147,16 @@ $_DBArray ['langOptions'] = $availableLangArray;
 G::LoadClass('configuration');
 //BootStrap::LoadClass('configuration');
 
+$myUrl = explode("/", $_SERVER["REQUEST_URI"]);
+
 $oConf = new Configurations();
 $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
-$aFields['USER_LANG'] = isset($oConf->aConfig['login_defaultLanguage'])
-                        ? $oConf->aConfig['login_defaultLanguage']
-                        : 'en';
+
+if (isset($myUrl) && $myUrl != "") {
+    $aFields["USER_LANG"] = $myUrl[2];
+} else {
+    $aFields['USER_LANG'] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en";
+}
 
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');

From a0284a1a1c329e1bfc22a057cb8446e5204fb4b6 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Fri, 8 Aug 2014 12:21:47 -0400
Subject: [PATCH 33/48] BUG Caracteres duplicados en field con validacion IE10
 e IE11

event.returnValue = false dejo de funcionar desde IE10 en adelante por tal motivo la validacion para otros browsers dejo de funcionar en IE10 e IE11 y se mostraba dos veces el caracter repetido despues de realizada una validacion.

Ahora se agrego una nueva validacion en la cual se verifica el browser (Netscape para IE11 con compatibilidad EDGE) y se utiliza event.preventDefault(); cuando existe el evento.
---
 gulliver/js/form/core/form.js       | 8 ++++++++
 gulliver/js/maborak/core/maborak.js | 1 +
 2 files changed, 9 insertions(+)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index d3cc86ab7..fe1319b0f 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -1473,6 +1473,14 @@ function G_Text(form, element, name)
         if (keyCode == 0) return true;
       }
 
+      if (me.browser.name == 'Microsoft Internet Explorer' || me.browser.name == 'Netscape'){
+    	    if (event.preventDefault) {
+    		    event.preventDefault();
+    		} else {
+    			event.returnValue = false;
+    		}
+      }
+
       if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){
         event.returnValue = false;
       }
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index 4165b3453..a2081f8ff 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1060,6 +1060,7 @@ if(pressKey==46){me.applyMask(256);}
 else{me.applyMask(pressKey);}
 if(updateOnChange){me.sendOnChange();}}
 if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
+alert(me.browser.name);if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){alert('explorer1');if(event.preventDefault){alert('***');event.preventDefault();}else{alert('***--***');event.returnValue=false;}}
 if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;}
 else{return false;}}};if(this.element){this.element.onblur=function(event)
 {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}

From fc423215e2f851afa032b5f424b995b49cd7260e Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 8 Aug 2014 13:06:16 -0400
Subject: [PATCH 34/48] BUG 15524 "Mantener el Idioma de la URL..." SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Mantener el Idioma de la URL al iniciar sesió
- Problema resuelto, al iniciar sesion con un determinado idioma en la url y cerrar sesion, al iniciar sesion nuevamente
  en el login el idioma se mantendra al idioma definido en la url, tambien se adiciona una opcion mas al guardar la configuracion
  del idioma cuya opcion es "Use the language of URL".
---
 workflow/engine/classes/class.system.php       | 18 +++++++++---------
 workflow/engine/controllers/admin.php          |  1 +
 workflow/engine/controllers/adminProxy.php     |  2 +-
 workflow/engine/methods/login/login.php        |  6 +++---
 .../engine/methods/setup/loginSettingsAjax.php |  2 ++
 workflow/public_html/bootstrap.php             |  2 +-
 workflow/public_html/sysGeneric.php            |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php
index 4ee4518e5..9c8470930 100755
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -682,14 +682,14 @@ class System
         return System::getSchema( PATH_TRUNK . "workflow/engine/config/schema.xml" );
     }
 
-    /**
-     * Retrieves the system schema rbac.
-     *
-     * @return schema content in an array
-     */
-    public static function getSystemSchemaRbac ()
-    {
-    	return System::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
+    /**
+     * Retrieves the system schema rbac.
+     *
+     * @return schema content in an array
+     */
+    public static function getSystemSchemaRbac ()
+    {
+    	return System::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
     }
 
     /**
@@ -1138,7 +1138,7 @@ class System
         @preg_match( $patt, $content, $match );
 
         if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
-            $newUrl = 'sys/' . $conf['lang'] . '/' . $conf['skin'] . '/login/login';
+            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : "en") . "/" . $conf["skin"] . "/login/login";
 
             $newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
             $newContent = str_replace( $match[0], $newMetaStr, $content );
diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php
index 7e4435ca2..f0126281e 100644
--- a/workflow/engine/controllers/admin.php
+++ b/workflow/engine/controllers/admin.php
@@ -30,6 +30,7 @@ class Admin extends Controller
         $timeZonesList = array_keys( $timeZonesList );
         $mainController = new Main();
         $languagesList = $mainController->getLanguagesList();
+        $languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
         $sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
 
         foreach ($skinsList['skins'] as $skin) {
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 71fe76e76..c5f69d694 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -119,7 +119,7 @@ class adminProxy extends HttpProxyController
 
         $this->success = true;
         $this->restart = $restart;
-        $this->url     = '/sys' .  SYS_SYS . '/' . $sysConf['default_lang'] . '/' . $sysConf['default_skin'] . $urlPart;
+        $this->url     = "/sys" .  SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : "en") . "/" . $sysConf["default_skin"] . $urlPart;
         $this->message = 'Saved Successfully';
     }
 
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 715481171..acc19b3e7 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -147,15 +147,15 @@ $_DBArray ['langOptions'] = $availableLangArray;
 G::LoadClass('configuration');
 //BootStrap::LoadClass('configuration');
 
-$myUrl = explode("/", $_SERVER["REQUEST_URI"]);
-
 $oConf = new Configurations();
 $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
+$myUrl = explode("/", $_SERVER["REQUEST_URI"]);
+
 if (isset($myUrl) && $myUrl != "") {
     $aFields["USER_LANG"] = $myUrl[2];
 } else {
-    $aFields['USER_LANG'] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en";
+    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en";
 }
 
 $G_PUBLISH = new Publisher();
diff --git a/workflow/engine/methods/setup/loginSettingsAjax.php b/workflow/engine/methods/setup/loginSettingsAjax.php
index a0a29bdc6..61eba676b 100755
--- a/workflow/engine/methods/setup/loginSettingsAjax.php
+++ b/workflow/engine/methods/setup/loginSettingsAjax.php
@@ -14,6 +14,8 @@ switch ($request) {
             );
         }
 
+        $result->rows[] = array ("LAN_ID" => "", "LAN_NAME" => G::LoadTranslation("ID_USE_LANGUAGE_URL"));
+
         print (G::json_encode( $result )) ;
         break;
     case 'saveSettings':
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index ec988636c..998f0897f 100755
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -226,7 +226,7 @@
   if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
     file_put_contents(
       PATH_HTML . 'index.html',
-      G::parseTemplate(PATH_TPL . 'index.html', array('lang' => SYS_LANG, 'skin' => SYS_SKIN))
+      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
     );
   }
 
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 1fb060fe9..01ca8c78f 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -478,7 +478,7 @@ if (Bootstrap::isPMUnderUpdating()) {
 
 // verify if index.html exists
 if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template
-    file_put_contents( PATH_HTML . 'index.html', Bootstrap::parseTemplate( PATH_TPL . 'index.html', array ('lang' => SYS_LANG,'skin' => SYS_SKIN
+    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
     ) ) );
 }
 

From 25db86d3badd61f1aacfd2cd4a9abe9a7b8d5052 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 12 Aug 2014 09:08:00 -0400
Subject: [PATCH 35/48] BUG-15503 Advanced Search: Cuando un caso es
 completado... SOLVED

- Cases with the completed status were not considered.
- A validation was added in criteria in file AppCacheView.php function getAllCases2
---
 workflow/engine/classes/model/AppCacheView.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index cc049f67a..9290ac54e 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -1051,8 +1051,8 @@ class AppCacheView extends BaseAppCacheView
             $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL)->addAnd(
             $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "CLOSED"))
         )->addOr(
-            //Completed - getCompleted()
-            $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)
+            $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)->addAnd(
+            $criteria->getNewCriterion(AppCacheViewPeer::DEL_LAST_INDEX, '1', Criteria::EQUAL))
         );
 
         if (!$doCount) {

From a16a53e786477f4a2d5917b24d4076d02abf3e1b Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 12 Aug 2014 10:07:28 -0400
Subject: [PATCH 36/48] BUG 15394 "Cambiar el password despues de aplicar..."
 SOLVED

- Cambiar el password despues de aplicar el hotfix 2.5.2.3
- Problema resuelto, se agrega una validacion para esta version de processmaker "2.5.2.4" o "2.5.3", cuando sean estas
  versiones, se crea un flag que se registra en la tabla "configuration" y se hace una actualizacion de registros en la tabla
  "USERS_PROPERTIES", la actualizacion de los datos solo se realizar una vez.

  Disponible para la version 2.5.3 de ProcessMaker.
---
 workflow/engine/classes/class.patch.php | 40 ++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php
index 1f8eab0e6..c6fc515fb 100644
--- a/workflow/engine/classes/class.patch.php
+++ b/workflow/engine/classes/class.patch.php
@@ -49,6 +49,15 @@ class p11835 extends patch
         return patch::$isPathchable;
     }
     
+    public static function pmVersion($version)
+    {
+        if (preg_match("/^\D*([\d\.]+)\D*$/", $version, $matches)) {
+            $version = $matches[1];
+        }
+        
+        return $version;
+    }
+    
     /*
      * Note.- Use after DB was upgraded.
      * Set the patch, setting all the TAS_GROUP_VARIABLE to '' 
@@ -83,7 +92,36 @@ class p11835 extends patch
                 $aRow = $recordSet->getRow();
             }
         }
-        echo $count. " records where patched to use SELF_SERVICE feature.\n";
+        
+        //Fix BUG-15394
+        G::LoadClass("configuration");
+        
+        $conf = new Configurations();
+        
+        if (!$conf->exists("HOTFIX")) {
+            //HOTFIX, Create empty record
+            $conf->aConfig = array();
+            $conf->saveConfig("HOTFIX", "");
+        }
+        
+        $arrayHotfix = $conf->getConfiguration("HOTFIX", "");
+        $arrayHotfix = (is_array($arrayHotfix))? $arrayHotfix : array($arrayHotfix);
+        
+        $pmVersion = self::pmVersion(System::getVersion()) . "";
+        
+        if (($pmVersion == "2.5.2.4" || $pmVersion == "2.5.3") && !in_array("15394", $arrayHotfix)) {
+            $cnn = Propel::getConnection("workflow");
+            $stmt = $cnn->prepareStatement("UPDATE USERS_PROPERTIES SET USR_LOGGED_NEXT_TIME = 0");
+            $rs = $stmt->executeQuery();
+        
+            //HOTFIX, Update record (add 15394)
+            $arrayHotfix[] = "15394";
+        
+            $conf->aConfig = $arrayHotfix;
+            $conf->saveConfig("HOTFIX", "");
+        }
+        
+        echo $count . " records where patched to use SELF_SERVICE feature.\n";
     }
 }
 

From 2d891371c4fa5187b2dab70ac71203a21a977e02 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 12 Aug 2014 12:27:32 -0400
Subject: [PATCH 37/48] BUG 15524 "Mantener el Idioma de la URL..." SOLVED

- Mantener el Idioma de la URL al iniciar sesion
- Problema resuelto, al iniciar sesion con un determinado idioma en la url y cerrar sesion, al iniciar sesion nuevamente
  en el login el idioma se mantendra al idioma definido en la url, tambien se adiciona una opcion mas al guardar la configuracion
  del idioma cuya opcion es "Use the language of URL".
---
 workflow/engine/classes/class.system.php   | 2 +-
 workflow/engine/controllers/adminProxy.php | 2 +-
 workflow/engine/methods/login/login.php    | 2 +-
 workflow/public_html/bootstrap.php         | 2 +-
 workflow/public_html/sysGeneric.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php
index 9c8470930..cd7d7da4c 100755
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -1138,7 +1138,7 @@ class System
         @preg_match( $patt, $content, $match );
 
         if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
-            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : "en") . "/" . $conf["skin"] . "/login/login";
+            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
 
             $newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
             $newContent = str_replace( $match[0], $newMetaStr, $content );
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index c5f69d694..d632636f8 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -119,7 +119,7 @@ class adminProxy extends HttpProxyController
 
         $this->success = true;
         $this->restart = $restart;
-        $this->url     = "/sys" .  SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : "en") . "/" . $sysConf["default_skin"] . $urlPart;
+        $this->url     = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart;
         $this->message = 'Saved Successfully';
     }
 
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index acc19b3e7..378537f7b 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -155,7 +155,7 @@ $myUrl = explode("/", $_SERVER["REQUEST_URI"]);
 if (isset($myUrl) && $myUrl != "") {
     $aFields["USER_LANG"] = $myUrl[2];
 } else {
-    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en";
+    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : SYS_LANG;
 }
 
 $G_PUBLISH = new Publisher();
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index 998f0897f..4f21f9c7a 100755
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -226,7 +226,7 @@
   if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
     file_put_contents(
       PATH_HTML . 'index.html',
-      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
+      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
     );
   }
 
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 01ca8c78f..9c046b951 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -478,7 +478,7 @@ if (Bootstrap::isPMUnderUpdating()) {
 
 // verify if index.html exists
 if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template
-    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
+    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
     ) ) );
 }
 

From 26e63131ede621654f8da36a38929271a40758e0 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 13 Aug 2014 11:00:44 -0400
Subject: [PATCH 38/48] BUG 15394 "Cambiar el password despues de aplicar..."
 SOLVED

- Cambiar el password despues de aplicar el hotfix 2.5.2.3
- Problema resuelto, se agrega una validacion para esta version de processmaker "2.5.3" o "2.8", cuando sean estas
  versiones, se crea un flag que se registra en la tabla "configuration" y se hace una actualizacion de registros en la tabla
  "USERS_PROPERTIES", la actualizacion de los datos solo se realizar una vez.
---
 workflow/engine/classes/class.patch.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php
index c6fc515fb..1f20efea3 100644
--- a/workflow/engine/classes/class.patch.php
+++ b/workflow/engine/classes/class.patch.php
@@ -95,7 +95,6 @@ class p11835 extends patch
         
         //Fix BUG-15394
         G::LoadClass("configuration");
-        
         $conf = new Configurations();
         
         if (!$conf->exists("HOTFIX")) {
@@ -109,7 +108,7 @@ class p11835 extends patch
         
         $pmVersion = self::pmVersion(System::getVersion()) . "";
         
-        if (($pmVersion == "2.5.2.4" || $pmVersion == "2.5.3") && !in_array("15394", $arrayHotfix)) {
+        if (($pmVersion == "2.5.3" || $pmVersion == "2.8") && !in_array("15394", $arrayHotfix)) {
             $cnn = Propel::getConnection("workflow");
             $stmt = $cnn->prepareStatement("UPDATE USERS_PROPERTIES SET USR_LOGGED_NEXT_TIME = 0");
             $rs = $stmt->executeQuery();

From 713b39d29d7fc013fbad786738d3499247127710 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 13 Aug 2014 11:19:00 -0400
Subject: [PATCH 39/48] BUG 15394 "Cambiar el password despues de aplicar..."
 SOLVED

- Cambiar el password despues de aplicar el hotfix 2.5.2.3
- Problema resuelto, se agrega una validacion para esta version de processmaker "2.5.2.4" o "2.8", cuando sean estas
  versiones, se crea un flag que se registra en la tabla "configuration" y se hace una actualizacion de registros en la tabla
  "USERS_PROPERTIES", la actualizacion de los datos solo se realizar una vez.
---
 workflow/engine/classes/class.patch.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php
index 1f20efea3..60f0a71aa 100644
--- a/workflow/engine/classes/class.patch.php
+++ b/workflow/engine/classes/class.patch.php
@@ -95,6 +95,7 @@ class p11835 extends patch
         
         //Fix BUG-15394
         G::LoadClass("configuration");
+        
         $conf = new Configurations();
         
         if (!$conf->exists("HOTFIX")) {
@@ -108,7 +109,7 @@ class p11835 extends patch
         
         $pmVersion = self::pmVersion(System::getVersion()) . "";
         
-        if (($pmVersion == "2.5.3" || $pmVersion == "2.8") && !in_array("15394", $arrayHotfix)) {
+        if (($pmVersion == "2.5.2.4" || $pmVersion == "2.8") && !in_array("15394", $arrayHotfix)) {
             $cnn = Propel::getConnection("workflow");
             $stmt = $cnn->prepareStatement("UPDATE USERS_PROPERTIES SET USR_LOGGED_NEXT_TIME = 0");
             $rs = $stmt->executeQuery();

From acee5772c0cb03aaea8eb583b2e2d11da9a5b868 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 13 Aug 2014 11:56:00 -0400
Subject: [PATCH 40/48] BUG 15394 "Cambiar el password despues de aplicar..."
 SOLVED

- Cambiar el password despues de aplicar el hotfix 2.5.2.3
- Problema resuelto, se agrega una validacion para esta version de processmaker "2.5.2.4" o "2.8", cuando sean estas
  versiones, se crea un flag que se registra en la tabla "configuration" y se hace una actualizacion de registros en la tabla
  "USERS_PROPERTIES", la actualizacion de los datos solo se realizar una vez.
---
 workflow/engine/classes/class.patch.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php
index 60f0a71aa..4a5ce313c 100644
--- a/workflow/engine/classes/class.patch.php
+++ b/workflow/engine/classes/class.patch.php
@@ -94,6 +94,7 @@ class p11835 extends patch
         }
         
         //Fix BUG-15394
+        
         G::LoadClass("configuration");
         
         $conf = new Configurations();
@@ -121,6 +122,7 @@ class p11835 extends patch
             $conf->saveConfig("HOTFIX", "");
         }
         
+        //echo
         echo $count . " records where patched to use SELF_SERVICE feature.\n";
     }
 }

From 526fb3af96ed4a7a83590f7e833a434f06c52046 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 13 Aug 2014 16:05:17 -0400
Subject: [PATCH 41/48] BUG 13913 "Icons to manage dynaform..." SOLVED

- Icons to manage dynaform fields are set below column Label
- Problema resuelto, cuando se crea un campo con label vacio, al hacer click en Fields Handler los iconos edit field y
  remove field se mostraran correctamente.
---
 workflow/engine/templates/dynaforms/fieldsHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php
index db984e499..547a4891c 100755
--- a/workflow/engine/templates/dynaforms/fieldsHandler.php
+++ b/workflow/engine/templates/dynaforms/fieldsHandler.php
@@ -144,7 +144,7 @@
               &nbsp;<?php echo "$node_name";?>
           </td>
 					<td><p style="font-size:12px; color:#1C3166; font-weight:bold">
-					<?php if( isset($node['__CONTENT__'][SYS_LANG]['__VALUE__']) ){
+					<?php if (isset($node["__CONTENT__"][SYS_LANG]["__VALUE__"]) && $node["__CONTENT__"][SYS_LANG]["__VALUE__"] != "") { //lsl
 						  if( strlen($node['__CONTENT__'][SYS_LANG]['__VALUE__']) > 30 ){
 						  	$label = substr(trim(strip_tags(G::stripCDATA($node['__CONTENT__'][SYS_LANG]['__VALUE__']))), 0, 30 ) . '...';
 						  } else {

From fb509b0594c16f51a9e3779a7c2d7c72704ece72 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 13 Aug 2014 16:18:27 -0400
Subject: [PATCH 42/48] BUG 13913 "Icons to manage dynaform..." SOLVED

- Icons to manage dynaform fields are set below column Label
- Problema resuelto, cuando se crea un campo con label vacio, al hacer click en Fields Handler los iconos edit field y
  remove field se mostraran correctamente.
---
 workflow/engine/templates/dynaforms/fieldsHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php
index 547a4891c..99fd5673f 100755
--- a/workflow/engine/templates/dynaforms/fieldsHandler.php
+++ b/workflow/engine/templates/dynaforms/fieldsHandler.php
@@ -144,7 +144,7 @@
               &nbsp;<?php echo "$node_name";?>
           </td>
 					<td><p style="font-size:12px; color:#1C3166; font-weight:bold">
-					<?php if (isset($node["__CONTENT__"][SYS_LANG]["__VALUE__"]) && $node["__CONTENT__"][SYS_LANG]["__VALUE__"] != "") { //lsl
+					<?php if (isset($node["__CONTENT__"][SYS_LANG]["__VALUE__"]) && $node["__CONTENT__"][SYS_LANG]["__VALUE__"] != "") {
 						  if( strlen($node['__CONTENT__'][SYS_LANG]['__VALUE__']) > 30 ){
 						  	$label = substr(trim(strip_tags(G::stripCDATA($node['__CONTENT__'][SYS_LANG]['__VALUE__']))), 0, 30 ) . '...';
 						  } else {

From 1408adaefb1d326391ca76e3d424389c3ad74e3c Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Thu, 14 Aug 2014 09:19:48 -0400
Subject: [PATCH 43/48] BUG-10252 advanced search case summary form SOLVED

- A permission was add SUMMARY_FORM
---
 workflow/engine/classes/class.case.php                 | 10 ++++++++--
 workflow/engine/classes/class.processMap.php           |  4 ++++
 workflow/engine/methods/cases/summary.php              |  6 ++++++
 .../processes/processes_EditObjectPermission.xml       |  5 +++--
 .../processes/processes_NewObjectPermission.xml        |  3 +++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index c0b58a134..8bb3c22b2 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -5069,7 +5069,8 @@ class Cases
             "INPUT" => Array(),
             "OUTPUT" => Array(),
             "CASES_NOTES" => 0,
-            "MSGS_HISTORY" => Array()
+            "MSGS_HISTORY" => Array(),
+            "SUMMARY_FORM" => 0
         );
 
         //permissions per user
@@ -5226,6 +5227,7 @@ class Cases
                             $oDataset->next();
                         }
                         $RESULT['CASES_NOTES'] = 1;
+                        $RESULT['SUMMARY_FORM'] = 1;
 
                         // Message History
                         $RESULT['MSGS_HISTORY'] = array('PERMISSION' => $ACTION);
@@ -5373,6 +5375,9 @@ class Cases
                     case 'CASES_NOTES':
                         $RESULT['CASES_NOTES'] = 1;
                         break;
+                    case 'SUMMARY_FORM':
+                        $RESULT['SUMMARY_FORM'] = 1;
+                        break;
                     case 'MSGS_HISTORY':
                         // Permission
                         $RESULT['MSGS_HISTORY'] = array('PERMISSION' => $ACTION);
@@ -5424,7 +5429,8 @@ class Cases
             "INPUT_DOCUMENTS" => $RESULT['INPUT'],
             "OUTPUT_DOCUMENTS" => $RESULT['OUTPUT'],
             "CASES_NOTES" => $RESULT['CASES_NOTES'],
-            "MSGS_HISTORY" => $RESULT['MSGS_HISTORY']
+            "MSGS_HISTORY" => $RESULT['MSGS_HISTORY'],
+            "SUMMARY_FORM" => $RESULT['SUMMARY_FORM']
         );
     }
 
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 5c6bc4883..a72a8e904 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -3636,6 +3636,10 @@ class processMap
                     $sObjectType = G::LoadTranslation('MSGS_HISTORY');
                     $sObject = G::LoadTranslation('ID_ALL');
                     break;
+                case 'SUMMARY_FORM':
+                    $sObjectType = G::LoadTranslation('ID_SUMMARY_FORM');
+                    $sObject = G::LoadTranslation('ID_ALL');
+                    break;
                 default:
                     $sObjectType = G::LoadTranslation('ID_ALL');
                     $sObject = G::LoadTranslation('ID_ALL');
diff --git a/workflow/engine/methods/cases/summary.php b/workflow/engine/methods/cases/summary.php
index bb9430059..8e7858379 100755
--- a/workflow/engine/methods/cases/summary.php
+++ b/workflow/engine/methods/cases/summary.php
@@ -47,6 +47,12 @@ try {
     }
     $applicationFields = $case->loadCase( $_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX'] );
 
+    $respView = $case->getAllObjectsFrom( $applicationFields['PRO_UID'], $_REQUEST['APP_UID'], $applicationFields['TAS_UID'], $_SESSION['USER_LOGGED'], 'VIEW' );
+
+    if ($respView['SUMMARY_FORM'] == 0) {
+        throw new Exception( G::LoadTranslation( 'ID_SUMMARY_FORM_NO_PERMISSIONS' ) );
+    }
+
     if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
         $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
         $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';
diff --git a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml
index 8d378cc5f..aa8369836 100755
--- a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml
+++ b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml
@@ -45,6 +45,7 @@
     <option name="OUTPUT">Output Document</option>
     <option name="CASES_NOTES">Cases Notes</option>
     <option name="MSGS_HISTORY">Messages History</option>
+    <option name="SUMMARY_FORM">Summary Form</option>
   </en>
 </OP_OBJ_TYPE>
 <ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -187,7 +188,7 @@ if (getField('OP_OBJ_TYPE').value=='OUTPUT') {
     hideRowById( 'INPUTS' );
     showRowById( 'OP_ACTION' );
 }
-if (getField('OP_OBJ_TYPE').value=='CASES_NOTES') {
+if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') {
     hideRowById( 'ALL' );
     hideRowById( 'DYNAFORMS' );
     hideRowById( 'INPUTS' );
@@ -227,7 +228,7 @@ leimnud.event.add(document.getElementById('form[OP_OBJ_TYPE]'), 'change', functi
         showRowById( 'OUTPUTS' );
         showRowById( 'OP_ACTION' );
     }
-    if (getField('OP_OBJ_TYPE').value=='CASES_NOTES') {
+    if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') {
         hideRowById( 'ALL' );
         hideRowById( 'DYNAFORMS' );
         hideRowById( 'INPUTS' );
diff --git a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml
index 5e75caf33..56a7acd0b 100755
--- a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml
+++ b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml
@@ -45,6 +45,7 @@
     <option name="OUTPUT">Output Document</option>
     <option name="CASES_NOTES">Cases Notes</option>
     <option name="MSGS_HISTORY">Messages History</option>
+    <option name="SUMMARY_FORM">Summary Form</option>
   </en>
 </OP_OBJ_TYPE>
 <ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -171,6 +172,7 @@ leimnud.event.add(getField('OP_OBJ_TYPE'), 'change', function() {
       showRowById('OP_ACTION');
     break;
     case 'CASES_NOTES':
+    case 'SUMMARY_FORM':
       getField('ALL').value = '';
       getField('DYNAFORMS').value = '';
       getField('INPUTS').value = '';
@@ -246,6 +248,7 @@ switch (vValue) {
     showRowById('OP_ACTION');
   break;
   case 'CASES_NOTES':
+  case 'SUMMARY_FORM':
       getField('ALL').value = '';
       getField('DYNAFORMS').value = '';
       getField('INPUTS').value = '';

From 9fac74a1b8633a5379b705381e82f697e2f1d088 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 14 Aug 2014 10:28:17 -0400
Subject: [PATCH 44/48] BUG 15581 " Issue with labels in Radio Group..." SOLVED

- Issue with labels in Radio Group, check group and suggest
- Se realizo el merge de cambios del codigo adjunto del presente bug "class.form.php" al archivo "class.form.php" del
  branch master.
---
 gulliver/system/class.form.php | 38 ++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php
index 3d3322ad8..9c9a254ac 100755
--- a/gulliver/system/class.form.php
+++ b/gulliver/system/class.form.php
@@ -376,7 +376,30 @@ class Form extends XmlForm
                         switch ($v->type) {
                             case 'radiogroup':
                                 $values[$k] = $newValues[$k];
-                                $values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
+
+                                if (isset($v->options[$newValues[$k]])) {
+                                    $values[$k . "_label"] = $newValues[$k . "_label"] = $v->options[$newValues[$k]];
+                                } else {
+                                    $query = G::replaceDataField( $this->fields[$k]->sql, $newValues );
+
+                                    //Execute just if a query was set, it should be not empty
+                                    if (trim($query) == "") {
+                                        continue; //if it is empty string skip it
+                                    }
+
+                                    //We do the query to the external connection and we've got the label
+                                    $con = Propel::getConnection(($this->fields[$k]->sqlConnection != "") ? $this->fields[$k]->sqlConnection : "workflow");
+                                    $stmt = $con->prepareStatement($query);
+                                    $rs = $stmt->executeQuery(ResultSet::FETCHMODE_NUM);
+
+                                    while ($rs->next()) {
+                                        list ($rowId, $rowContent) = $rs->getRow();
+                                        if ($newValues[$k] == $rowId) {
+                                            $values[$k . "_label"] = $rowContent;
+                                            break;
+                                        }
+                                    }
+                                }
                                 break;
                             case 'suggest':
                                 $values[$k] = $newValues[$k];
@@ -548,15 +571,6 @@ class Form extends XmlForm
                                 //This value is added when the user does not mark any checkbox
                                 $values[$k] = "__NULL__";
                                 break;
-                            case "grid":
-                                $values[$k] = $_FILES["form"]["name"][$k];
-                                foreach ($values[$k] as $inp => $ii){
-                                	foreach ($ii as $oo => $ee){
-                                		$x = $v->fields;
-                                		$_POST["INPUTS"][$k][$oo] = $x[$oo]->input;
-                                	}
-                                }
-                                break;
                         }
                     }
                 } else {
@@ -699,9 +713,7 @@ class Form extends XmlForm
                         break;
                     case "grid":
                         $i = 0;
-                        if (!is_array($data[$v->name])) {
-                            $data[$v->name] = array();
-                        }
+
                         foreach ($data[$v->name] as $dataGrid) {
                             $i = $i + 1;
 

From 10bea168b0c66c356f3a1c0a0f94b6f238b3400f Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 14 Aug 2014 10:31:47 -0400
Subject: [PATCH 45/48] BUG-15198 Problemas con querys en fields.

Se aumenta una validacion para el caso en que el campo este en modo 'edit' y tenga ya datos almacenados, en este caso no se ejecutara el query y se mostrara el valor ya almacenado.
---
 gulliver/js/maborak/core/maborak.js | 2 +-
 gulliver/system/class.xmlform.php   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index a2081f8ff..a76fb9ece 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1060,7 +1060,7 @@ if(pressKey==46){me.applyMask(256);}
 else{me.applyMask(pressKey);}
 if(updateOnChange){me.sendOnChange();}}
 if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
-alert(me.browser.name);if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){alert('explorer1');if(event.preventDefault){alert('***');event.preventDefault();}else{alert('***--***');event.returnValue=false;}}
+if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}}
 if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;}
 else{return false;}}};if(this.element){this.element.onblur=function(event)
 {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 21c64f3ee..0daf5ee2b 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -320,6 +320,10 @@ class XmlForm_Field
             return 1;
         }
 
+        if(isset($this->mode) && $this->mode == "edit" && ($this->owner->values[$this->name] !== "")){
+        	return 1;
+        }
+
         if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
         	return 1;
         }

From 5c695a08239f60cf330c93414b9cca78d08bb2d2 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 14 Aug 2014 10:55:43 -0400
Subject: [PATCH 46/48] BUG 13913 "Icons to manage dynaform..." SOLVED

- Icons to manage dynaform fields are set below column Label
- Problema resuelto, cuando se crea un campo con label vacio, al hacer click en Fields Handler los iconos edit field y
  remove field se mostraran correctamente.
---
 gulliver/system/class.form.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php
index 9c9a254ac..f0c9fd1ec 100755
--- a/gulliver/system/class.form.php
+++ b/gulliver/system/class.form.php
@@ -571,6 +571,15 @@ class Form extends XmlForm
                                 //This value is added when the user does not mark any checkbox
                                 $values[$k] = "__NULL__";
                                 break;
+                            case "grid":
+                                $values[$k] = $_FILES["form"]["name"][$k];
+                                foreach ($values[$k] as $inp => $ii){
+                                 foreach ($ii as $oo => $ee){
+                                  $x = $v->fields;
+                                  $_POST["INPUTS"][$k][$oo] = $x[$oo]->input;
+                                 }
+                                }
+                                break;
                         }
                     }
                 } else {
@@ -713,7 +722,9 @@ class Form extends XmlForm
                         break;
                     case "grid":
                         $i = 0;
-
+                        if (!is_array($data[$v->name])) {
+                            $data[$v->name] = array();
+                        }
                         foreach ($data[$v->name] as $dataGrid) {
                             $i = $i + 1;
 

From 04c4a98daedc9ba7692be3c83758abacb98f5079 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 14 Aug 2014 11:18:53 -0400
Subject: [PATCH 47/48] BUG-15198 Problemas con querys en fields.

Se aumenta una validacion para el caso en que el campo este en modo 'edit' y tenga ya datos almacenados, en este caso no se ejecutara el query y se mostrara el valor ya almacenado.
---
 gulliver/system/class.xmlform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 0daf5ee2b..2e40da9af 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -320,7 +320,7 @@ class XmlForm_Field
             return 1;
         }
 
-        if(isset($this->mode) && $this->mode == "edit" && ($this->owner->values[$this->name] !== "")){
+        if(isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $this->owner->values[$this->name] !== "")){
         	return 1;
         }
 

From fcc5a4355c492aeea31b5fc8c1b56826d348638f Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 14 Aug 2014 12:45:06 -0400
Subject: [PATCH 48/48] BUG 15524 "Mantener el Idioma de la URL..." SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Mantener el Idioma de la URL al iniciar sesió
- Problema resuelto, al iniciar sesion con un determinado idioma en la url y cerrar sesion, al iniciar sesion nuevamente
  en el login el idioma se mantendra al idioma definido en la url, tambien se adiciona una opcion mas al guardar la configuracion
  del idioma cuya opcion es "Use the language of URL".
---
 workflow/engine/methods/login/authentication.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 64278e30b..b336b6073 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -191,7 +191,7 @@ try {
             $lang = $frm['USER_LANG'];
         }
     } else {
-        if (defined('SYS_LANG')) {
+        if (defined("SYS_LANG") && SYS_LANG != "") {
             $lang = SYS_LANG;
         } else {
             $lang = 'en';