fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master' into BUG-10852

Browse Source
This commit is contained in:
Hector Cortez
2013-04-19 10:45:29 -04:00
parent c903dfd1d9 3855111262
commit 66a23c0a96
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.configuration.php
View File

@@ -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];
}
}

7
workflow/engine/controllers/installer.php
View File

@@ -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 = <<<EOL
INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES
('ENVIRONMENT_SETTINGS', 'a:3:{s:26:"login_enableForgotPassword";b:0;s:27:"login_enableVirtualKeyboard";b:0;s:21:"login_defaultLanguage";s:5:"pt-BR";}');
EOL;
$this->mysqlQuery($query);
}