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

Merged in bugfix/HOR-4547 (pull request #6464)

Browse Source 
HOR-4547

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-05-11 20:26:34 +00:00
committed by Julio Cesar Laura Avendaño
parent c414dfef7d 4b20786cd6
commit e9d2fa3103
20 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
View File

@@ -450,7 +450,7 @@ function custom_ldap_explode_dn($dn)
unset($result["count"]);
foreach ($result as $key => $value) {
$result[$key] = addcslashes(preg_replace("/\\\([0-9A-Fa-f]{2})/", function ($m) {
$result[$key] = addcslashes(preg_replace_callback("/\\\([0-9A-Fa-f]{2})/", function ($m) {
return chr(hexdec($m[1]));
}, $value), '<>,"');
}

3
workflow/engine/methods/groups/groups_Ajax.php
View File

@@ -160,7 +160,8 @@ switch ($_POST['action']) {
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
$groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], Propel::getConnection("workflow")->getResource());
$connection = Propel::getConnection("workflow")->getResource();
$groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], $connection);
$groupUsers = new GroupUser();
$type = $_POST['action'] === 'assignedMembers' ? 'USERS' : 'AVAILABLE-USERS';

2
workflow/engine/methods/processes/consolidated.php
View File

@@ -2,7 +2,7 @@
class AdditionalTablesConsolidated extends AdditionalTables
{
public function createPropelClasses($sTableName, $sClassName, $aFields, $sAddTabUid)
public function createPropelClasses($sTableName, $sClassName, $aFields, $sAddTabUid, $connection = 'workflow')
{
try {
$aTypes = array('VARCHAR' => 'string',

5
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -388,8 +388,9 @@ if ($action == "uploadFileNewProcess") {
$allowedExtensions = array ($processFileType
);
$allowedExtensions = array ('pm');
if (! in_array( end( explode( ".", $_FILES['PROCESS_FILENAME']['name'] ) ), $allowedExtensions )) {
throw new Exception( G::LoadTranslation( "ID_FILE_UPLOAD_INCORRECT_EXTENSION" ) );
$explode = explode(".", $_FILES['PROCESS_FILENAME']['name']);
if (!in_array(end($explode), $allowedExtensions)) {
throw new Exception(G::LoadTranslation("ID_FILE_UPLOAD_INCORRECT_EXTENSION"));
}
}

1
workflow/engine/methods/triggers/triggers_Delete.php
View File

@@ -35,6 +35,7 @@ try {
$oStepTrigger = new StepTrigger();
$oStepTrigger->removeTrigger( $_POST['TRI_UID'] );
$result = new stdClass();
$result->success = true;
$result->msg = G::LoadTranslation( 'ID_TRIGGERS_REMOVED' );