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

HOR-3620

Browse Source 
+ Add missing Phing package
- Remove pending LoadInclude
This commit is contained in:
davidcallizaya
2017-08-04 11:23:34 -04:00
parent 53f1350a89
commit bce594fe24
22 changed files with 199 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -57,6 +57,7 @@
"thirdparty/jsmin/jsmin.php",
"thirdparty/libchart/classes/",
"thirdparty/pear",
"thirdparty/phing",
"rbac/engine/classes/"
],
"files": [

2
framework/src/Maveriks/WebApplication.php
View File

@@ -418,7 +418,7 @@ class WebApplication
define("PATH_GULLIVER", PATH_GULLIVER_HOME . "system" . PATH_SEP); //gulliver system classes
define("PATH_GULLIVER_BIN", PATH_GULLIVER_HOME . "bin" . PATH_SEP); //gulliver bin classes
define("PATH_TEMPLATE", PATH_GULLIVER_HOME . "templates" . PATH_SEP);
define("PATH_THIRDPARTY", PATH_GULLIVER_HOME . "thirdparty" . PATH_SEP);
define("PATH_THIRDPARTY", PATH_TRUNK . "thirdparty" . PATH_SEP);
define("PATH_RBAC", PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP); //to enable rbac version 2
define("PATH_RBAC_CORE", PATH_RBAC_HOME . "engine" . PATH_SEP);
define("PATH_CORE", PATH_HOME . "engine" . PATH_SEP);

2
rbac/engine/config/paths.php
View File

@@ -38,7 +38,7 @@
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_TRUNK . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2

2
rbac/public_html/sysGeneric.php
View File

@@ -26,7 +26,7 @@
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', $pathTrunk . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine/classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_DATA', '/shared/rbac/');
define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );

28
workflow/engine/classes/class.pmTable.php → workflow/engine/classes/PmTable.php
View File

@@ -1,41 +1,14 @@
<?php
/**
* class.case.php
*
* @package workflow.engine.classes
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
require_once 'classes/model/AdditionalTables.php';
/**
* PmTable Class
* New class to handle pmTable in native form invoking to Phing & Propel
*
* @author Erik Amaru Ortiz <erik@colosa.com>
*/
class PmTable
{
private $dom = null;
private $schemaFile = '';
private $tableName;
@@ -1000,4 +973,3 @@ class PmTable
return $oCriteria;
}
}

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

@@ -305,7 +305,7 @@ class AdditionalTables extends BaseAdditionalTables
FieldsPeer::doDelete($criteria);
//remove all related to pmTable
$pmTable = new pmTable($additionalTable['ADD_TAB_NAME']);
$pmTable = new PmTable($additionalTable['ADD_TAB_NAME']);
$pmTable->setDataSource($additionalTable['DBS_UID']);
$pmTable->remove();
}
@@ -865,7 +865,7 @@ class AdditionalTables extends BaseAdditionalTables
// the class exists then load it.
require_once PATH_WORKSPACE . 'classes/' . $className . '.php';
// create a criteria object of report table class
$c = new Criteria(pmTable::resolveDbSource($row['DBS_UID']));
$c = new Criteria(PmTable::resolveDbSource($row['DBS_UID']));
// select all related records with this $appUid
eval('$c->add(' . $className . 'Peer::APP_UID, \'' . $appUid . '\');');
eval('$records = ' . $className . 'Peer::doSelect($c);');

2
workflow/engine/config/paths.php
View File

@@ -35,7 +35,7 @@
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_TRUNK . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );
define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );

