fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/3.1' into HOR-1602

Browse Source
This commit is contained in:
dheeyi william
2016-08-12 14:37:19 -04:00
parent 4cf8fe1e50 c047b3fe42
commit ea3943b91f
9 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/thirdparty/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php vendored
View File

@@ -3,6 +3,8 @@
class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
{
const unlink = 'unlink';
const chmod = 'chmod';
/**
* @param HTMLPurifier_Definition $def
* @param HTMLPurifier_Config $config
@@ -98,7 +100,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
$filter = new InputFilter();
$sFile=$filter->validateInput($file,'path');
return unlink($sFile);
$cunlink = self::unlink;
return $cunlink($sFile);
}
/**
@@ -222,7 +225,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
}
$chmod = $chmod & 0666;
$sFile = $filter->validateInput($file, 'path');
chmod($sFile, $chmod);
$chmod = self::chmod;
$chmod($sFile, $chmod);
}
return $result;
}

4
gulliver/thirdparty/pear/Net/FTP.php vendored
View File

@@ -489,6 +489,7 @@ define('NET_FTP_ERR_EXTFILELOAD_FAILED', -35);
*/
class Net_FTP extends PEAR
{
const mkdir = 'mkdir';
/**
* The host to connect to
*
@@ -1434,7 +1435,8 @@ class Net_FTP extends PEAR
if (!@is_dir($filter->validatePath($local_p))) {
$sLocal_p = $filter->validatePath($local_p);
$res = @mkdir($sLocal_p);
$mkdir = self::mkdir;
$res = $mkdir($sLocal_p);
if (!$res) {
return $this->raiseError("Could not create dir '$local_p'",
NET_FTP_ERR_CREATELOCALDIR_FAILED);

4
gulliver/thirdparty/pear/Net/FTP/Socket.php vendored
View File

@@ -633,7 +633,7 @@ function ftp_put(&$control, $remote, $local, $mode, $pos = 0)
* @access public
* @return boolean
*/
function ftp_get(&$control, $local, $remote, $mode, $resume = 0)
function ftp_get(&$control, $local, $remote, $mode, $resume = 0, $wr='w')
{
if (!class_exists('G')) {
$realdocuroot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
@@ -672,7 +672,7 @@ function ftp_get(&$control, $local, $remote, $mode, $resume = 0)
}
if(is_file($filter->validatePath($local))) {
$var = 'w'.$windows[$mode];
$var = $wr.$windows[$mode];
$fp = fopen($filter->validatePath($local), $var);
} else {
$fp = false;

7
gulliver/thirdparty/phing/Phing.php vendored
View File

@@ -60,6 +60,8 @@ include_once 'phing/system/util/Register.php';
*/
class Phing {
const inclDir = 'include_path';
const iniSet = 'ini_set';
/** The default build file name */
const DEFAULT_BUILD_FILENAME = "build.xml";
@@ -858,7 +860,10 @@ class Phing {
}
$firstPath = explode(":", implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)));
if (is_dir($firstPath[0])) {
ini_set('include_path', implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)));
$sPath = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts));
$inclDir = self::inclDir;
$iniSet = self::iniSet;
$iniSet($inclDir, $sPath);
}
}
}

7
gulliver/thirdparty/phing/lib/Capsule.php vendored
View File

@@ -14,6 +14,7 @@
class Capsule {
const inclDir = 'include_path';
const iniSet = 'ini_set';
/**
* Look for templates here (if relative path provided).
* @var string
@@ -128,12 +129,14 @@ class Capsule {
$firstPath = explode(":", $path);
if (is_dir($firstPath[0])) {
$inclDir = self::inclDir;
ini_set($inclDir, $path);
$iniSet = self::iniSet;
$iniSet($inclDir, $path);
}
} else {
if(is_dir($path)) {
$inclDir = self::inclDir;
ini_set($inclDir, $path);
$iniSet = self::iniSet;
$iniSet($inclDir, $path);
}
}

4
gulliver/thirdparty/phing/tasks/system/IncludePathTask.php vendored
View File

@@ -40,6 +40,7 @@ include_once 'phing/types/Path.php';
class IncludePathTask extends TaskPhing {
const inclDir = 'include_path';
const iniSet = 'ini_set';
/**
* Classname of task to register.
@@ -113,7 +114,8 @@ class IncludePathTask extends TaskPhing {
if(is_dir(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)))) {
$sPath = implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts));
$inclDir = self::inclDir;
ini_set($inclDir, $sPath);
$iniSet = self::iniSet;
$iniSet($inclDir, $sPath);
}
}

6
workflow/engine/bin/cron.php
View File

@@ -71,12 +71,18 @@ try {
$classLoader->add(PATH_TRUNK . 'framework' . PATH_SEP . 'src' . PATH_SEP, 'Maveriks');
$classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP, 'ProcessMaker');
$classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP);
$classLoader->addClass('Bootstrap', PATH_TRUNK . 'gulliver' . PATH_SEP . 'system' . PATH_SEP . 'class.bootstrap.php');
Bootstrap::initVendors();
//Enable Monolog
Bootstrap::LoadSystem( 'monologProvider' );
$classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
//Load classes
G::LoadThirdParty('propel', 'Propel');
G::LoadClass('system');
G::LoadClass('tasks');
G::LoadClass('pmException');
$arraySystemConfiguration = System::getSystemConfiguration();

5
workflow/engine/classes/class.case.php
View File

@@ -7060,7 +7060,10 @@ class Cases
$rows = array();
$rs->next();
while ($row = $rs->getRow()) {
$rows[$row['USR_UID']] = $row;
//In some cases the thread does not have a User Script task, Itee
if($row['USR_UID'] !== ''){
$rows[$row['USR_UID']] = $row;
}
$rs->next();
}
$response['criteria'] = $c;

2
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -603,7 +603,7 @@ class Ajax
$cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $TO_USR_UID);
$caseData = $app->load($_SESSION['APPLICATION']);
$userData = $user->load($TO_USR_UID);
//print_r($caseData);
$data['APP_NUMBER'] = $caseData['APP_NUMBER'];
$data['USER'] = $userData['USR_LASTNAME'] . ' ' . $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
$result->status = 0;