From defaca05be154a78b0661d65ccd1649f3ddb825d Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 15:04:13 -0400 Subject: [PATCH 01/10] DOCSYSTEM Arreglo para obtener la direccion de servidor Arreglo para obtener la direccion de servidor --- workflow/engine/classes/class.configuration.php | 2 +- workflow/engine/controllers/installer.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index b3a7fa60b..e33b2599c 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -551,7 +551,7 @@ class Configurations // extends Configuration $langLocate = 'PTB'; break; case 'en': - case 'en_US': + case 'en-US': default: $langLocate = 'EST'; break; diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 11edc3bc8..206e1e047 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1335,8 +1335,14 @@ EOL; ini_set('max_execution_time', '0'); ini_set('memory_limit', '256M'); - $serv = 'http://'.$_SERVER['SERVER_NAME']; - + $serv = 'http://'; + if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') { + $serv = 'https://'; + } + $serv .= $_SERVER['SERVER_NAME']; + if (isset($_SERVER['SERVER_PORT']) && trim($_SERVER['SERVER_PORT']) != '') { + $serv .= ':' . $_SERVER['SERVER_PORT']; + } // create session $cookiefile = sys_get_temp_dir() . PATH_SEP . 'curl-session'; From 0a0ac3303d6ca65097bd64d5d91dd66dd90ec3ca Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 22 Apr 2013 15:15:50 -0400 Subject: [PATCH 02/10] BUG 11216 "sql stripped from suggest field" SOLVED - Execution of query with clause DISTINCT, get duplicate data - Solved problem, added options for the clause SELECT * Available from version ProcessMaker-2.5 --- gulliver/methods/genericAjax.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gulliver/methods/genericAjax.php b/gulliver/methods/genericAjax.php index b84ea9004..3c3051f97 100755 --- a/gulliver/methods/genericAjax.php +++ b/gulliver/methods/genericAjax.php @@ -222,11 +222,11 @@ function sortByChar($aRows, $charSel) */ function queryModified($sqlParsed, $inputSel = "") { - if(!empty($sqlParsed['SELECT'])) { + $sqlSelectOptions = (isset($sqlParsed["OPTIONS"]) && count($sqlParsed["OPTIONS"]) > 0)? implode(" ", $sqlParsed["OPTIONS"]) : null; - $sqlSelect = "SELECT "; - $aSelect = $sqlParsed['SELECT']; + $sqlSelect = "SELECT $sqlSelectOptions "; + $aSelect = $sqlParsed["SELECT"]; $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr']; foreach($aSelect as $key => $value ) { From 835608523fc4af7ba55623c2089f562badb45491 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 22 Apr 2013 16:53:46 -0400 Subject: [PATCH 03/10] Improvement in sysGeneric when try to load nonexistent files --- gulliver/templates/controller.exception.tpl | 5 +---- workflow/public_html/sysGeneric.php | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gulliver/templates/controller.exception.tpl b/gulliver/templates/controller.exception.tpl index 204cf3544..3e77268e5 100755 --- a/gulliver/templates/controller.exception.tpl +++ b/gulliver/templates/controller.exception.tpl @@ -3,13 +3,11 @@ Server Error :: -