4
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -69,7 +69,7 @@ class pmTablesProxy extends HttpProxyController
foreach ($addTables['rows'] as $i => $table) {
try {
$con = Propel::getConnection( pmTable::resolveDbSource( $table['DBS_UID'] ) );
$con = Propel::getConnection( PmTable::resolveDbSource( $table['DBS_UID'] ) );
$stmt = $con->createStatement();
$rs = $stmt->executeQuery( 'SELECT COUNT(*) AS NUM_ROWS from ' . $table['ADD_TAB_NAME'] );
if ($rs->next()) {
@@ -1177,7 +1177,7 @@ class pmTablesProxy extends HttpProxyController
$additionalTables = new AdditionalTables();
$table = $additionalTables->load( $httpData->id );
if ($table['PRO_UID'] != '') {
$additionalTables->populateReportTable( $table['ADD_TAB_NAME'], pmTable::resolveDbSource( $table['DBS_UID'] ), $table['ADD_TAB_TYPE'], $table['PRO_UID'], $table['ADD_TAB_GRID'], $table['ADD_TAB_UID'] );
$additionalTables->populateReportTable( $table['ADD_TAB_NAME'], PmTable::resolveDbSource( $table['DBS_UID'] ), $table['ADD_TAB_TYPE'], $table['PRO_UID'], $table['ADD_TAB_GRID'], $table['ADD_TAB_UID'] );
$result->message = 'generated for table ' . $table['ADD_TAB_NAME'];
}

1
workflow/engine/methods/cases/casesSchedulerLog_Ajax.php
View File

@@ -23,7 +23,6 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
//if (($RBAC_Response=$RBAC->userCanAccess("PM_USERS"))!=1) return $RBAC_Response;
G::LoadInclude( 'ajax' );
$_POST['action'] = get_ajax_value( 'action' );
switch ($_POST['action']) {

1
workflow/engine/methods/departments/departments_Ajax.php
View File

@@ -62,7 +62,6 @@ function LookForChildren ($parent, $level, $aDepUsers)
if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
return $RBAC_Response;
}
G::LoadInclude( 'ajax' );
$_POST['action'] = get_ajax_value( 'action' );
require_once 'classes/model/Department.php';

2
workflow/engine/methods/dynaforms/dynaforms_PagedTableAjax.php
View File

@@ -40,8 +40,6 @@ function pagedTable_BeforeQuery (&$ntable)
require_once (PATH_GULLIVER_HOME . 'methods/pagedTableAjax.php');
die();
G::LoadInclude( 'ajax' );
$id = get_ajax_value( 'ptID' );
$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
$page = get_ajax_value( 'page' );

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

@@ -24,7 +24,6 @@
if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
return $RBAC_Response;
}
G::LoadInclude( 'ajax' );
$_POST['action'] = get_ajax_value( 'action' );
switch ($_POST['action']) {

1
workflow/engine/methods/login/login_Ajax.php
View File

@@ -23,7 +23,6 @@
*
*/
try {
G::LoadInclude ( 'ajax' );
if (isset ( $_POST ['form'] )) {
$_POST = $_POST ['form'];
}

1
workflow/engine/methods/patterns/patterns_Ajax.php
View File

@@ -21,7 +21,6 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
G::LoadInclude( 'ajax' );
//$oJSON = new Services_JSON();
if (isset( $_POST['mode'] ) && $_POST['mode'] != '') {
$aData = $_POST;

1
workflow/engine/methods/setup/language_Ajax.php
View File

@@ -27,7 +27,6 @@ try {
$filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST);
G::LoadInclude( 'ajax' );
if (isset( $_POST['form'] )) {
$_POST = $_POST['form'];
}

1
workflow/engine/methods/setup/webServicesAjax.php
View File

@@ -33,7 +33,6 @@ if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_FACTORY
die();
}
G::LoadInclude( 'ajax' );
//G::pr($_SESSION);
$_POST['action'] = get_ajax_value( 'action' );
if ($_POST['action'] == '') {

2
workflow/engine/methods/setup/weekend.php
View File

@@ -23,8 +23,6 @@
*/
if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
return $RBAC_Response;
G::LoadInclude( 'ajax' );
$G_ENABLE_BLANK_SKIN = true;
$ARR_WEEKDAYS[0] = array ('SUNDAY','MONDAY','TUESDAY','WEDNESDAY','THURSDAY','FRIDAY','SATURDAY'

2
workflow/engine/methods/setup/weekendAjax.php
View File

@@ -24,8 +24,6 @@
if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
return $RBAC_Response;
G::ForceLogin( 'WF_PROCESS' );
G::LoadInclude( 'ajax' );
$G_HELP_PAGE = "setup-environment-time-controls-weekend";
$G_MAIN_MENU = "processmaker";

1
workflow/engine/methods/steps/steps_Ajax.php
View File

@@ -43,7 +43,6 @@ try {
require_once 'classes/model/StepTrigger.php';
require_once 'classes/model/Triggers.php';
G::LoadInclude( 'ajax' );
if (! empty( $_GET )) {
if (! isset( $_GET['form'] )) {
$aData = urldecode_values( $_GET );

1
workflow/engine/methods/tools/translationsAjax.php
View File

@@ -22,7 +22,6 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
ini_set( 'display_errors', 'off' );
G::LoadInclude( 'ajax' );
$function = get_ajax_value( 'function' );
$cat = get_ajax_value( 'cat' );
$node = get_ajax_value( 'node' );

4
workflow/engine/src/ProcessMaker/BusinessModel/Table.php
View File

@@ -130,7 +130,7 @@ class Table
$table = $additionalTables->load($rep_uid);
$additionalTables->populateReportTable(
$table['ADD_TAB_NAME'],
\pmTable::resolveDbSource( $table['DBS_UID'] ),
\PmTable::resolveDbSource( $table['DBS_UID'] ),
$table['ADD_TAB_TYPE'],
$table['PRO_UID'],
$table['ADD_TAB_GRID'],
@@ -361,7 +361,7 @@ class Table
throw (new \Exception("The fields must have a key 'fld_key'"));
}
$pmTable = new \pmTable($tableName);
$pmTable = new \PmTable($tableName);
$pmTable->setDataSource($tableCon);
$pmTable->setColumns($columnsStd);
$pmTable->setAlterTable(true);

2
workflow/public_html/sysGeneric.php
View File

@@ -187,7 +187,7 @@ define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP );
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_TRUNK . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );