From 41a27f4d4c7b82bd835a02c6f3afc8220fd40f22 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 24 Jan 2014 10:56:41 -0400
Subject: [PATCH 01/54] Validating if exists 'HTTP_USER_AGENT' key in $_SERVER
 array

---
 workflow/public_html/sysGeneric.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 93793bd0c..ec6f6a11c 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -73,6 +73,11 @@ function transactionLog($transactionName){
     }
 }
 
+// Validating if exists 'HTTP_USER_AGENT' key in $_SERVER array
+if (!isset($_SERVER['HTTP_USER_AGENT'])) {
+    $_SERVER['HTTP_USER_AGENT'] = '';
+}
+
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
 define( 'PATH_SEP', '/' );
 

From 01a92122d9012f568b7a5c8e73d96e50d0e4ae31 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 24 Jan 2014 11:04:43 -0400
Subject: [PATCH 02/54] =?UTF-8?q?BUG-13727=20SOLVED=20La=20secci=C3=B3n=20?=
 =?UTF-8?q?AMIN=20/=20Dashboards=20/=20New=20{Instance=20Dashlets}=20/=20l?=
 =?UTF-8?q?a=20lista=20del=20campo=20=E2=80=98Name=E2=80=99=20no=20se=20mu?=
 =?UTF-8?q?estra=20de=20forma=20ordenada=20cuando=20se=20selecciona=20?=
 =?UTF-8?q?=E2=80=98Assign=20To=E2=80=99=20en=20=E2=80=98User=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/controllers/dashboard.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index e98ad5a9b..66b4868df 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -332,7 +332,9 @@ class Dashboard extends Controller
                         $users[] = array ('OWNER_UID' => $user['USR_UID'],'OWNER_NAME' => $user['USR_FIRSTNAME'] . ' ' . $user['USR_LASTNAME']
                         );
                     }
-
+                    usort($users, function($str1, $str2) {
+                        return strcmp(strtolower($str1["OWNER_NAME"]), strtolower($str2["OWNER_NAME"]));
+                    });
                     $result->total = $allUsers->totalCount;
                     $result->owners = $users;
                     break;

From 27e1df8b44c48d4855199237235354fc39062731 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Fri, 24 Jan 2014 17:26:27 -0400
Subject: [PATCH 03/54] Arreglo de model en languange

---
 .../engine/classes/model/map/LanguageMapBuilder.php  |  2 ++
 workflow/engine/classes/model/om/BaseLanguage.php    | 12 +++++++++---
 .../engine/classes/model/om/BaseLanguagePeer.php     |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/model/map/LanguageMapBuilder.php b/workflow/engine/classes/model/map/LanguageMapBuilder.php
index afa531039..a8b5f319e 100755
--- a/workflow/engine/classes/model/map/LanguageMapBuilder.php
+++ b/workflow/engine/classes/model/map/LanguageMapBuilder.php
@@ -67,6 +67,8 @@ class LanguageMapBuilder
 
         $tMap->addPrimaryKey('LAN_ID', 'LanId', 'string', CreoleTypes::VARCHAR, true, 4);
 
+        $tMap->addColumn('LAN_LOCATION', 'LanLocation', 'string', CreoleTypes::VARCHAR, true, 4);
+
         $tMap->addColumn('LAN_NAME', 'LanName', 'string', CreoleTypes::VARCHAR, true, 30);
 
         $tMap->addColumn('LAN_NATIVE_NAME', 'LanNativeName', 'string', CreoleTypes::VARCHAR, true, 30);
diff --git a/workflow/engine/classes/model/om/BaseLanguage.php b/workflow/engine/classes/model/om/BaseLanguage.php
index 1adf216c9..4b2968baf 100755
--- a/workflow/engine/classes/model/om/BaseLanguage.php
+++ b/workflow/engine/classes/model/om/BaseLanguage.php
@@ -1,13 +1,19 @@
 <?php
+
 require_once 'propel/om/BaseObject.php';
+
 require_once 'propel/om/Persistent.php';
 
+
 include_once 'propel/util/Criteria.php';
+
 include_once 'classes/model/LanguagePeer.php';
 
 /**
  * Base class that represents a row from the 'LANGUAGE' table.
  *
+ * 
+ *
  * @package    workflow.classes.model.om
  */
 abstract class BaseLanguage extends BaseObject implements Persistent
@@ -385,7 +391,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 7; // 7 = LanguagePeer::NUM_COLUMNS - LanguagePeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 8; // 8 = LanguagePeer::NUM_COLUMNS - LanguagePeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Language object", $e);
@@ -750,6 +756,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent
         if (array_key_exists($keys[7], $arr)) {
             $this->setLanCalendar($arr[$keys[7]]);
         }
+
     }
 
     /**
@@ -766,7 +773,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent
         }
 
         if ($this->isColumnModified(LanguagePeer::LAN_LOCATION)) {
-            $criteria->add(LanguagePeer::LAN_ID, $this->lan_location);
+            $criteria->add(LanguagePeer::LAN_LOCATION, $this->lan_location);
         }
 
         if ($this->isColumnModified(LanguagePeer::LAN_NAME)) {
@@ -896,7 +903,6 @@ abstract class BaseLanguage extends BaseObject implements Persistent
      * same instance for all member of this class. The method could therefore
      * be static, but this would prevent one from overriding the behavior.
      *
-     *
      * @return     LanguagePeer
      */
     public function getPeer()
diff --git a/workflow/engine/classes/model/om/BaseLanguagePeer.php b/workflow/engine/classes/model/om/BaseLanguagePeer.php
index 01d0ccaa7..f745cf95b 100755
--- a/workflow/engine/classes/model/om/BaseLanguagePeer.php
+++ b/workflow/engine/classes/model/om/BaseLanguagePeer.php
@@ -25,7 +25,7 @@ abstract class BaseLanguagePeer
     const CLASS_DEFAULT = 'classes.model.Language';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 8;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -69,7 +69,7 @@ abstract class BaseLanguagePeer
         BasePeer::TYPE_PHPNAME => array ('LanId', 'LanLocation', 'LanName', 'LanNativeName', 'LanDirection', 'LanWeight', 'LanEnabled', 'LanCalendar', ),
         BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID, LanguagePeer::LAN_LOCATION, LanguagePeer::LAN_NAME, LanguagePeer::LAN_NATIVE_NAME, LanguagePeer::LAN_DIRECTION, LanguagePeer::LAN_WEIGHT, LanguagePeer::LAN_ENABLED, LanguagePeer::LAN_CALENDAR, ),
         BasePeer::TYPE_FIELDNAME => array ('LAN_ID', 'LAN_LOCATION', 'LAN_NAME', 'LAN_NATIVE_NAME', 'LAN_DIRECTION', 'LAN_WEIGHT', 'LAN_ENABLED', 'LAN_CALENDAR', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,)
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -82,7 +82,7 @@ abstract class BaseLanguagePeer
         BasePeer::TYPE_PHPNAME => array ('LanId' => 0, 'LanLocation' => 1, 'LanName' => 2, 'LanNativeName' => 3, 'LanDirection' => 4, 'LanWeight' => 5, 'LanEnabled' => 6, 'LanCalendar' => 7, ),
         BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID => 0, LanguagePeer::LAN_LOCATION => 1, LanguagePeer::LAN_NAME => 2, LanguagePeer::LAN_NATIVE_NAME => 3, LanguagePeer::LAN_DIRECTION => 4, LanguagePeer::LAN_WEIGHT => 5, LanguagePeer::LAN_ENABLED => 6, LanguagePeer::LAN_CALENDAR => 7, ),
         BasePeer::TYPE_FIELDNAME => array ('LAN_ID' => 0, 'LAN_LOCATION' => 1, 'LAN_NAME' => 2, 'LAN_NATIVE_NAME' => 3, 'LAN_DIRECTION' => 4, 'LAN_WEIGHT' => 5, 'LAN_ENABLED' => 6, 'LAN_CALENDAR' => 7, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,)
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**

