From 3fce8769d8ea7ed31a60140d172a1b7656b1f130 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 18 Apr 2013 12:36:57 -0400 Subject: [PATCH 1/3] Arreglo de error en la configuracion de lenguaje Arreglo de error en la configuracion de lenguaje --- workflow/engine/classes/class.configuration.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 21e62447e..ac6aa04cd 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -520,10 +520,10 @@ class Configurations // extends Configuration $maskTime = array('d' => '%d', 'D' => '%a', 'j' => '%e', 'l' => '%A', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%h', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%P', 'A' => '%p', 'g' => '%l', 'G' => '%k', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S'); $creationDateMask = trim($creationDateMask); for ($i = 0; $i < strlen($creationDateMask); $i++) { - if ($creationDateMask[$i] == ' ' || $creationDateMask[$i] == ',') { - $newCreation .= $creationDateMask[$i]; - } else { + if ($creationDateMask[$i] != ' ' && isset($maskTime[$creationDateMask[$i]])) { $newCreation .= $maskTime[$creationDateMask[$i]]; + } else { + $newCreation .= $creationDateMask[$i]; } } From 6033c843fbeb8dafb239cc15e718f1fd7c7cab0d Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Thu, 18 Apr 2013 17:50:12 -0400 Subject: [PATCH 2/3] FIX on configuration insert for parnter env --- .gitignore | 1 + workflow/engine/controllers/installer.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c9bc964d..22b7d3ef1 100755 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ upgrade.log workflow/engine/gulliver workflow/public_html/index.html .DS_Store +.idea diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index a07e9ae76..4fc0bfd15 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1323,9 +1323,10 @@ class Installer extends Controller public function setConfiguration() { - $query = 'INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES'; - $query .= "('ENVIRONMENT_SETTINGS', " - . '\'"a:9:{s:6:"format";s:32:"@userName (@firstName @lastName)";s:10:"dateFormat";s:6:"D M, Y";s:23:"startCaseHideProcessInf";b:0;s:19:"casesListDateFormat";s:13:"F j, Y, g:i a";s:18:"casesListRowNumber";i:20;s:20:"casesListRefreshTime";i:120;s:26:"login_enableForgotPassword";b:0;s:27:"login_enableVirtualKeyboard";b:0;s:21:"login_defaultLanguage";s:5:"pt-BR";}\')'; + $query = <<mysqlQuery($query); } From 385511126200f76f03040914fc158373e22f2e22 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Thu, 18 Apr 2013 18:39:03 -0400 Subject: [PATCH 3/3] FIX on configuration insert for parnter env (2nd) --- workflow/engine/controllers/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 4fc0bfd15..11edc3bc8 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1323,7 +1323,7 @@ class Installer extends Controller public function setConfiguration() { - $query = <<