diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 3e49ee588..db55a7ee3 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1474,10 +1474,10 @@ function G_Text(form, element, name) } if (me.browser.name == 'Microsoft Internet Explorer' || me.browser.name == 'Netscape'){ - if (event.preventDefault) { - event.preventDefault(); + if (window.event.preventDefault) { + window.event.preventDefault(); } else { - event.returnValue = false; + window.event.returnValue = false; } } diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 06b080cd2..fde5e6dc2 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1061,7 +1061,7 @@ if(pressKey==46){me.applyMask(256);} else{me.applyMask(pressKey);} if(updateOnChange){me.sendOnChange();}} if(me.browser.name=='Firefox'){if(keyCode==0)return true;} -if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} +if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(window.event.preventDefault){window.event.preventDefault();}else{window.event.returnValue=false;}} if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;} else{return false;}}};if(this.element){this.element.onblur=function(event) {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}} diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 0384497ab..1d47cf54c 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5565,7 +5565,7 @@ class G $clean = trim(str_replace($strip, "", strip_tags($string))); $clean = preg_replace('/\s+/', "-", $clean); $clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ; - $clean = ($force_lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean; + $clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean; return $clean; } } diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 2d4e2aea9..bdd08eb9f 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3746,7 +3746,11 @@ class XmlForm_Field_Listbox extends XmlForm_Field $arrayAux = array(); foreach ($value as $index2 => $value2) { - $arrayAux[] = $value2 . ""; + if (!is_array($value2)) { + $arrayAux[] = $value2 . ""; + } else { + $arrayAux[] = ""; + } } $value = $arrayAux; diff --git a/rbac/engine/xmlform/login/noViewPage.xml b/rbac/engine/xmlform/login/noViewPage.xml index 0c7af2ee1..5adf1b5ae 100755 --- a/rbac/engine/xmlform/login/noViewPage.xml +++ b/rbac/engine/xmlform/login/noViewPage.xml @@ -7,12 +7,12 @@ - The account you are logged in under does not have enough security privileges to view this page - The account you are logged in under does not have enough security privileges to view this page + The user account which you are currently logged in does not have security privileges to view this page + The user account which you are currently logged in does not have security privileges to view this page - Please press back button to continue working with this system. + Please press the 'back' button to continue working with this system. Por favor presione el boton Regresar. diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 15a0f3c1b..cbd5f8ad3 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1368,7 +1368,14 @@ class adminProxy extends HttpProxyController //License Information: $activeLicense = $licenseManager->getActiveLicense(); - $params['license'] = $licenseManager; + $licenseInfo = array(); + $noInclude = array('licensedfeaturesList', 'result', 'serial'); + foreach ($licenseManager as $index => $value) { + if (!in_array($index, $noInclude)) { + $licenseInfo[$index] = G::sanitizeInput($value); + } + } + $params['license'] = $licenseInfo; //Operative System version (Linux, Windows) try { @@ -1391,9 +1398,9 @@ class adminProxy extends HttpProxyController //ProcessMaker Version $params['pmVersion'] = System::getVersion(); if (file_exists(PATH_DATA. 'log/upgrades.log')) { - $params['pmUpgrade'] = file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'); + $params['pmUpgrade'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r')); } else { - $params['pmUpgrade'] = G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE'); + $params['pmUpgrade'] = serialize(G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE')); } //Database server Version (MySQL version) diff --git a/workflow/engine/templates/home/appListSearch.html b/workflow/engine/templates/home/appListSearch.html index 4a758d247..3fa14c7ea 100644 --- a/workflow/engine/templates/home/appListSearch.html +++ b/workflow/engine/templates/home/appListSearch.html @@ -294,7 +294,7 @@
{$processTitle}: - {foreach from=$processValues key=k item=VALUE} {/foreach} @@ -311,7 +311,7 @@
{$searchTitle}: - +
diff --git a/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml b/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml index b5ff56454..09654281a 100755 --- a/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml +++ b/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml @@ -4,7 +4,7 @@ - + diff --git a/workflow/engine/xmlform/dynaforms/fields/date.xml b/workflow/engine/xmlform/dynaforms/fields/date.xml index 4dbe0abeb..1369008f8 100755 --- a/workflow/engine/xmlform/dynaforms/fields/date.xml +++ b/workflow/engine/xmlform/dynaforms/fields/date.xml @@ -31,7 +31,7 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME - Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates
NOTE. When these relative dates are set have the priority, leave empty to use Start and End dates.]]>
+ Data Codes: A number followed by a letter to indicate the unit of time (d=day m=month y=year).
Use negative numbers for past dates and positive numbers for future dates.
NOTE: These relative dates have priority. If left empty, then the Start and End dates will be used."]]>
diff --git a/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml b/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml index 882ad19d7..7abfa1107 100755 --- a/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml +++ b/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml @@ -43,7 +43,7 @@ - Max upload file size + Maximum upload file size diff --git a/workflow/engine/xmlform/login/noViewPage.xml b/workflow/engine/xmlform/login/noViewPage.xml index 5475d438d..f42b7fef3 100755 --- a/workflow/engine/xmlform/login/noViewPage.xml +++ b/workflow/engine/xmlform/login/noViewPage.xml @@ -3,8 +3,8 @@ <en><![CDATA[You don't have permission]]></en> - + - + diff --git a/workflow/engine/xmlform/processes/processes_Edit.xml b/workflow/engine/xmlform/processes/processes_Edit.xml index 55136aa32..ae2982565 100755 --- a/workflow/engine/xmlform/processes/processes_Edit.xml +++ b/workflow/engine/xmlform/processes/processes_Edit.xml @@ -56,7 +56,7 @@ WHERE - Type of process (only owner can edit the private processes) + Type of process (only owners can edit private processes) diff --git a/workflow/engine/xmlform/processes/processes_ImportExisting.xml b/workflow/engine/xmlform/processes/processes_ImportExisting.xml index 0f287fe4d..af238c966 100755 --- a/workflow/engine/xmlform/processes/processes_ImportExisting.xml +++ b/workflow/engine/xmlform/processes/processes_ImportExisting.xml @@ -4,7 +4,7 @@ Importing Existing Process]]> - + diff --git a/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml b/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml index f613ecc5c..d602f69b0 100755 --- a/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml +++ b/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml @@ -4,7 +4,7 @@ Importing Existing Process]]> - + diff --git a/workflow/engine/xmlform/reportTables/reportTables_Edit.html b/workflow/engine/xmlform/reportTables/reportTables_Edit.html index 6c73cd267..f2dca0eed 100755 --- a/workflow/engine/xmlform/reportTables/reportTables_Edit.html +++ b/workflow/engine/xmlform/reportTables/reportTables_Edit.html @@ -28,7 +28,7 @@ {$form.REP_TAB_NAME} - * {$REP_TAB_TYPE} + {$REP_TAB_TYPE} {$form.REP_TAB_TYPE} @@ -56,4 +56,4 @@ {$form.JS} - \ No newline at end of file + diff --git a/workflow/engine/xmlform/reportTables/reportTables_Edit.xml b/workflow/engine/xmlform/reportTables/reportTables_Edit.xml index cd8036d92..8260f52a1 100755 --- a/workflow/engine/xmlform/reportTables/reportTables_Edit.xml +++ b/workflow/engine/xmlform/reportTables/reportTables_Edit.xml @@ -82,13 +82,16 @@ function cancel(){ function reportTablesSave(form) { - var bContinue = true; - if (getField('REP_TAB_TITLE').value == '') { - bContinue = false; + if (getField("REP_TAB_TITLE").value.trim() == "") { + new leimnud.module.app.alert().make({label: _("ID_TITLE_REQUIRED")}); + return false; } - if (getField('REP_TAB_NAME').value == '') { - bContinue = false; + + if (getField("REP_TAB_NAME").value.trim() == ""){ + new leimnud.module.app.alert().make({label: _("ID_NAME_REQUIRED")}); + return false; } + var j = 0; if (getField('REP_TAB_TYPE').value == 'NORMAL') { var i; @@ -100,39 +103,18 @@ function reportTablesSave(form) } } if ((j < 1) || (j > 80)) { - bContinue = false; - } - } - else { - if (getField('REP_TAB_GRID').value == '') { - bContinue = false; - } - } - if (bContinue) { - ajax_post(form.action, form, 'POST'); - //currentPopupWindow.remove(); - //@#PAGED_TABLE_ID.refresh(); - history.back(); - } - else { - if (getField('REP_TAB_TYPE').value == 'NORMAL') { - if (j == 0) { - new leimnud.module.app.alert().make({ - label:'@G::LoadTranslation(ID_PLEASE_ENTER_REQUIRED_FIELDS)' - }); - } - else { - new leimnud.module.app.alert().make({ - label:'@G::LoadTranslation(ID_PLEASE_SELECT_MAX_X_FIELDS)' - }); - } - } - else { - new leimnud.module.app.alert().make({ - label:'@G::LoadTranslation(ID_PLEASE_ENTER_REQUIRED_FIELDS)' - }); + new leimnud.module.app.alert().make({label: _("ID_SELECT_LEAST_FIELD")}); + return false; + } + } else { + if (getField("REP_TAB_GRID").value == "") { + new leimnud.module.app.alert().make({label: _("ID_GRID_FIELDS_REQUIRED")}); + return false; } } + + ajax_post(form.action, form, 'POST'); + history.back(); } function reportTablesDelete(sUID) diff --git a/workflow/engine/xmlform/reports/report1.xml b/workflow/engine/xmlform/reports/report1.xml index 0c8b37a96..75aec5628 100755 --- a/workflow/engine/xmlform/reports/report1.xml +++ b/workflow/engine/xmlform/reports/report1.xml @@ -20,6 +20,6 @@ - + diff --git a/workflow/engine/xmlform/services/serviceMessage.xml b/workflow/engine/xmlform/services/serviceMessage.xml index 998490868..c11c29302 100755 --- a/workflow/engine/xmlform/services/serviceMessage.xml +++ b/workflow/engine/xmlform/services/serviceMessage.xml @@ -4,6 +4,6 @@ - + diff --git a/workflow/engine/xmlform/setup/pluginImport.xml b/workflow/engine/xmlform/setup/pluginImport.xml index a431cfc72..a62482ac9 100755 --- a/workflow/engine/xmlform/setup/pluginImport.xml +++ b/workflow/engine/xmlform/setup/pluginImport.xml @@ -4,7 +4,7 @@ - + diff --git a/workflow/engine/xmlform/setup/upgrade.xml b/workflow/engine/xmlform/setup/upgrade.xml index 28ce0c9b6..5d78f64af 100755 --- a/workflow/engine/xmlform/setup/upgrade.xml +++ b/workflow/engine/xmlform/setup/upgrade.xml @@ -7,7 +7,7 @@ - + diff --git a/workflow/engine/xmlform/setup/uplogo.xml b/workflow/engine/xmlform/setup/uplogo.xml index c40278d57..ea8eea896 100755 --- a/workflow/engine/xmlform/setup/uplogo.xml +++ b/workflow/engine/xmlform/setup/uplogo.xml @@ -4,7 +4,7 @@ - + diff --git a/workflow/engine/xmlform/users/myInfo2.xml b/workflow/engine/xmlform/users/myInfo2.xml index c5d706ab9..4b6fe8238 100755 --- a/workflow/engine/xmlform/users/myInfo2.xml +++ b/workflow/engine/xmlform/users/myInfo2.xml @@ -109,7 +109,7 @@ SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '000 + ]]> SELECT * FROM menutab diff --git a/workflow/engine/xmlform/users/myInfoView2.xml b/workflow/engine/xmlform/users/myInfoView2.xml index cad0cd30d..fc98387fb 100755 --- a/workflow/engine/xmlform/users/myInfoView2.xml +++ b/workflow/engine/xmlform/users/myInfoView2.xml @@ -80,7 +80,7 @@ + ]]> SELECT * FROM menutab diff --git a/workflow/engine/xmlform/users/users_EditRT.xml b/workflow/engine/xmlform/users/users_EditRT.xml index 15bebdaaa..cfa5589d1 100755 --- a/workflow/engine/xmlform/users/users_EditRT.xml +++ b/workflow/engine/xmlform/users/users_EditRT.xml @@ -86,7 +86,7 @@ --> - + diff --git a/workflow/engine/xmlform/users/users_New.xml b/workflow/engine/xmlform/users/users_New.xml index 4409d66d0..f56fb0468 100755 --- a/workflow/engine/xmlform/users/users_New.xml +++ b/workflow/engine/xmlform/users/users_New.xml @@ -92,7 +92,7 @@ SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '000 --> - +