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

HOR-2689 Removed references to G::LoadClass, Bootstrap::LoadClass and various references to class loading methods and require_once

Browse Source
This commit is contained in:
Chloe Deguzman
2017-02-14 21:24:08 +00:00
committed by davidcallizaya
parent d72b7aa561
commit 60efcf7ac7
461 changed files with 289 additions and 3170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/controllers/adhocUserProxy.php
View File

@@ -1,15 +1,10 @@
<?php
require_once 'classes/model/Application.php';
G::LoadClass( 'case' );
class adhocUserProxy extends HttpProxyController
{
//list of users into adhoc option
function adhocAssignUsersk ($params)
{
G::LoadClass( 'groups' );
G::LoadClass( 'tasks' );
$oTasks = new Tasks();
$aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 2 );
$aAdhocUsers = array ();

10
workflow/engine/controllers/admin.php
View File

@@ -18,7 +18,7 @@ class Admin extends Controller
global $RBAC;
$RBAC->requirePermissions( 'PM_SETUP' );
require_once PATH_CONTROLLERS . 'main.php';
G::loadClass( 'system' );
$skinsList = System::getSkingList();
foreach ($skinsList['skins'] as $key => $value) {
if ($value['SKIN_WORKSPACE'] != 'Global') {
@@ -36,7 +36,6 @@ class Admin extends Controller
}
$this->includeExtJS( 'admin/system' );
//G::LoadClass('configuration');
// $c = new Configurations();
// $configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
@@ -61,7 +60,6 @@ class Admin extends Controller
$RBAC->requirePermissions( 'PM_SETUP' );
require_once PATH_CONTROLLERS . 'adminProxy.php';
$this->includeExtJS( 'admin/uxUsersList' );
G::LoadClass( 'configuration' );
$c = new Configurations();
$configPage = $c->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
@@ -84,8 +82,6 @@ class Admin extends Controller
{
global $RBAC;
//$RBAC->requirePermissions('PM_SETUP_ADVANCE');
G::LoadClass( 'configuration' );
G::LoadClass( 'calendar' );
$CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() );
$calendarObj = new calendar();
@@ -169,7 +165,6 @@ class Admin extends Controller
global $RBAC;
$RBAC->requirePermissions( 'PM_SETUP_ADVANCE', 'PM_SETUP_LOGO');
G::LoadClass( 'configuration' );
$c = new Configurations();
$configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
@@ -214,7 +209,6 @@ class Admin extends Controller
private function _getSystemInfo ()
{
G::LoadClass( "system" );
if (getenv( 'HTTP_CLIENT_IP' )) {
$ip = getenv( 'HTTP_CLIENT_IP' );
@@ -236,8 +230,6 @@ class Admin extends Controller
$redhat .= " (" . PHP_OS . ")";
if (defined( "DB_HOST" )) {
G::LoadClass( 'net' );
G::LoadClass( 'dbConnections' );
$dbNetView = new NET( DB_HOST );
$dbNetView->loginDbServer( DB_USER, DB_PASS );

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

@@ -34,7 +34,6 @@ class adminProxy extends HttpProxyController
*/
public function saveSystemConf($httpData)
{
G::loadClass('system');
$envFile = PATH_CONFIG . 'env.ini';
$updateRedirector = false;
$restart = false;
@@ -211,7 +210,6 @@ class adminProxy extends HttpProxyController
public function uxGroupUpdate($httpData)
{
G::LoadClass('groups');
$groups = new Groups();
$users = $groups->getUsersOfGroup($httpData->GRP_UID);
$success = true;
@@ -295,7 +293,6 @@ class adminProxy extends HttpProxyController
//]
$form = $_POST;
G::LoadClass('calendar');
$calendarObj=new calendar();
$calendarObj->saveCalendarInfo($form);
echo "{success: true}";
@@ -368,9 +365,6 @@ class adminProxy extends HttpProxyController
*/
public function testConnection($params)
{
G::LoadClass('net');
G::LoadThirdParty('phpmailer', 'class.smtp');
if ($_POST['typeTest'] == 'MAIL') {
$eregMail = "/^[0-9a-zA-Z]+(?:[._][0-9a-zA-Z]+)*@[0-9a-zA-Z]+(?:[._-][0-9a-zA-Z]+)*\.[0-9a-zA-Z]{2,3}$/";
@@ -583,8 +577,6 @@ class adminProxy extends HttpProxyController
public function sendTestMail()
{
global $G_PUBLISH;
G::LoadClass("system");
G::LoadClass('spool');
$aConfiguration = array(
'MESS_ENGINE' => $_POST['MESS_ENGINE'],
@@ -766,8 +758,6 @@ class adminProxy extends HttpProxyController
*/
public function loadFields()
{
G::loadClass('configuration');
$oConfiguration = new Configurations();
$oConfiguration->loadConfig($x, 'Emails','','','','');
$fields = $oConfiguration->aConfig;
@@ -795,7 +785,6 @@ class adminProxy extends HttpProxyController
*/
public function getListImage($httpData)
{
G::LoadClass('replacementLogo');
$uplogo = PATH_TPL . 'setup' . PATH_SEP . 'uplogo.html';
$width = "100%";
$upload = new replacementLogo();
@@ -1101,7 +1090,6 @@ class adminProxy extends HttpProxyController
*/
public function getNameCurrentLogo()
{
G::LoadClass('replacementLogo');
$upload = new replacementLogo();
$aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']);
$sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']);
@@ -1197,7 +1185,6 @@ class adminProxy extends HttpProxyController
$snameLogo = urldecode($_GET['NAMELOGO']);
$snameLogo = trim($snameLogo);
$snameLogo = self::changeNamelogo($snameLogo);
G::loadClass('configuration');
$oConf = new Configurations;
$aConf = Array(
'WORKSPACE_LOGO_NAME' => SYS_SYS,
@@ -1213,7 +1200,6 @@ class adminProxy extends HttpProxyController
break;
case 'restoreLogo':
$snameLogo = $_GET['NAMELOGO'];
G::loadClass('configuration');
$oConf = new Configurations;
$aConf = Array(
'WORKSPACE_LOGO_NAME' => '',

3
workflow/engine/controllers/appProxy.php
View File

@@ -59,7 +59,6 @@ class AppProxy extends HttpProxyController
throw new Exception(G::LoadTranslation("ID_RESOLVE_APPLICATION_ID"));
}
G::LoadClass( 'case' );
$case = new Cases();
if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) {
@@ -185,7 +184,6 @@ class AppProxy extends HttpProxyController
break;
}
G::LoadClass( 'case' );
$case = new Cases();
if ($httpData->action == 'sent') { // Get the last valid delegation for participated list
@@ -236,7 +234,6 @@ class AppProxy extends HttpProxyController
$formCaseTitle = new Form( 'cases/cases_Resume_Current_Task_Title', PATH_XMLFORM, SYS_LANG );
$formCurrentTaskProperties = new Form( 'cases/cases_Resume_Current_Task', PATH_XMLFORM, SYS_LANG );
G::LoadClass( 'case' );
$case = new Cases();
foreach ($formCaseProperties->fields as $fieldName => $field) {

10
workflow/engine/controllers/caseSchedulerProxy.php
View File

@@ -14,7 +14,6 @@ class caseSchedulerProxy extends HttpProxyController
$sch_uid = $oData['EVN_ACTION'];
if ($sch_uid != '') {
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$rows = $oProcessMap->caseNewSchedulerList( $sch_uid );
if ($rows['SCH_OPTION'] == '3') {
@@ -114,11 +113,7 @@ class caseSchedulerProxy extends HttpProxyController
$messageCode = true;
$message = $result->message;
G::LoadClass( 'Task' );
//G::LoadClass ( 'Event' );
G::LoadClass( 'User' );
G::LoadClass( 'TaskUser' );
G::LoadClass( 'Groupwf' );
$event = new Event();
$event->load( $sEVN_UID );
@@ -128,9 +123,6 @@ class caseSchedulerProxy extends HttpProxyController
$task->load( $sTASKS );
$sTASKS_SEL = $task->getTasTitle();
if (! class_exists( 'GroupUser' )) {
G::LoadClass( 'GroupUser' );
}
// if the user has been authenticated, then check if has the rights or
// permissions to create the webentry
if ($result->status_code == 0) {

3
workflow/engine/controllers/dashboard.php
View File

@@ -22,7 +22,6 @@ class Dashboard extends Controller
G::header( 'location: login/login' );
exit(0);
}
G::LoadClass( 'pmDashlet' );
$this->pmDashlet = new PMDashlet();
}
@@ -36,7 +35,6 @@ class Dashboard extends Controller
$dashletsHide = array();
$dashletColumns = 2;
G::LoadClass( 'configuration' );
$oConfiguration = new Configurations();
$aConfiguration = $oConfiguration->load('Dashboard', '', '', $_SESSION['USER_LOGGED']);
if (is_array($aConfiguration) && count($aConfiguration) != 0) {
@@ -126,7 +124,6 @@ class Dashboard extends Controller
$orderDashlet[1] = Bootstrap::json_decode($data->positionCol1);
$orderDashlet[2] = Bootstrap::json_decode($data->positionCol2);
G::loadClass('configuration');
$oConfiguration = new Configurations();
$aConfiguration = $oConfiguration->load('Dashboard', '', '', $_SESSION['USER_LOGGED']);

10
workflow/engine/controllers/home.php
View File

@@ -99,14 +99,9 @@ class Home extends Controller
return;
}
require_once 'classes/model/UsersProperties.php';
G::LoadClass( 'process' );
G::LoadClass( 'case' );
$userProperty = new UsersProperties();
$process = new Process();
$case = new Cases();
G::loadClass( 'system' );
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
//Get ProcessStatistics Info
@@ -192,7 +187,6 @@ class Home extends Controller
$solrEnabled = false;
if (($solrConf = System::solrEnv()) !== false) {
G::LoadClass("AppSolr");
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
@@ -212,7 +206,6 @@ class Home extends Controller
if ($solrEnabled) {
$cases = $ApplicationSolrIndex->getAppGridData($this->userUid, 0, 1, 'todo');
} else {
G::LoadClass( 'applications' );
$apps = new Applications();
@@ -420,7 +413,6 @@ class Home extends Controller
) &&
(($solrConf = System::solrEnv()) !== false)
) {
G::LoadClass("AppSolr");
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
@@ -537,7 +529,6 @@ class Home extends Controller
}
if (isset( $row['DEL_DELEGATE_DATE'] )) {
G::LoadClass( "configuration" );
$conf = new Configurations();
$generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
$cases['data'][$i]['DEL_DELEGATE_DATE'] = '';
@@ -565,7 +556,6 @@ class Home extends Controller
public function startCase ($httpData)
{
G::LoadClass( 'case' );
$case = new Cases();
$aData = $case->startCase( $httpData->id, $_SESSION['USER_LOGGED'] );

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

@@ -928,7 +928,6 @@ class Installer extends Controller
//erik: for new env conf handling
G::loadClass( 'system' );
$envFile = PATH_CONFIG . 'env.ini';
// getting configuration from env.ini

21
workflow/engine/controllers/main.php
View File

@@ -14,7 +14,6 @@ class Main extends Controller
public function __construct ()
{
G::LoadClass( 'memcached' );
$this->memcache = & PMmemcached::getSingleton( defined( 'SYS_SYS' ) ? SYS_SYS : '' );
define( 'ERROR_EXCEPTION', 1 );
@@ -107,9 +106,6 @@ class Main extends Controller
*/
public function login ()
{
require_once 'classes/model/LoginLog.php';
G::LoadClass( 'system' );
G::loadClass( 'configuration' );
$this->conf = new Configurations();
// getting posibles errors passed by GET method
@@ -197,8 +193,6 @@ class Main extends Controller
$availableLangArray = $this->getLanguagesList();
G::LoadClass( "serverConfiguration" );
$sflag = 0;
if (($nextBeatDate = $this->memcache->get( 'nextBeatDate' )) === false) {
@@ -236,7 +230,6 @@ class Main extends Controller
$this->setJSVar( 'flagGettingStarted', ($flagGettingStarted == 0) );
G::loadClass( 'configuration' );
$oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
@@ -292,10 +285,7 @@ class Main extends Controller
*/
public function sysLogin ()
{
require_once ("propel/Propel.php");
require_once ("creole/Creole.php");
G::LoadClass( 'system' );
G::LoadThirdParty( "pake", "pakeColor.class" );
Propel::init( PATH_CORE . "config/databases.php" );
Creole::registerDriver( 'dbarray', 'creole.contrib.DBArrayConnection' );
@@ -313,7 +303,6 @@ class Main extends Controller
$aField['LOGIN_VERIFY_MSG'] = G::loadTranslation( 'LOGIN_VERIFY_MSG' );
//Get Server Configuration
G::LoadClass( 'serverConfiguration' );
$oServerConf = & serverConf::getSingleton();
$availableLangArray = $this->getLanguagesList();
@@ -357,9 +346,6 @@ class Main extends Controller
{
$this->setResponseType( 'json' );
global $RBAC;
require_once PATH_RBAC . "model/RbacUsers.php";
require_once 'classes/model/Users.php';
G::LoadClass( "system" );
$rbacUser = new RbacUsers();
$user = new Users();
@@ -477,7 +463,6 @@ class Main extends Controller
if (defined( "SYS_SYS" )) {
if (($aFotoSelect = $this->memcache->get( 'aFotoSelect' )) === false) {
G::LoadClass( 'replacementLogo' );
$oLogoR = new replacementLogo();
$aFotoSelect = $oLogoR->getNameLogo( (isset( $_SESSION['USER_LOGGED'] )) ? $_SESSION['USER_LOGGED'] : '' );
$this->memcache->set( 'aFotoSelect', $aFotoSelect, 1 * 3600 );
@@ -528,7 +513,6 @@ class Main extends Controller
private function getWorkspacesAvailable ()
{
G::LoadClass( 'serverConfiguration' );
$oServerConf = & serverConf::getSingleton();
$dir = PATH_DB;
$filesArray = array ();
@@ -688,7 +672,6 @@ class Main extends Controller
private function _getSystemInfo ()
{
G::LoadClass( "system" );
if (getenv( 'HTTP_CLIENT_IP' )) {
$ip = getenv( 'HTTP_CLIENT_IP' );
@@ -710,8 +693,6 @@ class Main extends Controller
$redhat .= " (" . PHP_OS . ")";
if (defined( "DB_HOST" )) {
G::LoadClass( 'net' );
G::LoadClass( 'dbConnections' );
$dbNetView = new NET( DB_HOST );
$dbNetView->loginDbServer( DB_USER, DB_PASS );

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

@@ -14,8 +14,6 @@ class newSiteProxy extends HttpProxyController
$action = (isset( $_POST['action'] )) ? trim( $_POST['action'] ) : 'test';
$ao_db_drop = (isset( $_POST['AO_DB_DROP'] )) ? true : false;
G::LoadClass( 'Installer' );
//G::LoadClass( 'json' );
$name = trim( $_POST['NW_TITLE'] );
$inst = new Installer();
if ($inst->isset_site($name)) {

3
workflow/engine/controllers/pmGmail.php
View File

@@ -10,7 +10,6 @@ class pmGmail extends Controller
{
public function saveConfigPmGmail($httpData)
{
G::LoadClass("pmGoogleApi");
$pmGoogle = new PMGoogleApi();
$result = new StdClass();
$result->success = true;
@@ -63,7 +62,6 @@ class pmGmail extends Controller
$this->setJSVar('__PMGMAIL_ERROR__', $_SESSION['__PMGMAIL_ERROR__']);
unset($_SESSION['__PMGMAIL_ERROR__']);
}
G::LoadClass("pmGoogleApi");
$pmGoogle = new PMGoogleApi();
$accountEmail = $pmGoogle->getServiceAccountEmail();
$googleCertificate = $pmGoogle->getServiceAccountCertificate();
@@ -100,7 +98,6 @@ class pmGmail extends Controller
*/
public function testConfigPmGmail($httpData)
{
G::LoadClass("pmGoogleApi");
$pmGoogle = new PMGoogleApi();
$result = new stdClass();

5
workflow/engine/controllers/pmTables.php
View File

@@ -26,7 +26,6 @@ class pmTables extends Controller
global $RBAC;
$RBAC->requirePermissions( 'PM_SETUP_ADVANCE', 'PM_SETUP_PM_TABLES' );
G::LoadClass( 'configuration' );
$c = new Configurations();
$configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
@@ -62,10 +61,6 @@ class pmTables extends Controller
*/
public function edit ($httpData)
{
require_once PATH_CONTROLLERS . 'pmTablesProxy.php';
require_once 'classes/model/AdditionalTables.php';
G::loadClass( 'pmTable' );
$additionalTables = new AdditionalTables();
$table = false;
$addTabUid = isset( $httpData->id ) ? $httpData->id : false;

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

@@ -25,9 +25,6 @@ class pmTablesProxy extends HttpProxyController
*/
public function getList ($httpData)
{
G::LoadClass( 'configuration' );
G::LoadClass( 'processMap' );
G::LoadClass( 'pmTable' );
$configurations = new Configurations();
$processMap = new processMap();
@@ -113,7 +110,6 @@ class pmTablesProxy extends HttpProxyController
if (! isset( $_SESSION['PROCESS'] )) {
$_SESSION['PROCESS'] = $_POST['PRO_UID'];
}
G::LoadClass( 'dbConnections' );
$proUid = $_POST['PRO_UID'];
$dbConn = new DbConnections();
$dbConnections = $dbConn->getConnectionsProUid( $proUid, array('mysql') );
@@ -142,7 +138,6 @@ class pmTablesProxy extends HttpProxyController
*/
public function getDynafields ($httpData)
{
G::LoadClass( 'reportTables' );
$aFields['FIELDS'] = array ();
$aFields['PRO_UID'] = $httpData->PRO_UID;
@@ -272,7 +267,6 @@ class pmTablesProxy extends HttpProxyController
}
if ($row->type == 'CLASSIC') {
G::LoadClass( 'reportTables' );
$rp = new reportTables();
$rp->deleteReportTable( $row->id );
$count ++;
@@ -321,9 +315,6 @@ class pmTablesProxy extends HttpProxyController
*/
public function dataView ($httpData)
{
require_once 'classes/model/AdditionalTables.php';
G::LoadClass( 'configuration' );
$co = new Configurations();
$config = $co->getConfiguration( 'additionalTablesData', 'pageSize', '', $_SESSION['USER_LOGGED'] );
$limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
@@ -462,8 +453,6 @@ class pmTablesProxy extends HttpProxyController
public function importCSV ($httpData)
{
G::LoadClass('pmFunctions');
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$countRow = 250;
$tmpfilename = $_FILES['form']['tmp_name']['CSV_FILE'];
@@ -949,11 +938,8 @@ class pmTablesProxy extends HttpProxyController
try {
$result = new stdClass();
G::LoadCLass( 'net' );
$net = new NET( G::getIpAddress() );
G::LoadClass( "system" );
$META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . System::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
$EXPORT_TRACEBACK = Array ();
@@ -1184,8 +1170,7 @@ class pmTablesProxy extends HttpProxyController
public function genDataReport ($httpData)
{
$result = new stdClass();
G::loadClass( 'pmTable' );
require_once 'classes/model/AdditionalTables.php';
$result->message = '';
$result->success = true;
@@ -1253,7 +1238,6 @@ class pmTablesProxy extends HttpProxyController
public function _getDynafields ($proUid, $type = 'xmlform', $start = null, $limit = null, $filter = null)
{
G::LoadClass('pmDynaform');
$cache = 1;
if (! isset( $_SESSION['_cache_pmtables'] ) || (isset( $_SESSION['_cache_pmtables'] ) && $_SESSION['_cache_pmtables']['pro_uid'] != $proUid) || (isset( $_SESSION['_cache_pmtables'] ) && $_SESSION['_cache_pmtables']['dyn_uid'] != $this->dynUid)) {
@@ -1556,7 +1540,6 @@ class pmTablesProxy extends HttpProxyController
public function _getGridFields ($proUid)
{
try {
G::LoadClass('pmDynaform');
$bpmn = new \ProcessMaker\Project\Bpmn();
$flagIsBpmn = $bpmn->exists($proUid);

9
workflow/engine/controllers/processOptionsProxy.php
View File

@@ -5,7 +5,6 @@ class processOptionsProxy extends HttpProxyController
public function loadInputDocuments ($params)
{
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$pro_uid = $params->PRO_UID;
@@ -25,7 +24,6 @@ class processOptionsProxy extends HttpProxyController
public function canDeleteInputDoc ($params)
{
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$aRows = $oProcessMap->getAllInputDocsByTask( $params->PRO_UID );
$response = isset( $aRows[$params->IDOC_UID] ) ? false : true;
@@ -34,11 +32,6 @@ class processOptionsProxy extends HttpProxyController
public function deleteInputDoc ($params)
{
require_once 'classes/model/StepSupervisor.php';
require_once 'classes/model/ObjectPermission.php';
require_once 'classes/model/InputDocument.php';
G::LoadClass( 'processMap' );
$oStepSupervisor = new StepSupervisor();
$fields2 = $oStepSupervisor->loadInfo( $params->IDOC_UID );
$oStepSupervisor->remove( $fields2['STEP_UID'] );
@@ -70,8 +63,6 @@ class processOptionsProxy extends HttpProxyController
public function saveInputDoc ($params)
{
require_once 'classes/model/InputDocument.php';
G::LoadClass( 'processMap' );
$aData = array ();
$aData['PRO_UID'] = $params->PRO_UID;

15
workflow/engine/controllers/processProxy.php
View File

@@ -56,6 +56,7 @@ class ProcessProxy extends HttpProxyController
}
$sProUid = $project->getUid();
$this->success = true;
$this->PRO_UID = $sProUid;
$this->msg = G::LoadTranslation( 'ID_CREATE_PROCESS_SUCCESS' );
@@ -73,7 +74,6 @@ class ProcessProxy extends HttpProxyController
{
$ids = explode( ',', $_REQUEST['UIDS'] );
G::LoadClass( 'processes' );
$oProcess = new Processes();
if (count( $ids ) > 0) {
foreach ($ids as $id) {
@@ -89,7 +89,6 @@ class ProcessProxy extends HttpProxyController
{
$ids = explode( ',', $_REQUEST['UIDS'] );
G::LoadClass( 'processes' );
$oProcess = new Processes();
if (count( $ids ) > 0) {
foreach ($ids as $id) {
@@ -226,8 +225,6 @@ class ProcessProxy extends HttpProxyController
*/
public function getProcessDetail ($httpData)
{
require_once 'classes/model/Process.php';
G::loadClass( 'tasks' );
$tasks = new Tasks();
$PRO_UID = $httpData->PRO_UID;
$process = ProcessPeer::retrieveByPk( $PRO_UID );
@@ -265,10 +262,7 @@ class ProcessProxy extends HttpProxyController
{
switch ($httpData->type) {
case 'process':
require_once 'classes/model/ProcessCategory.php';
require_once 'classes/model/CalendarDefinition.php';
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$process = $oProcessMap->editProcessNew( $httpData->UID );
$category = ProcessCategoryPeer::retrieveByPk( $process['PRO_CATEGORY'] );
@@ -310,9 +304,7 @@ class ProcessProxy extends HttpProxyController
{
switch ($httpData->type) {
case 'process':
require_once 'classes/model/ProcessCategory.php';
require_once 'classes/model/CalendarDefinition.php';
G::LoadClass( 'processMap' );
$oProcessMap = new ProcessMap();
$process['PRO_UID'] = $httpData->UID;
@@ -336,7 +328,6 @@ class ProcessProxy extends HttpProxyController
$fieldName = 'PRO_CALENDAR';
$calendar = CalendarDefinition::loadByCalendarName( $httpData->value );
G::LoadClass( "calendar" );
$calendarObj = new Calendar();
$calendarObj->assignCalendarTo( $process['PRO_UID'], $calendar['CALENDAR_UID'], 'PROCESS' );
break;
@@ -382,7 +373,6 @@ class ProcessProxy extends HttpProxyController
*/
public function getCaledarList ()
{
G::LoadClass( 'calendar' );
$calendar = new CalendarDefinition();
$calendarObj = $calendar->getCalendarList( true, true );
$calendarObj['array'][0] = Array ('CALENDAR_UID' => '','CALENDAR_NAME' => ''
@@ -398,7 +388,6 @@ class ProcessProxy extends HttpProxyController
*/
public function getPMVariables ($param)
{
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$rows = getDynaformsVars( $param->PRO_UID );
foreach ($rows as $i => $var) {

15
workflow/engine/controllers/webEntryProxy.php
View File

@@ -60,12 +60,6 @@ class webEntryProxy extends HttpProxyController
$messageCode = true;
$message = $result->message;
G::LoadClass( 'Task' );
//G::LoadClass ( 'Event' );
G::LoadClass( 'User' );
G::LoadClass( 'TaskUser' );
G::LoadClass( 'Groupwf' );
$event = new Event();
$event->load( $sEVN_UID );
$sTASKS = $event->getEvnTasUidTo();
@@ -74,9 +68,6 @@ class webEntryProxy extends HttpProxyController
$task->load( $sTASKS );
$sTASKS_SEL = $task->getTasTitle();
if (! class_exists( 'GroupUser' )) {
G::LoadClass( 'GroupUser' );
}
// if the user has been authenticated, then check if has the rights or
// permissions to create the webentry
if ($result->status_code == 0) {
@@ -133,11 +124,6 @@ class webEntryProxy extends HttpProxyController
unlink( PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "public" . PATH_SEP . $pro_uid . PATH_SEP . str_replace( ".php", "Post", $filename ) . ".php" );
}
//return $params;
G::LoadClass( "system" );
$pathProcess = PATH_DATA_SITE . 'public' . PATH_SEP . $sPRO_UID . PATH_SEP;
G::mk_dir( $pathProcess, 0777 );
@@ -242,7 +228,6 @@ class webEntryProxy extends HttpProxyController
public function load ($params)
{
G::LoadClass( 'processMap' );
$oProcessMap = new processMap( new DBConnection() );
$PRO_UID = $params->PRO_UID;
$EVN_UID = $params->EVN_UID;