fernando/luos
1
0
Fork 0
Code Releases Activity

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-04-02 10:34:39 -04:00
parent 58e4ae1c8a 762f6b40ac
commit ebcc090be5
13 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
/**
* cliWorkspaces.php
*

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

@@ -1,4 +1,4 @@
<?php
<?php
/**
* class.dynaformEditor.php

2
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
/**
* AdditionalTables.php

2
workflow/engine/classes/model/OutputDocument.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
/**
* OutputDocument.php

2
workflow/engine/classes/triggers/class.pmSugarFunctions.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
/**
* class.pmSugar.pmFunctions.php

2
workflow/engine/controllers/adminProxy.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
/**
* adminProxy.php
*

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

@@ -44,7 +44,7 @@ G::LoadSystem('inputfilter');
$filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST);
$_REQUEST = $filter->xssFilterHard($_REQUEST);
$_SESSION = $filter->xssFilterHard($_SESSION);
$_SESSION = $filter->xssFilterHard($_SESSION);
$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;

2
workflow/engine/methods/install/r.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if(isset($_GET['srv'])) {

4
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -132,6 +132,8 @@ class BpmnWorkflow extends Project\Bpmn
$bpmnProjectsUid = array_keys($bpmnProjectsList);
foreach ($workflowProjects as $workflowProject) {
$data = array();
$data["PRJ_UID"] = $workflowProject["PRO_UID"];
$data["PRJ_NAME"] = $workflowProject["PRO_TITLE"];
$data["PRJ_DESCRIPTION"] = $workflowProject["PRO_DESCRIPTION"];
@@ -147,6 +149,8 @@ class BpmnWorkflow extends Project\Bpmn
$data["PRJ_UPDATE_DATE"] = $workflowProject["PRO_UPDATE_DATE"];
}
$data["PRJ_STATUS"] = $workflowProject["PRO_STATUS"];
if ($changeCaseTo != CASE_UPPER) {
$data = array_change_key_case($data, $changeCaseTo);
}

6
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -49,8 +49,10 @@ class Light extends Api
);
$response = array();
foreach ($data as $counterList) {
$name = $structure[$counterList['item']];
$response[$name] = $counterList['count'];
if(isset($structure[$counterList['item']])){
$name = $structure[$counterList['item']];
$response[$name] = $counterList['count'];
}
}
return $response;
}

2
workflow/engine/templates/cases/cases_Load.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$_POST['qs'] = $filter->xssFilterHard($_POST['qs']);

2
workflow/engine/templates/cases/showDebugFrameBreaker.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if (isset($_POST['NextStep'])) {

2
workflow/engine/templates/reportTables/mainLoad.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if(isset($_GET['gui'])) {