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

6
gulliver/methods/genericAjax.php
View File

@@ -222,11 +222,11 @@ function sortByChar($aRows, $charSel)
*/ */
function queryModified($sqlParsed, $inputSel = "") function queryModified($sqlParsed, $inputSel = "")
{ {
if(!empty($sqlParsed['SELECT'])) { if(!empty($sqlParsed['SELECT'])) {
$sqlSelectOptions = (isset($sqlParsed["OPTIONS"]) && count($sqlParsed["OPTIONS"]) > 0)? implode(" ", $sqlParsed["OPTIONS"]) : null;
$sqlSelect = "SELECT "; $sqlSelect = "SELECT $sqlSelectOptions ";
$aSelect = $sqlParsed['SELECT']; $aSelect = $sqlParsed["SELECT"];
$sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr']; $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr'];
foreach($aSelect as $key => $value ) { foreach($aSelect as $key => $value ) {

9
gulliver/system/class.g.php
View File

@@ -1395,24 +1395,22 @@ class G
if ($lang === '') { if ($lang === '') {
$lang = defined( SYS_LANG ) ? SYS_LANG : 'en'; $lang = defined( SYS_LANG ) ? SYS_LANG : 'en';
} }
$aux = explode( ' ', $date ); //para dividir la fecha del dia $aux = explode( ' ', $date ); //para dividir la fecha del dia
$date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año. $date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año.
$time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos. $time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos.
$year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year $year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year
$month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month $month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month
$day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day $day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day
$h = isset( $time[0] ) ? $time[0] : '00'; //hour $h = isset( $time[0] ) ? $time[0] : '00'; //hour
$i = isset( $time[1] ) ? $time[1] : '00'; //minute $i = isset( $time[1] ) ? $time[1] : '00'; //minute
$s = isset( $time[2] ) ? $time[2] : '00'; //second $s = isset( $time[2] ) ? $time[2] : '00'; //second
$MONTHS = Array (); $MONTHS = Array ();
for ($i = 1; $i <= 12; $i ++) { for ($j = 1; $j <= 12; $j ++) {
$MONTHS[$i] = G::LoadTranslation( "ID_MONTH_$i", $lang ); $MONTHS[$j] = G::LoadTranslation( "ID_MONTH_$j", $lang );
} }
$d = (int) $day; $d = (int) $day;
@@ -1420,7 +1418,6 @@ class G
//missing D //missing D
$M = $MONTHS[$month]; $M = $MONTHS[$month];
$m = (int) $month; $m = (int) $month;
$mm = G::complete_field( $month, 2, 1 ); $mm = G::complete_field( $month, 2, 1 );

3
gulliver/templates/controller.exception.tpl
View File

@@ -3,13 +3,11 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Server Error :: </title> <title>Server Error :: </title>
<link href="style.css" rel="stylesheet" type="text/css">
</head> </head>
<style> <style>
.box { .box {
-moz-border-radius:6px; /* Rounded edges in Firefox */ -moz-border-radius:6px; /* Rounded edges in Firefox */
background-image: url(/images/classic/info.gif);
color :#000; color :#000;
border-style:solid; border-style:solid;
border-width:1px; border-width:1px;
@@ -55,4 +53,3 @@
</div> </div>
</body> </body>
</html> </html>

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

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

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

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

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

@@ -263,7 +263,7 @@ class SkinEngine
$meta = null; $meta = null;
$dirBody = 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]); $ie = intval($arrayMatch[1]);
$swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+ $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> </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"> <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_NAME>
<SCH_OPTION type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array"> <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(){ function validateSchedulerFields(){
getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
var validFields = true; var validFields = true;
var requiredFields = ''; var requiredFields = '';
var badFormatFields = ''; var badFormatFields = '';

4
workflow/public_html/sysGeneric.php
View File

@@ -501,8 +501,12 @@ if (defined( 'SYS_TEMP' ) && SYS_TEMP != '') {
// including workspace shared classes -> particularlly for pmTables // including workspace shared classes -> particularlly for pmTables
set_include_path( get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE ); set_include_path( get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE );
} else { } else {
if (SYS_LANG != '' && SYS_SKIN != '') {
Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" ); Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' ); Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
} else {
header('location: /errors/error404.php?url=' . urlencode($_SERVER['REQUEST_URI']));
}
die(); die();
} }
} else { //when we are in global pages, outside any valid workspace } else { //when we are in global pages, outside any valid workspace