From e10a1ec3831bd644235f14832fe6992e4cc8352f Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 25 Jun 2013 13:50:38 -0400
Subject: [PATCH 01/22] BUG-8665 32K Issue - Maximum of folder in
 shared/sites/files IMPROVEMENT

- No se modificaba la estructura porque no se tenia seteado la variable ENVIRONMENT_SETTINGS.
- Se modifico la funcion upgradeCasesDirectoryStructure para que cree la variable si no existe.
- Se movio la funcion upgradeCasesDirectoryStructure para que sea independiente al realizar el upgrade.
- se creo la funcion update-structure-directories para ejecutar por consola teniendo como parametro el workspace.
---
 workflow/engine/bin/tasks/cliWorkspaces.php | 32 ++++++++++++++++++++-
 workflow/engine/classes/class.wsTools.php   | 17 +++++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 661396509..c922b89cd 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -160,6 +160,18 @@ EOT
 CLI::taskArg('workspace-name', true, true);
 CLI::taskRun(run_translation_upgrade);
 
+CLI::taskName('update-structure-directories');
+CLI::taskDescription(<<<EOT
+  Updating the structure directories of a workspaces
+
+  Specify the WORKSPACE to updating to a different workspace name.
+EOT
+);
+//CLI::taskArg('workspace', true);
+CLI::taskOpt("workspace", "Select which workspace to updating the structure of directories, if multiple workspaces are present in the archive.",
+             "w:", "workspace=");
+CLI::taskRun(runStructureDirectories);
+
   /**
    * Function run_info
    * access public
@@ -460,4 +472,22 @@ function run_workspace_restore($args, $opts) {
   }
 }
 
-?>
+function runStructureDirectories($command, $args) {
+    $workspaces = get_workspaces_from_args($command);
+    $count = count($workspaces);
+    $errors = false;
+    $countWorkspace = 0;
+    foreach ($workspaces as $index => $workspace) {
+        try {
+            $countWorkspace++;
+            CLI::logging("Updating workspaces ($countWorkspace/$count): " . CLI::info($workspace->name) . "\n");
+            $workspace->updateStructureDirectories($workspace->name);
+            $workspace->close();
+        } catch (Exception $e) {
+            CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
+            $errors = true;
+        }
+    }
+}
+
+
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index bafa964fd..1cbc00d91 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -89,7 +89,14 @@ class workspaceTools
         $stop = microtime(true);
         $final = $stop - $start;
         CLI::logging("<*>   Updating cache view Process took $final seconds.\n");
+    }
 
+    /**
+     * Updating cases directories structure
+     *
+     */
+    public function updateStructureDirectories($workSpace = SYS_SYS)
+    {
         $start = microtime(true);
         CLI::logging("> Updating cases directories structure...\n");
         $this->upgradeCasesDirectoryStructure($workSpace);
@@ -583,13 +590,11 @@ class workspaceTools
         $this->initPropel(true);
         G::LoadClass("configuration");
         $conf = new Configurations();
-        if ($conf->exists("ENVIRONMENT_SETTINGS")) {
-            $conf->setDirectoryStructureVer(2);
-            CLI::logging(CLI::info("Version Directory Structure is 2 now.\n"));
-        } else {
-            CLI::logging(CLI::error("Error: found at try to use ENVIRONMENT_SETTINGS row.\n"));
-            return;
+        if (!$conf->exists("ENVIRONMENT_SETTINGS")) {
+            $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' );
         }
+        $conf->setDirectoryStructureVer(2);
+        CLI::logging(CLI::info("Version Directory Structure is 2 now.\n"));
     }
 
     /**

From 85367b82720150d04fbfb3aa8272b53ce57c58df Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 25 Jun 2013 14:36:02 -0400
Subject: [PATCH 02/22] BUG-8665 32K Issue - Maximum of folder in
 shared/sites/files IMPROVEMENT

- No se modificaba la estructura porque no se tenia seteado la variable ENVIRONMENT_SETTINGS.
- Se modifico la funcion upgradeCasesDirectoryStructure para que cree la variable si no existe.
- Se movio la funcion upgradeCasesDirectoryStructure para que sea independiente al realizar el upgrade.
- se creo la funcion update-structure-directories para ejecutar por consola teniendo como parametro el workspace.
---
 workflow/engine/bin/tasks/cliWorkspaces.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index c922b89cd..f28e8efbf 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -160,15 +160,15 @@ EOT
 CLI::taskArg('workspace-name', true, true);
 CLI::taskRun(run_translation_upgrade);
 
-CLI::taskName('update-structure-directories');
+CLI::taskName('migrate-cases-folders');
 CLI::taskDescription(<<<EOT
-  Updating the structure directories of a workspaces
+  Migrating cases folders of the workspaces
 
-  Specify the WORKSPACE to updating to a different workspace name.
+  Specify the WORKSPACE to migrate from a existing workspace.
 EOT
 );
 //CLI::taskArg('workspace', true);
-CLI::taskOpt("workspace", "Select which workspace to updating the structure of directories, if multiple workspaces are present in the archive.",
+CLI::taskOpt("workspace", "Select which workspace to migrate the cases folders, if multiple workspaces are present in the server.",
              "w:", "workspace=");
 CLI::taskRun(runStructureDirectories);
 

From cccf288b9c29aa1326079d631d9acb28f5ab2296 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 25 Jun 2013 15:04:44 -0400
Subject: [PATCH 03/22] BUG-12257 No es posible crear un Report Table-New
 Version... SOLVED

- El valor del PRO_UID no fue inicializado.
- Se captura el valor para iniciar el PRO_UID.
---
 workflow/engine/templates/pmTables/editReport.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index 44dd9b251..e0649868b 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -979,9 +979,10 @@ function createReportTable()
     });
     return false;
   }
-  
+
   //validate process
-  if(Ext.getCmp('PROCESS').getValue().trim() == '') {
+  PRO_UID = PRO_UID !== false ? PRO_UID : ((Ext.getCmp('PROCESS').getValue().trim() != '') ? Ext.getCmp('PROCESS').getValue().trim() : '')
+  if(PRO_UID == '') {
     Ext.getCmp('PROCESS').focus();
     PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
       Ext.getCmp('PROCESS').focus();

From 795c06c5ee5c0ba83c78e15122d6eee83af00e99 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Tue, 25 Jun 2013 15:19:02 -0400
Subject: [PATCH 04/22] BUG-12257 No es posible crear un Report Table-New
 Version... SOLVED

- El valor del PRO_UID no fue inicializado.
- Se captura el valor para iniciar el PRO_UID.
---
 .../engine/templates/pmTables/editReport.js    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index e0649868b..2f081a942 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -980,15 +980,15 @@ function createReportTable()
     return false;
   }
 
-  //validate process
-  PRO_UID = PRO_UID !== false ? PRO_UID : ((Ext.getCmp('PROCESS').getValue().trim() != '') ? Ext.getCmp('PROCESS').getValue().trim() : '')
-  if(PRO_UID == '') {
-    Ext.getCmp('PROCESS').focus();
-    PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
-      Ext.getCmp('PROCESS').focus();
-    });
-    return false;
-  }
+    //validate process
+    PRO_UID = (PRO_UID !== false) ? PRO_UID : ((Ext.getCmp('PROCESS').getValue().trim() != '') ? Ext.getCmp('PROCESS').getValue().trim() : '');
+    if(PRO_UID == '') {
+        Ext.getCmp('PROCESS').focus();
+        PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
+            Ext.getCmp('PROCESS').focus();
+        });
+        return false;
+    }
 
   // validate table name length
   if(tableName.length < 4) {

From ed825c4f817d15a5abd78ca7953e13d7d57a478b Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 25 Jun 2013 16:59:15 -0400
Subject: [PATCH 05/22] BUG 11068 Intermediate Message Event Does not fire on
 first Task in Sub Process IMPROVEMENT

- El bug se debe a un cambio originado para la validacion de los botones submit (evitar que se haga submit 2 veces)

- Se agregaron las validaciones correspondientes para que no de problemas con la nueva validacion
---
 gulliver/js/form/core/form.js                            | 2 +-
 gulliver/js/maborak/core/maborak.js                      | 4 ++--
 gulliver/templates/xmlform.html                          | 1 +
 workflow/engine/templates/filterform.html                | 3 ++-
 workflow/engine/templates/form.html                      | 1 +
 workflow/engine/templates/xmlform.html                   | 1 +
 workflow/engine/templates/xmlformScript.html             | 1 +
 workflow/engine/templates/xmlform_preview.html           | 1 +
 workflow/engine/xmlform/dynaforms/fields_Toolbar.xml     | 4 ++--
 workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml | 4 ++--
 10 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 0463d8107..73c9e49e5 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -3294,7 +3294,7 @@ var saveAndRefreshForm = function(oObject) {
 var sessionPersits = function() {
     var rpc = new leimnud.module.rpc.xmlhttp({
         url: '../services/sessionPersists',
-        args: 'dynaformRestoreValues=' + __dynaformSVal__,
+        args: 'dynaformRestoreValues=' + (typeof(__dynaformSVal__) != 'undefined' ? __dynaformSVal__ : ''),
         async: false
     });
     rpc.make();
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index 4e369bfc0..cd1a3452b 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1232,7 +1232,7 @@ else{var arrayForm=document.getElementsByTagName("form");var inputAux;var id="";
 var arrayLink=frm.getElementsByTagName("a");for(i2=0;i2<=arrayLink.length-1;i2++){var link=arrayLink[i2];if(typeof link.id!="undefined"&&link.id!=""&&link.id!="form[DYN_BACKWARD]"&&link.id!="form[DYN_FORWARD]"){var strHtml=link.parentNode.innerHTML;strHtml=stringReplace("\\x0A","",strHtml);strHtml=stringReplace("\\x0D","",strHtml);strHtml=stringReplace("\\x09","",strHtml);if(/^.*pm:field.*$/.test(strHtml)){id=link.id+"_";if(!document.getElementById(id)){var strAux=link.id.replace("form[","");strAux=strAux.substring(0,strAux.length-1);inputAux=document.createElement("input");inputAux.type="hidden";inputAux.id=id;inputAux.name=link.id;inputAux.value=link.href;frm.appendChild(inputAux);inputAux=document.createElement("input");inputAux.type="hidden";inputAux.id=id+"label";inputAux.name="form["+strAux+"_label]";inputAux.value=link.innerHTML;frm.appendChild(inputAux);}}}}}
 return true;}}else{return false;}};var getObject=function(sObject){var i;var oAux=null;var iLength=__aObjects__.length;for(i=0;i<iLength;i++){oAux=__aObjects__[i].getElementByName(sObject);if(oAux){return oAux;}}
 return oAux;};var saveAndRefreshForm=function(oObject){if(oObject){oObject.form.action+='&_REFRESH_=1';oObject.form.submit();}
-else{var oAux=window.document.getElementsByTagName('form');if(oAux.length>0){oAux[0].action+='&_REFRESH_=1';oAux[0].submit();}}};var sessionPersits=function(){var rpc=new leimnud.module.rpc.xmlhttp({url:'../services/sessionPersists',args:'dynaformRestoreValues='+__dynaformSVal__,async:false});rpc.make();var response=rpc.xmlhttp.responseText.parseJSON();return response.status;};var showPromptLogin=function(lastAction){lastActionPerformed=lastAction;promptPanel=new leimnud.module.panel();promptPanel.options={statusBarButtons:[{value:_('LOGIN')}],position:{center:true},size:{w:300,h:130},control:{close:false,resize:false},fx:{modal:true}};promptPanel.setStyle={content:{padding:10,paddingBottom:2,textAlign:'left',paddingLeft:50,backgroundRepeat:'no-repeat',backgroundPosition:'10 50%',backgroundColor:'transparent',borderWidth:0}};promptPanel.make();promptPanel.addContent(_('ID_DYNAFORM_EDITOR_LOGIN_AGAIN'));promptPanel.addContent('<br />');var thePassword=$dce('input');thePassword.type='password';thePassword.id='thePassword';leimnud.dom.setStyle(thePassword,{font:'normal 8pt Tahoma,MiscFixed',color:'#000',width:'100%',marginTop:3,backgroundColor:'white',border:'1px solid #919B9C'});promptPanel.addContent(thePassword);thePassword.focus();thePassword.onkeyup=function(evt)
+else{var oAux=window.document.getElementsByTagName('form');if(oAux.length>0){oAux[0].action+='&_REFRESH_=1';oAux[0].submit();}}};var sessionPersits=function(){var rpc=new leimnud.module.rpc.xmlhttp({url:'../services/sessionPersists',args:'dynaformRestoreValues='+(typeof(__dynaformSVal__)!='undefined'?__dynaformSVal__:''),async:false});rpc.make();var response=rpc.xmlhttp.responseText.parseJSON();return response.status;};var showPromptLogin=function(lastAction){lastActionPerformed=lastAction;promptPanel=new leimnud.module.panel();promptPanel.options={statusBarButtons:[{value:_('LOGIN')}],position:{center:true},size:{w:300,h:130},control:{close:false,resize:false},fx:{modal:true}};promptPanel.setStyle={content:{padding:10,paddingBottom:2,textAlign:'left',paddingLeft:50,backgroundRepeat:'no-repeat',backgroundPosition:'10 50%',backgroundColor:'transparent',borderWidth:0}};promptPanel.make();promptPanel.addContent(_('ID_DYNAFORM_EDITOR_LOGIN_AGAIN'));promptPanel.addContent('<br />');var thePassword=$dce('input');thePassword.type='password';thePassword.id='thePassword';leimnud.dom.setStyle(thePassword,{font:'normal 8pt Tahoma,MiscFixed',color:'#000',width:'100%',marginTop:3,backgroundColor:'white',border:'1px solid #919B9C'});promptPanel.addContent(thePassword);thePassword.focus();thePassword.onkeyup=function(evt)
 {var evt=(window.event)?window.event:evt;var key=(evt.which)?evt.which:evt.keyCode;if(key==13){verifyLogin();}}.extend(this);promptPanel.fixContent();promptPanel.elements.statusBarButtons[0].onmouseup=verifyLogin;};var verifyLogin=function(){if(document.getElementById('thePassword').value.trim()==''){alert(_('ID_WRONG_PASS'));return;}
 var rpc=new leimnud.module.rpc.xmlhttp({url:'../login/authentication',args:'form[USR_USERNAME]='+__usernameLogged__+'&form[USR_PASSWORD]='+document.getElementById('thePassword').value.trim()+'&form[USR_LANG]='+SYS_LANG});rpc.callback=function(rpc){if(rpc.xmlhttp.responseText.indexOf('form[USR_USERNAME]')==-1){promptPanel.remove();lastActionPerformed='';}else{alert(_('ID_WRONG_PASS'));}}.extend(this);rpc.make();};var saveForm=function(oObject,actionParameter){if(oObject){var actionUrl=actionParameter||oObject.form.action.replace('cases_SaveData','saveForm');ajax_post(actionUrl,oObject.form,'POST');}
 else{var oAux=window.document.getElementsByTagName('form');if(oAux.length>0){var actionUrl=actionParameter||oAux[0].action.replace('cases_SaveData','saveForm');ajax_post(actionUrl,oAux[0],'POST');}}};var validateURL=function(url){var regexp=/http?s?:\/\/([-\w\.]+)+(:\d+)?(\/([\w/_\.]*(\?\S+)?)?)?/;if(regexp.test(url)){return true;}else{return false;}};var saveAndRedirectForm=function(oObject,oLocation){saveForm(oObject);if(validateURL(oLocation)){if(typeof(parent)!="undefined"){parent.location.href=oLocation;}else{document.location.href=oLocation;}}};var removeRequiredById=function(sFieldName){if(!notValidateThisFields.inArray(sFieldName)){notValidateThisFields.push(sFieldName);var oAux=document.getElementById('__notValidateThisFields__');if(oAux){oAux.value=notValidateThisFields.toJSONString();}}};var enableRequiredById=function(sFieldName){if(notValidateThisFields.inArray(sFieldName)){var i;var aAux=[];for(i=0;i<notValidateThisFields.length;i++){if(notValidateThisFields[i]!=sFieldName){aAux.push(notValidateThisFields[i]);}}
@@ -1410,7 +1410,7 @@ iRowAux++;}
 this.oGrid.deleteRow(lastItem);for(i=0;i<=this.aFields.length-1;i++){this.aElements.pop();}
 var elem;if(oObj.aFunctions.length>0){for(i=0;i<=oObj.aFunctions.length-1;i++){elem=document.getElementById("form["+oObj.sGridName+"][1]["+oObj.aFunctions[i].sFieldName+"]");if(elem){switch(oObj.aFunctions[i].sFunction){case"sum":oObj.sum(false,elem);break;case"avg":oObj.avg(false,elem);break;}}}}
 if(oObj.ondeleterow){oObj.ondeleterow(iRow);}};this.clearRowWC=function(oObj,aRow)
-{var i=0;var pmLabel='';var elemNodeName='';var objects='';for(i=1;i<oObj.oGrid.rows[1].cells.length;i++){var oCell1=oObj.oGrid.rows[1].cells[i];elemNodeName=oCell1.innerHTML.substring(oCell1.innerHTML.indexOf("<")+1,oCell1.innerHTML.indexOf(" ")).toLowerCase();switch(elemNodeName){case"input":objects=oCell1.getElementsByTagName('input');if(objects[0].type=='checkbox'){document.getElementById(objects[0].id).checked=false;}else{document.getElementById(objects[0].id).value='';fieldSuggest=(objects[0].id).substring(0,(objects[0].id).length-7)+"]";if(document.getElementById(fieldSuggest)!=null){document.getElementById(fieldSuggest).value='';}}
+{var i=0;var j=0;var iAux=0;var pmLabel='';var elemNodeName='';var objects='';for(i=1;i<oObj.oGrid.rows[1].cells.length;i++){var oCell1=oObj.oGrid.rows[1].cells[i];elemNodeName=oCell1.innerHTML.substring(oCell1.innerHTML.indexOf("<")+1,oCell1.innerHTML.indexOf(" ")).toLowerCase();switch(elemNodeName){case"input":objects=oCell1.getElementsByTagName('input');if(objects[0].type=='checkbox'){document.getElementById(objects[0].id).checked=false;}else{document.getElementById(objects[0].id).value='';fieldSuggest=(objects[0].id).substring(0,(objects[0].id).length-7)+"]";if(document.getElementById(fieldSuggest)!=null){document.getElementById(fieldSuggest).value='';}}
 if(oObj.aFunctions.length>0){pmLabel='';for(iAux=0;iAux<=objects[0].attributes.length-1;iAux++){if(objects[0].attributes[iAux].name=="pm:label"){pmLabel=objects[0].attributes[iAux].nodeValue;break;}}
 for(j=0;j<oObj.aFunctions.length;j++){if(pmLabel!=''&&pmLabel==oObj.aFunctions[j].sFieldName){switch(oObj.aFunctions[j].sFunction){case"sum":oObj.sum(false,document.getElementById(objects[0].id));break;case"avg":oObj.avg(false,document.getElementById(objects[0].id));break;}
 break;}}}
diff --git a/gulliver/templates/xmlform.html b/gulliver/templates/xmlform.html
index 8993088d4..38d01c864 100755
--- a/gulliver/templates/xmlform.html
+++ b/gulliver/templates/xmlform.html
@@ -50,6 +50,7 @@ var form_{$form->id};
 var i;
 function loadForm_{$form->id}(ajaxServer)
 {literal}{{/literal}
+swSubmitValidateForm = 1;
 if (typeof(G_Form)==='undefined') return alert('form.js was not loaded');
   form_{$form->id}=new G_Form(document.getElementById('{$form->id}'),'{$form->id}');
   var myForm=form_{$form->id};
diff --git a/workflow/engine/templates/filterform.html b/workflow/engine/templates/filterform.html
index dc39fd299..a8d96c2e2 100755
--- a/workflow/engine/templates/filterform.html
+++ b/workflow/engine/templates/filterform.html
@@ -3,7 +3,7 @@
 <form id="form[{$form->id}]" name="form[{$form->name}]" action="{$form->action}" method="post" style="margin:0px;" class="formSearch">
 <table class="borderForm" id="{$form->name}" name="{$form->name}" class="basicTable" width='{$form->width}' cellspacing="0" cellpadding="0" style="display:none;width:{$form->width};">
   <tr>
-    <td valign='top'>        
+    <td valign='top'>
 {if isset($form->title) && $form->title !=='' }
    <table class="Header"  width='100%'>
      <tr>
@@ -70,6 +70,7 @@ var form_{$form->id};
 var i;
 function loadForm_{$form->id}(ajaxServer)
 {literal}{{/literal}
+swSubmitValidateForm = 1;
 if (typeof(G_Form)==='undefined') return alert('form.js was not loaded');
   form_{$form->id}=new G_Form(document.getElementById('form[{$form->id}]'),'{$form->id}');
   var myForm=form_{$form->id};
diff --git a/workflow/engine/templates/form.html b/workflow/engine/templates/form.html
index 6b491379d..7190ecc8d 100755
--- a/workflow/engine/templates/form.html
+++ b/workflow/engine/templates/form.html
@@ -80,6 +80,7 @@ var form_{$form->id};
 var i;
 function loadForm_{$form->id}(ajaxServer)
 {literal}{{/literal}
+swSubmitValidateForm = 1;
 if (typeof(G_Form)==='undefined') return alert('form.js was not loaded');
   form_{$form->id}=new G_Form(document.getElementById('{$form->id}'),'{$form->id}');
   var myForm=form_{$form->id};
diff --git a/workflow/engine/templates/xmlform.html b/workflow/engine/templates/xmlform.html
index 7cb7932e5..56c89cfec 100755
--- a/workflow/engine/templates/xmlform.html
+++ b/workflow/engine/templates/xmlform.html
@@ -90,6 +90,7 @@
 
     function loadForm_{$form->id}(ajaxServer)
     {literal}{{/literal}
+      swSubmitValidateForm = 1;
       var i = 0;
 
       if (typeof(G_Form) == "undefined") {literal}{{/literal}
diff --git a/workflow/engine/templates/xmlformScript.html b/workflow/engine/templates/xmlformScript.html
index b36629d64..04e9d44a3 100755
--- a/workflow/engine/templates/xmlformScript.html
+++ b/workflow/engine/templates/xmlformScript.html
@@ -2,6 +2,7 @@ var form_{$form->id};
 var i;
 function loadForm_{$form->id}(ajaxServer)
 {literal}{{/literal}
+swSubmitValidateForm = 1;
 if (typeof(G_Form)==='undefined') return alert('form.js was not loaded');
   form_{$form->id}=new G_Form(document.getElementById('{$form->id}'),'{$form->id}');
   var myForm=form_{$form->id};
diff --git a/workflow/engine/templates/xmlform_preview.html b/workflow/engine/templates/xmlform_preview.html
index e750db58a..e0e9572b2 100755
--- a/workflow/engine/templates/xmlform_preview.html
+++ b/workflow/engine/templates/xmlform_preview.html
@@ -93,6 +93,7 @@ if (typeof(__aObjects__) === 'undefined') {literal}{{/literal}
 {literal}}{/literal}
 function loadForm_{$form->id}(ajaxServer)
 {literal}{{/literal}
+swSubmitValidateForm = 1;
 if (typeof(G_Form)==='undefined') return alert('form.js was not loaded');
   form_{$form->id}=new G_Form(document.getElementById('{$form->id}'),'{$form->id}');
   object_{$form->name} = form_{$form->id};
diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
index a5e48da27..c5d041fbd 100755
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -3,10 +3,10 @@
   <PRO_UID type="private" />
   <DYN_UID type="private" />
   <!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
-  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" home="public_html" buttonType="class">
+  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save();return false;" home="public_html" buttonType="class">
     <en>Save</en>
   </saveDyna>
-  <saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as()" buttonType="class">
+  <saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as();return false;" buttonType="class">
     <en>Save as</en>
   </saveasDyna>
   <!--.-->
diff --git a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
index 11b3d9373..9e368b346 100755
--- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
@@ -3,10 +3,10 @@
   <PRO_UID type="private" />
   <DYN_UID type="private" />
   <!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
-  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" buttonType="class">
+  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save();return false;" buttonType="class">
     <en>Save</en>
   </saveDyna>
-  <saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as()" buttonType="class">
+  <saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as();return false;" buttonType="class">
     <en>Save as</en>
   </saveasDyna>
   <!--.-->

From 6021c128f707095c2bbece2d42c9eee77374bcd2 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 25 Jun 2013 21:39:15 +0000
Subject: [PATCH 06/22] BUG 12256 "Desbordamiento del editor de triggers desde
 steps" SOLVED

- Desbordamiento del editor de triggers desde steps
- Problema resuelto, al editar un trigger desde: Steps->Triggers->Edit, el editor de triggers se muestra correctamente.
* Available from version ProcessMaker-2.5.1-testing.3
---
 .../engine/templates/steps/triggers_Tree.php  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/templates/steps/triggers_Tree.php b/workflow/engine/templates/steps/triggers_Tree.php
index 4ab0bda78..337efd46d 100755
--- a/workflow/engine/templates/steps/triggers_Tree.php
+++ b/workflow/engine/templates/steps/triggers_Tree.php
@@ -93,6 +93,7 @@ try {
   $iCantidad2 = StepTriggerPeer::doCount($oCriteria);
   $oCriteria  = $oProcessMap->getStepTriggersCriteria(-2, $_SESSION['TASK'], 'AFTER');
   $iCantidad3 = StepTriggerPeer::doCount($oCriteria);
+
   $oNode             =& $oTree->addChild('-1', '&nbsp;&nbsp;<span onclick="tree.expand(this.parentNode);" style="cursor: pointer;">[<b> ' . G::LoadTranslation('ID_ASSIGN_TASK') . ' </b>] ' . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'] . '">' . ($iCantidad1 + $iCantidad2 + $iCantidad3) . '</span>)' . '</span>', array('nodeType'=>'parent'));
   $oNode->contracted = true;
   $oAux1             =& $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-1\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE_ASSIGNMENT') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-1_BEFORE">'. $iCantidad1 .'</span>) </span>', array('nodeType'=>'parent'));
@@ -107,7 +108,27 @@ try {
   $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-2\", \"AFTER\");'></span>";
   $oAux1->contracted = true;
   $oAux2             =& $oAux1->addChild('-2_after_node', '<span id="triggersSpan_-2_AFTER"></span>', array('nodeType'=>'parentBlue'));
-  echo $oTree->render();
+
+  $javascript = "
+  <script type=\"text/javascript\">
+  //Add css Codemirror
+  var head = document.getElementsByTagName(\"head\")[0];
+  var s = document.createElement(\"link\");
+
+  s.setAttribute(\"href\", \"/js/codemirror/lib/codemirror.css\");
+  s.setAttribute(\"type\", \"text/css\");
+  s.setAttribute(\"rel\", \"stylesheet\");
+  head.appendChild(s);
+
+  var s = document.createElement(\"link\");
+  s.setAttribute(\"href\", \"/js/codemirror/addon/hint/show-hint.css\");
+  s.setAttribute(\"type\", \"text/css\");
+  s.setAttribute(\"rel\", \"stylesheet\");
+  head.appendChild(s);
+  </script>
+  ";
+
+  echo $javascript . $oTree->render();
 }
 catch (Exception $oException) {
 	die($oException->getMessage());

From 37f90b18bf596f372eb2518018d8a42d8d28c263 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 26 Jun 2013 09:06:35 -0400
Subject: [PATCH 07/22] BUG-8665 32K Issue - Maximum of folder in
 shared/sites/files IMPROVEMENT

- No se modificaba la estructura porque no se tenia seteado la variable ENVIRONMENT_SETTINGS.
- Se modifico la funcion upgradeCasesDirectoryStructure para que cree la variable si no existe.
- Se movio la funcion upgradeCasesDirectoryStructure para que sea independiente al realizar el upgrade.
- se creo la funcion update-structure-directories para ejecutar por consola teniendo como parametro el workspace.
---
 workflow/engine/classes/class.wsTools.php             |  6 ++++++
 .../engine/methods/setup/environmentSettingsAjax.php  | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 1cbc00d91..a6f097b8a 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -591,6 +591,12 @@ class workspaceTools
         G::LoadClass("configuration");
         $conf = new Configurations();
         if (!$conf->exists("ENVIRONMENT_SETTINGS")) {
+            $conf->aConfig = array ("format" => '@userName (@firstName @lastName)',
+                                "dateFormat" => 'd/m/Y',
+                                "startCaseHideProcessInf" => false,
+                                "casesListDateFormat" => 'Y-m-d H:i:s',
+                                "casesListRowNumber" => 25,
+                                "casesListRefreshTime" => 120 );
             $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' );
         }
         $conf->setDirectoryStructureVer(2);
diff --git a/workflow/engine/methods/setup/environmentSettingsAjax.php b/workflow/engine/methods/setup/environmentSettingsAjax.php
index 9224e62d5..96116c955 100755
--- a/workflow/engine/methods/setup/environmentSettingsAjax.php
+++ b/workflow/engine/methods/setup/environmentSettingsAjax.php
@@ -36,10 +36,15 @@ switch ($request) {
         break;
     case "save":
         $conf = new Configurations();
+        $config = $conf->getConfiguration("ENVIRONMENT_SETTINGS", "" );
+        $config['format'] = $_POST["userFormat"];
+        $config['dateFormat'] = $_POST["dateFormat"];
+        $config['startCaseHideProcessInf'] = ((isset( $_POST["hideProcessInf"] )) ? true : false);
+        $config['casesListDateFormat'] = $_POST["casesListDateFormat"];
+        $config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
+        $config['casesListRefreshTime'] = intval( $_POST["txtCasesRefreshTime"]);
 
-        $conf->aConfig = array ("format" => $_POST["userFormat"],"dateFormat" => $_POST["dateFormat"],"startCaseHideProcessInf" => ((isset( $_POST["hideProcessInf"] )) ? true : false),"casesListDateFormat" => $_POST["casesListDateFormat"],"casesListRowNumber" => intval( $_POST["casesListRowNumber"] ),"casesListRefreshTime" => intval( $_POST["txtCasesRefreshTime"] )
-        );
-
+        $conf->aConfig = $config;
         $conf->saveConfig( "ENVIRONMENT_SETTINGS", "" );
 
         $response = new stdclass();

From 65860b59b8c55ddc536dcb8c2e18154583220f2c Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Wed, 26 Jun 2013 11:18:51 -0400
Subject: [PATCH 08/22] BUG 12118 Fatal error en un dynaform cuando se habilita
 el html SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Comportamiento actual. En linux, cuando se da click en enable html para habilitar la edición de un dynaform, luego de guardar y volver a preview se da un fatal error.
- Validation of modified smarty fields in html, and change to html entities.
---
 workflow/engine/classes/class.dynaformEditor.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php
index c74d811d2..9eddb2865 100755
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -543,6 +543,18 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
     public function set_htmlcode($A, $htmlcode)
     {
         try {
+            $iOcurrences = preg_match_all('/\{[\S*\<[^\>]*\S*\s*\>*\S*]*\$\S*\<[^\>]*\S*\s*\>*\S*\}/im', $htmlcode, $matches);
+            if ($iOcurrences) {
+                if (isset($matches[0])) {
+                    $tagsHtml = $matches[0];
+                    foreach ($tagsHtml as $value) {
+                        $aTagVar =  str_replace("{", "&#123;", $value);
+                        $aTagVar =  str_replace("}", "&#125;", $aTagVar);
+                        $aTagVar =  str_replace("$", "&#36;", $aTagVar);
+                        $htmlcode = str_replace($value, $aTagVar, $htmlcode);
+                    }
+                }
+            }
             $file = G::decrypt($A, URL_KEY);
             $form = new Form($file, PATH_DYNAFORM, SYS_LANG, true);
             $filename = substr($form->fileName, 0, - 3) . ($form->type === 'xmlform' ? '' : '.' . $form->type) . 'html';

From 5caffe3b10cd45493ecc7568626f4ef3e72ab67b Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 26 Jun 2013 12:38:17 -0400
Subject: [PATCH 09/22] Updating.po and .sql files for release 2.5.1-testing.3

---
 .../translations/english/processmaker.en.po   | 36 +++++++++++++++----
 workflow/engine/data/mssql/insert.sql         | 12 +++++--
 workflow/engine/data/mysql/insert.sql         | 10 ++++--
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index c7d63d0a6..faad85ca8 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ProcessMaker (Branch master) 2.5.1-testing.2\n"
+"Project-Id-Version: ProcessMaker (Branch master) 2.5.1-testing.3\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2013-06-05 13:33:25\n"
+"PO-Revision-Date: 2013-06-26 12:29:31\n"
 "Last-Translator: \n"
 "Language-Team: Colosa Developers Team <developers@colosa.com>\n"
 "MIME-Version: 1.0\n"
@@ -5236,8 +5236,8 @@ msgstr "Off"
 # TRANSLATION
 # LABEL/ID_NO_SELECTION_WARNING
 #: LABEL/ID_NO_SELECTION_WARNING
-msgid "Select a item from the list please."
-msgstr "Select a item from the list please."
+msgid "One item should be selected in order to execute the action."
+msgstr "One item should be selected in order to execute the action."
 
 # TRANSLATION
 # JAVASCRIPT/ID_REQUIRED_NAME_TRIGGERS
@@ -12940,8 +12940,8 @@ msgstr "Could not create the installation log"
 # TRANSLATION
 # LABEL/ID_PREVIUS
 #: LABEL/ID_PREVIUS
-msgid "Previus"
-msgstr "Previus"
+msgid "[LABEL/ID_PREVIUS] Previous"
+msgstr "Previous"
 
 # TRANSLATION
 # LABEL/ID_UPLOAD_COMPLETE
@@ -14905,6 +14905,30 @@ msgstr "You forgot the name of the Case Scheduler"
 msgid "Duplicate Case Scheduler name."
 msgstr "Duplicate Case Scheduler name."
 
+# TRANSLATION
+# LABEL/ID_MSG_CLEAR_GRID_FIRST_ITEM
+#: LABEL/ID_MSG_CLEAR_GRID_FIRST_ITEM
+msgid "Do you want to clear the information from the first row?"
+msgstr "Do you want to clear the information from the first row?"
+
+# TRANSLATION
+# LABEL/ID_FROM_NAME
+#: LABEL/ID_FROM_NAME
+msgid "From name"
+msgstr "From name"
+
+# TRANSLATION
+# LABEL/ID_ACCEPT
+#: LABEL/ID_ACCEPT
+msgid "[LABEL/ID_ACCEPT] Accept"
+msgstr "Accept"
+
+# TRANSLATION
+# LABEL/ID_ERROR_SEND_NOTIFICATIONS
+#: LABEL/ID_ERROR_SEND_NOTIFICATIONS
+msgid "The following error has occurred when trying to send the notifications:"
+msgstr "The following error has occurred when trying to send the notifications:"
+
 # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
 # additionalTables/additionalTablesData.xml
 #: text - ADD_TAB_NAME
diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql
index f054d42a5..6d02409da 100755
--- a/workflow/engine/data/mssql/insert.sql
+++ b/workflow/engine/data/mssql/insert.sql
@@ -3150,7 +3150,7 @@ SELECT 'LABEL','ID_ON','en','On','2013-05-15'
   UNION ALL
 SELECT 'LABEL','ID_OFF','en','Off','2013-05-15' 
   UNION ALL
-SELECT 'LABEL','ID_NO_SELECTION_WARNING','en','Select a item from the list please.','2013-05-15' 
+SELECT 'LABEL','ID_NO_SELECTION_WARNING','en','One item should be selected in order to execute the action.','2013-06-14' 
   UNION ALL
 SELECT 'JAVASCRIPT','ID_REQUIRED_NAME_TRIGGERS','en','You forgot the title of the trigger','2013-05-15' 
   UNION ALL
@@ -5750,7 +5750,7 @@ SELECT 'LABEL','ID_DOES_NOT_EXIST','en','does not exist','2013-03-07'
   UNION ALL
 SELECT 'LABEL','ID_CREATE_LOG_INSTALLATION','en','Could not create the installation log','2013-03-07' 
   UNION ALL
-SELECT 'LABEL','ID_PREVIUS','en','Previus','2013-03-07' 
+SELECT 'LABEL','ID_PREVIUS','en','Previous','2013-06-13' 
   UNION ALL
 SELECT 'LABEL','ID_UPLOAD_COMPLETE','en','Upload complete','2013-03-07' 
   UNION ALL
@@ -6415,6 +6415,14 @@ INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_U
 SELECT 'LABEL','ID_REQUIRED_NAME_CASE_SCHEDULER','en','You forgot the name of the Case Scheduler','2013-05-28' 
   UNION ALL
 SELECT 'LABEL','ID_DUPLICATE_CASE_SCHEDULER_NAME','en','Duplicate Case Scheduler name.','2013-05-28' 
+  UNION ALL
+SELECT 'LABEL','ID_MSG_CLEAR_GRID_FIRST_ITEM','en','Do you want to clear the information from the first row?','2013-06-13' 
+  UNION ALL
+SELECT 'LABEL','ID_FROM_NAME','en','From name','2013-06-14' 
+  UNION ALL
+SELECT 'LABEL','ID_ACCEPT','en','Accept','2013-06-17' 
+  UNION ALL
+SELECT 'LABEL','ID_ERROR_SEND_NOTIFICATIONS','en','The following error has occurred when trying to send the notifications:','2013-06-19' 
  ;
 
 INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) 
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index d70610dfc..f5c78e688 100755
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -2280,7 +2280,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_PRO_CREATE_DATE','en','Create Date','2013-05-15') ,
 ( 'LABEL','ID_ON','en','On','2013-05-15') ,
 ( 'LABEL','ID_OFF','en','Off','2013-05-15') ,
-( 'LABEL','ID_NO_SELECTION_WARNING','en','Select a item from the list please.','2013-05-15') ,
+( 'LABEL','ID_NO_SELECTION_WARNING','en','One item should be selected in order to execute the action.','2013-06-14') ,
 ( 'JAVASCRIPT','ID_REQUIRED_NAME_TRIGGERS','en','You forgot the title of the trigger','2013-05-15') ,
 ( 'JAVASCRIPT','ID_EXIST_PROCESS','en','There is a process with the same name. this process will not save','2013-05-15') ,
 ( 'JAVASCRIPT','ID_EXIST_DYNAFORM','en','There is a Dynaform with the same name in this process. It is not saving','2013-05-15') ,
@@ -3596,7 +3596,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_DIRECTORIES_NOT_WRITABLE','en','Some directories and/or files inside it are not writable','2013-03-07') ,
 ( 'LABEL','ID_DOES_NOT_EXIST','en','does not exist','2013-03-07') ,
 ( 'LABEL','ID_CREATE_LOG_INSTALLATION','en','Could not create the installation log','2013-03-07') ,
-( 'LABEL','ID_PREVIUS','en','Previus','2013-03-07') ,
+( 'LABEL','ID_PREVIUS','en','Previous','2013-06-13') ,
 ( 'LABEL','ID_UPLOAD_COMPLETE','en','Upload complete','2013-03-07') ,
 ( 'LABEL','ID_CREATE_FOLDER','en','Create New Folder','2013-03-07') ,
 ( 'LABEL','ID_UPLOAD_LEAST_FILE','en','You may upload at least one file','2013-03-07') ,
@@ -3933,7 +3933,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE )  VALUES 
 
 ( 'LABEL','ID_REQUIRED_NAME_CASE_SCHEDULER','en','You forgot the name of the Case Scheduler','2013-05-28') ,
-( 'LABEL','ID_DUPLICATE_CASE_SCHEDULER_NAME','en','Duplicate Case Scheduler name.','2013-05-28') ;
+( 'LABEL','ID_DUPLICATE_CASE_SCHEDULER_NAME','en','Duplicate Case Scheduler name.','2013-05-28') ,
+( 'LABEL','ID_MSG_CLEAR_GRID_FIRST_ITEM','en','Do you want to clear the information from the first row?','2013-06-13') ,
+( 'LABEL','ID_FROM_NAME','en','From name','2013-06-14') ,
+( 'LABEL','ID_ACCEPT','en','Accept','2013-06-17') ,
+( 'LABEL','ID_ERROR_SEND_NOTIFICATIONS','en','The following error has occurred when trying to send the notifications:','2013-06-19') ;
 
 INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES 
 ('AD','','',' ','') ,

From 5883652bd1d281b875e64c181e396ded6ee101c1 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Wed, 26 Jun 2013 13:15:43 -0400
Subject: [PATCH 10/22] BUG 12213 "Adicionar soporte para hotfixes" SOLVED

- Nuevo feature
- Funcionalidad para la instalacion de parches
- Nuevo feature implementado, se ha adicionado una nueva opcion al comando ./processmaker
  Esta nueva opcion trabaja de la siguiente manera:
      Caso 1 - ./processmaker patch-install MyPatch.tar
      Caso 2 - ./processmaker patch-install path_to_patch/MyPatch.tar
  Para el caso 1, el archivo tar debe estar fisicamente en la ruta:
      path_to_processmaker/shared/patchs (si no existe el directorio "patchs", crearlo y darle todos los permisos)
  Para el caso 2, el archivo debe existir en la ruta que se especifica
* Available from version ProcessMaker-2.5.1-testing.3
---
 workflow/engine/bin/tasks/cliPatch.php    | 48 ++++++++++++++++++
 workflow/engine/classes/class.wsTools.php | 62 ++++++++++++++++++++---
 2 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 workflow/engine/bin/tasks/cliPatch.php

diff --git a/workflow/engine/bin/tasks/cliPatch.php b/workflow/engine/bin/tasks/cliPatch.php
new file mode 100644
index 000000000..967f535fc
--- /dev/null
+++ b/workflow/engine/bin/tasks/cliPatch.php
@@ -0,0 +1,48 @@
+<?php
+CLI::taskName("patch-install");
+
+CLI::taskDescription(<<<EOT
+    Install patch to system
+
+    This command is executed when you want to update certain files, which have improvements or solution to bugs.
+EOT
+);
+
+CLI::taskRun(runPatchInstall);
+
+function runPatchInstall($command, $args)
+{
+    CLI::logging("PATCH", PATH_DATA . "log" . PATH_SEP . "upgrades.log");
+    CLI::logging("Install patch to system\n");
+
+    $arrayFile = $command;
+
+    if (count($arrayFile) > 0) {
+        //Install patch
+        foreach ($arrayFile as $value) {
+            $f = $value;
+
+            $result = workspaceTools::patchInstall($f);
+
+            CLI::logging($result["message"] . "\n");
+        }
+
+        //Clear server's cache
+        CLI::logging("\nClearing cache...\n");
+
+        if (defined("PATH_C")) {
+            G::rm_dir(PATH_C);
+            G::mk_dir(PATH_C, 0777);
+        }
+
+        //Safe upgrade for JavaScript files
+        CLI::logging("\nSafe upgrade for files cached by the browser\n\n");
+
+        G::browserCacheFilesSetUid();
+
+        CLI::logging("PATCH done\n");
+    } else {
+        CLI::logging("Not exist patchs to install in the command\n");
+    }
+}
+
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index a6f097b8a..92039eb74 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -555,7 +555,7 @@ class workspaceTools
                         rmdir($UIdDir);//remove the diretory itself, G::rm_dir cannot do it
                     } else {
                         CLI::logging(CLI::error("Error: Failure at coping from $UIdDir...\n"));
-                    }                        
+                    }
                 } else {
                     CLI::logging("$UIdDir is empty, removing it\n");
                     rmdir($UIdDir);//remove the diretory itself
@@ -582,7 +582,7 @@ class workspaceTools
                     unlink($file[$index]);
                 } else {
                     CLI::logging(CLI::error("Error: Failure at copy $file[$index] files...\n"));
-                }     
+                }
             }
         }
 
@@ -633,7 +633,7 @@ class workspaceTools
         $this->upgradeData();
         p11835::execute();
         return true;
-    }	
+    }
 
     /**
      * Upgrade this workspace database from a schema
@@ -1191,12 +1191,12 @@ class workspaceTools
         if (isset($srcWorkspace) && !in_array("$srcWorkspace.meta", array_map(BASENAME, $metaFiles))) {
             throw new Exception("Workspace $srcWorkspace not found in backup");
         }
-        
+
         $version = System::getVersion();
         $version = explode('-', $version);
         $versionPresent = ( isset($version[0])) ? $version[0] : '';
         CLI::logging(CLI::warning("
-            Note.- If you try to execute a restore from a generated backup on a recent version of Processmaker 
+            Note.- If you try to execute a restore from a generated backup on a recent version of Processmaker
             than version you are using currently to restore it, it may be occur errors on the restore process,
             it shouldn't be restaured generated backups on later versions than version when the restore is executed") . "\n");
 
@@ -1296,7 +1296,7 @@ class workspaceTools
             $stop = microtime(true);
             $final = $stop - $start;
             CLI::logging("<*>   Updating cache view Process took $final seconds.\n");
-            
+
 
             mysql_close($link);
         }
@@ -1307,5 +1307,55 @@ class workspaceTools
 
         CLI::logging(CLI::info("Done restoring") . "\n");
     }
+
+    public static function patchInstall($file)
+    {
+        $result = array();
+
+        $dirPatch = PATH_DATA . "patchs";
+
+        $arrayPathInfo = pathinfo($file);
+
+        $f = ($arrayPathInfo["dirname"] == ".")? $dirPatch . PATH_SEP . $file : $file;
+
+        $swv  = 1;
+        $msgv = "";
+
+        if (!file_exists($dirPatch)) {
+            G::mk_dir($dirPatch, 0777);
+        }
+
+        if (!file_exists($f)) {
+            $swv  = 0;
+            $msgv = $msgv . (($msgv != "")? "\n": null) . "- The file \"$f\" does not exist";
+        }
+
+        if ($arrayPathInfo["extension"] != "tar") {
+            $swv  = 0;
+            $msgv = $msgv . (($msgv != "")? "\n": null) . "- The file's extension \"$file\" no is \"tar\"";
+        }
+
+        if ($swv == 1) {
+            G::LoadThirdParty("pear/Archive", "Tar");
+
+            //Extract
+            $tar = new Archive_Tar($f);
+
+            $swTar = $tar->extract(PATH_OUTTRUNK); //true on success, false on error
+
+            if ($swTar) {
+                $result["status"] = 1;
+                $result["message"] = "- Successfully to install patch \"$f\"";
+            } else {
+                $result["status"] = 0;
+                $result["message"] = "- Could not extract file \"$f\"";
+            }
+        } else {
+            $result["status"] = 0;
+            $result["message"] = $msgv;
+        }
+
+        return $result;
+    }
 }
 

From c113922bd6898511a14936b55cfddb98faded2ac Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 26 Jun 2013 14:27:20 -0400
Subject: [PATCH 11/22] Validating error message for function "chmod" when is
 in the disable_functions list

---
 gulliver/system/class.g.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 48229d133..3a8ac7c82 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -4804,7 +4804,7 @@ class G
          } else {
             //first a raw permission check
             if(fileperms($file) != 33200) {
-                chmod ($file, 0660);
+                @chmod ($file, 0660);
             }
         }
     }

From 70c644ce635dfc9f9f6552936be4bb95d78bbde3 Mon Sep 17 00:00:00 2001
From: Vera Osokina <vera.osokina@colosa.com>
Date: Wed, 26 Jun 2013 14:42:38 -0400
Subject: [PATCH 12/22] Validating error message for function "chmod" when is
 in the disable_functions list (2)

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

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 3a8ac7c82..7abdb7cf5 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -2614,7 +2614,7 @@ class G
                 G::verifyPath( $path, true );
             }
             move_uploaded_file( $file, $path . "/" . $nameToSave );
-            chmod( $path . "/" . $nameToSave, $permission );
+            @chmod( $path . "/" . $nameToSave, $permission );
             umask( $oldumask );
         } catch (Exception $oException) {
             throw $oException;
@@ -2676,7 +2676,7 @@ class G
         imagecopyresampled( $image_p, $image, 0, 0, 0, 0, $resWidth, $resHeight, $width, $height );
         $outputFn( $image_p, $saveTo );
 
-        chmod( $saveTo, 0666 );
+        @chmod( $saveTo, 0666 );
     }
 
     /**

From 5361bbf61550de9d4daea7a5b4957587a1b3edb3 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Wed, 26 Jun 2013 14:54:37 -0400
Subject: [PATCH 13/22] BUG 12213 "Adicionar soporte para hotfixes" SOLVED

- Nuevo feature
- Funcionalidad para la instalacion de hotfixes
- Nuevo feature implementado, se ha adicionado una nueva opcion al comando ./processmaker
  Esta nueva opcion trabaja de la siguiente manera:
      Caso 1 - ./processmaker hotfix-install MyHotfix.tar
      Caso 2 - ./processmaker hotfix-install path_to_hotfix/MyHotfix.tar
  Para el caso 1, el archivo tar debe estar fisicamente en la ruta:
      path_to_processmaker/shared/hotfixes (si no existe el directorio "hotfixes", crearlo y darle todos los permisos)
  Para el caso 2, el archivo debe existir en la ruta que se especifica
* Available from version ProcessMaker-2.5.1-testing.3
---
 .../bin/tasks/{cliPatch.php => cliHotfix.php} | 20 +++++++++----------
 workflow/engine/classes/class.wsTools.php     | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename workflow/engine/bin/tasks/{cliPatch.php => cliHotfix.php} (61%)

diff --git a/workflow/engine/bin/tasks/cliPatch.php b/workflow/engine/bin/tasks/cliHotfix.php
similarity index 61%
rename from workflow/engine/bin/tasks/cliPatch.php
rename to workflow/engine/bin/tasks/cliHotfix.php
index 967f535fc..e5e7f4281 100644
--- a/workflow/engine/bin/tasks/cliPatch.php
+++ b/workflow/engine/bin/tasks/cliHotfix.php
@@ -1,28 +1,28 @@
 <?php
-CLI::taskName("patch-install");
+CLI::taskName("hotfix-install");
 
 CLI::taskDescription(<<<EOT
-    Install patch to system
+    Install hotfix to system
 
     This command is executed when you want to update certain files, which have improvements or solution to bugs.
 EOT
 );
 
-CLI::taskRun(runPatchInstall);
+CLI::taskRun(runHotfixInstall);
 
-function runPatchInstall($command, $args)
+function runHotfixInstall($command, $args)
 {
-    CLI::logging("PATCH", PATH_DATA . "log" . PATH_SEP . "upgrades.log");
-    CLI::logging("Install patch to system\n");
+    CLI::logging("HOTFIX", PATH_DATA . "log" . PATH_SEP . "upgrades.log");
+    CLI::logging("Install hotfix to system\n");
 
     $arrayFile = $command;
 
     if (count($arrayFile) > 0) {
-        //Install patch
+        //Install hotfix
         foreach ($arrayFile as $value) {
             $f = $value;
 
-            $result = workspaceTools::patchInstall($f);
+            $result = workspaceTools::hotfixInstall($f);
 
             CLI::logging($result["message"] . "\n");
         }
@@ -40,9 +40,9 @@ function runPatchInstall($command, $args)
 
         G::browserCacheFilesSetUid();
 
-        CLI::logging("PATCH done\n");
+        CLI::logging("HOTFIX done\n");
     } else {
-        CLI::logging("Not exist patchs to install in the command\n");
+        CLI::logging("Not exist hotfixes to install in the command\n");
     }
 }
 
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 92039eb74..4f8993cbb 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1308,21 +1308,21 @@ class workspaceTools
         CLI::logging(CLI::info("Done restoring") . "\n");
     }
 
-    public static function patchInstall($file)
+    public static function hotfixInstall($file)
     {
         $result = array();
 
-        $dirPatch = PATH_DATA . "patchs";
+        $dirHotfix = PATH_DATA . "hotfixes";
 
         $arrayPathInfo = pathinfo($file);
 
-        $f = ($arrayPathInfo["dirname"] == ".")? $dirPatch . PATH_SEP . $file : $file;
+        $f = ($arrayPathInfo["dirname"] == ".")? $dirHotfix . PATH_SEP . $file : $file;
 
         $swv  = 1;
         $msgv = "";
 
-        if (!file_exists($dirPatch)) {
-            G::mk_dir($dirPatch, 0777);
+        if (!file_exists($dirHotfix)) {
+            G::mk_dir($dirHotfix, 0777);
         }
 
         if (!file_exists($f)) {
@@ -1345,7 +1345,7 @@ class workspaceTools
 
             if ($swTar) {
                 $result["status"] = 1;
-                $result["message"] = "- Successfully to install patch \"$f\"";
+                $result["message"] = "- Successfully to install hotfix \"$f\"";
             } else {
                 $result["status"] = 0;
                 $result["message"] = "- Could not extract file \"$f\"";

From 45f846f4e788d31b5ef5aa6b46c3c944e1624bb5 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Wed, 26 Jun 2013 15:24:18 -0400
Subject: [PATCH 14/22] BUG 12213 "Adicionar soporte para hotfixes" SOLVED

- Nuevo feature
- Funcionalidad para la instalacion de hotfixes
- Nuevo feature implementado, se ha adicionado una nueva opcion al comando ./processmaker
  Esta nueva opcion trabaja de la siguiente manera:
      Caso 1 - ./processmaker hotfix-install MyHotfix.tar
      Caso 2 - ./processmaker hotfix-install path_to_hotfix/MyHotfix.tar
  Para el caso 1, el archivo tar debe estar fisicamente en la ruta:
      path_to_processmaker/shared/hotfixes (si no existe el directorio "hotfixes", crearlo y darle todos los permisos)
  Para el caso 2, el archivo debe existir en la ruta que se especifica
* Available from version ProcessMaker-2.5.1-testing.3
---
 workflow/engine/bin/tasks/cliHotfix.php   | 4 ++--
 workflow/engine/classes/class.wsTools.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliHotfix.php b/workflow/engine/bin/tasks/cliHotfix.php
index e5e7f4281..2264815ad 100644
--- a/workflow/engine/bin/tasks/cliHotfix.php
+++ b/workflow/engine/bin/tasks/cliHotfix.php
@@ -4,7 +4,7 @@ CLI::taskName("hotfix-install");
 CLI::taskDescription(<<<EOT
     Install hotfix to system
 
-    This command is executed when you want to update certain files, which have improvements or solution to bugs.
+    This command is executed when you want to update certain files, which have improvements or bugs solutions.
 EOT
 );
 
@@ -42,7 +42,7 @@ function runHotfixInstall($command, $args)
 
         CLI::logging("HOTFIX done\n");
     } else {
-        CLI::logging("Not exist hotfixes to install in the command\n");
+        CLI::logging("Please specify the hotfix to install\n");
     }
 }
 
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 4f8993cbb..6565710e3 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1332,7 +1332,7 @@ class workspaceTools
 
         if ($arrayPathInfo["extension"] != "tar") {
             $swv  = 0;
-            $msgv = $msgv . (($msgv != "")? "\n": null) . "- The file's extension \"$file\" no is \"tar\"";
+            $msgv = $msgv . (($msgv != "")? "\n": null) . "- The file extension \"$file\" is not \"tar\"";
         }
 
         if ($swv == 1) {
@@ -1345,7 +1345,7 @@ class workspaceTools
 
             if ($swTar) {
                 $result["status"] = 1;
-                $result["message"] = "- Successfully to install hotfix \"$f\"";
+                $result["message"] = "- Hotfix installed successfully \"$f\"";
             } else {
                 $result["status"] = 0;
                 $result["message"] = "- Could not extract file \"$f\"";

From 2e0f11f6aea6575382894d03f279fe7e92ca1fe8 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 26 Jun 2013 15:32:46 -0400
Subject: [PATCH 15/22] Add validation in class.system.php when is used
 function "md5_file"

---
 workflow/engine/classes/class.system.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php
index b4dc10715..1d83b53ac 100755
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -1096,10 +1096,10 @@ class System
 
         $md5 = array ();
         if ($readGlobalIniFile) {
-            $md5[] = md5_file( $globalIniFile );
+            $md5[] = @md5_file( $globalIniFile );
         }
         if ($readWsIniFile) {
-            $md5[] = md5_file( $wsIniFile );
+            $md5[] = @md5_file( $wsIniFile );
         }
         $hash = implode( '-', $md5 );
 

From 93f3a607dce1781caf7a6633fb414d08cea97d9c Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 26 Jun 2013 16:37:07 -0400
Subject: [PATCH 16/22] BUG 11068 Improvement in events creation when start a
 case IMPROVEMENT

---
 workflow/engine/classes/class.case.php                | 6 ++++++
 workflow/engine/controllers/home.php                  | 5 -----
 workflow/engine/methods/cases/casesStartPage_Ajax.php | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index a63569d04..02d494bb5 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -1960,6 +1960,12 @@ class Cases
                 G::LoadClass('derivation');
                 $oDerivation = new Derivation();
                 $oDerivation->setTasLastAssigned($sTasUid, $sUsrUid);
+
+                // Execute Events
+                require_once 'classes/model/Event.php';
+                $event = new Event();
+                $event->createAppEvents($sProUid, $sAppUid, $iDelIndex, $sTasUid);
+
                 //update searchindex
                 if ($this->appSolr != null) {
                     $this->appSolr->updateApplicationSearchIndex($sAppUid);
diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 72946706d..27eab0fcd 100755
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -360,11 +360,6 @@ class Home extends Controller
         $_SESSION['STEP_POSITION'] = 0;
         $_SESSION['CASES_REFRESH'] = true;
 
-        // Execute Events
-        require_once 'classes/model/Event.php';
-        $event = new Event();
-        $event->createAppEvents( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK'] );
-
         $oCase = new Cases();
         $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
         //../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo
diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index a902122f0..8c88391ef 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -250,11 +250,6 @@ function startCase ()
 
         $_SESSION['CASES_REFRESH'] = true;
 
-        // Execute Events
-        require_once 'classes/model/Event.php';
-        $event = new Event();
-        $event->createAppEvents( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK'] );
-
         $oCase = new Cases();
         $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
 

From f03ebf3ab9cbb5878f4b5547bfa1049368e4bf3f Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Thu, 27 Jun 2013 14:21:19 +0000
Subject: [PATCH 17/22] BUG 12260 "No se pueden ver los mensajes en message
 history" SOLVED

- No se pueden ver los mensajes en message history
- Problema resuelto, los mensajes son visibles cuando se selecciona Message History.
* Available from version ProcessMaker-2.5.1-testing.3
---
 .../methods/cases/caseMessageHistory_Ajax.php | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
index 55a357931..73fbcc018 100644
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -58,23 +58,36 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
 
     $delIndex = array();
     $respMess = "";
-    if (count($respView['MSGS_HISTORY'])>0) {
-        $respMess = $respView['MSGS_HISTORY']['PERMISSION'];
-        $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+
+    if (count($respView["MSGS_HISTORY"]) > 0) {
+        $respMess = $respView["MSGS_HISTORY"]["PERMISSION"];
+
+        if (isset($respView["MSGS_HISTORY"]["DEL_INDEX"])) {
+            $delIndex = $respView["MSGS_HISTORY"]["DEL_INDEX"];
+        }
+
     } else {
-        if (count($respBlock['MSGS_HISTORY'])>0) {
-            $respMess = $respBlock['MSGS_HISTORY']['PERMISSION'];
-            $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+        if (count($respBlock["MSGS_HISTORY"]) > 0) {
+            $respMess = $respBlock["MSGS_HISTORY"]["PERMISSION"];
+
+            if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) {
+                $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"];
+            }
+
         } else {
-            if (count($respResend['MSGS_HISTORY'])>0) {
-                $respMess = $respResend['MSGS_HISTORY']['PERMISSION'];
-                $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+            if (count($respResend["MSGS_HISTORY"]) > 0) {
+
+                $respMess = $respResend["MSGS_HISTORY"]["PERMISSION"];
+
+                if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) {
+                    $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"];
+                }
             }
         }
     }
 
     foreach ($appMessageArray as $index => $value) {
-        if (($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1  && $respMess != 'BLOCK' ) && 
+        if (($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1  && $respMess != 'BLOCK' ) &&
             ($appMessageArray[$index]['DEL_INDEX'] == 0 || in_array($appMessageArray[$index]['DEL_INDEX'], $delIndex ))) {
             $appMessageArray[$index]['ID_MESSAGE'] = $appMessageArray[$index]['APP_UID'] . '_' . $appMessageArray[$index]['APP_MSG_UID'];
             if ($respMess == 'BLOCK' || $respMess == '') {

From cc1d97d2e4b32886e902e82f2da5029037a3a6b8 Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Thu, 27 Jun 2013 17:36:55 -0400
Subject: [PATCH 18/22] =?UTF-8?q?BUG=2012284=20P=C3=A9rdida=20de=20sesion?=
 =?UTF-8?q?=20al=20ejecutar=20la=20funcion=20PMFInformationUser()=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Al ejecutar la función PMFInformationUser() se pierde la sesión al hacer subnit. Se abre una ventana modal para introducir el password, pero esta no desaparece despues de introducir el password. Si es posible ir al siguiente paso con Next step.
- Adjustment in session variables saved, for restoring  variables.
---
 workflow/engine/methods/cases/cases_Step.php  |  6 +++-
 .../methods/services/sessionPersists.php      | 34 ++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index cf2870d92..1fc7baa2c 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -184,7 +184,11 @@ try {
 //Obtain previous and next step - End
 
 $aRequiredFields = array(
-    'APP_DATA' => $Fields['APP_DATA']
+    'APPLICATION'   => $Fields['APP_DATA']['APPLICATION'],
+    'PROCESS'       => $Fields['APP_DATA']['PROCESS'],
+    'TASK'          => $Fields['APP_DATA']['TASK'],
+    'INDEX'         => $Fields['APP_DATA']['INDEX'],
+    'TRIGGER_DEBUG' => $Fields['APP_DATA']['TRIGGER_DEBUG']
 );
 
 $oHeadPublisher->addScriptCode('var __dynaformSVal__ = \'' . base64_encode(serialize($aRequiredFields)) . '\'; ');
diff --git a/workflow/engine/methods/services/sessionPersists.php b/workflow/engine/methods/services/sessionPersists.php
index d13aa2764..e43c711d1 100755
--- a/workflow/engine/methods/services/sessionPersists.php
+++ b/workflow/engine/methods/services/sessionPersists.php
@@ -34,25 +34,21 @@ if (isset($_REQUEST['dynaformEditorParams'])) {
 if (isset($_REQUEST['dynaformRestoreValues'])) {
 
     $aRetValues = unserialize(stripslashes(base64_decode($_REQUEST['dynaformRestoreValues'])));
-
-    if (isset($aRetValues['APP_DATA'])) {
-        $_SESSION['APP_DATA'] = $aRetValues['APP_DATA'];
-
-        if (isset($aRetValues['APP_DATA']['APPLICATION'])) {
-            $_SESSION['APPLICATION'] = $aRetValues['APP_DATA']['APPLICATION'];
-        }
-        if (isset($aRetValues['APP_DATA']['PROCESS'])) {
-            $_SESSION['PROCESS'] = $aRetValues['APP_DATA']['PROCESS'];
-        }
-        if (isset($aRetValues['APP_DATA']['TASK'])) {
-            $_SESSION['TASK'] = $aRetValues['APP_DATA']['TASK'];
-        }
-        if (isset($aRetValues['APP_DATA']['INDEX'])) {
-            $_SESSION['INDEX'] = $aRetValues['APP_DATA']['INDEX'];
-        }
-        if (isset($aRetValues['APP_DATA']['TRIGGER_DEBUG'])) {
-            $_SESSION['TRIGGER_DEBUG'] = $aRetValues['APP_DATA']['TRIGGER_DEBUG'];
-        }
+ 
+    if (isset($aRetValues['APPLICATION'])) {
+        $_SESSION['APPLICATION'] = $aRetValues['APPLICATION'];
+    }
+    if (isset($aRetValues['PROCESS'])) {
+        $_SESSION['PROCESS'] = $aRetValues['PROCESS'];
+    }
+    if (isset($aRetValues['TASK'])) {
+        $_SESSION['TASK'] = $aRetValues['TASK'];
+    }
+    if (isset($aRetValues['INDEX'])) {
+        $_SESSION['INDEX'] = $aRetValues['INDEX'];
+    }
+    if (isset($aRetValues['TRIGGER_DEBUG'])) {
+        $_SESSION['TRIGGER_DEBUG'] = $aRetValues['TRIGGER_DEBUG'];
     }
 }
 die(G::json_encode($response));
\ No newline at end of file

From ec80baf0a729cbed5842bce8ecfc47ec22fdd0be Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Fri, 28 Jun 2013 11:04:46 -0400
Subject: [PATCH 19/22] BUG 0000 Translation for plugins with incorrect value

Translation for plugins with incorrect value
---
 workflow/engine/classes/model/Translation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php
index 81d1e688e..b6508cfb8 100755
--- a/workflow/engine/classes/model/Translation.php
+++ b/workflow/engine/classes/model/Translation.php
@@ -260,6 +260,7 @@ class Translation extends BaseTranslation
         $POFile = new i18n_PO( $languageFile );
         $POFile->readInit();
         while ($rowTranslation = $POFile->getTranslation()) {
+            $context = '';
             foreach ($POFile->translatorComments as $a => $aux) {
                 $aux = trim( $aux );
                 if ($aux == 'TRANSLATION') {
@@ -281,7 +282,7 @@ class Translation extends BaseTranslation
                     }
                 }
             }
-            if ($identifier == 'TRANSLATION') {
+            if ($identifier == 'TRANSLATION' && $context != '') {
                 list ($category, $id) = explode( '/', $context );
                 $translation[$id] = $rowTranslation['msgstr'] ;
             }

From 83de2204748e40c8df431b927dc820c65b17bdf7 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 28 Jun 2013 16:57:43 -0400
Subject: [PATCH 20/22] Improvement in use of the var __dynaformSVal__

---
 gulliver/js/form/core/form.js       | 2 +-
 gulliver/js/maborak/core/maborak.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 73c9e49e5..cd408f5fe 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -2906,7 +2906,7 @@ var validateForm = function(sRequiredFields) {
         swSubmitValidateForm = 0;
 
         sFormName = document.getElementById('__DynaformName__');
-        if ((typeof(sFormName) != 'undefined' && sFormName != 'login') && (typeof(__usernameLogged__) != 'undefined' && __usernameLogged__ != '') ) {
+        if (typeof(__dynaformSVal__) != 'undefined' && (typeof(sFormName) != 'undefined' && sFormName != 'login') && (typeof(__usernameLogged__) != 'undefined' && __usernameLogged__ != '') ) {
             if (!sessionPersits()) {
                 showPromptLogin('session');
 
diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index cd1a3452b..54ca9e1a9 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1199,7 +1199,7 @@ vtext.failed();}else{vtext.passed();}}
 dropdowns=grids[j].getElementsByTagName('select');for(i=0;i<dropdowns.length;i++){var vtext=new input(dropdowns[i]);if(dropdowns[i].getAttribute("pm:required")=="1"&&dropdowns[i].value.trim()==""){$label=dropdowns[i].name.split("[");$labelPM=dropdowns[i].getAttribute("pm:label");if($labelPM==''||$labelPM==null){$fieldName=$label[3].split("]")[0]+" "+$label[2].split("]")[0];}else{$fieldName=$labelPM+" "+$label[2].split("]")[0];}
 fieldGridName=$label[1]+"["+$label[2]+"["+$label[3].split("]")[0];if(!notValidateThisFields.inArray(fieldGridName)){invalidFields.push($fieldName);}
 vtext.failed();}else{vtext.passed();}}}
-return(invalidFields);};var swSubmitValidateForm=1;var validateForm=function(sRequiredFields){if(swSubmitValidateForm==1){swSubmitValidateForm=0;sFormName=document.getElementById('__DynaformName__');if((typeof(sFormName)!='undefined'&&sFormName!='login')&&(typeof(__usernameLogged__)!='undefined'&&__usernameLogged__!='')){if(!sessionPersits()){showPromptLogin('session');swSubmitValidateForm=1;return false;}}
+return(invalidFields);};var swSubmitValidateForm=1;var validateForm=function(sRequiredFields){if(swSubmitValidateForm==1){swSubmitValidateForm=0;sFormName=document.getElementById('__DynaformName__');if(typeof(__dynaformSVal__)!='undefined'&&(typeof(sFormName)!='undefined'&&sFormName!='login')&&(typeof(__usernameLogged__)!='undefined'&&__usernameLogged__!='')){if(!sessionPersits()){showPromptLogin('session');swSubmitValidateForm=1;return false;}}
 if(typeof(sRequiredFields)!='object'||sRequiredFields.indexOf("%27")>0){sRequiredFields=sRequiredFields.replace(/%27/gi,'"');}
 if(typeof(sRequiredFields)!='object'||sRequiredFields.indexOf("%39")>0){sRequiredFields=sRequiredFields.replace(/%39/gi,"'");}
 aRequiredFields=eval(sRequiredFields);var sMessage='';var invalid_fields=Array();var fielEmailInvalid=Array();for(var i=0;i<aRequiredFields.length;i++){aRequiredFields[i].label=(aRequiredFields[i].label=='')?aRequiredFields[i].name:aRequiredFields[i].label;if(!notValidateThisFields.inArray(aRequiredFields[i].name)){if(typeof aRequiredFields[i].required!='undefined'){required=aRequiredFields[i].required;}else{required=1;}

From 198b954fdab0f02e0dadcad67cf114e7259ef69f Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 28 Jun 2013 17:34:33 -0400
Subject: [PATCH 21/22] Improvement in messages history with the case notes
 notifications

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

diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 566359efb..69b83aaf3 100755
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -229,7 +229,7 @@ class AppNotes extends BaseAppNotes
                 }
 
                 $oSpool->setConfig( array ('MESS_ENGINE' => $aConfiguration['MESS_ENGINE'],'MESS_SERVER' => $aConfiguration['MESS_SERVER'],'MESS_PORT' => $aConfiguration['MESS_PORT'],'MESS_ACCOUNT' => $aConfiguration['MESS_ACCOUNT'],'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'],'SMTPAuth' => $aConfiguration['MESS_RAUTH'] == '1' ? true : false,'SMTPSecure' => isset( $aConfiguration['SMTPSecure'] ) ? $aConfiguration['SMTPSecure'] : '') );
-                $oSpool->create( array ('msg_uid' => '','app_uid' => $appUid,'del_index' => 1,'app_msg_type' => 'DERIVATION','app_msg_subject' => $sSubject,'app_msg_from' => $sFrom,'app_msg_to' => $sTo,'app_msg_body' => $sBody,'app_msg_cc' => '','app_msg_bcc' => '','app_msg_attach' => '','app_msg_template' => '','app_msg_status' => 'pending') );
+                $oSpool->create( array ('msg_uid' => '','app_uid' => $appUid,'del_index' => 0,'app_msg_type' => 'DERIVATION','app_msg_subject' => $sSubject,'app_msg_from' => $sFrom,'app_msg_to' => $sTo,'app_msg_body' => $sBody,'app_msg_cc' => '','app_msg_bcc' => '','app_msg_attach' => '','app_msg_template' => '','app_msg_status' => 'pending') );
                 if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {
                     $oSpool->sendMail();
                 }

From 5d2ff4b9ae269bec1d90860f751eb38536beba33 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Fri, 28 Jun 2013 17:48:50 -0400
Subject: [PATCH 22/22] BUG 12295 No se pueden guardar las importaciones de
 triggers en un proceso SOLVED

- Como se actualizo la version de Codemirror, la funcion para obtener el contenido del editor cambio
- Ahora se usa el metodo "getValue" en lugar de "getCode"
---
 workflow/engine/xmlform/triggers/triggerCopy.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/xmlform/triggers/triggerCopy.xml b/workflow/engine/xmlform/triggers/triggerCopy.xml
index f6fadb92e..ab9602d8c 100644
--- a/workflow/engine/xmlform/triggers/triggerCopy.xml
+++ b/workflow/engine/xmlform/triggers/triggerCopy.xml
@@ -65,7 +65,7 @@
     <en>Script</en>
 </TRI_WEBBOT>
 
-<BTNCOPYSAVE type="button" onclick="document.getElementById('form[TRI_WEBBOT]').value = triggerEditor.getCode(); triggerSave1(this.form);">
+<BTNCOPYSAVE type="button" onclick="document.getElementById('form[TRI_WEBBOT]').value = triggerEditor.getValue(); triggerSave1(this.form);">
     <en>Copy/Import and Save</en>
 </BTNCOPYSAVE>
 
@@ -94,7 +94,7 @@
 	    readOnly: true
 	});
 	triggerEditor.setSize(400,200);
-    
+
     function cancel()
     {
         currentPopupWindow.remove();