From 1ce879d2fbeb186134b240272fb3abf17f3d5a2a Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Mon, 27 Jan 2014 11:06:38 -0400
Subject: [PATCH 04/54] =?UTF-8?q?BUG-13708=20SOLVED=20En=20la=20secci?=
 =?UTF-8?q?=C3=B3n:=20ADMIN=20/=20PM=20Tables=20/=20{seleccionar=20alg?=
 =?UTF-8?q?=C3=BAn=20Report=20Table},=20al=20editar=20una=20columna=20del?=
 =?UTF-8?q?=20Report=20Table=20el=20campo=20size=20se=20encuentra=20bloque?=
 =?UTF-8?q?ado.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/templates/pmTables/editReport.js   | 115 +++++++++---------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index 624879a6c..8882e8d2c 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -207,6 +207,9 @@ Ext.onReady(function(){
   sm = new Ext.grid.RowSelectionModel({
     selectSingle: false,
     listeners:{
+      rowselect: function(sm) {
+        validateFieldSizeAutoincrement(assignedGrid.getSelectionModel().getSelected().get('field_type'), false);
+      },
       selectionchange: function(sm){
           switch(sm.getCount()){
             case 0:
@@ -247,7 +250,12 @@ Ext.onReady(function(){
                       nanText: 'This field should content a number',
                       minValue: 1,
                       maxValue: 99,
-                      minLength: 0
+                      minLength: 0,
+                      listeners:{
+                        render:function(){
+                            validateFieldSizeAutoincrement(assignedGrid.getSelectionModel().getSelected().get('field_type'), false);
+                        }
+                      }
                   });
 
 
@@ -353,65 +361,12 @@ Ext.onReady(function(){
                       }
                   },
                   'select': function(combo, row, index) {
-                      if( cm && cm instanceof Ext.grid.ColumnModel) {
-                          if(selCombo != combo.getValue()) {
-                              Ext.getCmp('sizeEdit').setValue('');
-                          }
-                          selCombo = combo.getValue();
-
-                          var swSize = 1;  //Enable
-                          var swAI = 1;
-
-                          //Date
-                          if (selCombo == "TIME" || selCombo == "DATE" || selCombo == "DATETIME") {
-                              swSize = 0;  //Disable
-                              swAI = 0;
-                          }
-
-                          //Numbers
-                          if (selCombo == "BIGINT" || selCombo == "INTEGER" || selCombo == "SMALLINT" || selCombo == "TINYINT") {
-                              //Enable All
-                          }
-
-                          if (selCombo == "DECIMAL" || selCombo == "FLOAT" || selCombo == "REAL" || selCombo == "DOUBLE") {
-                              swSize = 0;
-                              swAI = 0;
-                          }
-
-                          if (selCombo == "CHAR" || selCombo =="VARCHAR" || selCombo == "LONGVARCHAR") {
-                             var swAI = 0;
-                          }
-
-                          //Boolean
-                          if (selCombo == "BOOLEAN") {
-                              swSize = 0;
-                              swAI = 0;
-                          }
-
-                          if (swAI == 1) {
-                              Ext.getCmp("field_incre").enable();
-                          } else {
-                              Ext.getCmp("field_incre").disable();
-                              Ext.getCmp("field_incre").setValue(false);
-                          }
-
-                          if (swSize == 1) {
-                              Ext.getCmp("sizeEdit").enable();
-
-                              if (selCombo == "CHAR" || selCombo =="VARCHAR" || selCombo == "LONGVARCHAR") {
-                                  Ext.getCmp("sizeEdit").setMaxValue(((selCombo == "CHAR") ? 255 : 999));
-                                  sizeField.getEl().dom.maxLength = 3;
-                              } else {
-                                  Ext.getCmp("sizeEdit").setMaxValue(99);
-                                  sizeField.getEl().dom.maxLength = 2;
-                              }
-                          } else {
-                              Ext.getCmp("sizeEdit").disable();
-                              Ext.getCmp("sizeEdit").setValue("");
-                          }
-
-                          flagShowMessageError = 1;
-                      }
+                    if (cm && cm instanceof Ext.grid.ColumnModel) {
+                        var valueCombo = combo.getValue();
+                        var changeValue = !(valueCombo === assignedGrid.getSelectionModel().getSelected().get('field_type'));
+                        validateFieldSizeAutoincrement(valueCombo, changeValue);
+                        flagShowMessageError = 1;
+                    }
                   }//select
               }
           })
@@ -439,6 +394,45 @@ Ext.onReady(function(){
         }
       }
   ];
+  
+function validateFieldSizeAutoincrement(valueType, defaultValue) {
+    if (Ext.getCmp("sizeEdit").getEl()) {
+        
+        if (valueType === 'INTEGER' || valueType === 'BIGINT' || valueType === 'SMALLINT' || valueType === 'TINYINT') {
+            Ext.getCmp("sizeEdit").enable();
+            Ext.getCmp("sizeEdit").setMaxValue(99);
+            Ext.getCmp("sizeEdit").getEl().dom.maxLength = 2;
+            if (defaultValue) {
+                Ext.getCmp("sizeEdit").setValue('');
+            }
+            
+            Ext.getCmp("field_incre").enable();
+            if (defaultValue) {
+                Ext.getCmp("field_incre").setValue(false);
+            }
+        }
+        
+        if (valueType === 'CHAR' || valueType === 'VARCHAR' || valueType === 'LONGVARCHAR') {
+            Ext.getCmp("sizeEdit").enable();
+            Ext.getCmp("sizeEdit").setMaxValue(((valueType === 'CHAR') ? 255 : 999));
+            Ext.getCmp("sizeEdit").getEl().dom.maxLength = 3;
+            if (defaultValue) {
+                Ext.getCmp("sizeEdit").setValue('');
+            }
+            
+            Ext.getCmp("field_incre").disable();
+            Ext.getCmp("field_incre").setValue(false);
+        }
+        
+        if (valueType === 'BOOLEAN' || valueType === 'DATE' || valueType === 'DATETIME' || valueType === 'TIME' || valueType === 'DECIMAL' || valueType === 'DOUBLE' || valueType === 'FLOAT' || valueType === 'REAL') {
+            Ext.getCmp("sizeEdit").disable();
+            Ext.getCmp("sizeEdit").setValue('');
+            
+            Ext.getCmp("field_incre").disable();
+            Ext.getCmp("field_incre").setValue(false);
+        }
+    }
+}
 
   //if permissions plugin is enabled
   if (TABLE !== false && TABLE.ADD_TAB_TAG == 'plugin@simplereport') {
@@ -533,6 +527,7 @@ Ext.onReady(function(){
     beforeedit: function(roweditor, rowIndex) {
       row = assignedGrid.getSelectionModel().getSelected();
       if (row.get('field_name') == 'APP_UID' || row.get('field_name') == 'APP_NUMBER' || row.get('field_name') == 'ROW') {
+          editor.stopEditing();
         return false;
       }
     }

From 69afc1b9dd9b535b7a550a765e441427740edf63 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Mon, 27 Jan 2014 16:48:39 -0400
Subject: [PATCH 05/54] Add validation when existas tasks without routing rules
 in the processmap preview for the operator users

---
 workflow/engine/classes/class.processMap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 9b0fe1de4..d77a4d01e 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -155,6 +155,7 @@ class processMap
                 $oTask->position->x = (int) $aRow1['TAS_POSX'];
                 $oTask->position->y = (int) $aRow1['TAS_POSY'];
                 $oTask->derivation = null;
+                $oTask->derivation->type = '';
                 $oTask->derivation->to = array();
                 $oCriteria = new Criteria('workflow');
                 $oCriteria->add(RoutePeer::PRO_UID, $sProcessUID);

From 6da77ddb89b4ddfe929d7ae5d3d527f97e4022d3 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Tue, 28 Jan 2014 13:01:23 -0400
Subject: [PATCH 06/54] =?UTF-8?q?BUG-13748=20SOLVED=20En=20la=20secci?=
 =?UTF-8?q?=C3=B3n:=20ADMIN=20/=20PM=20Tables=20/=20{seleccionar=20alg?=
 =?UTF-8?q?=C3=BAn=20Report=20Table}=20/=20Data,=20los=20Report=20Table=20?=
 =?UTF-8?q?con=20columnas=20de=20tipo=20numero=20y=20cadena,=20al=20ingres?=
 =?UTF-8?q?ar=20cadenas=20no=20num=C3=A9ricas=20al=20buscador=20este=20des?=
 =?UTF-8?q?pliega=20adicionalmente=20los=20registros=20cuyo=20tipo=20de=20?=
 =?UTF-8?q?dato=20sean=20num=C3=A9ricos=20y=20cuyo=20valor=20sea=20cero.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/classes/model/AdditionalTables.php | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index ce5cd41d8..a3e79598d 100755
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -371,9 +371,21 @@ class AdditionalTables extends BaseAdditionalTables
         $oCriteria = new Criteria($aData['DBS_UID']);
 
         //eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");');
+        
+        /*
+         * data type:
+         * 'INTEGER'  'BIGINT'  'SMALLINT'  'TINYINT'  'DECIMAL'  'DOUBLE'  'FLOAT'  'REAL'
+         * 'CHAR'  'VARCHAR'  'LONGVARCHAR'  'BOOLEAN'  'DATE'  'DATETIME'  'TIME'
+         */
+        $types = array('DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
+        
         if ($keyOrderUppercase == true) {
             foreach ($aData['FIELDS'] as $aField) {
-                eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
+                $field = '$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');';
+                if (in_array($aField['FLD_TYPE'], $types)) {
+                    $field = '$oCriteria->addAsColumn("' . $aField['FLD_NAME'] . '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", 2)" );';
+                }
+                eval($field);
                 /*if ($aField['FLD_KEY'] == '1') {
                     eval('$oCriteria->addAscendingOrderByColumn('. $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
                 }*/
@@ -384,37 +396,27 @@ class AdditionalTables extends BaseAdditionalTables
         eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
 
         if ($filter != '' && is_string($filter)) {
-            eval('$fieldsTable = ' . $sClassPeerName . '::getFieldNames(BasePeer::TYPE_FIELDNAME);');
-            $countField = count($fieldsTable);
             $stringOr = '$oCriteria->add(';
-            $cont = 0;
-            $fieldAppUid = '';
-            foreach ($fieldsTable as $value) {
-            	if ($value != 'APP_UID') {
-	                if (($cont+1) == $countField) {
-	                    if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') {
-	                        $stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)';
-	                    } else {
-	                        $stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)';
-	                    }
-	                } else {
-	                    if ($aData['FIELDS'][$cont]['FLD_TYPE'] == 'VARCHAR') {
-	                        $stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "%' . $filter . '%", Criteria::LIKE)->addOr(';
-	                    } else {
-	                        $stringOr .= '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . strtoupper($value) . ', "' . $filter . '", Criteria::LIKE)->addOr(';
-	                    }
-	                }
-                } else {
-                    $fieldAppUid = $cont;
-                }
-                $cont++;
-            }
-            for ($c = 0; $c < $countField-1; $c++) {            	
-                if ($fieldAppUid !== $c) {
-                	$stringOr .= ')';
+            $closure = '';
+            $compare = '';
+            $types = array('INTEGER', 'BIGINT', 'SMALLINT', 'TINYINT', 'DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
+            foreach ($aData['FIELDS'] as $aField) {
+                if ($aField['FLD_NAME'] != 'APP_UID') {
+                    $compare = '"%' . $filter . '%", Criteria::LIKE';
+                    
+                    if (in_array($aField['FLD_TYPE'], $types)) {
+                        if (is_numeric($filter)) {
+                            $compare = '"' . $filter . '", Criteria::EQUAL';
+                        } else {
+                            $compare = 'null, Criteria::ISNULL';
+                        }
+                    }
+
+                    $stringOr = $stringOr . '$oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', ' . $compare . ')->addOr(';
+                    $closure = $closure . ")";
                 }
             }
-            $stringOr .= ');';
+            $stringOr = rtrim($stringOr, '->addOr(') . $closure . ';';
             eval($stringOr);
 
             $oCriteriaCount = clone $oCriteria;

From 1c708c28f65af4e0f7cb45812ea4d67df843cba8 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 29 Jan 2014 10:57:57 -0400
Subject: [PATCH 07/54] Correcciones de labels para DocSystem

---
 workflow/engine/classes/class.configuration.php    | 4 ++--
 workflow/engine/methods/cases/ajaxListener.php     | 5 +++--
 workflow/engine/methods/cases/cases_Derivate.php   | 4 ++--
 workflow/engine/methods/setup/appCacheViewAjax.php | 6 +++---
 workflow/engine/methods/users/usersAjax.php        | 2 +-
 workflow/engine/templates/cases/main.js            | 4 ++--
 workflow/engine/templates/groups/groupsList.js     | 4 ++--
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php
index 9045f07d0..54105f2d6 100755
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -597,8 +597,8 @@ class Configurations // extends Configuration
                     }
                 }
 
-                setlocale(LC_TIME, $langLocate . ".utf8");
-                $dateTime = strftime($newCreation, mktime($h, $i, $s, $m, $d, $y));
+                setlocale(LC_TIME, $langLocate);
+                $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)));
 
                 if (strpos($dateTime, ' ') !== false) {
                     $dateTime = ucwords($dateTime);
diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php
index bc66b38e3..07d057483 100755
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -334,8 +334,9 @@ class Ajax
             $processData['PRO_AUTHOR'] = '(USER DELETED)';
         }
 
-        $processData['PRO_CREATE_DATE'] = date('F j, Y', strtotime($processData['PRO_CREATE_DATE']));
-
+        $conf = new Configurations();
+        $conf->getFormats();
+        $processData['PRO_CREATE_DATE'] = $conf->getSystemDate($processData['PRO_CREATE_DATE']);
         print (G::json_encode($processData));
     }
 
diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php
index be0e388d3..5855894c5 100755
--- a/workflow/engine/methods/cases/cases_Derivate.php
+++ b/workflow/engine/methods/cases/cases_Derivate.php
@@ -75,7 +75,7 @@ try {
 
         //save trigger variables for debugger
         $_SESSION['TRIGGER_DEBUG']['info'][0]['NUM_TRIGGERS'] = sizeof( $triggers );
-        $_SESSION['TRIGGER_DEBUG']['info'][0]['TIME'] = 'BEFORE';
+        $_SESSION['TRIGGER_DEBUG']['info'][0]['TIME'] = G::toUpper(G::loadTranslation('ID_BEFORE'));
         $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
         $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_VALUES'] = $triggers;
     }
@@ -104,7 +104,7 @@ try {
 
 
         $_SESSION['TRIGGER_DEBUG']['info'][1]['NUM_TRIGGERS'] = sizeof( $triggers );
-        $_SESSION['TRIGGER_DEBUG']['info'][1]['TIME'] = 'AFTER';
+        $_SESSION['TRIGGER_DEBUG']['info'][1]['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
         $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
         $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers;
     }
diff --git a/workflow/engine/methods/setup/appCacheViewAjax.php b/workflow/engine/methods/setup/appCacheViewAjax.php
index e9ed60072..7c82744c1 100755
--- a/workflow/engine/methods/setup/appCacheViewAjax.php
+++ b/workflow/engine/methods/setup/appCacheViewAjax.php
@@ -138,15 +138,15 @@ switch ($request) {
         if (! $currentUserIsSuper && ! $result->error) {
             $res = $appCache->checkGrantsForUser( true );
             if (! isset( $res['error'] )) {
-                $result->info[] = array ('name' => 'Root User','value' => $res['user']);
-                $result->info[] = array ('name' => 'Root User has SUPER privilege','value' => $res['super']);
+                $result->info[] = array ('name' => G::LoadTranslation ( 'ID_ROOT_USER' ), 'value' => $res['user']);
+                $result->info[] = array ('name' => G::LoadTranslation ( 'ID_ROOT_USER_SUPER' ), 'value' => $res['super']);
             } else {
                 $result->info[] = array ('name' => 'Error','value' => $res['msg']);
             }
 
             $res = $appCache->setSuperForUser( $currentUser );
             if (! isset( $res['error'] )) {
-                $result->info[] = array ('name' => 'Setting SUPER privilege','value' => 'Successfully');
+                $result->info[] = array ('name' => G::LoadTranslation ( 'ID_SETTING_SUPER' ), 'value' => G::LoadTranslation ( 'ID_SUCCESSFULLY' ));
             } else {
                 $result->error = true;
                 $result->errorMsg = $res['msg'];
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 954343b0f..a05ccf4f9 100755
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -88,7 +88,7 @@ switch ($_POST['action']) {
         G::LoadClass('calendar');
         $calendar = new Calendar();
         $calendarObj = $calendar->getCalendarList(true, true);
-        $oData[] = array('CALENDAR_UID' => '', 'CALENDAR_NAME' => '- None -');
+        $oData[] = array('CALENDAR_UID' => '', 'CALENDAR_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -');
         foreach ($calendarObj['array'] as $rowid => $row) {
             if ($rowid > 0) {
                 $oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']);
diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js
index ae66d9928..e9dd0ac25 100755
--- a/workflow/engine/templates/cases/main.js
+++ b/workflow/engine/templates/cases/main.js
@@ -359,8 +359,8 @@ Ext.onReady(function(){
       store: triggerStore,
 
       columns: [
-        {id:'name',header: "Name", width: 60, sortable: true, dataIndex: 'name'},
-        {header: "Execution", width: 30, sortable: true, dataIndex: 'execution_time'},
+        {id:'name',header: _('ID_NAME'), width: 60, sortable: true, dataIndex: 'name'},
+        {header: _('ID_EXECUTION'), width: 30, sortable: true, dataIndex: 'execution_time'},
         {header: "Code", width: 30, sortable: false, dataIndex: 'code', hidden: true}
       ],
 
diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js
index 4b4ec287d..820edfa47 100755
--- a/workflow/engine/templates/groups/groupsList.js
+++ b/workflow/engine/templates/groups/groupsList.js
@@ -145,7 +145,7 @@ Ext.onReady(function(){
 
   comboStatusStore = new Ext.data.SimpleStore({
     fields: ['id','value'],
-    data: [['1','ACTIVE'],['0','INACTIVE']]
+    data: [['1',_('ID_ACTIVE').toUpperCase()],['0', _('ID_INACTIVE').toUpperCase()]]
   });
 
   newForm = new Ext.FormPanel({
@@ -164,7 +164,7 @@ Ext.onReady(function(){
              store: comboStatusStore,
              listeners   : {
                  beforerender: function(status){
-                   status.setValue('ACTIVE');
+                   status.setValue(_('ID_ACTIVE').toUpperCase());
                  }
              },
              displayField: 'value',

From b1d9f8903b1c42da7763df608702632e4b3dca3b Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 29 Jan 2014 12:27:58 -0400
Subject: [PATCH 08/54] Arreglo para ABM de grupos con idiomas

---
 workflow/engine/methods/groups/groups_Ajax.php |  4 ++--
 workflow/engine/templates/groups/groupsList.js | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php
index 939ffb39e..233e56619 100644
--- a/workflow/engine/methods/groups/groups_Ajax.php
+++ b/workflow/engine/methods/groups/groups_Ajax.php
@@ -144,7 +144,7 @@ switch ($_POST['action']) {
     case 'saveNewGroup':
         G::LoadClass( 'groups' );
         $newGroup['GRP_UID'] = '';
-        $newGroup['GRP_STATUS'] = G::toUpper( $_POST['status'] );
+        $newGroup['GRP_STATUS'] = ($_POST['status'] == '1') ? 'ACTIVE' : 'INACTIVE';
         $newGroup['GRP_TITLE'] = trim( $_POST['name'] );
         unset( $newGroup['GRP_UID'] );
         $group = new Groupwf();
@@ -154,7 +154,7 @@ switch ($_POST['action']) {
     case 'saveEditGroup':
         G::LoadClass( 'groups' );
         $editGroup['GRP_UID'] = $_POST['grp_uid'];
-        $editGroup['GRP_STATUS'] = G::toUpper( $_POST['status'] );
+        $editGroup['GRP_STATUS'] = ($_POST['status'] == '1') ? 'ACTIVE' : 'INACTIVE';
         $editGroup['GRP_TITLE'] = trim( $_POST['name'] );
         $group = new Groupwf();
         $group->update( $editGroup );
diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js
index 820edfa47..b9d0e1908 100755
--- a/workflow/engine/templates/groups/groupsList.js
+++ b/workflow/engine/templates/groups/groupsList.js
@@ -144,7 +144,7 @@ Ext.onReady(function(){
   });
 
   comboStatusStore = new Ext.data.SimpleStore({
-    fields: ['id','value'],
+    fields: ['changeInt','value'],
     data: [['1',_('ID_ACTIVE').toUpperCase()],['0', _('ID_INACTIVE').toUpperCase()]]
   });
 
@@ -164,11 +164,11 @@ Ext.onReady(function(){
              store: comboStatusStore,
              listeners   : {
                  beforerender: function(status){
-                   status.setValue(_('ID_ACTIVE').toUpperCase());
+                   status.setValue('1');
                  }
              },
              displayField: 'value',
-             valueField:'value',
+             valueField:'changeInt',
              allowBlank: false,
              triggerAction: 'all',
              emptyText: _('ID_SELECT_STATUS'),
@@ -189,13 +189,15 @@ Ext.onReady(function(){
            {xtype: 'textfield', fieldLabel: _('ID_GROUP_NAME'), name: 'name', width: 200, allowBlank: false},
            {
              xtype: 'combo',
+             id: 'statusEdit',
+             name: 'statusEdit',
              fieldLabel: _('ID_STATUS'),
              hiddenName: 'status',
              typeAhead: true,
              mode: 'local',
              store: comboStatusStore,
              displayField: 'value',
-             valueField:'value',
+             valueField:'changeInt',
              allowBlank: false,
              editable:false,
              triggerAction: 'all',
@@ -409,6 +411,7 @@ DuplicateGroupName = function(){
 
 //Save New Group
 SaveNewGroup = function(){
+  document.getElementById('status').value = Ext.getCmp('status').getValue();
   newForm.getForm().submit({
     waitTitle : "&nbsp;",
     success: function(f,a){
@@ -438,7 +441,8 @@ EditGroupWindow = function(){
 
   editForm.getForm().findField('grp_uid').setValue(rowSelected.data.GRP_UID);
   editForm.getForm().findField('name').setValue(strName);
-  editForm.getForm().findField('status').setValue(rowSelected.data.GRP_STATUS);
+  var valueEditChangeInt = (rowSelected.data.GRP_STATUS == 'ACTIVE') ? '1' : '0';
+  editForm.getForm().findField('status').setValue(valueEditChangeInt);
   w = new Ext.Window({
     autoHeight: true,
     width: 440,
@@ -467,6 +471,7 @@ SaveEditGroupAction = function(){
 
 //Save Edit Group
 SaveEditGroup = function(){
+  document.getElementById('statusEdit').value = Ext.getCmp('statusEdit').getValue();
   editForm.getForm().submit({
     waitTitle : "&nbsp;",
     success: function(f,a){

From c1d4a5663bddb399da092fe00115bae387628007 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 30 Jan 2014 11:03:21 -0400
Subject: [PATCH 09/54] =?UTF-8?q?BUG-13775=20SOLVED=20El=20comando=20de=20?=
 =?UTF-8?q?restauraci=C3=B3n:=20./processmaker=20workspace-restore=20/home?=
 =?UTF-8?q?/sample-backup=20sample=20no=20puede=20completarse=20cuando=20l?=
 =?UTF-8?q?a=20contrase=C3=B1a=20de=20base=20de=20datos=20contiene=20carac?=
 =?UTF-8?q?teres=20especiales=20por=20ejemplo:=20aaa$aaa.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/class.wsTools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 478172cd9..d7ee43a30 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1096,7 +1096,7 @@ class workspaceTools
             $command = 'mysql'
             . ' --host=' . $parameters['dbHost']
             . ' --user=' . $parameters['dbUser']
-            . ' --password=' . $parameters['dbPass']
+            . ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($parameters['dbPass'])))//no change! supports the type passwords: .\+*?[^]($)'"\"'
             . ' --database=' . mysql_real_escape_string($database)
             . ' --default_character_set utf8'
             . ' --execute="SOURCE '.$filename.'"';

From 7929369624d96887a14c4afe56258ba0f764b48b Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Thu, 30 Jan 2014 11:18:37 -0400
Subject: [PATCH 10/54] BUG-TREE_STEPS Error en la funcionalidad

Error en la funcionalidad cuando cambias de formulario en TreeSteps
---
 gulliver/js/maborak/core/maborak.js     |  5 +-
 workflow/engine/templates/cases/open.js | 86 ++++++++++++++-----------
 2 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index c4096a993..e6834f173 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1281,8 +1281,9 @@ selectdd.innerHTML="";for(i=0;i<=arrayOption.options.length-1;i++){if(swOptGroup
 optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}else{optionAux=document.createElement("option");selectdd.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}}}
 if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}}
 function dynaFormChanged(frm)
-{for(var i1=0;i1<=frm.elements.length-1;i1++){if(frm.elements[i1].type=="text"&&frm.elements[i1].value!=frm.elements[i1].defaultValue){return true;}
-if(frm.elements[i1].type=="textarea"&&frm.elements[i1].value!=frm.elements[i1].defaultValue){return true;}
+{ 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;for(var i2=0;i2<=frm.elements[i1].options.length-1;i2++){if(frm.elements[i1].options[i2].defaultSelected){selectDefaultValue=frm.elements[i1].options[i2].value;break;}}
 if(frm.elements[i1].value!=selectDefaultValue){return true;}}}
 return false;}
diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js
index 216c68e95..e46932053 100755
--- a/workflow/engine/templates/cases/open.js
+++ b/workflow/engine/templates/cases/open.js
@@ -241,53 +241,65 @@ Ext.onReady(function(){
                 if (swForm == 1) {
                     var requiredField = "";
                     var swRequiredField = 1;
+                    var dynaformChange ="";
+                    var swDynaformChange = 0;
+
+                    if (window.frames["openCaseFrame"].document.getElementsByTagName("form")) {
+                    	dynaformChange = window.frames["openCaseFrame"].document.getElementsByTagName("form").item(0);
+                    	swDynaformChange = (window.frames["openCaseFrame"].dynaFormChanged(dynaformChange))? 1 : 0;
+                    }
 
                     if (window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields")) {
                         requiredField = window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields").value;
-
                         if (requiredField != "") {
                             swRequiredField = (window.frames["openCaseFrame"].validateForm(requiredField))? 1 : 0;
                         }
                     }
 
-                    if (swRequiredField == 1) {
-                        Ext.MessageBox.show({
-                            title: _("ID_CONFIRM"),
-                            msg: _("ID_DYNAFORM_SAVE_CHANGES"),
-                            icon:  Ext.MessageBox.QUESTION,
-                            buttons: {ok: _("ID_ACCEPT"), cancel: _("ID_CANCEL")},
-                            fn: function (btn)
-                            {
-                                loadMaskStep.show();
+                    if (swDynaformChange) {
+	                    if ((swRequiredField == 1)){
+	                        Ext.MessageBox.show({
+	                            title: _("ID_CONFIRM"),
+	                            msg: _("ID_DYNAFORM_SAVE_CHANGES"),
+	                            icon:  Ext.MessageBox.QUESTION,
+	                            buttons: {ok: _("ID_ACCEPT"), cancel: _("ID_CANCEL")},
+	                            fn: function (btn)
+	                            {
+	                                loadMaskStep.show();
 
-                                if (btn == "ok") {
-                                    var frm = window.frames["openCaseFrame"].document.getElementsByTagName("form");
+	                                if (btn == "ok") {
+	                                    var frm = window.frames["openCaseFrame"].document.getElementsByTagName("form");
 
-                                    if (frm.length > 0) {
-                                        var result = window.frames["openCaseFrame"].ajax_post(
-                                            frm[0].action.replace("cases_SaveData", "saveForm"),
-                                            frm[0],
-                                            "POST",
-                                            function (responseText)
-                                            {
-                                                //Set URL and redirect
-                                                document.getElementById("openCaseFrame").src = node.attributes.url;
-                                            },
-                                            true
-                                        );
-                                    } else {
-                                        //Set URL and redirect
-                                        document.getElementById("openCaseFrame").src = node.attributes.url;
-                                    }
-                                } else {
-                                    //Set URL and redirect
-                                    document.getElementById("openCaseFrame").src = node.attributes.url;
-                                }
-                            }
-                        });
-                    } else {
-                        swNodeCurrentSelect = 1;
-                    }
+	                                    if (frm.length > 0) {
+	                                        var result = window.frames["openCaseFrame"].ajax_post(
+	                                            frm[0].action.replace("cases_SaveData", "saveForm"),
+	                                            frm[0],
+	                                            "POST",
+	                                            function (responseText)
+	                                            {
+	                                                //Set URL and redirect
+	                                                document.getElementById("openCaseFrame").src = node.attributes.url;
+	                                            },
+	                                            true
+	                                        );
+	                                    } else {
+	                                        //Set URL and redirect
+	                                        document.getElementById("openCaseFrame").src = node.attributes.url;
+	                                    }
+	                                } else {
+	                                    //Set URL and redirect
+	                                    document.getElementById("openCaseFrame").src = node.attributes.url;
+	                                }
+	                            }
+	                        });
+	                    } else {
+	                    	swNodeCurrentSelect = 1;
+	                    }
+                	} else {
+	                	loadMaskStep.show();
+	                    //Set URL and redirect
+	                    document.getElementById("openCaseFrame").src = node.attributes.url;	
+                	}
                 } else {
                     loadMaskStep.show();
 

From faa9b3da5ada0ead38ca246cbc26db0dc0403726 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Thu, 30 Jan 2014 11:27:15 -0400
Subject: [PATCH 11/54] Correcion de actualizacion en roles

---
 rbac/engine/classes/model/Roles.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index 000b5f8e9..81d8b251d 100755
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -607,7 +607,9 @@ class Roles extends BaseRoles {
         $o = new RolesPermissions();
         $o->setPerUid($sData['PER_UID']);
         $o->setRolUid($sData['ROL_UID']);
-        $o->setPermissionName($sData['PER_NAME']);
+        if (isset($sData['PER_NAME'])) {
+            $o->setPermissionName($sData['PER_NAME']);
+        }
         $o->save();
     }
 

From 35bf988043fdc4d7a476b60113ac53e39f943c0c Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 30 Jan 2014 13:39:48 -0400
Subject: [PATCH 12/54] =?UTF-8?q?BUG-14035=20SOLVED=20La=20secci=C3=B3n=20?=
 =?UTF-8?q?DESIGNER=20/=20{dbl-click=20en=20alg=C3=BAn=20proceso}=20/=20ri?=
 =?UTF-8?q?ght-click=20Process=20Map=20/=20Events=20/=20Intermediate=20Con?=
 =?UTF-8?q?ditional=20/=20New,=20=20el=20campo=20Execute=20trigger=20muest?=
 =?UTF-8?q?ra=20los=20nombres=20de=20los=20triggers=20con=20valor=200,=20e?=
 =?UTF-8?q?l=20mismo=20comportamiento=20ocurre=20cuando=20se=20realiza=20l?=
 =?UTF-8?q?a=20edici=C3=B3n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/methods/events/eventsEdit.php | 1 +
 workflow/engine/methods/events/eventsNew.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/workflow/engine/methods/events/eventsEdit.php b/workflow/engine/methods/events/eventsEdit.php
index 564b40429..4675dde2f 100755
--- a/workflow/engine/methods/events/eventsEdit.php
+++ b/workflow/engine/methods/events/eventsEdit.php
@@ -64,6 +64,7 @@ $aTriggersFileds[] = array ('TRI_UID' => 'char','TRI_TITLE' => 'char');
 foreach ($aTriggersList as $i => $v) {
     unset( $aTriggersList[$i]['PRO_UID'] );
     unset( $aTriggersList[$i]['TRI_DESCRIPTION'] );
+    unset( $aTriggersList[$i]['TRI_LOCATE_WEBBOT_PARAM'] );
     $aTriggersList[$i]['TRI_TITLE'] = (strlen( $aTriggersList[$i]['TRI_TITLE'] ) > 32) ? substr( $aTriggersList[$i]['TRI_TITLE'], 0, 32 ) . '...' : $aTriggersList[$i]['TRI_TITLE'];
 }
 
diff --git a/workflow/engine/methods/events/eventsNew.php b/workflow/engine/methods/events/eventsNew.php
index b7b1021c6..8acee21eb 100755
--- a/workflow/engine/methods/events/eventsNew.php
+++ b/workflow/engine/methods/events/eventsNew.php
@@ -54,6 +54,7 @@ $aTriggersFileds[] = array ("TRI_UID" => "char", "TRI_TITLE" => "char");
 foreach ($aTriggersList as $i => $v) {
     unset( $aTriggersList[$i]['PRO_UID'] );
     unset( $aTriggersList[$i]['TRI_DESCRIPTION'] );
+    unset( $aTriggersList[$i]['TRI_LOCATE_WEBBOT_PARAM'] );
     $aTriggersList[$i]['TRI_TITLE'] = (strlen( $aTriggersList[$i]['TRI_TITLE'] ) > 32) ? substr( $aTriggersList[$i]['TRI_TITLE'], 0, 32 ) . '...' : $aTriggersList[$i]['TRI_TITLE'];
 }
 

From a5da83b2eaad5fa6dc8e701d7fc5d4eb3f11aa80 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 31 Jan 2014 10:58:11 -0400
Subject: [PATCH 13/54] =?UTF-8?q?BUG-13979=20SOLVED=20Los=20botones=20de?=
 =?UTF-8?q?=20Print=20y=20Next=20Step,=20no=20realizan=20ninguna=20acci?=
 =?UTF-8?q?=C3=B3n=20en=20las=20secciones:=20'HOME=20/=20Participated=20/?=
 =?UTF-8?q?=20{seleccionar=20alg=C3=BAn=20caso}=20/=20Open=20/=20Informati?=
 =?UTF-8?q?on=20/=20Dynaforms=20/=20{seleccionar=20alg=C3=BAn=20registro}?=
 =?UTF-8?q?=20/=20Preview=20/'=20'HOME=20/=20Search=20/=20Advanced=20Searc?=
 =?UTF-8?q?h=20/=20{hacer=20click=20en=20buscar=20y=20hacer=20click=20en?=
 =?UTF-8?q?=20el=20bot=C3=B3n=20Summary}=20/=20More=20Information=20/=20'.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
index a338ff5a8..e8cc30fdb 100644
--- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
@@ -478,6 +478,6 @@ if ($actionAjax == 'historyDynaformGridPreview') {
     </script>
     <?php
 
-    G::RenderPage( 'publish', 'raw' );
+    G::RenderPage( 'publish', 'blank' );
 }
 

From 0fa978d3c8ca087e16c6276dbb42199eba0a4cb5 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Mon, 3 Feb 2014 09:45:31 -0400
Subject: [PATCH 14/54] =?UTF-8?q?BUG-13950=20SOLVED=20Cuando=20se=20usa=20?=
 =?UTF-8?q?caracteres=20Chinos=20como=20t=C3=ADtulo=20de=20varios=20proces?=
 =?UTF-8?q?os=20la=20secci=C3=B3n:=20HOME=20/=20New=20Case=20/=20{dbl-clic?=
 =?UTF-8?q?k}=20Al=20seleccionar=20un=20nodo=20este=20siempre=20salta=20al?=
 =?UTF-8?q?=20=C3=BAltimo=20nodo=20del=20TreeView.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/methods/cases/casesStartPage_Ajax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index bdc2cdfed..f5cdda0bc 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -70,7 +70,7 @@ function getProcessList ()
         if (1) {
             foreach ($processList as $key => $processInfo) {
                 $tempTree['text'] = $key;
-                $tempTree['id'] = preg_replace('([^A-Za-z0-9])', '', $key);
+                $tempTree['id'] = md5($key);
                 $tempTree['cls'] = 'folder';
                 $tempTree['draggable'] = true;
                 $tempTree['optionType'] = "category";
@@ -87,7 +87,7 @@ function getProcessList ()
                     //print_r($processInfo);
                     $tempTreeChild['text'] = htmlentities($keyChild, ENT_QUOTES, 'UTF-8'); //ellipsis ( $keyChild, 50 );
                     //$tempTree['text']=$key;
-                    $tempTreeChild['id'] = preg_replace('([^A-Za-z0-9 ()])', '', $keyChild);
+                    $tempTreeChild['id'] = md5($keyChild);
                     $tempTreeChild['draggable'] = true;
                     $tempTreeChild['leaf'] = true;
                     $tempTreeChild['icon'] = '/images/icon.trigger.png';

From 8c38fb33feeb14aae2e321b30acdeb4456d6ddd0 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Tue, 4 Feb 2014 09:31:05 -0400
Subject: [PATCH 15/54] =?UTF-8?q?BUG-13979=20IMPROVEMENT=20La=20variable?=
 =?UTF-8?q?=20DYNUIDPRINT=20no=20se=20encuentra=20definido=20para=20la=20o?=
 =?UTF-8?q?pci=C3=B3n=20Summary=20en=20los=20listados=20Inbox,=20Participa?=
 =?UTF-8?q?ted,=20Advanced=20Search,=20el=20cual=20muestra=20el=20mensaje?=
 =?UTF-8?q?=20de=20error=20'The=20row=20''=20in=20table=20Dynaform=20doesn?=
 =?UTF-8?q?'t=20exist',=20en=20la=20venta=20de=20vista=20de=20impresi?=
 =?UTF-8?q?=C3=B3n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/workflow/engine/methods/cases/summary.php b/workflow/engine/methods/cases/summary.php
index c0f42affd..bb9430059 100755
--- a/workflow/engine/methods/cases/summary.php
+++ b/workflow/engine/methods/cases/summary.php
@@ -52,6 +52,7 @@ try {
         $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';
         $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
         $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#';
+        $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_REQUEST['DYN_UID'];
 
         G::LoadClass( 'dbConnections' );
         $_SESSION['PROCESS'] = $applicationFields['PRO_UID'];

From 0c44ef388766709b1ea1328f9edcf3704ac2a0b9 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 5 Feb 2014 16:48:30 -0400
Subject: [PATCH 16/54] BUG-TREE_STEPS Error en la funcionalidad de guardado

Se debe validar solo cuando han ocurrido cambios
---
 gulliver/js/form/core/form.js           | 12 +++++++-----
 gulliver/js/maborak/core/maborak.js     |  5 ++---
 workflow/engine/templates/cases/open.js | 17 ++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 291487ced..aad196d0f 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -3908,13 +3908,15 @@ function dropDownSetOption(elem, arrayOption)
 function dynaFormChanged(frm)
 {
     for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) {
-        if (frm.elements[i1].type == "text" && frm.elements[i1].value != frm.elements[i1].defaultValue) {
-            return true;
+        
+        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].value != frm.elements[i1].defaultValue) {
-            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 e6834f173..23a3046bd 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1281,9 +1281,8 @@ selectdd.innerHTML="";for(i=0;i<=arrayOption.options.length-1;i++){if(swOptGroup
 optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}else{optionAux=document.createElement("option");selectdd.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}}}
 if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}}
 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;}
+{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;for(var i2=0;i2<=frm.elements[i1].options.length-1;i2++){if(frm.elements[i1].options[i2].defaultSelected){selectDefaultValue=frm.elements[i1].options[i2].value;break;}}
 if(frm.elements[i1].value!=selectDefaultValue){return true;}}}
 return false;}
diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js
index e46932053..45bd27203 100755
--- a/workflow/engine/templates/cases/open.js
+++ b/workflow/engine/templates/cases/open.js
@@ -256,8 +256,8 @@ Ext.onReady(function(){
                         }
                     }
 
-                    if (swDynaformChange) {
-	                    if ((swRequiredField == 1)){
+                      if (swRequiredField == 1){
+                          if (swDynaformChange) {
 	                        Ext.MessageBox.show({
 	                            title: _("ID_CONFIRM"),
 	                            msg: _("ID_DYNAFORM_SAVE_CHANGES"),
@@ -292,14 +292,13 @@ Ext.onReady(function(){
 	                                }
 	                            }
 	                        });
-	                    } else {
+                          } else {
+                            loadMaskStep.show(); 
+                            document.getElementById("openCaseFrame").src = node.attributes.url;
+                          }
+                      } else {
 	                    	swNodeCurrentSelect = 1;
-	                    }
-                	} else {
-	                	loadMaskStep.show();
-	                    //Set URL and redirect
-	                    document.getElementById("openCaseFrame").src = node.attributes.url;	
-                	}
+	                }
                 } else {
                     loadMaskStep.show();
 

From cce17201911a845b8514c22fc16de0ea31b32961 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Fri, 7 Feb 2014 15:10:26 -0400
Subject: [PATCH 17/54] BUG-14060 Ordering "Dynaform" dropdown

Dynaform dropdown is not in alphabetical order
---
 workflow/engine/classes/class.processMap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index d77a4d01e..027b20343 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -1907,7 +1907,7 @@ class processMap
         $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
         $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID);
-
+        $oCriteria->addAscendingOrderByColumn(DYN_TITLE);
         $oDataset = DynaformPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();

From bbf425aeeca2bdddad3c58c60b4616df88d3a972 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Fri, 7 Feb 2014 16:35:18 -0400
Subject: [PATCH 18/54] BUG-14060 Ordering Dynaform dropdown menu

Dynaform dropdown is not in alphabetical order.
---
 workflow/engine/classes/class.processMap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 027b20343..9fdd36591 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -1907,7 +1907,7 @@ class processMap
         $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
         $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(DynaformPeer::PRO_UID, $sProcessUID);
-        $oCriteria->addAscendingOrderByColumn(DYN_TITLE);
+        $oCriteria->addAscendingOrderByColumn('DYN_TITLE');
         $oDataset = DynaformPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();

From c3770233cd0d0f990a1169bfa93fa97da5a33a0d Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Mon, 10 Feb 2014 10:55:44 -0400
Subject: [PATCH 19/54] BUG-14050 Gridd Issue

Delete and Add rows propertie is not saved.
---
 workflow/engine/methods/dynaforms/fields_Save.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/methods/dynaforms/fields_Save.php b/workflow/engine/methods/dynaforms/fields_Save.php
index c9a0c537c..a15c5dc81 100755
--- a/workflow/engine/methods/dynaforms/fields_Save.php
+++ b/workflow/engine/methods/dynaforms/fields_Save.php
@@ -118,10 +118,10 @@ if (file_exists(PATH_XMLFORM . 'dynaforms/fields/' . $type . '.xml')) {
     }
     if ($type === 'grid') {
         if (!isset($_POST['form']['PME_ADDROW']) || $_POST['form']['PME_ADDROW'] == '') {
-            $_POST['form']['PME_ADDROW'] = '0';
+            $_POST['form']['PME_ADDROW'] = 0;
         }
         if (!isset($_POST['form']['PME_DELETEROW']) || $_POST['form']['PME_DELETEROW'] == '') {
-            $_POST['form']['PME_DELETEROW'] = '0';
+            $_POST['form']['PME_DELETEROW'] = 0;
         }
     }
     if ($type === 'dropdown' || $type === 'listbox') {
@@ -147,7 +147,7 @@ foreach ($_POST['form'] as $key => $value) {
 
 $_POST['form'] = $res;
 
-$dbc = new DBConnection(PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml');
+$dbc = new DBConnection(PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml'); 
 $ses = new DBSession($dbc);
 
 $fields = new DynaFormField($dbc);
@@ -179,7 +179,7 @@ unset($attributes['PRO_UID']);
 
 $options = null;
 foreach ($attributes as $key => $value) {
-    if ($key === 'OPTIONS') {
+    if ($key === 'OPTIONS') { 
         if (is_array($value)) {
             if (is_array(reset($value))) {
                 $langs = array();
@@ -210,7 +210,7 @@ foreach ($attributes as $key => $value) {
                   } */
             }
         }
-    } else {
+    } else { 
         if (is_array($value)) {
             //Is a list:
             if (is_string(reset($value))) {
@@ -223,14 +223,15 @@ foreach ($attributes as $key => $value) {
 }
 unset($attributes['VALIDATE_NAME']);
 $fields->setFileName(PATH_DYNAFORM . $file . '.xml');
-
 $FieldAttributes = $attributes;
 $FieldAttrib = array();
+
 unset($FieldAttributes['XMLNODE_NAME']);
 unset($FieldAttributes['XMLNODE_NAME_OLD']);
 unset($FieldAttributes['XMLNODE_VALUE']);
 unset($FieldAttributes['BTN_CANCEL']);
 unset($FieldAttributes['SAVELABEL']);
+
 foreach ($FieldAttributes as $key => $value) {
     switch (gettype($value)) {
         case 'string':

From e2b2d8f6e8da17614c8d391d71c7dd0473143d79 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 11 Feb 2014 15:07:07 -0400
Subject: [PATCH 20/54] BUG-14005 Emergency subProcess in mobile mode

Sub-processes has showed in Start Case option
---
 workflow/engine/controllers/home.php | 34 +++++++++++++++++++---------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 06b8dadd8..f6b3749ec 100755
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -43,13 +43,13 @@ class Home extends Controller
     }
 
     public function login ($httpData)
-    {
+    {   
         //start new session
         @session_destroy();
         session_start();
         session_regenerate_id();
 
-        $data = isset( $httpData->d ) ? unserialize( base64_decode( $httpData->d ) ) : '';
+        $data = isset( $httpData->d ) ? unserialize( base64_decode( $httpData->d ) ) : ''; 
         $template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard';
         $skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified';
 
@@ -94,8 +94,20 @@ class Home extends Controller
         $start = 0;
         $limit = '';
 
-        $proData = $process->getAllProcesses( $start, $limit );
-        $processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' );
+        $proData = $process->getAllProcesses( $start, $limit, null, null, false, true ); 
+        $processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' ); 
+        
+        unset( $processList[0] );
+        $processesList = array ();
+
+        foreach ($processList as $key => $valueProcess) {
+            foreach ($proData as $keyPro => $valuePro) {
+                if ($valueProcess['pro_uid'] == $valuePro['PRO_UID']) {
+                    $processesList[] = $valueProcess;
+                }       
+            }
+        }
+        
         $switchLink = $userProperty->getUserLocation( $_SESSION['USER_LOGGED'] );
 
         if (!isset($_COOKIE['workspaceSkin'])) {
@@ -105,8 +117,6 @@ class Home extends Controller
             }
         }
 
-        unset( $processList[0] );
-
         //Get simplified options
         global $G_TMP_MENU;
 
@@ -132,7 +142,7 @@ class Home extends Controller
 
         $this->setVar( 'usrUid', $this->userID );
         $this->setVar( 'userName', $this->userName );
-        $this->setVar( 'processList', $processList );
+        $this->setVar( 'processList', $processesList );
         $this->setVar( 'canStartCase', $case->canStartCase( $_SESSION['USER_LOGGED'] ) );
         $this->setVar( 'userUxType', $this->userUxType );
         $this->setVar( 'clientBrowser', $this->clientBrowser['name'] );
@@ -183,7 +193,7 @@ class Home extends Controller
     }
 
     public function appList ($httpData)
-    {
+    {   
         // setting default list applications types [default: todo]
         $httpData->t = isset( $httpData->t ) ? $httpData->t : 'todo';
 
@@ -199,6 +209,7 @@ class Home extends Controller
                 $title = G::LoadTranslation("ID_UNASSIGNED_INBOX");
                 break;
             default:
+                G::pr('sueñooooo');die();
                 $title = ucwords( $httpData->t );
                 break;
         }
@@ -270,7 +281,7 @@ class Home extends Controller
     }
 
     public function getApps ($httpData)
-    {
+    {   
         $cases = $this->getAppsData( $httpData->t, $httpData->start, $httpData->limit );
 
         $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'applications' );
@@ -293,7 +304,7 @@ class Home extends Controller
         $dir = null,
         $sort = "APP_CACHE_VIEW.APP_NUMBER",
         $category = null)
-    {
+    {   
         require_once ("classes/model/AppNotes.php");
         G::LoadClass( 'applications' );
 
@@ -545,7 +556,7 @@ class Home extends Controller
         return $status;
     }
     function getProcessArray($action, $userUid)
-    {
+    {  
         global $oAppCache;
 
         $processes = array();
@@ -576,6 +587,7 @@ class Home extends Controller
                 $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
                 $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
                 $oDataset = ProcessPeer::doSelectRS($cProcess);
+               
                 $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
                 $oDataset->next();

From 40710b67e756d48c7d14ad9915d7ba743357918c Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 12 Feb 2014 09:55:03 -0400
Subject: [PATCH 21/54] BUG-14043 Simplified User Experience

In the language arabic it is not possible to change the user experience or logout.
---
 workflow/engine/skinEngine/simplified/css/topbar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/skinEngine/simplified/css/topbar.css b/workflow/engine/skinEngine/simplified/css/topbar.css
index dadd76521..9d4473365 100644
--- a/workflow/engine/skinEngine/simplified/css/topbar.css
+++ b/workflow/engine/skinEngine/simplified/css/topbar.css
@@ -523,7 +523,7 @@ div.topbar ul.primary-nav li ul {
   left: 0;
 }
 div.topbar ul.secondary-nav li ul {
-  right: 0;
+  left: 0 !important;
 }
 div.topbar ul li ul li {
   float: none;

From 6c49835d75d90303e8c828b7368be989752086cc Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 12 Feb 2014 12:17:42 -0400
Subject: [PATCH 22/54] Adicion de traducciones a la clase SMTP

---
 gulliver/thirdparty/phpmailer/class.smtp.php | 59 ++++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/gulliver/thirdparty/phpmailer/class.smtp.php b/gulliver/thirdparty/phpmailer/class.smtp.php
index fdec2fdb9..3d4b9ce00 100755
--- a/gulliver/thirdparty/phpmailer/class.smtp.php
+++ b/gulliver/thirdparty/phpmailer/class.smtp.php
@@ -162,7 +162,7 @@ class SMTP {
     // make sure we are __not__ connected
     if($this->connected()) {
       // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
+      $this->error = array("error" => G::LoadTranslation( 'ID_SMTP_ALREADY_CONNECTED' ));
       return false;
     }
 
@@ -178,7 +178,7 @@ class SMTP {
                                  $tval);   // give up after ? secs
     // verify we connected properly
     if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
+      $this->error = array("error" => G::LoadTranslation( 'ID_SMTP_FAILED_CONNECT_SERVER' ),
                            "errno" => $errno,
                            "errstr" => $errstr);
       if($this->do_debug >= 1) {
@@ -220,7 +220,7 @@ class SMTP {
     $this->error = null; # to avoid confusion
 
     if(!$this->connected()) {
-      $this->error = array("error" => "Called StartTLS() without being connected");
+      $this->error = array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_START_TLS' ));
       return false;
     }
 
@@ -235,7 +235,7 @@ class SMTP {
 
     if($code != 220) {
       $this->error =
-         array("error"     => "STARTTLS not accepted from server",
+         array("error"     => G::LoadTranslation( 'ID_SMTP_ERROR_START_TLS_NOT_ACCEPTED' ),
                "smtp_code" => $code,
                "smtp_msg"  => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -278,7 +278,7 @@ class SMTP {
     
         if($code != 334) {
           $this->error =
-            array("error" => "AUTH not accepted from server",
+            array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_AUTH_NOT_ACCEPTED' ),
                   "smtp_code" => $code,
                   "smtp_msg" => substr($rply,4));
           if($this->do_debug >= 1) {
@@ -294,7 +294,7 @@ class SMTP {
     
         if($code != 235) {
           $this->error =
-            array("error" => "Authentication not accepted from server",
+            array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_AUTH_NOT_ACCEPTED' ),
                   "smtp_code" => $code,
                   "smtp_msg" => substr($rply,4));
           if($this->do_debug >= 1) {
@@ -312,7 +312,7 @@ class SMTP {
     
         if($code != 334) {
           $this->error =
-            array("error" => "AUTH not accepted from server",
+            array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_AUTH_NOT_ACCEPTED' ),
                   "smtp_code" => $code,
                   "smtp_msg" => substr($rply,4));
           if($this->do_debug >= 1) {
@@ -329,7 +329,7 @@ class SMTP {
     
         if($code != 334) {
           $this->error =
-            array("error" => "Username not accepted from server",
+            array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_USERNAME_NOT_ACCEPTED' ),
                   "smtp_code" => $code,
                   "smtp_msg" => substr($rply,4));
           if($this->do_debug >= 1) {
@@ -346,7 +346,7 @@ class SMTP {
     
         if($code != 235) {
           $this->error =
-            array("error" => "Password not accepted from server",
+            array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_PASSWORD_NOT_ACCEPTED' ),
                   "smtp_code" => $code,
                   "smtp_msg" => substr($rply,4));
           if($this->do_debug >= 1) {
@@ -369,7 +369,7 @@ class SMTP {
         if(! $ntlm_client->Initialize($temp)){//let's test if every function its available
             $this->error = array("error" => $temp->error);
             if($this->do_debug >= 1) {
-                $this->edebug("You need to enable some modules in your php.ini file: " . $this->error["error"] . $this->CRLF);
+                $this->edebug(G::LoadTranslation( 'ID_SMTP_ERROR_ENABLE_PHPINI' ) . ": " . $this->error["error"] . $this->CRLF);
             }
             return false;
         }
@@ -383,7 +383,7 @@ class SMTP {
 
         if($code != 334) {
             $this->error =
-                array("error" => "AUTH not accepted from server",
+                array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_AUTH_NOT_ACCEPTED' ),
                       "smtp_code" => $code,
                       "smtp_msg" => substr($rply,4));
             if($this->do_debug >= 1) {
@@ -404,7 +404,7 @@ class SMTP {
 
         if($code != 235) {
             $this->error =
-                array("error" => "Could not authenticate",
+                array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_COULD_NOT_AUTH' ),
                       "smtp_code" => $code,
                       "smtp_msg" => substr($rply,4));
             if($this->do_debug >= 1) {
@@ -428,7 +428,7 @@ class SMTP {
       if($sock_status["eof"]) {
         // the socket is valid but we are not connected
         if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected");
+            $this->edebug("SMTP -> NOTICE:" . $this->CRLF . G::LoadTranslation( 'ID_SMTP_ERROR_EOF_CAUGHT' ));
         }
         $this->Close();
         return false;
@@ -484,7 +484,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-              "error" => "Called Data() without being connected");
+              "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_DATA_WITHOUT' ));
       return false;
     }
 
@@ -499,7 +499,7 @@ class SMTP {
 
     if($code != 354) {
       $this->error =
-        array("error" => "DATA command not accepted from server",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_DATA_COM_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -593,7 +593,7 @@ class SMTP {
 
     if($code != 250) {
       $this->error =
-        array("error" => "DATA not accepted from server",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_DATA_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -622,7 +622,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-            "error" => "Called Hello() without being connected");
+            "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_HELLO_WITHOUT' ));
       return false;
     }
 
@@ -661,7 +661,7 @@ class SMTP {
 
     if($code != 250) {
       $this->error =
-        array("error" => $hello . " not accepted from server",
+        array("error" => $hello . ' ' . G::LoadTranslation( 'ID_SMTP_ERROR_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -695,7 +695,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-              "error" => "Called Mail() without being connected");
+              "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_MAIL_WITHOUT' ));
       return false;
     }
 
@@ -711,7 +711,7 @@ class SMTP {
 
     if($code != 250) {
       $this->error =
-        array("error" => "MAIL not accepted from server",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_MAIL_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -739,7 +739,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-              "error" => "Called Quit() without being connected");
+              "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_QUIT_WITHOUT' ));
       return false;
     }
 
@@ -759,7 +759,7 @@ class SMTP {
     $code = substr($byemsg,0,3);
     if($code != 221) {
       // use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
+      $e = array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_SERVER_REJECTED' ),
                  "smtp_code" => $code,
                  "smtp_rply" => substr($byemsg,4));
       $rval = false;
@@ -793,7 +793,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-              "error" => "Called Recipient() without being connected");
+              "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_RECIPIENT_WITHOUT' ));
       return false;
     }
 
@@ -808,7 +808,7 @@ class SMTP {
 
     if($code != 250 && $code != 251) {
       $this->error =
-        array("error" => "RCPT not accepted from server",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_RCPT_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -836,7 +836,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-              "error" => "Called Reset() without being connected");
+              "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_RESET_WITHOUT' ));
       return false;
     }
 
@@ -851,7 +851,7 @@ class SMTP {
 
     if($code != 250) {
       $this->error =
-        array("error" => "RSET failed",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_RSET_FAILED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -885,7 +885,7 @@ class SMTP {
 
     if(!$this->connected()) {
       $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
+          "error" => G::LoadTranslation( 'ID_SMTP_ERROR_CALLED_SENDANDMAIL_WITHOUT' ));
       return false;
     }
 
@@ -900,7 +900,7 @@ class SMTP {
 
     if($code != 250) {
       $this->error =
-        array("error" => "SAML not accepted from server",
+        array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_SAML_NOT_ACCEPTED' ),
               "smtp_code" => $code,
               "smtp_msg" => substr($rply,4));
       if($this->do_debug >= 1) {
@@ -925,8 +925,7 @@ class SMTP {
    * @return bool
    */
   public function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
+    $this->error = array("error" => G::LoadTranslation( 'ID_SMTP_ERROR_MET_TURN_SMTP_NOT_IMPLEMENTED' ));
     if($this->do_debug >= 1) {
       $this->edebug("SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />');
     }

From 710459860a26bd7c65be09f056844e957bbe0a25 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 12 Feb 2014 15:10:04 -0400
Subject: [PATCH 23/54] Adicion de label en xmlform de events

---
 .../methods/events/eventsEditAction.php       | 13 ++++++
 .../xmlform/events/eventsEditAction.html      | 44 +++++++++++--------
 .../xmlform/events/eventsEditAction.xml       | 39 ++++++++++++++++
 3 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/workflow/engine/methods/events/eventsEditAction.php b/workflow/engine/methods/events/eventsEditAction.php
index eff7749f3..7ee480b9e 100755
--- a/workflow/engine/methods/events/eventsEditAction.php
+++ b/workflow/engine/methods/events/eventsEditAction.php
@@ -229,6 +229,7 @@ $_DBArray['triggers'] = $aTriggers;
 
 $_SESSION['_DBArray'] = $_DBArray;
 
+$aFields = array_merge($aFields, setLabels());
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'events/eventsEditAction', '', $aFields, '../events/eventsSave' );
 //$G_PUBLISH->AddContent('xmlform', 'xmlform', 'events/eventsEditAction', '', $aFields, '../events/eventsSave');
@@ -239,3 +240,15 @@ function replaceQuotes ($aData)
     return str_replace( '"', '&quote;', $aData );
 }
 
+function setLabels () {
+    $labels = array(
+        'LABEL_ADD' => G::LoadTranslation( 'ID_ADD' ),
+        'LABEL_ADD_CURRENT' => G::LoadTranslation( 'ID_EVENT_ADD_CURRENT' ),
+        'LABEL_ADD_USERS'   => G::LoadTranslation( 'ID_EVENT_ADD_USERS' ),
+        'LABEL_REMOVED_SELECTED'    => G::LoadTranslation( 'ID_EVENT_REMOVE_SELECTED' ),
+        'LABEL_ADD_DYNAVAR' => G::LoadTranslation( 'ID_EVENT_ADD_DYNAVAR' ),
+        'LABEL_ADD_GROUPS'  => G::LoadTranslation( 'ID_EVENT_ADD_GROUPS' )
+    );
+    return $labels;
+}
+
diff --git a/workflow/engine/xmlform/events/eventsEditAction.html b/workflow/engine/xmlform/events/eventsEditAction.html
index 70bd5bfa1..f486889f5 100755
--- a/workflow/engine/xmlform/events/eventsEditAction.html
+++ b/workflow/engine/xmlform/events/eventsEditAction.html
@@ -60,14 +60,14 @@
                 <table>
                   <tr>
                     <td rowspan="3">{$form.EVN_MESSAGE_TO_TO_SIMPLEADD}<br/>{$form.EVN_MESSAGE_TO_TO}</td>
-                    <td><a title="Add" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAdd" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddCurrent" title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddUsers" title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
-                  	<td><a title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
-                    <td><a title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelRemoved" title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddDynavar" title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddGroup" title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_TO');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
                     <td>&nbsp;</td>          
@@ -86,14 +86,14 @@
                 <table>
                   <tr>
                     <td rowspan="3">{$form.EVN_MESSAGE_TO_CC_SIMPLEADD}<br/>{$form.EVN_MESSAGE_TO_CC}</td>
-                    <td><a title="Add" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAdd" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddCurrent" title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddUsers" title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
-                  	<td><a title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
-                    <td><a title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelRemoved" title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddDynavar" title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddGroup" title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_CC');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
                     <td>&nbsp;</td>          
@@ -111,14 +111,14 @@
                 <table>
                   <tr>
                     <td rowspan="3">{$form.EVN_MESSAGE_TO_BCC_SIMPLEADD}<br/>{$form.EVN_MESSAGE_TO_BCC}</td>
-                    <td><a title="Add" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAdd" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.add();return false;"><img src="/images/addc.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddCurrent" title="Add current task user" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.toAdd('-1', '(Current Task User)', 'usr'); return false;"><img src="/images/user-id-32x32.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddUsers" title="Add users" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showUsers(event); return false;"><img src="/images/add-user-32x32.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
-                  	<td><a title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
-                    <td><a title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
-                    <td><a title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelRemoved" title="Remove selected" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.dropSel();return false;"><img src="/images/delete-icon.png" width="15px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddDynavar" title="Add dynavar" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showDynavars(event); return false;"><img src="/images/dynavars.png" width="18px" height="15px" border="0"/></a></td>
+                    <td><a name="labelAddGroup" title="Add groups" href="#" onclick="e=new EventCompose('EVN_MESSAGE_TO_BCC');e.showGroups(event); return false;"><img src="/images/group_add.png" width="15px" height="15px" border="0"/></a></td>
                   </tr>
                   <tr>
                     <td>&nbsp;</td>          
@@ -141,6 +141,14 @@
         </td>
       </tr>
     </table>
+    <div style="display:none;">
+      {$form.LABEL_ADD}
+      {$form.LABEL_ADD_CURRENT}
+      {$form.LABEL_ADD_USERS}
+      {$form.LABEL_REMOVED_SELECTED}
+      {$form.LABEL_ADD_DYNAVAR}
+      {$form.LABEL_ADD_GROUPS}
+    </div>
     <div class="FormRequiredTextMessage"><font color="red">*  </font>{php}echo (G::LoadTranslation('ID_REQUIRED_FIELD'));{/php}</div>		</div>
 		<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
   </div>
diff --git a/workflow/engine/xmlform/events/eventsEditAction.xml b/workflow/engine/xmlform/events/eventsEditAction.xml
index 527b249b8..370fdab0e 100755
--- a/workflow/engine/xmlform/events/eventsEditAction.xml
+++ b/workflow/engine/xmlform/events/eventsEditAction.xml
@@ -83,6 +83,14 @@ SELECT TRI_UID, TRI_TITLE FROM triggers
   <en>Save</en>
 </SAVE>
 
+
+<LABEL_ADD type="hidden" />
+<LABEL_ADD_CURRENT type="hidden" />
+<LABEL_ADD_USERS type="hidden" />
+<LABEL_REMOVED_SELECTED type="hidden" />
+<LABEL_ADD_DYNAVAR type="hidden" />
+<LABEL_ADD_GROUPS type="hidden" />
+
 <JS type="javascript"><![CDATA[
 
 
@@ -151,6 +159,37 @@ function cancel(){
     currentPopupWindow.remove();
 }
 
+
+var lAdd = document.getElementsByName("labelAdd");
+for(var i=0; i<lAdd.length; i++) {
+    lAdd[i].title = getField('LABEL_ADD').value;
+}
+
+var lAddCur = document.getElementsByName("labelAddCurrent");
+for(var i=0; i<lAddCur.length; i++) {
+    lAddCur[i].title = getField('LABEL_ADD_CURRENT').value;
+}
+
+var lAddCur = document.getElementsByName("labelAddUsers");
+for(var i=0; i<lAddCur.length; i++) {
+    lAddCur[i].title = getField('LABEL_ADD_USERS').value;
+}
+
+var lRemo = document.getElementsByName("labelRemoved");
+for(var i=0; i<lRemo.length; i++) {
+    lRemo[i].title = getField('LABEL_REMOVED_SELECTED').value;
+}
+
+var lAddDyn = document.getElementsByName("labelAddDynavar");
+for(var i=0; i<lAddDyn.length; i++) {
+    lAddDyn[i].title = getField('LABEL_ADD_DYNAVAR').value;
+}
+
+var lAddGro = document.getElementsByName("labelAddGroup");
+for(var i=0; i<lAddGro.length; i++) {
+    lAddGro[i].title = getField('LABEL_ADD_GROUPS').value;
+}
+
 ]]></JS>
 
 </dynaForm>
\ No newline at end of file

From 7fef38ea5a31317049d29474da4b37c8b31368b1 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 12 Feb 2014 15:11:29 -0400
Subject: [PATCH 24/54] BUG-14043 Simplified User Experience

In the arabic language is not possible to change the user experience or logout
---
 workflow/engine/controllers/home.php                 | 10 +++++++++-
 workflow/engine/skinEngine/simplified/css/topbar.css |  5 ++++-
 workflow/engine/templates/home/index.html            |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index f6b3749ec..6ea704e96 100755
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -117,6 +117,14 @@ class Home extends Controller
             }
         }
 
+        $oServerConf = & serverConf::getSingleton();
+
+        if ($oServerConf->isRtl( SYS_LANG )) {
+            $swRtl = 1; 
+        } else {
+            $swRtl = 0;
+        }
+
         //Get simplified options
         global $G_TMP_MENU;
 
@@ -149,6 +157,7 @@ class Home extends Controller
         $this->setVar( 'switchLink', $switchLink );
         $this->setVar( 'arrayMnuOption', $arrayMnuOption );
         $this->setVar( 'mnuNewCase', $mnuNewCase );
+        $this->setVar( 'rtl', $swRtl );
 
         $this->render();
     }
@@ -209,7 +218,6 @@ class Home extends Controller
                 $title = G::LoadTranslation("ID_UNASSIGNED_INBOX");
                 break;
             default:
-                G::pr('sueñooooo');die();
                 $title = ucwords( $httpData->t );
                 break;
         }
diff --git a/workflow/engine/skinEngine/simplified/css/topbar.css b/workflow/engine/skinEngine/simplified/css/topbar.css
index 9d4473365..c05a0d018 100644
--- a/workflow/engine/skinEngine/simplified/css/topbar.css
+++ b/workflow/engine/skinEngine/simplified/css/topbar.css
@@ -523,7 +523,10 @@ div.topbar ul.primary-nav li ul {
   left: 0;
 }
 div.topbar ul.secondary-nav li ul {
-  left: 0 !important;
+  right: 0;
+}
+div.topbar ul.rtl-secondary-nav li ul {
+  left: 0;
 }
 div.topbar ul li ul li {
   float: none;
diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html
index 6ff61e37b..000059de2 100644
--- a/workflow/engine/templates/home/index.html
+++ b/workflow/engine/templates/home/index.html
@@ -136,14 +136,16 @@
             </li>
             {/if}
           </ul>
-
-          <ul class="nav secondary-nav">
+          {if $rtl eq 1}
+          <ul class="nav rtl-secondary-nav">
+          {else}
+          <ul class="nav secondary-nav">    
+          {/if}
             <li class="account">
               <a class="menu user-photo" href="javascript:;">
                 <img alt="user_avatar_mini" height="24" src="users/users_ViewPhotoGrid?pUID={$usrUid}" width="24" />
                 <span class="menu-label screen-name">{$userName}</span>
               </a>
-
               <ul class="menu-dropdown">
                 <!--<li><a href="#" accesskey="s" id="settings_link">Settings</a></li>
                 <li><a href="#" accesskey="?" id="help_link">Help</a></li>-->

From 344bbac5082fe2705fdf0538802b872dc3f3388d Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 12 Feb 2014 15:30:25 -0400
Subject: [PATCH 25/54] Arreglo para setear idioma en phpmailer

---
 gulliver/thirdparty/phpmailer/class.phpmailer.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gulliver/thirdparty/phpmailer/class.phpmailer.php b/gulliver/thirdparty/phpmailer/class.phpmailer.php
index 99c0d783a..1002df591 100755
--- a/gulliver/thirdparty/phpmailer/class.phpmailer.php
+++ b/gulliver/thirdparty/phpmailer/class.phpmailer.php
@@ -1148,6 +1148,9 @@ class PHPMailer {
     //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
     $l = true;
     if ($langcode != 'en') { //There is no English translation file
+      if (substr($langcode, 0, 2) == 'pt') {
+        $langcode = 'br';
+      }
       $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
     }
     $this->language = $PHPMAILER_LANG;
@@ -2417,8 +2420,12 @@ class PHPMailer {
    * @return string
    */
   protected function Lang($key) {
+    $lang = 'en';
     if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
+      if (defined('SYS_LANG')) {
+        $lang = SYS_LANG;
+      }
+      $this->SetLanguage($lang);
     }
 
     if(isset($this->language[$key])) {

From 5103b9804b4ecc015f1b062c623a2c00d69777c4 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 12 Feb 2014 16:08:10 -0400
Subject: [PATCH 26/54] Correcion de label para el Debug en triggers

---
 workflow/engine/classes/class.pmScript.php          | 4 ++--
 workflow/engine/methods/cases/casesSaveDataView.php | 2 +-
 workflow/engine/methods/cases/cases_SaveData.php    | 2 +-
 workflow/engine/methods/cases/cases_Step.php        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 7cbd8f87b..31a9de9f1 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -582,7 +582,7 @@ function handleFatalErrors ($buffer)
             if (strpos( $_SERVER['REQUEST_URI'], '&ACTION=GENERATE' ) !== false) {
                 $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
                 if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
-                    $_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
+                    $_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
                     $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
                     $aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';
                 }
@@ -605,7 +605,7 @@ function handleFatalErrors ($buffer)
         } else {
             $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
             if (isset($_SESSION['TRIGGER_DEBUG']['ISSET']) && $_SESSION['TRIGGER_DEBUG']['ISSET']) {
-                $_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
+                $_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
                 $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
                 $aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';
             }
diff --git a/workflow/engine/methods/cases/casesSaveDataView.php b/workflow/engine/methods/cases/casesSaveDataView.php
index 454c847ac..d0fd20b7e 100755
--- a/workflow/engine/methods/cases/casesSaveDataView.php
+++ b/workflow/engine/methods/cases/casesSaveDataView.php
@@ -56,7 +56,7 @@ $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array ();
 $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array ();
 $triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'DYNAFORM', $_GET['UID'], 'AFTER' );
 $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
-$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
+$_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
 
 if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
     $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php
index 73f968474..f391fd96d 100644
--- a/workflow/engine/methods/cases/cases_SaveData.php
+++ b/workflow/engine/methods/cases/cases_SaveData.php
@@ -69,7 +69,7 @@ try {
     $triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'DYNAFORM', $_GET['UID'], 'AFTER' );
 
     $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
-    $_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
+    $_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
     if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 80eb5347a..9a8791bc7 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -138,7 +138,7 @@ if (! isset( $_GET['breakpoint'] )) {
     $triggers = $oCase->loadTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE' );
 
     $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
-    $_SESSION['TRIGGER_DEBUG']['TIME'] = 'BEFORE';
+    $_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_BEFORE'));
     if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;

From 85cc8b26c56641d9b2176122ebfbae126b6fc24e Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Thu, 13 Feb 2014 11:21:18 -0400
Subject: [PATCH 27/54] BUG-14044 The description in input documents doesn't
 work in arabic language

The description in input documents doesn't work in arabic language.
---
 workflow/engine/methods/cases/cases_Step.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 9a8791bc7..4e155d215 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -187,7 +187,7 @@ $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
 
 
 //Obtain previous and next step - Start
-try {
+try { 
     $oCase = new Cases();
     $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
     $aPreviousStep = $oCase->getPreviousStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
@@ -259,12 +259,12 @@ try {
 
             $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower( $oStep->getStepMode() ) != 'edit' ? strtolower( $oStep->getStepMode() ) : '') );
             break;
-        case 'INPUT_DOCUMENT':
+        case 'INPUT_DOCUMENT': 
             if ($noShowTitle == 0) {
                 $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
             }
             $oInputDocument = new InputDocument();
-            $Fields = $oInputDocument->load( $_GET['UID'] );
+            $Fields = $oInputDocument->load( $_GET['UID'] ); 
             if (! $aPreviousStep) {
                 $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
                 $Fields['PREVIOUS_STEP_LABEL'] = '';
@@ -278,13 +278,13 @@ try {
             $Fields['NEXT_STEP'] = $aNextStep['PAGE'];
             $Fields['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
             switch ($_GET['ACTION']) {
-                case 'ATTACH':
+                case 'ATTACH': 
                     switch ($Fields['INP_DOC_FORM_NEEDED']) {
                         case 'REAL':
                             $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_NEW' );
                             $sXmlForm = 'cases/cases_AttachInputDocument2';
                             break;
-                        case 'VIRTUAL':
+                        case 'VIRTUAL': 
                             $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
                             $sXmlForm = 'cases/cases_AttachInputDocument1';
                             break;
@@ -319,8 +319,8 @@ try {
 
                     $oHeadPublisher = & headPublisher::getSingleton();
                     $titleDocument = "<h3>" . $Fields['INP_DOC_TITLE'] . "<br><small>" . G::LoadTranslation( 'ID_INPUT_DOCUMENT' ) . "</small></h3>";
-                    if ($Fields['INP_DOC_DESCRIPTION']) {
-                        $titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( htmlentities( utf8_decode( $Fields['INP_DOC_DESCRIPTION'] ) ) ) ) ) . "";
+                    if ($Fields['INP_DOC_DESCRIPTION']) { 
+                        $titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( html_entity_decode($Fields['INP_DOC_DESCRIPTION'], ENT_COMPAT | ENT_HTML401, "UTF-8") ) ) ) . "";
                     }
 
                     $oHeadPublisher->addScriptCode( "documentName='{$titleDocument}';" );

From e11b3571f4716b952db5953d5daed1295f0a70f4 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Thu, 13 Feb 2014 14:45:55 -0400
Subject: [PATCH 28/54] BUG-14066 Admin users are able to switch the interface
 to use experience skin

Admin users are able to switch the interface to user experience skin
---
 workflow/engine/methods/users/users_Ajax.php   | 3 ++-
 workflow/engine/templates/admin/uxUsersList.js | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index 0ae4c9336..a2892ed59 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -443,6 +443,7 @@ try {
                 } catch (exception $oError) {
                     $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
                 }
+                $row['USR_ROLE_ID'] = $row['USR_ROLE'];
                 $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
                 $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
                 $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';
@@ -450,7 +451,7 @@ try {
                 $row['DEP_TITLE'] = isset($aDepart[$row['USR_UID']]) ? $aDepart[$row['USR_UID']] : '';
                 $row['USR_UX'] = isset($uxList[$row['USR_UX']]) ? $uxList[$row['USR_UX']] : $uxList['NORMAL'];
                 $row['USR_AUTH_SOURCE'] = isset($aAuthSources[$row['USR_UID']]) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)';
-
+                
                 $rows[] = $row;
             }
             echo '{users: ' . G::json_encode($rows) . ', total_users: ' . $totalRows . '}';
diff --git a/workflow/engine/templates/admin/uxUsersList.js b/workflow/engine/templates/admin/uxUsersList.js
index b24b74865..f192a3b2d 100755
--- a/workflow/engine/templates/admin/uxUsersList.js
+++ b/workflow/engine/templates/admin/uxUsersList.js
@@ -78,6 +78,7 @@ Ext.onReady(function(){
       {name : 'USR_LASTNAME'},
       {name : 'USR_EMAIL'},
       {name : 'USR_ROLE'},
+      {name : 'USR_ROLE_ID'},
       {name : 'USR_DUE_DATE'},
       {name : 'DEP_TITLE'},
       {name : 'LAST_LOGIN'},
@@ -153,6 +154,7 @@ Ext.onReady(function(){
       //{header: '', dataIndex: 'USR_UID', width: 30, align:'center', sortable: false, renderer: photo_user},
       {header: _('ID_USER_NAME'), dataIndex: 'USR_USERNAME', width: 90, hidden:false, align:'left'},
       {header: _('ID_FULL_NAME'), dataIndex: 'USR_USERNAME', width: 50, align:'left', renderer: full_name},
+      {id: 'USR_ROLE_ID', dataIndex: 'USR_ROLE_ID', hidden:true},
       {header: _('ID_ROLE'), dataIndex: 'USR_ROLE', width: 50, hidden:false, align:'left'},
       {header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 50, hidden: true, align: 'center', renderer: render_status},
       {
@@ -174,8 +176,8 @@ Ext.onReady(function(){
           listeners: {
             select: function(a, b) {
               var row = usersGrid.getSelectionModel().getSelected();
-              role = row.get('USR_ROLE');
-
+              role = row.get('USR_ROLE_ID');
+              
               if (role == 'PROCESSMAKER_ADMIN' && (this.value == 'SIMPLIFIED' || this.value == 'SINGLE')) {
                 PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS'));
                 this.setValue('NORMAL');

From 0a02f4931d5ca8c9d5ffb17be0a4d721182741a5 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 18 Feb 2014 10:40:10 -0400
Subject: [PATCH 29/54] BUG-14031 Do not exist ProcessMaker fields attribute
 identifier in generated HTML

It has been added field attribute identifier "pm_fieldtype" and "pm_gridType" in class xmlform for HTML file generated.
---
 gulliver/system/class.xmlform.php | 48 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 54e830d8c..929e97494 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -854,6 +854,7 @@ class XmlForm_Field
     public function NSGridType ($show = false)
     {
         $igt = 'pm:gridtype="' . $this->gridFieldType . '"';
+        
         if ($show) {
             return $igt;
         } else {
@@ -920,7 +921,7 @@ class XmlForm_Field_Title extends XmlForm_Field
     public function render ($value = null, &$owner = null)
     {
         $this->label = G::replaceDataField( $this->label, $owner->values );
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' >' . $this->htmlentities( $this->label ) . '</span>';
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\'' . $this->NSFieldType() . '>' . $this->htmlentities( $this->label ) . '</span>';
     }
 
     /**
@@ -955,7 +956,7 @@ class XmlForm_Field_Subtitle extends XmlForm_Field
      */
     public function render ($value = null)
     {
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' >' . $this->htmlentities( $this->label ) . '</span>';
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\'' . $this->NSFieldType() . '>' . $this->htmlentities( $this->label ) . '</span>';
     }
 
     /**
@@ -1881,14 +1882,14 @@ class XmlForm_Field_Password extends XmlForm_Field
 
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' readOnly="readOnly"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . 'readOnly="readOnly"/>';
             } else {
-                $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\'/>';
+                $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . '/>';
                 $html .= $this->renderHint();
                 return $html;
             }
         } elseif ($this->mode === 'view') {
-            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' readOnly="readOnly"/>';
+            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) .  '\'' . $this->NSFieldType() . ' readOnly="readOnly"/>';
             $html .= $this->htmlentities( str_repeat( '*', 10 ), ENT_COMPAT, 'utf-8' );
             return $html;
         } else {
@@ -1955,6 +1956,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field
             $html .= 'style="' . $scrollStyle . '" wrap="' . $this->htmlentities( $this->wrap, ENT_QUOTES, 'UTF-8' ) . '" ';
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
+            $html .= $this->NSFieldType() . ' ';
             $html .= 'class="' . $className . '" >';
             $html .= $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
             $html .= '</textarea>';
@@ -2748,6 +2750,7 @@ class XmlForm_Field_Link extends XmlForm_Field
 
         $html = "<a class=\"tableOption\" href=\"" . $this->htmlentities($link, ENT_QUOTES, "utf-8") . "\"";
         $html = $html . " id=\"form[$id]\" name=\"form[$id]\" pm:field=\"pm:field\"";
+        $html .= $this->NSFieldType() . ' ';
         if ((strrpos($_SERVER['HTTP_USER_AGENT'], "Chrome") === false ? false : true) && trim($this->htmlentities($link, ENT_QUOTES, "utf-8")) === "#") {
             $html = $html . (($this->onclick) ? " onclick=\"" . htmlentities($onclick, ENT_QUOTES, "utf-8") . " return false;\"" : " onclick=\" return false;\"");
         } else {
@@ -2903,8 +2906,7 @@ class XmlForm_Field_File extends XmlForm_Field
             $styleDisplay = "display: none;";
         }
 
-        $html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" value=\"" . $value . "\" class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " " . $this->NSRequiredValue() . " />" . $html2;
-
+        $html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" " .$this->NSFieldType(). " value=\"" . $value . "\"class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " " . $this->NSRequiredValue() . " />" . $html2;
         if (isset( $this->input ) && $this->input != null) {
             require_once ("classes/model/InputDocument.php");
 
@@ -3081,9 +3083,9 @@ class XmlForm_Field_Checkbox extends XmlForm_Field
         if ($this->mode === 'edit') {
             //$readOnly = isset ( $this->readOnly ) && $this->readOnly ? 'disabled' : '';
             if ($this->labelOnRight) {
-                $res = "<input id='form[" . $this->name . "]' value='{$this->value}' name='form[" . $this->name . "]' type='checkbox' $checked $readOnly $disabled><span class='FormCheck'>" . $this->label . '</span></input>';
+                $res = "<input id='form[" . $this->name . "]' value='{$this->value}' " . $this->NSFieldType() . " name='form[" . $this->name . "]' type='checkbox' $checked $readOnly $disabled><span class='FormCheck'>" . $this->label . '</span></input>';
             } else {
-                $res = "<input id='form[" . $this->name . "]' value='{$this->value}' name='form[" . $this->name . "]' type='checkbox' $checked $readOnly $disabled/>";
+                $res = "<input id='form[" . $this->name . "]' value='{$this->value}' " . $this->NSFieldType() . " name='form[" . $this->name . "]' type='checkbox' $checked $readOnly $disabled/>";
             }
             $res .= $this->renderHint();
 
@@ -3195,7 +3197,7 @@ class XmlForm_Field_Button extends XmlForm_Field
         $onclick = G::replaceDataField( $this->onclick, $owner->values );
         $label = G::replaceDataField( $this->label, $owner->values );
         if ($this->mode === 'edit') {
-            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . "name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
             return $re;
         } elseif ($this->mode === 'view') {
             return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
@@ -3230,7 +3232,7 @@ class XmlForm_Field_Reset extends XmlForm_Field
         //return '<input name="'.$this->name.'" type ="reset" value="'.$this->label.'"/>';
         //    return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities ( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         if ($this->mode === 'edit') {
-            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . "name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         } elseif ($this->mode === 'view') {
             return "<input style=\"{$this->style};display:none\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         } else {
@@ -3266,7 +3268,7 @@ class XmlForm_Field_Submit extends XmlForm_Field
         if ($this->mode === 'edit') {
             //      if ($this->readOnly)
             //        return '<input id="form['.$this->name.']" name="form['.$this->name.']" type=\'submit\' value=\''. $this->label .'\' disabled/>';
-            return "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
          } elseif ($this->mode === 'view') {
             //return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities ( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
             //$sLinkNextStep = 'window.open("' . $owner->fields['__DYNAFORM_OPTIONS']->xmlMenu->values['NEXT_STEP'] . '", "_self");';
@@ -3300,7 +3302,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
     public $sql = '';
     public $sqlOption = array ();
     public $dependentFields = '';
-
+    public $gridFieldType = 'hidden';
     /**
      * Function render
      *
@@ -3326,7 +3328,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
             }
         }
         if ($this->mode === 'edit') {
-            return '<input id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $value . '\'/>';
+            return '<input id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $value . '\'/>';
         } elseif ($this->mode === 'view') {
             //a button? who wants a hidden field be showed like a button?? very strange.
             return '<input id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'text\' value=\'' . $value . '\' style="display:none"/>';
@@ -3347,13 +3349,15 @@ class XmlForm_Field_Hidden extends XmlForm_Field
         $result = array ();
         $r = 1;
         foreach ($values as $v) {
-            $result[] = '<input type="hidden" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
+            $result[] = '<input type="hidden" ' . $this->NSGridType() . 'value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
             $r ++;
         }
 
         return $result;
     }
 
+            //$arrayResult[] = $this->render( $v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow );
+        
     /**
      * Render the field in a table
      *
@@ -3363,7 +3367,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
      */
     public function renderTable ($value = '', $owner = null)
     {
-        return '<input id="form[' . $this->name . ']" name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $value . '\'/>';
+        return '<input id="form[' . $this->name . ']"  name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $value . '\'/>';
     }
 }
 
@@ -3644,7 +3648,7 @@ class XmlForm_Field_Listbox extends XmlForm_Field
             if ($this->width != '') {
                 $itemWidth = 'style="width:' . $this->width . '"';
             }
-            $html = '<select multiple="multiple" id="form[' . $this->name . ']" name="form[' . $this->name . '][]" size="' . $this->size . '" ' . $itemWidth . '  ' . $this->NSFieldType() . '>';
+            $html = '<select multiple="multiple" id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . '][]" size="' . $this->size . '" ' . $itemWidth . '  ' . $this->NSFieldType() . '>';
             foreach ($this->option as $optionName => $option) {
                 $html .= "<option value=\"" . $optionName . "\" " . ((in_array( $optionName . "", $value )) ? "selected=\"selected\"" : "") . ">" . $option . "</option>";
             }
@@ -3740,9 +3744,9 @@ class XmlForm_Field_RadioGroup extends XmlForm_Field
             $i = 0;
             foreach ($this->options as $optionName => $option) {
                 if (isset( $this->linkType ) && ($this->linkType == 1 || $this->linkType == "1")) {
-                    $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><a href="#" onclick="executeEvent(\'form[' . $this->name . '][' . $optionName . ']\', \'click\'); return false;">' . $option . '</a></input>';
+                    $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><a href="#" onclick="executeEvent(\'form[' . $this->name . '][' . $optionName . ']\', \'click\'); return false;">' . $option . '</a></input>';
                 } else {
-                    $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><label for="form[' . $this->name . '][' . $optionName . ']">' . $option . '</label></input>';
+                    $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><label for="form[' . $this->name . '][' . $optionName . ']">' . $option . '</label></input>';
                 }
                 if (++ $i == count( $this->options )) {
                     $html .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $this->renderHint();
@@ -3855,7 +3859,7 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
             $i = 0;
             $html = '';
             foreach ($this->options as $optionName => $option) {
-                $html .= "<input type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" name=\"form[" . $this->name . "][]\"  value=\"" . $optionName . "\"" . (in_array( $optionName . "", $value ) ? "checked = \"checked\" " : "") . "><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input>";
+                $html .= "<input type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" " . $this->NSFieldType() . " name=\"form[" . $this->name . "][]\"  value=\"" . $optionName . "\"" . (in_array( $optionName . "", $value ) ? "checked = \"checked\" " : "") . "><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input>";
 
                 if (++ $i == count( $this->options )) {
                     $html .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $this->renderHint();
@@ -4413,7 +4417,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
                     if (trim($v) !== "") {
                         $v = date( masktophp($mask, $v) );
                     }
-                    $html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ' . $this->NSGridType() . '/>' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
+                    $html = '<input ' . $this->NSRequiredValue() .' class="module_app_input___gray" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" />' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
                 } else {
                     $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
                     $html = $this->__draw_widget( $id, $v, $owner, true );
@@ -4567,7 +4571,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
             if ($this->editable != "0") {
                 $html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             } else {
-                $html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
+                $html = '<input ' . $this->NSFieldType() . 'pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             }
         } else {
             $html = "<span style='border:1;border-color:#000;width:100px;' name='" . $pID . "'>$value</span>" . '<input type="hidden" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '"' . 'pm:end="' . $endDate . '"  ' . $onchange . ' class="module_app_input___gray" value="' . $value . '"/>';

From 537c7d0bf300e4c3e1ad712e207f35d1a0fcb8c2 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 18 Feb 2014 15:10:00 -0400
Subject: [PATCH 30/54] BUG-14031 Do not exist ProcessMaker fields attribute
 identifier in generated HTML

It has been added field attribute identifier "pm_fieldtype" and "pm_gridtype" in class xmlform for HTML file generated.
---
 gulliver/system/class.xmlform.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 929e97494..6f140e648 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -921,7 +921,7 @@ class XmlForm_Field_Title extends XmlForm_Field
     public function render ($value = null, &$owner = null)
     {
         $this->label = G::replaceDataField( $this->label, $owner->values );
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\'' . $this->NSFieldType() . '>' . $this->htmlentities( $this->label ) . '</span>';
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
     }
 
     /**
@@ -956,7 +956,7 @@ class XmlForm_Field_Subtitle extends XmlForm_Field
      */
     public function render ($value = null)
     {
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\'' . $this->NSFieldType() . '>' . $this->htmlentities( $this->label ) . '</span>';
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
     }
 
     /**
@@ -1882,14 +1882,14 @@ class XmlForm_Field_Password extends XmlForm_Field
 
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . 'readOnly="readOnly"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
             } else {
                 $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . '/>';
                 $html .= $this->renderHint();
                 return $html;
             }
         } elseif ($this->mode === 'view') {
-            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) .  '\'' . $this->NSFieldType() . ' readOnly="readOnly"/>';
+            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) .  '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
             $html .= $this->htmlentities( str_repeat( '*', 10 ), ENT_COMPAT, 'utf-8' );
             return $html;
         } else {
@@ -2749,7 +2749,7 @@ class XmlForm_Field_Link extends XmlForm_Field
         $target = G::replaceDataField($this->target, $v);
 
         $html = "<a class=\"tableOption\" href=\"" . $this->htmlentities($link, ENT_QUOTES, "utf-8") . "\"";
-        $html = $html . " id=\"form[$id]\" name=\"form[$id]\" pm:field=\"pm:field\"";
+        $html = $html . " id=\"form[$id]\" name=\"form[$id]\" pm:field=\"pm:field\" ";
         $html .= $this->NSFieldType() . ' ';
         if ((strrpos($_SERVER['HTTP_USER_AGENT'], "Chrome") === false ? false : true) && trim($this->htmlentities($link, ENT_QUOTES, "utf-8")) === "#") {
             $html = $html . (($this->onclick) ? " onclick=\"" . htmlentities($onclick, ENT_QUOTES, "utf-8") . " return false;\"" : " onclick=\" return false;\"");
@@ -2906,7 +2906,7 @@ class XmlForm_Field_File extends XmlForm_Field
             $styleDisplay = "display: none;";
         }
 
-        $html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" " .$this->NSFieldType(). " value=\"" . $value . "\"class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " " . $this->NSRequiredValue() . " />" . $html2;
+        $html = $html1 . "<input type=\"file\" id=\"form" . $rowId . "[" . $this->name . "]\" name=\"form" . $rowId . "[" . $this->name . "]\" " .$this->NSFieldType(). " value=\"" . $value . "\" class=\"module_app_input___gray_file\" style=\"" . $styleDisplay . "\"" . $mode . " " . $this->NSRequiredValue() . " />" . $html2;
         if (isset( $this->input ) && $this->input != null) {
             require_once ("classes/model/InputDocument.php");
 
@@ -3197,7 +3197,7 @@ class XmlForm_Field_Button extends XmlForm_Field
         $onclick = G::replaceDataField( $this->onclick, $owner->values );
         $label = G::replaceDataField( $this->label, $owner->values );
         if ($this->mode === 'edit') {
-            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . "name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
             return $re;
         } elseif ($this->mode === 'view') {
             return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
@@ -3232,7 +3232,7 @@ class XmlForm_Field_Reset extends XmlForm_Field
         //return '<input name="'.$this->name.'" type ="reset" value="'.$this->label.'"/>';
         //    return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities ( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         if ($this->mode === 'edit') {
-            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . "name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         } elseif ($this->mode === 'view') {
             return "<input style=\"{$this->style};display:none\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         } else {
@@ -3349,15 +3349,13 @@ class XmlForm_Field_Hidden extends XmlForm_Field
         $result = array ();
         $r = 1;
         foreach ($values as $v) {
-            $result[] = '<input type="hidden" ' . $this->NSGridType() . 'value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
+            $result[] = '<input type="hidden" ' . $this->NSGridType() . ' value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
             $r ++;
         }
 
         return $result;
     }
 
-            //$arrayResult[] = $this->render( $v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow );
-        
     /**
      * Render the field in a table
      *
@@ -4571,7 +4569,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
             if ($this->editable != "0") {
                 $html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             } else {
-                $html = '<input ' . $this->NSFieldType() . 'pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
+                $html = '<input ' . $this->NSFieldType() . ' pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             }
         } else {
             $html = "<span style='border:1;border-color:#000;width:100px;' name='" . $pID . "'>$value</span>" . '<input type="hidden" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '"' . 'pm:end="' . $endDate . '"  ' . $onchange . ' class="module_app_input___gray" value="' . $value . '"/>';

From f1f0c1059158f616f30b2d0f2de851b308f59520 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Fri, 21 Feb 2014 16:50:48 -0400
Subject: [PATCH 31/54] BUG-14066 Admin users are able to switch interface to
 use experience skin

Column ROLE_ID added in the query and uxUserUpdate function
---
 workflow/engine/controllers/adminProxy.php     |  8 ++++++++
 workflow/engine/methods/users/users_Ajax.php   |  6 ++++++
 workflow/engine/templates/admin/uxUsersList.js | 11 +++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 4ef05adcd..b15d3e4e5 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -135,6 +135,7 @@ class adminProxy extends HttpProxyController
             $list =  $data;
         }
 
+        $oRoles = new Roles();
         $rows = array();
 
         foreach ($list as $value) {
@@ -144,6 +145,13 @@ class adminProxy extends HttpProxyController
             $user->save();
 
             $row = $user->toArray(BasePeer::TYPE_FIELDNAME);
+            try {
+                $uRole = $oRoles->loadByCode($row['USR_ROLE']);
+            } catch (exception $oError) {
+                $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
+            }
+            $row['USR_ROLE_ID'] = $row['USR_ROLE'];
+            $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
 
             $uxList = self::getUxTypesList();
             $row['USR_UX'] = $uxList[$user->getUsrUx()];
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index a2892ed59..adb0d17c2 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -390,7 +390,9 @@ try {
             $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
             $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
             $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
+            
             $oCriteria->addSelectColumn(UsersPeer::USR_ROLE);
+            
             $oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE);
             $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
             $oCriteria->addSelectColumn(UsersPeer::USR_UX);
@@ -438,13 +440,16 @@ try {
             $uRole = Array();
             while ($oDataset->next()) {
                 $row = $oDataset->getRow();
+                
                 try {
                     $uRole = $oRoles->loadByCode($row['USR_ROLE']);
                 } catch (exception $oError) {
                     $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
                 }
+
                 $row['USR_ROLE_ID'] = $row['USR_ROLE'];
                 $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
+
                 $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
                 $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';
                 $row['TOTAL_CASES'] = isset($aCases[$row['USR_UID']]) ? $aCases[$row['USR_UID']] : 0;
@@ -454,6 +459,7 @@ try {
                 
                 $rows[] = $row;
             }
+
             echo '{users: ' . G::json_encode($rows) . ', total_users: ' . $totalRows . '}';
             break;
         case 'updatePageSize':
diff --git a/workflow/engine/templates/admin/uxUsersList.js b/workflow/engine/templates/admin/uxUsersList.js
index f192a3b2d..d707bf816 100755
--- a/workflow/engine/templates/admin/uxUsersList.js
+++ b/workflow/engine/templates/admin/uxUsersList.js
@@ -151,10 +151,9 @@ Ext.onReady(function(){
   cmodel = new Ext.grid.ColumnModel({
     columns: [
       {id:'USR_UID', dataIndex: 'USR_UID', hidden:true, hideable:false},
-      //{header: '', dataIndex: 'USR_UID', width: 30, align:'center', sortable: false, renderer: photo_user},
       {header: _('ID_USER_NAME'), dataIndex: 'USR_USERNAME', width: 90, hidden:false, align:'left'},
       {header: _('ID_FULL_NAME'), dataIndex: 'USR_USERNAME', width: 50, align:'left', renderer: full_name},
-      {id: 'USR_ROLE_ID', dataIndex: 'USR_ROLE_ID', hidden:true},
+      {dataIndex: 'USR_ROLE_ID', hidden:true, hideable:false},
       {header: _('ID_ROLE'), dataIndex: 'USR_ROLE', width: 50, hidden:false, align:'left'},
       {header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 50, hidden: true, align: 'center', renderer: render_status},
       {
@@ -173,12 +172,12 @@ Ext.onReady(function(){
             fields: ['id', 'name'],
             data : uxTypes
           }),
-          listeners: {
-            select: function(a, b) {
+          listeners: { 
+            select: function(combo, newValue) {
               var row = usersGrid.getSelectionModel().getSelected();
               role = row.get('USR_ROLE_ID');
-              
-              if (role == 'PROCESSMAKER_ADMIN' && (this.value == 'SIMPLIFIED' || this.value == 'SINGLE')) {
+
+              if (role == 'PROCESSMAKER_ADMIN'  && (combo.getValue() == 'SIMPLIFIED' || combo.getValue() == 'SINGLE')) {
                 PMExt.warning(_('ID_WARNING'), _('ID_ADMINS_CANT_USE_UXS'));
                 this.setValue('NORMAL');
               }

From b32bc093c2603b641296f365d28432be1cffd91e Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Mon, 24 Feb 2014 09:38:24 -0400
Subject: [PATCH 32/54] BUG-14031 Add ProcessMaker fields attribute identifier
 in generated HTML

Some fields doesn't have pm:fieldtype attribute. Class xmlform modified, it has been added NSFieldType function for render fields.
---
 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 6f140e648..d6d2e6018 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -4567,9 +4567,9 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
             }
 
             if ($this->editable != "0") {
-                $html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
+                $html = '<input ' . $this->NSFieldType() . ' pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             } else {
-                $html = '<input ' . $this->NSFieldType() . ' pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
+                $html = '<input pm:required="' . $isRequired . '" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '" pm:end="' . $endDate . '" pm:time="' . $Time . '" ' . $onchange . ' class="module_app_input___gray" size="' . $sizeend . '" value="' . $value . '" pm:defaultvalue="' . $defaultValue . '" readonly="readonly"  />' . '<a onclick="removeValue(\'' . $pID . '\'); return false;" style="position:relative;left:-17px;top:2px;" >' . '  <img src="/images/icons_silk/calendar_x_button.png" />' . '</a>' . '<a id="' . $pID . '[btn]" style="position: relative; top: 2px; left: -16px;" >' . '  <img src="/images/pmdateicon.png" border="0" width="12" height="14" />' . '</a>' . '<script>datePicker4("", \'' . $pID . '\', \'' . $mask . '\', \'' . $startDate . '\', \'' . $endDate . '\',' . $Time . ')</script>';
             }
         } else {
             $html = "<span style='border:1;border-color:#000;width:100px;' name='" . $pID . "'>$value</span>" . '<input type="hidden" id="' . $pID . '" name="' . $pID . '" pm:mask="' . $mask . '" pm:start="' . $startDate . '"' . 'pm:end="' . $endDate . '"  ' . $onchange . ' class="module_app_input___gray" value="' . $value . '"/>';

From d21162303ff458fa5941337dc41a8ecc15e13ef9 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Mon, 24 Feb 2014 12:12:53 -0400
Subject: [PATCH 33/54] BUG-14140 Al pasar el formulario con "Next Step" nos
 muestra el mensaje Do you want to save changes?

Al pasar al siguiente paso con la opcion "Next Step" no debe mostrar el mesnaje de Do you want to save changes? cuando no se hicieron cambios.
---
 gulliver/system/class.publisher.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index 1088b1014..6dbd28ab9 100755
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -238,6 +238,11 @@ class Publisher
                                 // Show Prompt only if there are no required fields can submit the form.
                                 $G_FORM->values['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'if (document.getElementById("' . $G_FORM->id . '")&&validateForm(document.getElementById(\'DynaformRequiredFields\').value)) {new leimnud.module.app.confirm().make({label:"@G::LoadTranslation(ID_DYNAFORM_SAVE_CHANGES)",action:function(){document.getElementById("' . $G_FORM->id . '").submit();}.extend(this),cancel:function(){window.location = getField("DYN_FORWARD").href;}.extend(this)});return false;} return false;';
                                 break;
+
+                            case 'prompt':
+                                // Show Prompt only if there are no required fields can submit the form.
+                                $G_FORM->values['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'if (document.getElementById("' . $G_FORM->id . '")&&validateForm(document.getElementById(\'DynaformRequiredFields\').value)) {if(dynaFormChanged(document.getElementsByTagName(\'form\').item(0))) {new leimnud.module.app.confirm().make({label:"@G::LoadTranslation(ID_DYNAFORM_SAVE_CHANGES)", action:function(){document.getElementById("' . $G_FORM->id . '").submit();}.extend(this), cancel:function(){window.location = getField("DYN_FORWARD").href;}.extend(this)});return false;} else {window.location = getField("DYN_FORWARD").href;return false;}}return false;';
+                                break;
                         }
                     }
                 }

From 5f8e4d541cb025a7393d9dd7ec4b3eb53bf052d7 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 25 Feb 2014 13:08:56 -0400
Subject: [PATCH 34/54] Fix incorrect object declaration, PHP 5.4.x
 compatibility

---
 workflow/engine/methods/dynaforms/fields_Ajax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/methods/dynaforms/fields_Ajax.php b/workflow/engine/methods/dynaforms/fields_Ajax.php
index 3f268f8d1..10ea47d8c 100755
--- a/workflow/engine/methods/dynaforms/fields_Ajax.php
+++ b/workflow/engine/methods/dynaforms/fields_Ajax.php
@@ -88,7 +88,7 @@ $r = 0;
 foreach ($dependentFields as $d) {
     $sendContent[$r] = new stdclass();
     $sendContent[$r]->name = $d;
-    $sendContent[$r]->content = null;
+    $sendContent[$r]->content = new stdclass();
     foreach ($G_FORM->fields[$d] as $attribute => $value) {
         switch ($attribute) {
             case 'type':
@@ -108,7 +108,7 @@ function toJSArray ($array)
 {
     $result = array ();
     foreach ($array as $k => $v) {
-        $o = null;
+        $o = new stdclass();
         $o->key = $k;
         $o->value = $v;
         $result[] = $o;

From 33985fe1665f020d60a3cf3d489d4bb7a9e549db Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 25 Feb 2014 15:43:45 -0400
Subject: [PATCH 35/54] BUG-14140 Al pasar el formulario con "Next Step" nos
 muestra el mensaje Do you want to save changes?

Al pasar al siguiente paso con la opcion "Next Step" no debe mostrar el mesnaje de Do you want to save changes? cuando no se hicieron cambios.
---
 gulliver/system/class.publisher.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index 6dbd28ab9..a26b22f19 100755
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -234,11 +234,6 @@ class Publisher
                                 // Save and Next only if there are no required fields can submit the form.
                                 $G_FORM->values['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'if (document.getElementById("' . $G_FORM->id . '")&&validateForm(document.getElementById(\'DynaformRequiredFields\').value)) {document.getElementById("' . $G_FORM->id . '").submit();}return false;';
                                 break;
-                            case 'prompt':
-                                // Show Prompt only if there are no required fields can submit the form.
-                                $G_FORM->values['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'if (document.getElementById("' . $G_FORM->id . '")&&validateForm(document.getElementById(\'DynaformRequiredFields\').value)) {new leimnud.module.app.confirm().make({label:"@G::LoadTranslation(ID_DYNAFORM_SAVE_CHANGES)",action:function(){document.getElementById("' . $G_FORM->id . '").submit();}.extend(this),cancel:function(){window.location = getField("DYN_FORWARD").href;}.extend(this)});return false;} return false;';
-                                break;
-
                             case 'prompt':
                                 // Show Prompt only if there are no required fields can submit the form.
                                 $G_FORM->values['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'if (document.getElementById("' . $G_FORM->id . '")&&validateForm(document.getElementById(\'DynaformRequiredFields\').value)) {if(dynaFormChanged(document.getElementsByTagName(\'form\').item(0))) {new leimnud.module.app.confirm().make({label:"@G::LoadTranslation(ID_DYNAFORM_SAVE_CHANGES)", action:function(){document.getElementById("' . $G_FORM->id . '").submit();}.extend(this), cancel:function(){window.location = getField("DYN_FORWARD").href;}.extend(this)});return false;} else {window.location = getField("DYN_FORWARD").href;return false;}}return false;';

From 77c696d71260182f05377f6cc11010047edff64e Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 26 Feb 2014 11:13:54 -0400
Subject: [PATCH 36/54] BUG-14025 Ability to apply conditional show/hide when
 re-viewing 'participated cases'/dynaforms

When reviewing the Dynaform, all fields are being displayed and omiting any condition applied
---
 gulliver/system/class.xmlform.php                               | 2 +-
 workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index d6d2e6018..617d497f6 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2629,7 +2629,7 @@ class XmlForm_Field_YesNo extends XmlForm_Field
             }
         } else {
             //VIEW MODE
-            $html .= '<span id="form[' . $this->name . ']">';
+            $html .= '<span id=" ' . $this->name . ' ">';
             $html .= ($value === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' );
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
index e8cc30fdb..762e2a1ba 100644
--- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
@@ -461,6 +461,7 @@ if ($actionAjax == 'historyDynaformGridPreview') {
     </script>
     <?php
 
+    $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID'];
     $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
     $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
 

From 75f0697093ac3228487ef973cb0d8733580123ea Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 14 Mar 2014 14:10:22 -0400
Subject: [PATCH 37/54] BUG 13974 "Error in triggers in lines of code
 commented" SOLVED - Error in triggers in lines of code commented. - Problema
 Resuelto, Se valida el Script del triggers quitando todo los comnetarios que
 existe en el codigo antes de ser   ejecutado, el cambio se lo realizo en el
 metodo "setScript($sScript = '')".

---
 workflow/engine/classes/class.pmScript.php | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 31a9de9f1..15422ecf3 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -151,6 +151,39 @@ class PMScript
      */
     public function setScript ($sScript = '')
     {
+        $nrt     = array("\n",    "\r",    "\t");
+        $nrthtml = array("(n /)", "(r /)", "(t /)");
+
+        $script = $sScript;
+        $script = str_replace($nrt, $nrthtml, $script);
+
+        while (preg_match("/^(.*)\/\*(.*)$/", $script, $arrayMatch)) {
+            $scriptAux = "";
+
+            if (preg_match("/^.*\*\/.*$/", $arrayMatch[2])) {
+                $arrayAux = explode("*/", $arrayMatch[2]);
+                unset($arrayAux[0]);
+                $scriptAux = implode("*/", $arrayAux);
+            }
+
+            $script = $arrayMatch[1] . $scriptAux;
+        }
+
+        while (preg_match("/^(.*)(?:\/\/|#)(.*)$/", $script, $arrayMatch)) {
+            $scriptAux = "";
+
+            if (preg_match("/^.*\(n\s\/\).*$/", $arrayMatch[2])) {
+                $arrayAux = explode("(n /)", $arrayMatch[2]);
+                unset($arrayAux[0]);
+                $scriptAux = implode("(n /)", $arrayAux);
+            }
+
+            $script = $arrayMatch[1] . $scriptAux;
+        }
+
+        $script = str_replace($nrthtml, $nrt, $script);
+        $sScript = $script;
+
         $this->sScript = $sScript;
     }
 

From 13552bf8a0f2ac7bf7431ef3328c8ab271873fe2 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 18 Mar 2014 10:29:57 -0400
Subject: [PATCH 38/54] BUG 13974 "Error in triggers in lines of code
 commented" SOLVED - Error in triggers in lines of code commented. - Problema
 Resuelto, Se valida el Script del triggers quitando todo los comnetarios que
 existe en el codigo antes de ser   ejecutado, el cambio se lo realizo en el
 metodo "setScript($sScript = '')".

---
 workflow/engine/classes/class.pmScript.php | 50 +++++++++++-----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 15422ecf3..9fab948ea 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -151,38 +151,36 @@ class PMScript
      */
     public function setScript ($sScript = '')
     {
-        $nrt     = array("\n",    "\r",    "\t");
-        $nrthtml = array("(n /)", "(r /)", "(t /)");
-
-        $script = $sScript;
-        $script = str_replace($nrt, $nrthtml, $script);
-
-        while (preg_match("/^(.*)\/\*(.*)$/", $script, $arrayMatch)) {
-            $scriptAux = "";
-
-            if (preg_match("/^.*\*\/.*$/", $arrayMatch[2])) {
-                $arrayAux = explode("*/", $arrayMatch[2]);
-                unset($arrayAux[0]);
-                $scriptAux = implode("*/", $arrayAux);
-            }
-
-            $script = $arrayMatch[1] . $scriptAux;
+        if (!defined("T_ML_COMMENT")) {
+            define("T_ML_COMMENT", T_COMMENT);
+        } else {
+            define("T_DOC_COMMENT", T_ML_COMMENT);
         }
 
-        while (preg_match("/^(.*)(?:\/\/|#)(.*)$/", $script, $arrayMatch)) {
-            $scriptAux = "";
+        $script = "<?php " . $sScript;
+        $tokens = token_get_all($script);
+        $result = "";
 
-            if (preg_match("/^.*\(n\s\/\).*$/", $arrayMatch[2])) {
-                $arrayAux = explode("(n /)", $arrayMatch[2]);
-                unset($arrayAux[0]);
-                $scriptAux = implode("(n /)", $arrayAux);
+        foreach ($tokens as $token) {
+            if (is_string($token)) {
+                $result = $result . $token;
+            } else {
+                list($id, $text) = $token;
+
+                switch ($id) {
+                    case T_COMMENT:
+                    case T_ML_COMMENT:  //we've defined this
+                    case T_DOC_COMMENT: //and this
+                        break;
+                    default:
+                        $result = $result . $text;
+                        break;
+                }
             }
-
-            $script = $arrayMatch[1] . $scriptAux;
         }
 
-        $script = str_replace($nrthtml, $nrt, $script);
-        $sScript = $script;
+        $result = trim(str_replace(array("<?php", "<?", "?>"), array("", "", ""), $result));
+        $sScript = $result;
 
         $this->sScript = $sScript;
     }

From 88604409a1cd6beea56f1e68c91d39e820a39682 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 18 Mar 2014 12:13:37 -0400
Subject: [PATCH 39/54] BUG 13974 "Error in triggers in lines of code
 commented" SOLVED - Error in triggers in lines of code commented. - Problema
 Resuelto, Se valida el Script del triggers quitando todo los comnetarios que
 existe en el codigo antes de ser   ejecutado, el cambio se lo realizo en el
 metodo "setScript($sScript = '')".

---
 workflow/engine/classes/class.pmScript.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 9fab948ea..6635b5df0 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -168,6 +168,8 @@ class PMScript
                 list($id, $text) = $token;
 
                 switch ($id) {
+                    case T_OPEN_TAG:
+                    case T_CLOSE_TAG:
                     case T_COMMENT:
                     case T_ML_COMMENT:  //we've defined this
                     case T_DOC_COMMENT: //and this
@@ -179,7 +181,7 @@ class PMScript
             }
         }
 
-        $result = trim(str_replace(array("<?php", "<?", "?>"), array("", "", ""), $result));
+        $result = trim($result);
         $sScript = $result;
 
         $this->sScript = $sScript;

From 7cfbd3cab8399b2904912216c5149afa9fc144a7 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 19 Mar 2014 10:12:21 -0400
Subject: [PATCH 40/54] BUG 14482 Misspelling in Case Scheduler labels SOLVED

- Wrong labels in case scheduelr list
- Change labels in case scheduler list
---
 workflow/engine/xmlform/cases/cases_Scheduler_List.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_List.xml b/workflow/engine/xmlform/cases/cases_Scheduler_List.xml
index e3d34dfba..dbb5cf0b9 100755
--- a/workflow/engine/xmlform/cases/cases_Scheduler_List.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_List.xml
@@ -15,10 +15,10 @@
 </TAS_TITLE>
 
 <SCH_TIME_NEXT_RUN type="text" titlealign="left" align="left" colWidth="120">
-  <en>Time next run</en>
+  <en>Next execution time</en>
 </SCH_TIME_NEXT_RUN>
 <SCH_LAST_RUN_TIME type="text" titlealign="left" align="left" colWidth="120">
-  <en>Last run time</en>
+  <en>Last execution time</en>
 </SCH_LAST_RUN_TIME>
 
 <SCH_STATUS_LNK type="link" align="left" titlealign="left" colWidth="50" value="@G::LoadTranslation(ID_@#SCH_STATE)" link="cases_Scheduler_ChangeStatus?SCH_UID=@#SCH_UID">

From d8287363a15f42503d78bc7ef8cbc5ed51a4966a Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 19 Mar 2014 10:17:29 -0400
Subject: [PATCH 41/54] BUG-13914 Browser not recognizing PDF Output Document

New feature added in Output Document Properties and new column added in OUTPUT DOCUMENT table.
---
 .../model/map/OutputDocumentMapBuilder.php    |  2 +
 .../classes/model/om/BaseOutputDocument.php   | 60 ++++++++++++++++++-
 .../model/om/BaseOutputDocumentPeer.php       | 23 ++++---
 workflow/engine/config/schema.xml             |  1 +
 .../cases/cases_ShowOutputDocument.php        | 19 ++++--
 .../outputdocs/outputdocs_Properties.html     |  4 ++
 .../outputdocs/outputdocs_Properties.xml      |  3 +
 7 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
index d4f7be1cd..92c7d36a2 100755
--- a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
+++ b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
@@ -105,6 +105,8 @@ class OutputDocumentMapBuilder
 
         $tMap->addColumn('OUT_DOC_PDF_SECURITY_PERMISSIONS', 'OutDocPdfSecurityPermissions', 'string', CreoleTypes::VARCHAR, false, 150);
 
+        $tMap->addColumn('OUT_DOC_OPEN_TYPE', 'OutDocOpenType', 'int', CreoleTypes::INTEGER, false, null);
+
         $tMap->addValidator('OUT_DOC_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Output Document UID can be no larger than 32 in size');
 
         $tMap->addValidator('OUT_DOC_UID', 'required', 'propel.validator.RequiredValidator', '', 'Output Document UID is required.');
diff --git a/workflow/engine/classes/model/om/BaseOutputDocument.php b/workflow/engine/classes/model/om/BaseOutputDocument.php
index b71ff437f..889500012 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocument.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocument.php
@@ -147,6 +147,12 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
      */
     protected $out_doc_pdf_security_permissions = '';
 
+    /**
+     * The value for the out_doc_open_type field.
+     * @var        int
+     */
+    protected $out_doc_open_type = 0;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -381,6 +387,17 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
         return $this->out_doc_pdf_security_permissions;
     }
 
+    /**
+     * Get the [out_doc_open_type] column value.
+     * 
+     * @return     int
+     */
+    public function getOutDocOpenType()
+    {
+
+        return $this->out_doc_open_type;
+    }
+
     /**
      * Set the value of [out_doc_uid] column.
      * 
@@ -821,6 +838,28 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
 
     } // setOutDocPdfSecurityPermissions()
 
+    /**
+     * Set the value of [out_doc_open_type] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setOutDocOpenType($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->out_doc_open_type !== $v || $v === 0) {
+            $this->out_doc_open_type = $v;
+            $this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_OPEN_TYPE;
+        }
+
+    } // setOutDocOpenType()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -878,12 +917,14 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
 
             $this->out_doc_pdf_security_permissions = $rs->getString($startcol + 19);
 
+            $this->out_doc_open_type = $rs->getInt($startcol + 20);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 20; // 20 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 21; // 21 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating OutputDocument object", $e);
@@ -1147,6 +1188,9 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
             case 19:
                 return $this->getOutDocPdfSecurityPermissions();
                 break;
+            case 20:
+                return $this->getOutDocOpenType();
+                break;
             default:
                 return null;
                 break;
@@ -1187,6 +1231,7 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
             $keys[17] => $this->getOutDocPdfSecurityOpenPassword(),
             $keys[18] => $this->getOutDocPdfSecurityOwnerPassword(),
             $keys[19] => $this->getOutDocPdfSecurityPermissions(),
+            $keys[20] => $this->getOutDocOpenType(),
         );
         return $result;
     }
@@ -1278,6 +1323,9 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
             case 19:
                 $this->setOutDocPdfSecurityPermissions($value);
                 break;
+            case 20:
+                $this->setOutDocOpenType($value);
+                break;
         } // switch()
     }
 
@@ -1381,6 +1429,10 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
             $this->setOutDocPdfSecurityPermissions($arr[$keys[19]]);
         }
 
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setOutDocOpenType($arr[$keys[20]]);
+        }
+
     }
 
     /**
@@ -1472,6 +1524,10 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
             $criteria->add(OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, $this->out_doc_pdf_security_permissions);
         }
 
+        if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_OPEN_TYPE)) {
+            $criteria->add(OutputDocumentPeer::OUT_DOC_OPEN_TYPE, $this->out_doc_open_type);
+        }
+
 
         return $criteria;
     }
@@ -1564,6 +1620,8 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
 
         $copyObj->setOutDocPdfSecurityPermissions($this->out_doc_pdf_security_permissions);
 
+        $copyObj->setOutDocOpenType($this->out_doc_open_type);
+
 
         $copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
index 0ab08dcd0..f6b2c4744 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
@@ -25,7 +25,7 @@ abstract class BaseOutputDocumentPeer
     const CLASS_DEFAULT = 'classes.model.OutputDocument';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 20;
+    const NUM_COLUMNS = 21;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -91,6 +91,9 @@ abstract class BaseOutputDocumentPeer
     /** the column name for the OUT_DOC_PDF_SECURITY_PERMISSIONS field */
     const OUT_DOC_PDF_SECURITY_PERMISSIONS = 'OUTPUT_DOCUMENT.OUT_DOC_PDF_SECURITY_PERMISSIONS';
 
+    /** the column name for the OUT_DOC_OPEN_TYPE field */
+    const OUT_DOC_OPEN_TYPE = 'OUTPUT_DOCUMENT.OUT_DOC_OPEN_TYPE';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -102,10 +105,10 @@ abstract class BaseOutputDocumentPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('OutDocUid', 'ProUid', 'OutDocReportGenerator', 'OutDocLandscape', 'OutDocMedia', 'OutDocLeftMargin', 'OutDocRightMargin', 'OutDocTopMargin', 'OutDocBottomMargin', 'OutDocGenerate', 'OutDocType', 'OutDocCurrentRevision', 'OutDocFieldMapping', 'OutDocVersioning', 'OutDocDestinationPath', 'OutDocTags', 'OutDocPdfSecurityEnabled', 'OutDocPdfSecurityOpenPassword', 'OutDocPdfSecurityOwnerPassword', 'OutDocPdfSecurityPermissions', ),
-        BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID, OutputDocumentPeer::PRO_UID, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR, OutputDocumentPeer::OUT_DOC_LANDSCAPE, OutputDocumentPeer::OUT_DOC_MEDIA, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN, OutputDocumentPeer::OUT_DOC_TOP_MARGIN, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN, OutputDocumentPeer::OUT_DOC_GENERATE, OutputDocumentPeer::OUT_DOC_TYPE, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING, OutputDocumentPeer::OUT_DOC_VERSIONING, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH, OutputDocumentPeer::OUT_DOC_TAGS, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, ),
-        BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID', 'PRO_UID', 'OUT_DOC_REPORT_GENERATOR', 'OUT_DOC_LANDSCAPE', 'OUT_DOC_MEDIA', 'OUT_DOC_LEFT_MARGIN', 'OUT_DOC_RIGHT_MARGIN', 'OUT_DOC_TOP_MARGIN', 'OUT_DOC_BOTTOM_MARGIN', 'OUT_DOC_GENERATE', 'OUT_DOC_TYPE', 'OUT_DOC_CURRENT_REVISION', 'OUT_DOC_FIELD_MAPPING', 'OUT_DOC_VERSIONING', 'OUT_DOC_DESTINATION_PATH', 'OUT_DOC_TAGS', 'OUT_DOC_PDF_SECURITY_ENABLED', 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD', 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD', 'OUT_DOC_PDF_SECURITY_PERMISSIONS', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
+        BasePeer::TYPE_PHPNAME => array ('OutDocUid', 'ProUid', 'OutDocReportGenerator', 'OutDocLandscape', 'OutDocMedia', 'OutDocLeftMargin', 'OutDocRightMargin', 'OutDocTopMargin', 'OutDocBottomMargin', 'OutDocGenerate', 'OutDocType', 'OutDocCurrentRevision', 'OutDocFieldMapping', 'OutDocVersioning', 'OutDocDestinationPath', 'OutDocTags', 'OutDocPdfSecurityEnabled', 'OutDocPdfSecurityOpenPassword', 'OutDocPdfSecurityOwnerPassword', 'OutDocPdfSecurityPermissions', 'OutDocOpenType', ),
+        BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID, OutputDocumentPeer::PRO_UID, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR, OutputDocumentPeer::OUT_DOC_LANDSCAPE, OutputDocumentPeer::OUT_DOC_MEDIA, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN, OutputDocumentPeer::OUT_DOC_TOP_MARGIN, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN, OutputDocumentPeer::OUT_DOC_GENERATE, OutputDocumentPeer::OUT_DOC_TYPE, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING, OutputDocumentPeer::OUT_DOC_VERSIONING, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH, OutputDocumentPeer::OUT_DOC_TAGS, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, OutputDocumentPeer::OUT_DOC_OPEN_TYPE, ),
+        BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID', 'PRO_UID', 'OUT_DOC_REPORT_GENERATOR', 'OUT_DOC_LANDSCAPE', 'OUT_DOC_MEDIA', 'OUT_DOC_LEFT_MARGIN', 'OUT_DOC_RIGHT_MARGIN', 'OUT_DOC_TOP_MARGIN', 'OUT_DOC_BOTTOM_MARGIN', 'OUT_DOC_GENERATE', 'OUT_DOC_TYPE', 'OUT_DOC_CURRENT_REVISION', 'OUT_DOC_FIELD_MAPPING', 'OUT_DOC_VERSIONING', 'OUT_DOC_DESTINATION_PATH', 'OUT_DOC_TAGS', 'OUT_DOC_PDF_SECURITY_ENABLED', 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD', 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD', 'OUT_DOC_PDF_SECURITY_PERMISSIONS', 'OUT_DOC_OPEN_TYPE', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
     );
 
     /**
@@ -115,10 +118,10 @@ abstract class BaseOutputDocumentPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('OutDocUid' => 0, 'ProUid' => 1, 'OutDocReportGenerator' => 2, 'OutDocLandscape' => 3, 'OutDocMedia' => 4, 'OutDocLeftMargin' => 5, 'OutDocRightMargin' => 6, 'OutDocTopMargin' => 7, 'OutDocBottomMargin' => 8, 'OutDocGenerate' => 9, 'OutDocType' => 10, 'OutDocCurrentRevision' => 11, 'OutDocFieldMapping' => 12, 'OutDocVersioning' => 13, 'OutDocDestinationPath' => 14, 'OutDocTags' => 15, 'OutDocPdfSecurityEnabled' => 16, 'OutDocPdfSecurityOpenPassword' => 17, 'OutDocPdfSecurityOwnerPassword' => 18, 'OutDocPdfSecurityPermissions' => 19, ),
-        BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID => 0, OutputDocumentPeer::PRO_UID => 1, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR => 2, OutputDocumentPeer::OUT_DOC_LANDSCAPE => 3, OutputDocumentPeer::OUT_DOC_MEDIA => 4, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN => 5, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN => 6, OutputDocumentPeer::OUT_DOC_TOP_MARGIN => 7, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN => 8, OutputDocumentPeer::OUT_DOC_GENERATE => 9, OutputDocumentPeer::OUT_DOC_TYPE => 10, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION => 11, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING => 12, OutputDocumentPeer::OUT_DOC_VERSIONING => 13, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH => 14, OutputDocumentPeer::OUT_DOC_TAGS => 15, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED => 16, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD => 17, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD => 18, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS => 19, ),
-        BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID' => 0, 'PRO_UID' => 1, 'OUT_DOC_REPORT_GENERATOR' => 2, 'OUT_DOC_LANDSCAPE' => 3, 'OUT_DOC_MEDIA' => 4, 'OUT_DOC_LEFT_MARGIN' => 5, 'OUT_DOC_RIGHT_MARGIN' => 6, 'OUT_DOC_TOP_MARGIN' => 7, 'OUT_DOC_BOTTOM_MARGIN' => 8, 'OUT_DOC_GENERATE' => 9, 'OUT_DOC_TYPE' => 10, 'OUT_DOC_CURRENT_REVISION' => 11, 'OUT_DOC_FIELD_MAPPING' => 12, 'OUT_DOC_VERSIONING' => 13, 'OUT_DOC_DESTINATION_PATH' => 14, 'OUT_DOC_TAGS' => 15, 'OUT_DOC_PDF_SECURITY_ENABLED' => 16, 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD' => 17, 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD' => 18, 'OUT_DOC_PDF_SECURITY_PERMISSIONS' => 19, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
+        BasePeer::TYPE_PHPNAME => array ('OutDocUid' => 0, 'ProUid' => 1, 'OutDocReportGenerator' => 2, 'OutDocLandscape' => 3, 'OutDocMedia' => 4, 'OutDocLeftMargin' => 5, 'OutDocRightMargin' => 6, 'OutDocTopMargin' => 7, 'OutDocBottomMargin' => 8, 'OutDocGenerate' => 9, 'OutDocType' => 10, 'OutDocCurrentRevision' => 11, 'OutDocFieldMapping' => 12, 'OutDocVersioning' => 13, 'OutDocDestinationPath' => 14, 'OutDocTags' => 15, 'OutDocPdfSecurityEnabled' => 16, 'OutDocPdfSecurityOpenPassword' => 17, 'OutDocPdfSecurityOwnerPassword' => 18, 'OutDocPdfSecurityPermissions' => 19, 'OutDocOpenType' => 20, ),
+        BasePeer::TYPE_COLNAME => array (OutputDocumentPeer::OUT_DOC_UID => 0, OutputDocumentPeer::PRO_UID => 1, OutputDocumentPeer::OUT_DOC_REPORT_GENERATOR => 2, OutputDocumentPeer::OUT_DOC_LANDSCAPE => 3, OutputDocumentPeer::OUT_DOC_MEDIA => 4, OutputDocumentPeer::OUT_DOC_LEFT_MARGIN => 5, OutputDocumentPeer::OUT_DOC_RIGHT_MARGIN => 6, OutputDocumentPeer::OUT_DOC_TOP_MARGIN => 7, OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN => 8, OutputDocumentPeer::OUT_DOC_GENERATE => 9, OutputDocumentPeer::OUT_DOC_TYPE => 10, OutputDocumentPeer::OUT_DOC_CURRENT_REVISION => 11, OutputDocumentPeer::OUT_DOC_FIELD_MAPPING => 12, OutputDocumentPeer::OUT_DOC_VERSIONING => 13, OutputDocumentPeer::OUT_DOC_DESTINATION_PATH => 14, OutputDocumentPeer::OUT_DOC_TAGS => 15, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_ENABLED => 16, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD => 17, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD => 18, OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS => 19, OutputDocumentPeer::OUT_DOC_OPEN_TYPE => 20, ),
+        BasePeer::TYPE_FIELDNAME => array ('OUT_DOC_UID' => 0, 'PRO_UID' => 1, 'OUT_DOC_REPORT_GENERATOR' => 2, 'OUT_DOC_LANDSCAPE' => 3, 'OUT_DOC_MEDIA' => 4, 'OUT_DOC_LEFT_MARGIN' => 5, 'OUT_DOC_RIGHT_MARGIN' => 6, 'OUT_DOC_TOP_MARGIN' => 7, 'OUT_DOC_BOTTOM_MARGIN' => 8, 'OUT_DOC_GENERATE' => 9, 'OUT_DOC_TYPE' => 10, 'OUT_DOC_CURRENT_REVISION' => 11, 'OUT_DOC_FIELD_MAPPING' => 12, 'OUT_DOC_VERSIONING' => 13, 'OUT_DOC_DESTINATION_PATH' => 14, 'OUT_DOC_TAGS' => 15, 'OUT_DOC_PDF_SECURITY_ENABLED' => 16, 'OUT_DOC_PDF_SECURITY_OPEN_PASSWORD' => 17, 'OUT_DOC_PDF_SECURITY_OWNER_PASSWORD' => 18, 'OUT_DOC_PDF_SECURITY_PERMISSIONS' => 19, 'OUT_DOC_OPEN_TYPE' => 20, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
     );
 
     /**
@@ -259,6 +262,8 @@ abstract class BaseOutputDocumentPeer
 
         $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS);
 
+        $criteria->addSelectColumn(OutputDocumentPeer::OUT_DOC_OPEN_TYPE);
+
     }
 
     const COUNT = 'COUNT(OUTPUT_DOCUMENT.OUT_DOC_UID)';
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 0bfe72d84..d768368e3 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -781,6 +781,7 @@
     <column name="OUT_DOC_PDF_SECURITY_OPEN_PASSWORD" type="VARCHAR" size="32" required="false" default=""/>
     <column name="OUT_DOC_PDF_SECURITY_OWNER_PASSWORD" type="VARCHAR" size="32" required="false" default=""/>
     <column name="OUT_DOC_PDF_SECURITY_PERMISSIONS" type="VARCHAR" size="150" required="false" default=""/>
+    <column name="OUT_DOC_OPEN_TYPE" type="INTEGER" default="0"/>
     <validator column="OUT_DOC_UID">
       <rule name="maxLength" value="32" message="Output Document UID can be no larger than ${value} in size"/>
       <rule name="required" message="Output Document UID is required."/>
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index 49eeee328..6a87329b3 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -34,18 +34,25 @@ if (!isset($_SESSION['USER_LOGGED'])) {
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-/*
- * Created on 13-02-2008
- *
- * @author David Callizaya <davidsantos@colosa.com>
+/*
+ * Created on 13-02-2008
+ *
+ * @author David Callizaya <davidsantos@colosa.com>
  */
 
 require_once ("classes/model/AppDocumentPeer.php");
+require_once ("classes/model/OutputDocumentPeer.php");
 
 $oAppDocument = new AppDocument();
 $oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : null );
 
 $sAppDocUid = $oAppDocument->getAppDocUid();
+$sDocUid = $oAppDocument->Fields['DOC_UID'];
+
+$oOutputDocument = new OutputDocument();
+$oOutputDocument->Fields = $oOutputDocument->getByUid( $sDocUid );
+$download = $oOutputDocument->Fields['OUT_DOC_OPEN_TYPE'];
+
 $info = pathinfo( $oAppDocument->getAppDocFilename() );
 if (! isset( $_GET['ext'] )) {
     $ext = $info['extension'];
@@ -58,7 +65,7 @@ if (! isset( $_GET['ext'] )) {
 }
 $ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
 
-if (! $ver) //This code is in the case the outputdocument won't be versioned
+if (! $ver) //This code is in the case the outputdocument won't be versioned
     $ver = '_1';
 
 $realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext;
@@ -102,7 +109,7 @@ if (! $sw_file_exists) {
         $res['message'] = $info['basename'] . $ver . '.' . $ext;
         print G::json_encode( $res );
     } else {
-        G::streamFile( $realPath, true, $info['basename'] . $ver . '.' . $ext );
+        G::streamFile( $realPath, $download, $info['basename'] . $ver . '.' . $ext );
     }
 }
 //G::streamFile ( $realPath, true);
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
index 1e77f0630..5ddcafa58 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
@@ -124,6 +124,10 @@
                     <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.OUT_DOC_TAGS} </td>  //-->
                     <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.OUT_DOC_TAGS}</td>
                   </tr>
+                  <tr>
+                    <td class="FormLabel" width="{$form_labelWidth}">{$OUT_DOC_OPEN_TYPE}</td>
+                    <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.OUT_DOC_OPEN_TYPE}</td>
+                  </tr>
                   <tr>
                     <td class="FormButton" colspan="2" align="center"></td>
                   </tr>
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
index 055be1be2..f1d0636b7 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
@@ -103,6 +103,9 @@
   </en>
 </OUT_DOC_PDF_SECURITY_PERMISSIONS>
 
+<OUT_DOC_OPEN_TYPE type="dropdown">
+  <en>By clicking on the generated file link<option name="0">Download the file</option><option name="1">Open the file</option></en>
+</OUT_DOC_OPEN_TYPE>
 
 <BTN_CANCEL type="button" onclick="cancel();">
   <en>Cancel</en>

From ad6eb8a77507ce4b0826f2f18e0e85f8222fd529 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 19 Mar 2014 11:24:05 -0400
Subject: [PATCH 42/54] BUG-13914 Browser not recognizing PDF Output Document

New featured added in Output Document properties and new column added in OUTPUT DOCUMENT table.
---
 workflow/engine/classes/model/map/OutputDocumentMapBuilder.php | 2 --
 workflow/engine/classes/model/om/BaseOutputDocument.php        | 2 --
 workflow/engine/classes/model/om/BaseOutputDocumentPeer.php    | 1 -
 workflow/engine/config/schema.xml                              | 2 ++
 workflow/engine/methods/cases/cases_ShowOutputDocument.php     | 3 +--
 workflow/engine/xmlform/outputdocs/outputdocs_Properties.html  | 1 +
 workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml   | 2 --
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
index 92c7d36a2..0e58314b5 100755
--- a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
+++ b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
@@ -7,8 +7,6 @@ include_once 'creole/CreoleTypes.php';
 /**
  * This class adds structure of 'OUTPUT_DOCUMENT' table to 'workflow' DatabaseMap object.
  *
- *
- *
  * These statically-built map classes are used by Propel to do runtime db structure discovery.
  * For example, the createSelectSql() method checks the type of a given column used in an
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
diff --git a/workflow/engine/classes/model/om/BaseOutputDocument.php b/workflow/engine/classes/model/om/BaseOutputDocument.php
index 889500012..7dd743e4b 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocument.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocument.php
@@ -4,14 +4,12 @@ require_once 'propel/om/BaseObject.php';
 
 require_once 'propel/om/Persistent.php';
 
-
 include_once 'propel/util/Criteria.php';
 
 include_once 'classes/model/OutputDocumentPeer.php';
 
 /**
  * Base class that represents a row from the 'OUTPUT_DOCUMENT' table.
- *
  * 
  *
  * @package    workflow.classes.model.om
diff --git a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
index f6b2c4744..2d068d262 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
@@ -7,7 +7,6 @@ include_once 'classes/model/OutputDocument.php';
 
 /**
  * Base static class for performing query and update operations on the 'OUTPUT_DOCUMENT' table.
- *
  * 
  *
  * @package    workflow.classes.model.om
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index d768368e3..3bd8fb84c 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -740,6 +740,7 @@
     <column name="LEX_VALUE" type="VARCHAR" size="128" required="true" default=""/>
     <column name="LEX_CAPTION" type="VARCHAR" size="128" required="true" default=""/>
   </table>
+  
   <table name="OUTPUT_DOCUMENT">
     <vendor type="mysql">
       <parameter name="Name" value="OUTPUT_DOCUMENT"/>
@@ -797,6 +798,7 @@
       <rule name="validValues" value="HTML|ITEXT|JRXML|ACROFORM" message="Please select a valid Output Document Type."/>
     </validator>
   </table>
+
   <table name="PROCESS">
     <vendor type="mysql">
       <parameter name="Name" value="PROCESS"/>
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index 6a87329b3..515c1535a 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -33,8 +33,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-/*
+ *
  * Created on 13-02-2008
  *
  * @author David Callizaya <davidsantos@colosa.com>
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
index 5ddcafa58..f5b309e46 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
@@ -126,6 +126,7 @@
                   </tr>
                   <tr>
                     <td class="FormLabel" width="{$form_labelWidth}">{$OUT_DOC_OPEN_TYPE}</td>
+                    <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.OUT_DOC_OPEN_TYPE} </td>  //-->
                     <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.OUT_DOC_OPEN_TYPE}</td>
                   </tr>
                   <tr>
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
index f1d0636b7..408d7acd1 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
@@ -116,7 +116,6 @@
 </ACCEPT>
 
 <JS type="JavaScript"><![CDATA[
-
 var _oVarsPanel_;
 var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
   _oVarsPanel_ = new leimnud.module.panel();
@@ -232,6 +231,5 @@ leimnud.event.add(getField('OUT_DOC_GENERATE'), 'change', function() {
 
 showPdfSecuritySwitch();
 togglePDFSecurity();
-
 ]]></JS>
 </dynaForm>
\ No newline at end of file

From 1e0ab50e4c1dbb2987b10980ad3984e919a1beb4 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 19 Mar 2014 14:29:23 -0400
Subject: [PATCH 43/54] BUG 14414 "No se puede realizar la import,..." SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- No se puede realizar la import, export, delete, data, edit de un Report Table.
- Problema Resuelto, el problema que se tenia era por la version de php que era php 5.4. Esta version de php
  exige mejor control cuando se utiliza los metodos de una clase, no se puede utilizar los metodos directamente sin antes
  de ser creados.

  Se puede realizar las acciones de: edit, delete, data, import y export en un Report Table. y NO muestra error.

  Disponible para la versió.5.3 de ProcessMaker.
---
 gulliver/system/class.g.php                   | 4 ++--
 workflow/engine/controllers/pmTablesProxy.php | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 2a0d773ae..13d8d07d4 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -689,7 +689,7 @@ class G
      * @param string $strClass
      * @return void
      */
-    public function LoadClass ($strClass)
+    public static function LoadClass ($strClass)
     {
         $classfile = G::ExpandPath( "classes" ) . 'class.' . $strClass . '.php';
         if (! file_exists( $classfile )) {
@@ -3294,7 +3294,7 @@ class G
      *
      * @author Erik A.O. <erik@colosa.com>
      */
-    public function json_encode($Json)
+    public static function json_encode($Json)
     {
         if ( function_exists('json_encode') ) {
             return json_encode($Json);
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index 86905ef7f..fd2e0daa2 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -198,6 +198,7 @@ class pmTablesProxy extends HttpProxyController
         //require_once 'classes/model/Fields.php';
 
         try {
+            $result = new stdClass();
             ob_start();
             $data = (array) $httpData;
             $data['PRO_UID'] = trim( $data['PRO_UID'] );
@@ -326,6 +327,7 @@ class pmTablesProxy extends HttpProxyController
             $result->success = true;
             $result->message = $result->msg = $buildResult;
         } catch (Exception $e) {
+            $result = new stdClass();
             $buildResult = ob_get_contents();
             ob_end_clean();
             $result->success = false;
@@ -352,6 +354,7 @@ class pmTablesProxy extends HttpProxyController
      */
     public function delete ($httpData)
     {
+        $result = new stdClass();
         $rows = G::json_decode( stripslashes( $httpData->rows ) );
         $errors = '';
         $count = 0;
@@ -735,6 +738,7 @@ class pmTablesProxy extends HttpProxyController
     {
         require_once 'classes/model/AdditionalTables.php';
         try {
+            $result = new stdClass();
             $errors = '';
 
             $overWrite = isset( $_POST['form']['OVERWRITE'] ) ? true : false;
@@ -962,6 +966,7 @@ class pmTablesProxy extends HttpProxyController
 
             $result->message = $msg;
         } catch (Exception $e) {
+            $result = new stdClass();
             $result->errorType = 'error';
             $result->buildResult = ob_get_contents();
             ob_end_clean();
@@ -993,6 +998,7 @@ class pmTablesProxy extends HttpProxyController
         $tablesToExport = G::json_decode( stripslashes( $httpData->rows ) );
 
         try {
+            $result = new stdClass();
             G::LoadCLass( 'net' );
             $net = new NET( G::getIpAddress() );
 
@@ -1093,6 +1099,7 @@ class pmTablesProxy extends HttpProxyController
             $result->link = $link;
             $result->message = "Generated file: $filenameOnly, size: $size";
         } catch (Exception $e) {
+            $result = new stdClass();
             $result->success = false;
             $result->message = $e->getMessage();
         }
@@ -1225,6 +1232,7 @@ class pmTablesProxy extends HttpProxyController
 
     public function genDataReport ($httpData)
     {
+        $result = new stdClass();
         G::loadClass( 'pmTable' );
         require_once 'classes/model/AdditionalTables.php';
         $result->message = '';

From d35466aa64c1b43dc7076d630331aa980d782f83 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 19 Mar 2014 15:20:39 -0400
Subject: [PATCH 44/54] BUG-13914 Browser not recognizing PDF Output Document

New feature added in Output Document Properties and new column added in OUTPUT DOCUMENT table.
---
 workflow/engine/classes/model/map/OutputDocumentMapBuilder.php | 1 +
 workflow/engine/classes/model/om/BaseOutputDocument.php        | 1 +
 workflow/engine/classes/model/om/BaseOutputDocumentPeer.php    | 1 +
 workflow/engine/config/schema.xml                              | 2 --
 workflow/engine/data/mssql/schema.sql                          | 1 +
 workflow/engine/data/mysql/schema.sql                          | 1 +
 workflow/engine/data/oracle/schema.sql                         | 3 ++-
 workflow/engine/methods/cases/cases_ShowOutputDocument.php     | 1 +
 workflow/engine/xmlform/outputdocs/outputdocs_Properties.html  | 1 -
 workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml   | 3 ++-
 10 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
index 0e58314b5..75e5cfb5e 100755
--- a/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
+++ b/workflow/engine/classes/model/map/OutputDocumentMapBuilder.php
@@ -7,6 +7,7 @@ include_once 'creole/CreoleTypes.php';
 /**
  * This class adds structure of 'OUTPUT_DOCUMENT' table to 'workflow' DatabaseMap object.
  *
+ *
  * These statically-built map classes are used by Propel to do runtime db structure discovery.
  * For example, the createSelectSql() method checks the type of a given column used in an
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
diff --git a/workflow/engine/classes/model/om/BaseOutputDocument.php b/workflow/engine/classes/model/om/BaseOutputDocument.php
index 7dd743e4b..73dfa9c0b 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocument.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocument.php
@@ -12,6 +12,7 @@ include_once 'classes/model/OutputDocumentPeer.php';
  * Base class that represents a row from the 'OUTPUT_DOCUMENT' table.
  * 
  *
+ *
  * @package    workflow.classes.model.om
  */
 abstract class BaseOutputDocument extends BaseObject implements Persistent
diff --git a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
index 2d068d262..aafaaa4ef 100755
--- a/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
+++ b/workflow/engine/classes/model/om/BaseOutputDocumentPeer.php
@@ -9,6 +9,7 @@ include_once 'classes/model/OutputDocument.php';
  * Base static class for performing query and update operations on the 'OUTPUT_DOCUMENT' table.
  * 
  *
+ *
  * @package    workflow.classes.model.om
  */
 abstract class BaseOutputDocumentPeer
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 3bd8fb84c..d768368e3 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -740,7 +740,6 @@
     <column name="LEX_VALUE" type="VARCHAR" size="128" required="true" default=""/>
     <column name="LEX_CAPTION" type="VARCHAR" size="128" required="true" default=""/>
   </table>
-  
   <table name="OUTPUT_DOCUMENT">
     <vendor type="mysql">
       <parameter name="Name" value="OUTPUT_DOCUMENT"/>
@@ -798,7 +797,6 @@
       <rule name="validValues" value="HTML|ITEXT|JRXML|ACROFORM" message="Please select a valid Output Document Type."/>
     </validator>
   </table>
-
   <table name="PROCESS">
     <vendor type="mysql">
       <parameter name="Name" value="PROCESS"/>
diff --git a/workflow/engine/data/mssql/schema.sql b/workflow/engine/data/mssql/schema.sql
index 4fcda9090..04264711d 100755
--- a/workflow/engine/data/mssql/schema.sql
+++ b/workflow/engine/data/mssql/schema.sql
@@ -852,6 +852,7 @@ CREATE TABLE [OUTPUT_DOCUMENT]
 	[OUT_DOC_PDF_SECURITY_OPEN_PASSWORD] VARCHAR(32) default '' NULL,
 	[OUT_DOC_PDF_SECURITY_OWNER_PASSWORD] VARCHAR(32) default '' NULL,
 	[OUT_DOC_PDF_SECURITY_PERMISSIONS] VARCHAR(150) default '' NULL,
+	[OUT_DOC_OPEN_TYPE] INT default 0 NULL,
 	CONSTRAINT OUTPUT_DOCUMENT_PK PRIMARY KEY ([OUT_DOC_UID])
 );
 
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index a603ce18d..b51457a24 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -374,6 +374,7 @@ CREATE TABLE `OUTPUT_DOCUMENT`
 	`OUT_DOC_PDF_SECURITY_OPEN_PASSWORD` VARCHAR(32) default '',
 	`OUT_DOC_PDF_SECURITY_OWNER_PASSWORD` VARCHAR(32) default '',
 	`OUT_DOC_PDF_SECURITY_PERMISSIONS` VARCHAR(150) default '',
+	`OUT_DOC_OPEN_TYPE` INTEGER default 0,
 	PRIMARY KEY (`OUT_DOC_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
diff --git a/workflow/engine/data/oracle/schema.sql b/workflow/engine/data/oracle/schema.sql
index 21c1e0227..6a5cba79e 100755
--- a/workflow/engine/data/oracle/schema.sql
+++ b/workflow/engine/data/oracle/schema.sql
@@ -470,7 +470,8 @@ CREATE TABLE "OUTPUT_DOCUMENT"
 	"OUT_DOC_PDF_SECURITY_ENABLED" NUMBER(3,0) default 0,
 	"OUT_DOC_PDF_SECURITY_OPEN_PASSWORD" VARCHAR2(32) default '',
 	"OUT_DOC_PDF_SECURITY_OWNER_PASSWORD" VARCHAR2(32) default '',
-	"OUT_DOC_PDF_SECURITY_PERMISSIONS" VARCHAR2(150) default ''
+	"OUT_DOC_PDF_SECURITY_PERMISSIONS" VARCHAR2(150) default '',
+	"OUT_DOC_OPEN_TYPE" NUMBER default 0
 );
 
 	ALTER TABLE "OUTPUT_DOCUMENT"
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index 515c1535a..61e7e667c 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -36,6 +36,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
  *
  * Created on 13-02-2008
  *
+ *
  * @author David Callizaya <davidsantos@colosa.com>
  */
 
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
index f5b309e46..5ddcafa58 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.html
@@ -126,7 +126,6 @@
                   </tr>
                   <tr>
                     <td class="FormLabel" width="{$form_labelWidth}">{$OUT_DOC_OPEN_TYPE}</td>
-                    <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.OUT_DOC_OPEN_TYPE} </td>  //-->
                     <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.OUT_DOC_OPEN_TYPE}</td>
                   </tr>
                   <tr>
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
index 408d7acd1..68bc82010 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
@@ -116,6 +116,7 @@
 </ACCEPT>
 
 <JS type="JavaScript"><![CDATA[
+
 var _oVarsPanel_;
 var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
   _oVarsPanel_ = new leimnud.module.panel();
@@ -196,7 +197,6 @@ var verifyTitle = function(oForm)
 
 }
 
-
 function cancel(){
     currentPopupWindow.remove();
 }
@@ -231,5 +231,6 @@ leimnud.event.add(getField('OUT_DOC_GENERATE'), 'change', function() {
 
 showPdfSecuritySwitch();
 togglePDFSecurity();
+
 ]]></JS>
 </dynaForm>
\ No newline at end of file

From 05dd7adfc80f83b9fb1a8033d39548f0518fdf63 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 21 Mar 2014 12:53:37 -0400
Subject: [PATCH 45/54] BUG 14273 "Error al ejecutar los eventos con..." SOLVED

- Error al ejecutar los eventos con PMFSendMessage.
- El bug NO se replica, se ha verificado en el branch master donde se importo el proceso adjunto se hizo correr el caso
  y al ejecutar el "cron" no muestra ningun error como en la imagen adjunta, se siguio los pasos que se menciona en el bug.

  Revisando los triggers del proceso adjunto se observo que la funcion PMFgetUserEmailAddress no existe en las Funciones
  que proporciona Processmaker. Se corrige el nombre de la funcion: PMFgetUserEmailAddress por PMFGetUserEmailAddress.
---
 workflow/engine/templates/events/sendMessage.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/templates/events/sendMessage.tpl b/workflow/engine/templates/events/sendMessage.tpl
index f3fa7a1cc..08b694f5f 100755
--- a/workflow/engine/templates/events/sendMessage.tpl
+++ b/workflow/engine/templates/events/sendMessage.tpl
@@ -1,6 +1,6 @@
 /*
  * Autogenerated by Processmaker Daemon System
- * 
+ *
  * Generic Send Message trigger
  * {timestamp}
  */
@@ -9,11 +9,11 @@ $sRecipientTO  = "{TO}";
 $sRecipientCC  = "{CC}";
 $sRecipientBCC = "{BCC}";
 
-/*Composing the message using PMFgetUserEmailAddress() PM function*/
+/*Composing the message using PMFGetUserEmailAddress() PM function*/
 $from     = '{from}';
-$to       = PMFgetUserEmailAddress($sRecipientTO,  @@APPLICATION);
-$cc       = PMFgetUserEmailAddress($sRecipientCC,  @@APPLICATION);
-$bcc      = PMFgetUserEmailAddress($sRecipientBCC, @@APPLICATION);
+$to       = PMFGetUserEmailAddress($sRecipientTO,  @@APPLICATION);
+$cc       = PMFGetUserEmailAddress($sRecipientCC,  @@APPLICATION);
+$bcc      = PMFGetUserEmailAddress($sRecipientBCC, @@APPLICATION);
 $subject  = '{subject}';
 $template = '{template}';
 

From fb17e03909474372270cd3c47ec261429c57e31e Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Mon, 24 Mar 2014 12:42:09 -0400
Subject: [PATCH 46/54] Improvement validation report tables in designer

---
 workflow/engine/templates/pmTables/list.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js
index 5c8753886..227d81281 100755
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -439,7 +439,7 @@ EditPMTable = function(){
     if (row.data.TYPE != 'CLASSIC') {
       tableType = row.data.PRO_UID ? 'report' : 'table';
       proParam = PRO_UID !== false ? '&PRO_UID='+PRO_UID : '';
-      location.href = 'pmTables/edit?id='+row.data.ADD_TAB_UID+'&tableType=' + tableType + proParam;
+      location.href = 'pmTables/edit?id='+row.data.ADD_TAB_UID+'&flagProcessmap='+flagProcessmap+'&tableType=' + tableType + proParam;
     }
     else { //edit old report table
       location.href = 'reportTables/reportTables_Edit?REP_TAB_UID='+row.data.ADD_TAB_UID
@@ -488,6 +488,10 @@ DeletePMTable = function() {
             Ext.Msg.alert( _('ID_ERROR'), resp.result.message);
           }
         });
+        editButton.disable();
+        deleteButton.disable();
+        exportButton.disable();
+        dataButton.disable();
       }
     }
   );

From bf3151951f52bdab43bb98e053e57966ea6b757d Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 25 Mar 2014 15:26:05 -0400
Subject: [PATCH 47/54] BUG 14130 "Date is not showing correctly in..." SOLVED

- Date is not showing correctly in process map with unread new cases
- Problema resuelto, cuando un Supervisor de Procesos revisa el estado del proceso con los casos no leidos en
  HOME>PROCESS SUPERVISOR>REVIEW, click en "Information" seleccionando la opcion "Process map", en el popup se
  mostraba en el label "Init Date" con la fecha de "1969-12-31" dando a confusion.
  Se corrige y en su lugar se muestra el mensaje "Case not yet started".
---
 workflow/engine/xmlform/cases/cases_TaskDetails.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/xmlform/cases/cases_TaskDetails.xml b/workflow/engine/xmlform/cases/cases_TaskDetails.xml
index 469ba64f3..3d9cb9c8a 100755
--- a/workflow/engine/xmlform/cases/cases_TaskDetails.xml
+++ b/workflow/engine/xmlform/cases/cases_TaskDetails.xml
@@ -9,11 +9,11 @@
   <en>User</en>
 </USER>
 
-<INIT_DATE type="date" mode="view">
+<INIT_DATE type="text" mode="view">
   <en>Init Date</en>
 </INIT_DATE>
 
-<DUE_DATE type="date" mode="view">
+<DUE_DATE type="text" mode="view">
   <en>Due date</en>
 </DUE_DATE>
 
@@ -25,4 +25,4 @@
   <en>Duration</en>
 </DURATION>
 
-</dynaForm>  
\ No newline at end of file
+</dynaForm>
\ No newline at end of file

From 7bc29a03ea6e1b13e326dc7c97f9a9e43220e1d3 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Wed, 26 Mar 2014 17:11:58 -0400
Subject: [PATCH 48/54] BUG 14102 "La tabla LOGIN_LOG almacena el ip errado."
 SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- La tabla LOGIN_LOG almacena el ip errado
- Problema resuelto, se registra el ip utilizando el metodo getIpAddress().
  Disponible para la versió.5.3 de ProcessMaker.
---
 workflow/engine/methods/login/authentication.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 04e9138fb..1752c0995 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -195,10 +195,12 @@ try {
 
     /**log in table Login**/
     require_once 'classes/model/LoginLog.php';
+    $g = new G();
+
     $weblog=new LoginLog();
     $aLog['LOG_UID']            = G::generateUniqueID();
     $aLog['LOG_STATUS']         = 'ACTIVE';
-    $aLog['LOG_IP']             = $_SERVER['REMOTE_ADDR'];
+    $aLog['LOG_IP']             = $g->getIpAddress();
     $aLog['LOG_SID']            = session_id();
     $aLog['LOG_INIT_DATE']      = date('Y-m-d H:i:s');
     //$aLog['LOG_END_DATE']       = '0000-00-00 00:00:00';

From b12c61f1703ccd54aa962667d4f3eddd00c2b1b9 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 27 Mar 2014 10:09:35 -0400
Subject: [PATCH 49/54] BUG 14102 "La tabla LOGIN_LOG almacena el ip errado."
 SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- La tabla LOGIN_LOG almacena el ip errado
- Problema resuelto, se registra el ip utilizando el metodo getIpAddress().
  Disponible para la versió.5.3 de ProcessMaker.
---
 gulliver/system/class.g.php                      | 2 +-
 workflow/engine/methods/login/authentication.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 13d8d07d4..fa5417356 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -177,7 +177,7 @@ class G
      * getIpAddress
      * @return string $ip
      */
-    public function getIpAddress ()
+    public static function getIpAddress ()
     {
         if (getenv( 'HTTP_CLIENT_IP' )) {
             $ip = getenv( 'HTTP_CLIENT_IP' );
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 1752c0995..96e7ab427 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -195,12 +195,10 @@ try {
 
     /**log in table Login**/
     require_once 'classes/model/LoginLog.php';
-    $g = new G();
-
     $weblog=new LoginLog();
     $aLog['LOG_UID']            = G::generateUniqueID();
     $aLog['LOG_STATUS']         = 'ACTIVE';
-    $aLog['LOG_IP']             = $g->getIpAddress();
+    $aLog['LOG_IP']             = G::getIpAddress();
     $aLog['LOG_SID']            = session_id();
     $aLog['LOG_INIT_DATE']      = date('Y-m-d H:i:s');
     //$aLog['LOG_END_DATE']       = '0000-00-00 00:00:00';

From ac94b41cdd26b6267d61ee844730efe750496abe Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 27 Mar 2014 11:20:19 -0400
Subject: [PATCH 50/54] add id's

---
 gulliver/js/ext/pmos-common.js             |  4 ++++
 workflow/engine/templates/pmTables/data.js |  2 ++
 workflow/engine/templates/pmTables/list.js | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js
index 288569aa5..e6978ca33 100755
--- a/gulliver/js/ext/pmos-common.js
+++ b/gulliver/js/ext/pmos-common.js
@@ -15,6 +15,7 @@ PMExtJSCommon = function() {
 
   this.info = function(title, msg, fn) {
     Ext.MessageBox.show({
+      id: 'infoMessageBox',
       title: title,
       msg: msg,
       buttons: Ext.MessageBox.OK,
@@ -26,6 +27,7 @@ PMExtJSCommon = function() {
 
   this.question = function(title, msg, fn) {
     Ext.MessageBox.show({
+      id: 'questionMessageBox',
       title: title,
       msg: msg,
       buttons: Ext.MessageBox.YESNO,
@@ -40,6 +42,7 @@ PMExtJSCommon = function() {
 
   this.warning = function(title, msg, fn) {
     Ext.MessageBox.show({
+      id: 'warningMessageBox',
       title: title,
       msg: msg,
       buttons: Ext.MessageBox.OK,
@@ -51,6 +54,7 @@ PMExtJSCommon = function() {
 
   this.error = function(title, msg, fn) {
     Ext.MessageBox.show({
+      id: 'errorMessageBox',
       title: title,
       msg: msg,
       buttons: Ext.MessageBox.OK,
diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js
index fa5ec31d3..e50711417 100755
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -559,6 +559,7 @@ ImportPMTableCSV = function(){
                                     [',', 'Comma (,)']]
                        });
   var w = new Ext.Window({
+    id: 'windowImportUploader',
     title       : '',
     width       : 440,
     height      : 180,
@@ -672,6 +673,7 @@ ExportPMTableCSV = function(){
                                     [',', 'Comma (,)']]
                        });
   var w = new Ext.Window({
+    id: 'windowExportUploader',
     title       : '',
     width       : 320,
     height      : 140,
diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js
index 227d81281..9a46f9329 100755
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -62,12 +62,14 @@ Ext.onReady(function(){
     }
 
     newButton = new Ext.Action({
+      id: 'newButton',
       text: _('ID_NEW'),
       icon: '/images/add-table.png',
       menu: newMenuOptions
     });
 
     editButton = new Ext.Action({
+      id: 'editButton',
       text: _('ID_EDIT'),
       icon: '/images/edit-table.png',
       handler: EditPMTable,
@@ -75,6 +77,7 @@ Ext.onReady(function(){
     });
 
     deleteButton = new Ext.Action({
+      id: 'deleteButton',
       text: _('ID_DELETE'),
       icon: '/images/delete-table.png',
       handler: DeletePMTable,
@@ -82,6 +85,7 @@ Ext.onReady(function(){
     });
 
     importButton = new Ext.Action({
+      id: 'importButton',
       text: _('ID_IMPORT'),
       iconCls: 'silk-add',
       icon: '/images/import.gif',
@@ -89,6 +93,7 @@ Ext.onReady(function(){
     });
 
     exportButton = new Ext.Action({
+      id: 'exportButton',
       text: _('ID_EXPORT'),
       iconCls: 'silk-add',
       icon: '/images/export.png',
@@ -97,6 +102,7 @@ Ext.onReady(function(){
     });
 
     dataButton = new Ext.Action({
+      id: 'dataButton',
       text: '&nbsp;' + _('ID_DATA'),
       iconCls: 'silk-add',
       icon: '/images/database-start.png',
@@ -105,6 +111,7 @@ Ext.onReady(function(){
     });
 
     searchButton = new Ext.Action({
+      id: 'searchButton',
       text: _('ID_SEARCH'),
       handler: DoSearch
     });
@@ -162,6 +169,7 @@ Ext.onReady(function(){
     });
 
     clearTextButton = new Ext.Action({
+      id: 'clearTextButton',
       text: 'X',
       ctCls:'pm_search_x_button',
       handler: GridByDefault
@@ -174,6 +182,7 @@ Ext.onReady(function(){
     });
 
     comboPageSize = new Ext.form.ComboBox({
+      id: 'comboPageSize',
       typeAhead     : false,
       mode          : 'local',
       triggerAction : 'all',
@@ -306,6 +315,7 @@ Ext.onReady(function(){
     });
 
     bbarpaging = new Ext.PagingToolbar({
+        id: 'bbarpaging',
         pageSize: pageSize,
         store: store,
         displayInfo: true,
@@ -501,6 +511,7 @@ DeletePMTable = function() {
 ImportPMTable = function(){
 
   var w = new Ext.Window({
+    id: 'windowPmTableUploaderImport',
     title: '',
     width: 420,
     height: 160,
@@ -535,12 +546,14 @@ ImportPMTable = function(){
                 iconCls: 'upload-icon'
             }
         }, {
+          id: 'importPMTableOverwrite',
           xtype: 'checkbox',
           fieldLabel: '',
           boxLabel: _('ID_OVERWRITE_EXIST'), // 'Overwrite if exists?',
           name: 'form[OVERWRITE]'
         }],
         buttons: [{
+            id: 'importPMTableButtonUpload',
             text: _('ID_UPLOAD'),
             handler: function(){
               var uploader = Ext.getCmp('uploader');
@@ -558,6 +571,7 @@ ImportPMTable = function(){
                     }
                     else {
                       win = new Ext.Window({
+                        id: 'windowImportingError',
                         applyTo:'hello-win',
                         layout:'fit',
                         width:500,
@@ -602,6 +616,7 @@ ImportPMTable = function(){
               uploader.getForm().reset();
             }
         }*/,{
+            id: 'importPMTableButtonCancel',
             text: TRANSLATIONS.ID_CANCEL,
             handler: function(){
               w.close();
@@ -646,6 +661,7 @@ PMTableData = function()
   }
 
   win = new Ext.Window({
+    id: 'windowPmtablesReportTable',
     layout: 'fit',
     width: 700,
     height: 400,

From 97621d326788ee670601e8d10bd2770a456a0fa9 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 27 Mar 2014 16:29:05 -0400
Subject: [PATCH 51/54] BUG 14325 "When using the variable picker, the..."
 SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- When using the variable picker, the system variable option shows all variables including dyanform variables
- Problema resuelto,  al aplicar el selector de variables y al seleccionar la opcion "System" del dropdown "Type Variable",
  se mostrara las variables del sistema.
  Disponible para la versió.5.3 de ProcessMaker.
---
 .../methods/processes/processes_Ajax.php      | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 775f310e8..e8bb90191 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -552,15 +552,30 @@ try {
                 $aFields = getDynaformsVars($proUid, $isSystem, isset($_REQUEST['bIncMulSelFields']) ? $_REQUEST['bIncMulSelFields'] : 1);
             }
             $aVariables = array();
-            foreach ($aFields as $key => $value) {
-                if ($queryText != '') {
-                    if (stristr($aFields[$key]['sName'], $queryText)) {
+
+            if ($queryText != "") {
+                foreach ($aFields as $key => $value) {
+                    if (stristr($aFields[$key]["sName"], $queryText)) {
                         $aVariables[] = $aFields[$key];
                     }
-                } else {
-                    $aVariables[] = $aFields[$key];
+                }
+            } else {
+                switch ($_REQUEST["type"]) {
+                    case "system" :
+                        foreach ($aFields as $key => $value) {
+                            if ($aFields[$key]["sType"] == "system") {
+                                $aVariables[] = $aFields[$key];
+                            }
+                        }
+                        break;
+                    default :
+                        foreach ($aFields as $key => $value) {
+                            $aVariables[] = $aFields[$key];
+                        }
+                        break;
                 }
             }
+
             echo Bootstrap::json_encode($aVariables);
             break;
             /**

From 25093705fb20bbb97ee93a543c86dacef5487137 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Fri, 28 Mar 2014 16:34:15 -0400
Subject: [PATCH 52/54] BUG 12394 "Cabecera se pierde en Chrome Browser" SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 12394: Cabecera se pierde en Chrome Browser.
- Problema resuelto, en el diseñr de dynaforms en el Tab "Fields handler" y "Preview" al hacer click en la opcion
  ayuda (?),  el menu de processmaker NO se desborda.
  Disponible para la versió.5.3 de ProcessMaker.
---
 gulliver/system/class.xmlform.php                     | 4 ++--
 workflow/engine/templates/dynaforms/fieldsHandler.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 617d497f6..72bf44aa7 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -854,7 +854,7 @@ class XmlForm_Field
     public function NSGridType ($show = false)
     {
         $igt = 'pm:gridtype="' . $this->gridFieldType . '"';
-        
+
         if ($show) {
             return $igt;
         } else {
@@ -892,7 +892,7 @@ class XmlForm_Field
     {
         $_outHint = '';
         if ($this->hint != '' && $this->mode == 'edit') {
-            $_outHint = '<a href="#" onmouseout="hideTooltip()" onmouseover="showTooltip(event, \'' . $this->hint . '\');return false;">
+            $_outHint = '<a href="#" onclick="return false;" onmouseout="hideTooltip()" onmouseover="showTooltip(event, \'' . $this->hint . '\');return false;">
                      <image src="/images/help4.gif" width="13" height="13" border="0"/>
                    </a>';
         }
diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php
index ecc665d7c..db984e499 100755
--- a/workflow/engine/templates/dynaforms/fieldsHandler.php
+++ b/workflow/engine/templates/dynaforms/fieldsHandler.php
@@ -87,7 +87,7 @@
 	<table border="0" width="100%" cellpadding="0" cellspacing="0" class="fieldshandler_item">
 	<tr>
 	<td width="15%"  valign="top" align="left">
-	     <a href='#' onmouseout="parent.hideTooltip()" onmouseover="parent.showTooltip(event,document.getElementById('help').innerHTML);return false;">
+	     <a href='#' onclick="return false;" onmouseout="parent.hideTooltip()" onmouseover="parent.showTooltip(event,document.getElementById('help').innerHTML);return false;">
 	 	    <image src="/images/help4.gif" width="16" height="16" border="0"/>
 	 	 </a>
 	</td>

From 3ef4c6e9fec298932f4bf1431e9f9686dc6664aa Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 1 Apr 2014 11:45:54 -0400
Subject: [PATCH 53/54] BUG-14386 Fechas en idioma espaniol en Windows server

Se condiciono setlocale() de acuerdo a la variable PARTNER FLAG
---
 workflow/engine/classes/class.configuration.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php
index 54105f2d6..0030f940c 100755
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -596,9 +596,14 @@ class Configurations // extends Configuration
                             break;
                     }
                 }
-
-                setlocale(LC_TIME, $langLocate);
-                $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)));
+                
+                if (defined('PARTNER_FLAG')) {
+                    setlocale(LC_TIME, $langLocate);
+                    $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)));
+                } else {
+                    setlocale(LC_TIME, $langLocate . ".utf8");
+                    $dateTime = strftime($newCreation, mktime($h, $i, $s, $m, $d, $y));
+                }
 
                 if (strpos($dateTime, ' ') !== false) {
                     $dateTime = ucwords($dateTime);

From a8d320f8be9bac36fc33893e16b6d145846d3050 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 1 Apr 2014 15:06:11 -0400
Subject: [PATCH 54/54] BUG 14431 "Titulo de caso se distorsiona..." SOLVED

- Titulo de caso se distorsiona si se usa caracteres en el nombre
- Problema resuelto, al adicionar el titulo del caso por un campo dynaform con caracteres especiales en el inbox en las
  columnas "Case" y "Case Notes" ya NO se distorsionan.
  Disponible para la version 2.5.3 de ProcessMaker.
---
 workflow/engine/templates/cases/casesList.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js
index 10ccbd145..b8d99fd39 100644
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -483,8 +483,10 @@ Ext.onReady ( function() {
         style = style + chain;
       }
     }
+
+    data = Ext.util.Format.htmlEncode(data);
     metadata.attr = 'ext:qtip="' + data + '" style="'+ style +' white-space: normal; "';
-    return Ext.util.Format.htmlEncode(data);
+    return data;
   };
 
   function openLink(value, p, r){
@@ -545,9 +547,9 @@ Ext.onReady ( function() {
   function renderNote(val,p,r) {
     pro = r.json.PRO_UID;
     tas = r.json.TAS_UID;
-
     appUid = r.data['APP_UID'];
-    title  = r.data['APP_TITLE'];
+    title = Ext.util.Format.htmlEncode(r.data['APP_TITLE']);
+
     return '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ICON_CASES_NOTES" unselectable="off" id="extdd-17" onClick="openCaseNotesWindow(\''+appUid+'\', true, \''+title+'\', \''+pro+'\', \''+tas+'\')">';
   }