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-23 18:27:19 -04:00
parent fe2a36a417 7d33d4ce06
commit dbf73b721e
8 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,7 +551,7 @@ class Configurations // extends Configuration
$langLocate = 'PTB';
break;
case 'en':
case 'en_US':
case 'en-US':
default:
$langLocate = 'EST';
break;

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

@@ -337,7 +337,9 @@ class Installer extends Controller
if (substr( $pathShared, - 1 ) != '/') {
$pathShared .= '/';
}
$logFile = $pathShared . 'log/install.log';
$pathSharedLog = $pathShared . 'log/';
G::verifyPath($pathSharedLog, true);
$logFile = $pathSharedLog . 'install.log';
if (! is_file( $logFile )) {
G::mk_dir( dirname( $pathShared ) );
@@ -839,8 +841,9 @@ class Installer extends Controller
$updatedConf['default_skin'] = $skinUri;
$info->uri = PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';
$indexFileUpdated = true;
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
$this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
$this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], $langUri);
} else {
try {
G::update_php_ini( $envFile, $updatedConf );
@@ -1335,8 +1338,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';
@@ -1374,7 +1383,6 @@ EOL;
// File to upload/post
$postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po";
curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/languages_Import");
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_VERBOSE, 0);
@@ -1446,7 +1454,6 @@ EOL;
curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
curl_setopt($ch, CURLOPT_TIMEOUT, 90);
$output = curl_exec($ch);
curl_close($ch);
}

2
workflow/engine/skinEngine/skinEngine.php
View File

@@ -263,7 +263,7 @@ class SkinEngine
$meta = null;
$dirBody = null;
if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
$ie = intval($arrayMatch[1]);
$swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+

5
workflow/engine/xmlform/cases/cases_Scheduler_New.xml
View File

@@ -46,7 +46,7 @@
</TAS_UID>
<SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0">
<en>Description</en>
<en>Name</en>
</SCH_NAME>
<SCH_OPTION type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array">
@@ -623,6 +623,9 @@ function case_userSchedulerValidate(username, password) {
*/
function validateSchedulerFields(){
getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
var validFields = true;
var requiredFields = '';
var badFormatFields = '';