diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index 4296a8fac..e6308a748 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -566,10 +566,6 @@ class WebApplication define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' ); define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' ); - // create memcached singleton - //\Bootstrap::LoadClass("memcached"); - //$memcache = PMmemcached::getSingleton( SYS_SYS ); - \Propel::init(PATH_CONFIG . "databases.php"); //Set Time Zone diff --git a/gulliver/bin/tasks/pakeGulliver.php b/gulliver/bin/tasks/pakeGulliver.php index 745dbbe22..44cf5441d 100644 --- a/gulliver/bin/tasks/pakeGulliver.php +++ b/gulliver/bin/tasks/pakeGulliver.php @@ -191,7 +191,7 @@ function run_generate_unit_test_class($task, $args) { } include ('test' . PATH_SEP . 'bootstrap' . PATH_SEP . 'unit.php'); - + require_once ('propel/Propel.php'); require_once ($classFilename); diff --git a/gulliver/methods/pagedTableAjax.php b/gulliver/methods/pagedTableAjax.php index 26c791073..8b96f701f 100644 --- a/gulliver/methods/pagedTableAjax.php +++ b/gulliver/methods/pagedTableAjax.php @@ -24,7 +24,7 @@ */ - +require_once ( 'classes/class.xmlfield_InputPM.php' ); $id=get_ajax_value('ptID'); $ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']'])); $page=get_ajax_value('page'); diff --git a/gulliver/methods/propelTableAjax.php b/gulliver/methods/propelTableAjax.php index 19bc99a91..ed41c50a9 100644 --- a/gulliver/methods/propelTableAjax.php +++ b/gulliver/methods/propelTableAjax.php @@ -24,6 +24,9 @@ */ /* Includes */ + G::LoadAllModelClasses(); + G::LoadAllPluginModelClasses(); + require_once ( 'classes/class.xmlfield_InputPM.php' ); $id = get_ajax_value('ptID'); $ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']'])); $page = get_ajax_value('page'); diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 76577cb11..16d0ae874 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -2985,7 +2985,7 @@ class XmlForm_Field_File extends XmlForm_Field } if (isset( $_SESSION["APPLICATION"] ) && isset( $_SESSION["USER_LOGGED"] ) && isset( $_SESSION["TASK"] ) && isset( $this->input ) && $this->input != null && $this->mode == "view") { - + require_once ("classes/model/AppDocument.php"); $case = new Cases(); diff --git a/rbac/engine/classes/model/RbacUsers.php b/rbac/engine/classes/model/RbacUsers.php index 2cfa1b523..760a9c9b2 100644 --- a/rbac/engine/classes/model/RbacUsers.php +++ b/rbac/engine/classes/model/RbacUsers.php @@ -27,11 +27,6 @@ /** * @access public */ -require_once 'classes/model/om/BaseRbacUsers.php'; - -if (!class_exists('PMLicensedFeatures')) { - G::LoadClass('licensedFeatures'); -} /** * Skeleton subclass for representing a row from the 'USERS' table. diff --git a/thirdparty/propel/Propel.php b/thirdparty/propel/Propel.php index a0732b12c..810117520 100644 --- a/thirdparty/propel/Propel.php +++ b/thirdparty/propel/Propel.php @@ -488,7 +488,7 @@ class Propel { * @date: 27-05-08 11:48 * * @Description: this was added for the additional database connections * ***********************************************************************/ - G::LoadClass ('dbConnections'); + $oDbConnections = new dbConnections($_SESSION['PROCESS']); $oDbConnections->loadAdditionalConnections(); $dsn = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null; diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php index 5c690a36f..728075580 100644 --- a/workflow/engine/PmBootstrap.php +++ b/workflow/engine/PmBootstrap.php @@ -317,7 +317,6 @@ class PmBootstrap extends Bootstrap $bRedirect = true; if (isset($_GET['sid'])) { - G::LoadClass('sessions'); $oSessions = new Sessions(); if ($aSession = $oSessions->verifySession($_GET['sid'])) { require_once 'classes/model/Users.php'; diff --git a/workflow/engine/bin/cli.php b/workflow/engine/bin/cli.php index 963e9b3d4..07b634040 100644 --- a/workflow/engine/bin/cli.php +++ b/workflow/engine/bin/cli.php @@ -98,8 +98,6 @@ $app->loadEnvironment(); require PATH_THIRDPARTY . "pake" . PATH_SEP . "pakeFunction.php"; require PATH_THIRDPARTY . "pake" . PATH_SEP . "pakeGetopt.class.php"; -G::LoadClass("cli"); - // trap -V before pake if (in_array('-v', $argv) || in_array('-V', $argv) || in_array('--version', $argv)) { diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 408907a40..f0ace7c4b 100644 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -74,15 +74,8 @@ try { $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(); diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 9c19eb300..bc75f488b 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -64,35 +64,6 @@ try { $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP); - //Load classes - G::LoadThirdParty('pear/json', 'class.json'); - G::LoadThirdParty('smarty/libs', 'Smarty.class'); - G::LoadThirdParty('propel', 'Propel'); - G::LoadSystem('error'); - G::LoadSystem('dbconnection'); - G::LoadSystem('dbsession'); - G::LoadSystem('dbrecordset'); - G::LoadSystem('dbtable'); - G::LoadSystem('rbac' ); - G::LoadSystem('publisher'); - G::LoadSystem('templatePower'); - G::LoadSystem('xmlDocument'); - G::LoadSystem('xmlform'); - G::LoadSystem('xmlformExtension'); - G::LoadSystem('form'); - G::LoadSystem('menu'); - G::LoadSystem('xmlMenu'); - G::LoadSystem('table'); - G::LoadSystem('pagedTable'); - G::LoadSystem('httpProxyController'); - G::LoadClass('system'); - G::LoadClass('tasks'); - - require_once('propel/Propel.php'); - require_once('creole/Creole.php'); - - //TODO: get rid of the global variable improving the timezone activation when this feature is enabled - global $arraySystemConfiguration; $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspace); $e_all = (defined('E_DEPRECATED'))? E_ALL & ~E_DEPRECATED : E_ALL; @@ -151,12 +122,6 @@ try { Bootstrap::registerClass('dashboards', PATH_HOME . 'engine/classes/class.dashboards.php'); /*----------------------------------********---------------------------------*/ - G::LoadClass('processes'); - G::LoadClass('derivation'); - G::LoadClass('dates'); //Load Criteria - G::LoadClass('spool'); - G::LoadClass('pmException'); - //Set variables /*----------------------------------********---------------------------------*/ $dateInit = null; @@ -216,7 +181,6 @@ try { if (file_exists($sSerializedFile)) { $pluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile); } - G::LoadClass('pmScript'); //DB $phpCode = ''; @@ -349,12 +313,11 @@ try { function processWorkspace() { try { - Bootstrap::LoadClass("plugin"); + $oPluginRegistry =& PMPluginRegistry::getSingleton(); if (file_exists(PATH_DATA_SITE . 'plugin.singleton')) { $oPluginRegistry->unSerializeInstance(file_get_contents(PATH_DATA_SITE . 'plugin.singleton')); } - Bootstrap::LoadClass("case"); global $sObject; global $sLastExecution; @@ -394,7 +357,6 @@ function resendEmails() setExecutionMessage("Resending emails"); try { - G::LoadClass("spool"); $dateResend = $sNow; @@ -460,7 +422,7 @@ function unpauseApplications() setExecutionMessage("Unpausing applications"); try { - G::LoadClass('case'); + $oCases = new Cases(); $oCases->ThrowUnpauseDaemon($sNow, 1); @@ -1033,7 +995,6 @@ function synchronizeDrive () } $licensedFeatures = &PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) { - G::LoadClass('AppDocumentDrive'); $drive = new AppDocumentDrive(); if ($drive->getStatusDrive()) { setExecutionMessage("Synchronize documents to Drive"); @@ -1063,11 +1024,9 @@ function synchronizeGmailLabels() } $licensedFeatures = &PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) { - G::LoadClass("pmGoogleApi"); $pmGoogle = new PMGoogleApi(); if ($pmGoogle->getServiceGmailStatus()) { setExecutionMessage("Synchronize labels in Gmail"); - G::LoadClass('labelsGmail'); $labGmail = new labelsGmail(); $labGmail->processPendingRelabelingInQueue(); } else { diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php index fc31dedf2..4885fb8ef 100644 --- a/workflow/engine/bin/reindex_solr.php +++ b/workflow/engine/bin/reindex_solr.php @@ -114,69 +114,11 @@ if (! defined ('PATH_HOME')) { define ('PATH_OUTTRUNK', $pathOutTrunk); define( 'PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP ); - require_once PATH_TRUNK . "framework/src/Maveriks/Util/ClassLoader.php"; require_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php'); require_once (PATH_GULLIVER . "class.bootstrap.php"); - Bootstrap::registerSystemClasses(); spl_autoload_register(array('Bootstrap', 'autoloadClass')); - - Bootstrap::registerClass('BaseProcess', PATH_HOME . "engine/classes/model/om/BaseProcess.php"); - Bootstrap::registerClass('ProcessPeer', PATH_HOME . "engine/classes/model/ProcessPeer.php"); - Bootstrap::registerClass('BaseAppSolrQueue', PATH_HOME . "engine/classes/model/om/BaseAppSolrQueue.php"); - Bootstrap::registerClass('BaseDynaform', PATH_HOME . "engine/classes/model/om/BaseDynaform.php"); - Bootstrap::registerClass('DynaformPeer', PATH_HOME . "engine/classes/model/DynaformPeer.php"); - Bootstrap::registerClass('BaseTaskUser', PATH_HOME . "engine/classes/model/om/BaseTaskUser.php"); - Bootstrap::registerClass('BaseTask', PATH_HOME . "engine/classes/model/om/BaseTask.php"); - Bootstrap::registerClass('BaseGroupUserPeer', PATH_HOME . "engine/classes/model/om/BaseGroupUserPeer.php"); - Bootstrap::registerClass('BaseGroupUser', PATH_HOME . "engine/classes/model/om/BaseGroupUser.php"); - Bootstrap::registerClass('BaseUsers', PATH_HOME . "engine/classes/model/om/BaseUsers.php"); - Bootstrap::registerClass('BaseContent', PATH_HOME . "engine/classes/model/om/BaseContent.php"); - Bootstrap::registerClass('BaseContentPeer', PATH_HOME . "engine/classes/model/om/BaseContentPeer.php"); - Bootstrap::registerClass('ContentPeer', PATH_HOME . "engine/classes/model/ContentPeer.php"); - Bootstrap::registerClass('BaseAppThread', PATH_HOME . "engine/classes/model/om/BaseAppThread.php"); - Bootstrap::registerClass('AppThreadPeer', PATH_HOME . "engine/classes/model/AppThreadPeer.php"); - Bootstrap::registerClass('BaseApplication', PATH_HOME . "engine/classes/model/om/BaseApplication.php"); - Bootstrap::registerClass('ApplicationPeer', PATH_HOME . "engine/classes/model/ApplicationPeer.php"); - Bootstrap::registerClass('BaseAppDelegation', PATH_HOME . "engine/classes/model/om/BaseAppDelegation.php"); - Bootstrap::registerClass('BaseAppDelegationPeer',PATH_HOME . "engine/classes/model/om/BaseAppDelegationPeer.php"); - Bootstrap::registerClass('BaseEvent', PATH_HOME . "engine/classes/model/om/BaseEvent.php"); - Bootstrap::registerClass('BaseEventPeer', PATH_HOME . "engine/classes/model/om/BaseEventPeer.php"); - Bootstrap::registerClass('BaseAppEvent', PATH_HOME . "engine/classes/model/om/BaseAppEvent.php"); - Bootstrap::registerClass('AppEventPeer', PATH_HOME . "engine/classes/model/AppEventPeer.php"); - Bootstrap::registerClass('BaseCaseScheduler', PATH_HOME . "engine/classes/model/om/BaseCaseScheduler.php"); - Bootstrap::registerClass('BaseCaseSchedulerPeer',PATH_HOME . "engine/classes/model/om/BaseCaseSchedulerPeer.php"); - Bootstrap::registerClass('CaseSchedulerPeer', PATH_HOME . "engine/classes/model/CaseSchedulerPeer.php"); - - require_once 'classes/model/AppDelegation.php'; - require_once 'classes/model/Event.php'; - require_once 'classes/model/AppEvent.php'; - require_once 'classes/model/CaseScheduler.php'; - - G::LoadThirdParty ('pear/json', 'class.json'); - G::LoadThirdParty ('smarty/libs', 'Smarty.class'); - G::LoadSystem ('error'); - G::LoadSystem ('dbconnection'); - G::LoadSystem ('dbsession'); - G::LoadSystem ('dbrecordset'); - G::LoadSystem ('dbtable'); - G::LoadSystem ('rbac'); - G::LoadSystem ('publisher'); - G::LoadSystem ('templatePower'); - G::LoadSystem ('xmlDocument'); - G::LoadSystem ('xmlform'); - G::LoadSystem ('xmlformExtension'); - G::LoadSystem ('form'); - G::LoadSystem ('menu'); - G::LoadSystem ("xmlMenu"); - G::LoadSystem ('table'); - G::LoadSystem ('pagedTable'); - G::LoadClass ('system'); - require_once ("propel/Propel.php"); - require_once ("creole/Creole.php"); } -// G::loadClass('pmScript'); - print "PATH_HOME: " . PATH_HOME . "\n"; print "PATH_DB: " . PATH_DB . "\n"; print "PATH_CORE: " . PATH_CORE . "\n"; @@ -319,7 +261,6 @@ function processWorkspace() try { if (($solrConf = System::solrEnv (SYS_SYS)) !== false) { - G::LoadClass ('AppSolr'); print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n"; print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n"; print "solr_host: " . $solrConf ['solr_host'] . "\n"; diff --git a/workflow/engine/bin/tasks/cliAddons.php b/workflow/engine/bin/tasks/cliAddons.php index 78b8aa81b..332a4deb8 100644 --- a/workflow/engine/bin/tasks/cliAddons.php +++ b/workflow/engine/bin/tasks/cliAddons.php @@ -1,7 +1,4 @@ name, "INFO")."\n"); try { diff --git a/workflow/engine/bin/tasks/cliMafe.php b/workflow/engine/bin/tasks/cliMafe.php index dee53e1c4..f2790a13f 100644 --- a/workflow/engine/bin/tasks/cliMafe.php +++ b/workflow/engine/bin/tasks/cliMafe.php @@ -23,9 +23,6 @@ * * @package workflow-engine-bin-tasks */ -G::LoadClass("system"); -G::LoadClass("wsTools"); - CLI::taskName('mafe-translation'); CLI::taskDescription(<<_solrIsEnabled, $this->_solrHost); // execute query $solrStatusResult = $searchIndex->isEnabled ($this->_solrInstance); @@ -296,8 +294,6 @@ class AppSolr $result ['success'] = false; $result ['message'] = "Error description."; - G::LoadClass ('searchIndex'); - try { if($this->debug) { @@ -1059,23 +1055,10 @@ class AppSolr // ex: phrase => TEXT:"This is a lazy dog" // search the first - - // cache the index fields - //G::LoadClass ('PMmemcached'); - //$oMemcache = PMmemcached::getSingleton ($this->_solrInstance); - //$ListFieldsInfo = $oMemcache->get ('Solr_Index_Fields'); - //if (! $ListFieldsInfo) { - G::LoadClass ('searchIndex'); - + $searchIndex = new BpmnEngine_Services_SearchIndex ($this->_solrIsEnabled, $this->_solrHost); // execute query $ListFieldsInfo = $searchIndex->getIndexFields ($this->_solrInstance); - - //var_dump($ListFieldsInfo); - // cache - //$oMemcache->set ('Solr_Index_Fields', $ListFieldsInfo); - - //} $tok = strtok ($plainSearchText, " "); @@ -1367,8 +1350,6 @@ class AppSolr ); $oSolrUpdateDocument = Entity_SolrUpdateDocument::createForRequest ($data); - G::LoadClass ('searchIndex'); - $oSearchIndex = new BpmnEngine_Services_SearchIndex ($this->_solrIsEnabled, $this->_solrHost); $oSearchIndex->updateIndexDocument ($oSolrUpdateDocument); @@ -1477,9 +1458,7 @@ class AppSolr } }*/ - try{ - - G::LoadClass ('searchIndex'); + try{ $oSearchIndex = new BpmnEngine_Services_SearchIndex ($this->_solrIsEnabled, $this->_solrHost); @@ -2169,8 +2148,6 @@ class AppSolr */ public function getApplicationIndexData($AppUID, $allAppDbData) { - //G::LoadClass ('memcached'); - // get all the application data //$allAppDbData = $this->getApplicationDelegationData ($AppUID); // check if the application record was found @@ -2383,7 +2360,6 @@ class AppSolr //$oMemcache = PMmemcached::getSingleton ($this->_solrInstance); //$dynaformFieldTypes = $oMemcache->get ("SOLR_DYNAFORM_FIELD_TYPES_" . $documentInformation ['PRO_UID']); //if (! $dynaformFieldTypes) { - G::LoadClass ('dynaformhandler'); $dynaformFileNames = $this->getProcessDynaformFileNames ($documentInformation ['PRO_UID']); $dynaformFields = array (); foreach ($dynaformFileNames as $dynaformFileName) { @@ -3023,8 +2999,6 @@ class AppSolr */ public function getCountApplicationsSearchIndex() { - G::LoadClass ('searchIndex'); - $searchIndex = new BpmnEngine_Services_SearchIndex ($this->_solrIsEnabled, $this->_solrHost); // execute query $count = $searchIndex->getNumberDocuments ($this->_solrInstance); @@ -3039,12 +3013,9 @@ class AppSolr */ public function optimizeSearchIndex() { - G::LoadClass ('searchIndex'); - $searchIndex = new BpmnEngine_Services_SearchIndex ($this->_solrIsEnabled, $this->_solrHost); // execute query $searchIndex->optimizeIndexChanges ($this->_solrInstance); - } /** diff --git a/workflow/engine/classes/class.Upgrade.php b/workflow/engine/classes/class.Upgrade.php index 8df3cb97d..fe42cc4b1 100644 --- a/workflow/engine/classes/class.Upgrade.php +++ b/workflow/engine/classes/class.Upgrade.php @@ -1,8 +1,5 @@ loadCase($data->APP_UID); @@ -178,7 +176,7 @@ class actionsByEmailCoreClass extends PMPlugin $field = new stdClass(); $field->label = ''; $actionField = str_replace(array('@@', '@#', '@=', '@%', '@?', '@$'), '', $configuration['ABE_ACTION_FIELD']); - G::LoadClass('pmDynaform'); + $obj = new pmDynaform($configuration['DYN_UID']); $configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID']; $file = $obj->printPmDynaformAbe($configuration); @@ -229,7 +227,7 @@ class actionsByEmailCoreClass extends PMPlugin } } } - G::LoadClass('pmDynaform'); + $obj = new pmDynaform($configuration['DYN_UID']); $configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID']; $file = $obj->printPmDynaformAbe($configuration); @@ -280,8 +278,6 @@ class actionsByEmailCoreClass extends PMPlugin $__ABE__ = preg_replace('/class="tableGrid_view" /', 'class="tableGrid_view" width="100%" ', $__ABE__); $caseFields['APP_DATA']['__ABE__'] = $__ABE__; - G::LoadClass("Users"); - $user = new Users(); if (!$configuration['ABE_MAILSERVER_OR_MAILCURRENT'] && $configuration['ABE_TYPE'] !== '') { @@ -301,7 +297,6 @@ class actionsByEmailCoreClass extends PMPlugin } } - G::LoadClass('wsBase'); $wsBaseInstance = new wsBase(); $result = $wsBaseInstance->sendMessage( $data->APP_UID, diff --git a/workflow/engine/classes/class.actionsByEmailUtils.php b/workflow/engine/classes/class.actionsByEmailUtils.php index 0325349e3..ce242fc39 100644 --- a/workflow/engine/classes/class.actionsByEmailUtils.php +++ b/workflow/engine/classes/class.actionsByEmailUtils.php @@ -27,7 +27,6 @@ function postNote($httpData) //return true; //send notification in background $noteRecipientsList = array(); - G::LoadClass('case'); $oCase = new Cases(); $p = $oCase->getUsersParticipatedInCase($appUid); diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 9230c6926..f34ce1222 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -218,7 +218,6 @@ class Applications $dir = isset($dir)? $dir : "DESC"; if (isset($sort)) { - G::LoadClass('phpSqlParser'); $parser = new PHPSQLParser($sort); $sort = $parser->parsed; $sort = $sort[''][0]; @@ -237,8 +236,6 @@ class Applications $dateFrom = isset($dateFrom)? $dateFrom : ""; $dateTo = isset($dateTo)? $dateTo : ""; - G::LoadClass("BasePeer"); - G::LoadClass("configuration"); //require_once ("classes/model/AppCacheView.php"); //require_once ("classes/model/AppDelegation.php"); //require_once ("classes/model/AdditionalTables.php"); @@ -1128,16 +1125,6 @@ class Applications public function getSteps ($appUid, $index, $tasUid, $proUid) { - //require_once 'classes/model/Step.php'; - //require_once 'classes/model/Content.php'; - //require_once 'classes/model/AppDocument.php'; - //require_once 'classes/model/InputDocumentPeer.php'; - //require_once 'classes/model/OutputDocument.php'; - //require_once 'classes/model/Dynaform.php'; - - //G::LoadClass( 'pmScript' ); - G::LoadClass( 'case' ); - $steps = Array (); $case = new Cases(); $step = new Step(); diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 741e76b9c..fd71db44c 100644 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -25,7 +25,6 @@ * */ -G::LoadClass("pmScript"); /** * A Cases object where you can do start, load, update, refresh about cases @@ -44,7 +43,6 @@ class Cases { //get Solr initialization variables if (($solrConf = System::solrEnv()) !== false) { - G::LoadClass('AppSolr'); $this->appSolr = new AppSolr($solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance']); } } @@ -80,7 +78,6 @@ class Cases } //check groups - G::LoadClass('groups'); $group = new Groups(); $aGroups = $group->getActiveGroupsForAnUser($sUIDUser); @@ -138,7 +135,6 @@ class Cases } //check groups - G::LoadClass('groups'); $group = new Groups(); $aGroups = $group->getActiveGroupsForAnUser($sUIDUser); @@ -223,7 +219,6 @@ class Cases } //check groups - G::LoadClass('groups'); $group = new Groups(); $aGroups = $group->getActiveGroupsForAnUser($sUIDUser); @@ -349,7 +344,6 @@ class Cases } //check groups - G::LoadClass('groups'); $group = new Groups(); $aGroups = $group->getActiveGroupsForAnUser($sUIDUser); @@ -952,7 +946,6 @@ class Cases $DEL_INDEX = isset($Fields['DEL_INDEX']) ? $Fields['DEL_INDEX'] : ''; $TAS_UID = isset($Fields['TAS_UID']) ? $Fields['TAS_UID'] : ''; - G::LoadClass('reportTables'); require_once 'classes/model/AdditionalTables.php'; $oReportTables = new ReportTables(); $addtionalTables = new additionalTables(); @@ -1095,7 +1088,6 @@ class Cases $oCriteria2->add(SubApplicationPeer::SA_STATUS, 'ACTIVE'); if (SubApplicationPeer::doCount($oCriteria2) > 0) { - G::LoadClass('derivation'); $oDerivation = new Derivation(); $oDerivation->verifyIsCaseChild($sAppUid); } @@ -2144,7 +2136,6 @@ class Cases $AppThread = new AppThread; $iAppThreadIndex = $AppThread->createAppThread($sAppUid, $iDelIndex, 0); - G::LoadClass('derivation'); $oDerivation = new Derivation(); //Multiple Instance @@ -2299,7 +2290,6 @@ class Cases public function getNextStep($sProUid = '', $sAppUid = '', $iDelIndex = 0, $iPosition = 0) { - G::LoadClass('pmScript'); $oPMScript = new PMScript(); $oApplication = new Application(); $aFields = $oApplication->Load($sAppUid); @@ -2338,11 +2328,7 @@ class Cases $iPosition += 1; $aNextStep = null; if ($iPosition <= $iLastStep) { - //to do: $oApplication = new Application($this->_dbc); - //to do: $oApplication->load($sApplicationUID); - //to do: G::LoadClass('pmScript'); - //to do: $oPMScript = new PMScript(); - //to do: $oPMScript->setFields($oApplication->Fields['APP_DATA']); + while ($iPosition <= $iLastStep) { $bAccessStep = false; //step @@ -2436,7 +2422,6 @@ class Cases public function getPreviousStep($sProUid = '', $sAppUid = '', $iDelIndex = 0, $iPosition = 0) { //Note: Depreciated, delete in the future - G::LoadClass('pmScript'); $oPMScript = new PMScript(); $oApplication = new Application(); //$aFields = $oApplication->load($sAppUid); @@ -3443,10 +3428,6 @@ class Cases public function executeTriggers($sTasUid, $sStepType, $sStepUidObj, $sTriggerType, $aFields = array()) { - /*----------------------------------********---------------------------------*/ - G::LoadClass("codeScanner"); - /*----------------------------------********---------------------------------*/ - $aTriggers = $this->loadTriggers($sTasUid, $sStepType, $sStepUidObj, $sTriggerType); if (count($aTriggers) > 0) { @@ -3657,7 +3638,6 @@ class Cases global $_DBArray; $_DBArray['inputDocuments'] = $aInputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('inputDocuments'); // $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE); @@ -3721,7 +3701,6 @@ class Cases global $_DBArray; $_DBArray['inputDocuments'] = $aInputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('inputDocuments'); $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX); @@ -3983,7 +3962,6 @@ class Cases global $_DBArray; $_DBArray['outputDocuments'] = $aOutputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('outputDocuments'); $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX); @@ -4244,7 +4222,6 @@ class Cases $aFields['APP_STATUS'] = 'CANCELLED'; $oApplication->update($aFields); - G::LoadClass('reportTables'); require_once 'classes/model/AdditionalTables.php'; $oReportTables = new ReportTables(); $addtionalTables = new additionalTables(); @@ -4294,7 +4271,6 @@ class Cases $oCriteria2->add(SubApplicationPeer::APP_UID, $sApplicationUID); $oCriteria2->add(SubApplicationPeer::SA_STATUS, 'ACTIVE'); if (SubApplicationPeer::doCount($oCriteria2) > 0) { - G::LoadClass('derivation'); $oDerivation = new Derivation(); $oDerivation->verifyIsCaseChild($sApplicationUID, $iIndex); } @@ -4653,8 +4629,6 @@ class Cases public function getAllUploadedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex = 0) { - G::LoadClass("configuration"); - $conf = new Configurations(); $confEnvSetting = $conf->getFormats(); @@ -4944,7 +4918,6 @@ class Cases global $_DBArray; $_DBArray['inputDocuments'] = $aInputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('inputDocuments'); $oCriteria->addDescendingOrderByColumn('CREATE_DATE'); @@ -4964,8 +4937,6 @@ class Cases public function getAllGeneratedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex =0) { - G::LoadClass("configuration"); - $conf = new Configurations(); $confEnvSetting = $conf->getFormats(); @@ -5184,7 +5155,6 @@ class Cases global $_DBArray; $_DBArray['outputDocuments'] = $aOutputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('outputDocuments'); $oCriteria->addDescendingOrderByColumn('CREATE_DATE'); @@ -5291,7 +5261,6 @@ class Cases global $_DBArray; $_DBArray['Dynaforms'] = $aInputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('Dynaforms'); $oCriteria->setDistinct(); @@ -5320,7 +5289,6 @@ class Cases $sSubject = G::LoadTranslation('ID_MESSAGE_SUBJECT_DERIVATION'); } - G::loadClass('configuration'); $oConf = new Configurations; $oConf->loadConfig($x, 'TAS_EXTRA_PROPERTIES', $aTaskInfo['TAS_UID'], '', ''); $conf = $oConf->aConfig; @@ -5497,7 +5465,6 @@ class Cases */ public function sendMessage($dataLastEmail, $arrayData, $arrayTask) { - G::LoadClass("spool"); foreach ($arrayTask as $aTask) { //Check and fix if Task Id is complex if (strpos($aTask['TAS_UID'], "/") !== false) { @@ -6218,7 +6185,6 @@ class Cases global $_DBArray; $_DBArray['inputDocuments'] = $aInputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('inputDocuments'); $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE); @@ -6298,7 +6264,6 @@ class Cases global $_DBArray; $_DBArray['outputDocuments'] = $aOutputDocuments; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('outputDocuments'); $oCriteria->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE); @@ -6364,7 +6329,6 @@ class Cases global $_DBArray; $_DBArray['messages'] = $aMessages; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('messages'); @@ -6381,7 +6345,6 @@ class Cases public function getHistoryMessagesTrackerExt($sApplicationUID, $onlyVisibles = false, $start = null, $limit = null) { - G::LoadClass('ArrayPeer'); global $_DBArray; $oAppDocument = new AppDocument(); @@ -6919,9 +6882,6 @@ class Cases public function getUsersToReassign($TAS_UID, $USR_UID, $PRO_UID=null) { - G::LoadClass('groups'); - G::LoadClass('tasks'); - $oTasks = new Tasks(); $aAux = $oTasks->getGroupsOfTask($TAS_UID, 1); $row = array(); @@ -7204,7 +7164,6 @@ class Cases $rsCriteria2 = AdditionalTablesPeer::doSelectRS($criteria2); $rsCriteria2->setFetchmode(ResultSet::FETCHMODE_ASSOC); - G::LoadClass("pmTable"); $pmTable = new PmTable(); while ($rsCriteria2->next()) { diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php index 9f870f9ea..a77e79e0d 100644 --- a/workflow/engine/classes/class.consolidatedCases.php +++ b/workflow/engine/classes/class.consolidatedCases.php @@ -1,8 +1,5 @@ deleteAllReportVars($_POST['form']['REP_TAB_UID']); - G::LoadClass("pmDynaform"); $pmDyna = new pmDynaform(array()); $pmDyna->fields["CURRENT_DYNAFORM"] = $DynUid; $dataDyna = $pmDyna->getDynaform(); @@ -212,7 +208,6 @@ class ConsolidatedCases public function createReportTable($dataRepTab) { - G::LoadClass("reportTables"); $oReportTable = new ReportTable(); $oReportTable->create($dataRepTab); return $oReportTable->getRepTabUid(); diff --git a/workflow/engine/classes/class.dashletOpenVSCompleted.php b/workflow/engine/classes/class.dashletOpenVSCompleted.php index ed79b0c9c..530a5f812 100644 --- a/workflow/engine/classes/class.dashletOpenVSCompleted.php +++ b/workflow/engine/classes/class.dashletOpenVSCompleted.php @@ -275,7 +275,6 @@ class dashletOpenVSCompleted implements DashletInterface public function render ($width = 300) { - G::LoadClass( 'pmGauge' ); $g = new pmGauge(); $g->w = $width; $g->value = $this->value; diff --git a/workflow/engine/classes/class.dates.php b/workflow/engine/classes/class.dates.php index c8f582503..6fcbd1cbb 100644 --- a/workflow/engine/classes/class.dates.php +++ b/workflow/engine/classes/class.dates.php @@ -74,7 +74,6 @@ class dates { //$oldDate=$this->calculateDate_noCalendar( $sInitDate, $iDuration, $sTimeUnit, $iTypeDay, $UsrUid, $ProUid, $TasUid); //Set Calendar when the object is instanced in this order/priority (Task, User, Process, Default) - G::LoadClass('calendar'); $calendarObj = new calendar($UsrUid, $ProUid, $TasUid); //Get next Business Hours/Range based on : switch (strtoupper($sTimeUnit)) { diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 9b32140ad..d2cb27e00 100644 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -36,8 +36,6 @@ require_once ('classes/model/SubApplication.php'); require_once ('classes/model/SubProcess.php'); require_once ("classes/model/Users.php"); -G::LoadClass( "plugin" ); - /** * derivation - derivation class * @@ -168,10 +166,6 @@ class Derivation public function prepareInformation(array $arrayData, $taskUid = "") { try { - if (!class_exists("Cases")) { - G::LoadClass("case"); - } - $this->case = new Cases(); $task = new Task(); @@ -223,8 +217,6 @@ class Derivation //Evaluate the condition if there are conditions defined if (trim($arrayRouteData["ROU_CONDITION"]) != "" && $arrayRouteData["ROU_TYPE"] != "SELECT") { - G::LoadClass("pmScript"); - $pmScript = new PMScript(); $pmScript->setFields($arrayApplicationData["APP_DATA"]); $pmScript->setScript($arrayRouteData["ROU_CONDITION"]); @@ -1743,8 +1735,6 @@ class Derivation function getGrpUser ($aData) { - G::LoadClass( 'groups' ); - G::LoadClass( 'tasks' ); require_once 'classes/model/Content.php'; $oTasks = new Tasks(); $oGroups = new Groups(); diff --git a/workflow/engine/classes/class.dynaFormField.php b/workflow/engine/classes/class.dynaFormField.php index 8183e29e0..1869e548a 100644 --- a/workflow/engine/classes/class.dynaFormField.php +++ b/workflow/engine/classes/class.dynaFormField.php @@ -25,8 +25,6 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. * */ -//G::LoadClass('xmlDb'); -//G::LoadSystem('dynaformhandler'); /** * Dynaform Field - DynaformField class diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index 5ce6ccce8..21705a4a6 100644 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -31,13 +31,6 @@ * @copyright 2007 COLOSA * @author David Callizaya */ -G::LoadSystem("webResource"); -G::LoadClass('toolBar'); -G::LoadClass('dynaFormField'); -require_once ('classes/model/Process.php'); -require_once ('classes/model/Dynaform.php'); -G::LoadClass('xmlDb'); -G::LoadSystem('dynaformhandler'); /** * @@ -194,7 +187,6 @@ class dynaformEditor extends WebResource global $_DBArray; $_DBArray['fields'] = $aFields; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('fields'); /** diff --git a/workflow/engine/classes/class.enterprise.php b/workflow/engine/classes/class.enterprise.php index 307caca53..4d4615944 100644 --- a/workflow/engine/classes/class.enterprise.php +++ b/workflow/engine/classes/class.enterprise.php @@ -108,7 +108,6 @@ class enterpriseClass extends PMPlugin public function enterpriseLimitCreateUser() { - G::LoadClass('serverConfiguration'); $oServerConf = &serverConf::getSingleton(); $infoLicense =$oServerConf->getProperty('LICENSE_INFO'); if (isset($infoLicense[SYS_SYS]['LIMIT_USERS'])) { @@ -129,7 +128,6 @@ class enterpriseClass extends PMPlugin return false; } - G::LoadClass( "configuration" ); $config = new Configurations(); $typeEncrypt = $config->getConfiguration('ENTERPRISE_SETTING_ENCRYPT', ''); if ($typeEncrypt == null) { @@ -143,8 +141,6 @@ class enterpriseClass extends PMPlugin $config->saveConfig('ENTERPRISE_SETTING_ENCRYPT', ''); } - require_once 'classes/model/RbacUsersPeer.php'; - require_once 'classes/model/UsersProperties.php'; $userProperty = new UsersProperties(); $criteria = new Criteria($object->workspace->dbInfo['DB_RBAC_NAME']); diff --git a/workflow/engine/classes/class.groupUser.php b/workflow/engine/classes/class.groupUser.php index adb279847..a07b8d75f 100644 --- a/workflow/engine/classes/class.groupUser.php +++ b/workflow/engine/classes/class.groupUser.php @@ -39,8 +39,6 @@ * @copyright 2007 COLOSA */ -G::LoadClass( 'pmObject' ); - class GroupUser extends DBTable { diff --git a/workflow/engine/classes/class.indicatorsCalculator.php b/workflow/engine/classes/class.indicatorsCalculator.php index 53b2ac06e..ef1b7a06b 100644 --- a/workflow/engine/classes/class.indicatorsCalculator.php +++ b/workflow/engine/classes/class.indicatorsCalculator.php @@ -650,7 +650,6 @@ class indicatorsCalculator } private function pdoConnection() { - G::loadClass('wsTools'); $currentWS = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; $workSpace = new workspaceTools($currentWS); $arrayHost = explode(':', $workSpace->dbHost); diff --git a/workflow/engine/classes/class.labelsGmail.php b/workflow/engine/classes/class.labelsGmail.php index 36e5e7d0c..f77f796a3 100644 --- a/workflow/engine/classes/class.labelsGmail.php +++ b/workflow/engine/classes/class.labelsGmail.php @@ -1,6 +1,4 @@ DB_RBAC_NAME, 'rb_') === false) { - $onedb = true; - } else { - $onedb = false; + if (strpos($metadata->DB_RBAC_NAME, 'rb_') === false) { + $onedb = true; + } else { + $onedb = false; } $newDBNames = $workspace->resetDBInfo( $dbHost, $createWorkspace, $onedb ); diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php index f19d967e0..cd95c37af 100644 --- a/workflow/engine/classes/class.patch.php +++ b/workflow/engine/classes/class.patch.php @@ -1,8 +1,5 @@ prepareStatement("describe TASK;"); @@ -94,10 +87,6 @@ class p11835 extends patch } } - //Fix BUG-15394 - - G::LoadClass("configuration"); - $conf = new Configurations(); if (!$conf->exists("HOTFIX")) { diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php index cd4045de1..9a5933c8f 100644 --- a/workflow/engine/classes/class.pluginRegistry.php +++ b/workflow/engine/classes/class.pluginRegistry.php @@ -596,19 +596,12 @@ class PMPluginRegistry public function uninstallPluginWorkspaces ($arrayPlugin) { - G::LoadClass( "system" ); - G::LoadClass( "wsTools" ); - $workspace = System::listWorkspaces(); foreach ($workspace as $indexWS => $ws) { $wsPathDataSite = PATH_DATA . "sites" . PATH_SEP . $ws->name . PATH_SEP; if (file_exists( $wsPathDataSite . "plugin.singleton" )) { - //G::LoadClass("plugin"); - //Here we are loading all plug-ins registered - //The singleton has a list of enabled plug-ins - $pluginRegistry = &PMPluginRegistry::getSingleton(); $pluginRegistry->unSerializeInstance( file_get_contents( $wsPathDataSite . "plugin.singleton" ) ); @@ -1628,8 +1621,6 @@ class PMPluginRegistry public function updatePluginAttributesInAllWorkspaces($pluginName) { try { - G::LoadClass("system"); - G::LoadClass("wsTools"); //Set variables $pluginFileName = $pluginName . ".php"; diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php index 4c7e12428..6df43488a 100644 --- a/workflow/engine/classes/class.pmDashlet.php +++ b/workflow/engine/classes/class.pmDashlet.php @@ -21,7 +21,6 @@ class PMDashlet extends DashletInstance implements DashletInterface self::setIncludePath(); require_once 'classes' . PATH_SEP . 'class.' . $className . '.php'; } - G::LoadClass( $className ); eval( "\$additionalFields = $className::getAdditionalFields(\$className);" ); return $additionalFields; } catch (Exception $error) { @@ -38,7 +37,7 @@ class PMDashlet extends DashletInstance implements DashletInterface throw new Exception( G::LoadTranslation( 'ID_ERROR_OBJECT_NOT_EXISTS' ) . ' - Probably the plugin related is disabled' ); } $className = $this->dashletInstance['DAS_CLASS']; - G::LoadClass( $className ); + if (! class_exists( $className )) { self::setIncludePath(); require_once 'classes' . PATH_SEP . 'class.' . $className . '.php'; @@ -292,7 +291,6 @@ class PMDashlet extends DashletInstance implements DashletInterface } } // Check for group assignments - G::LoadClass( 'groups' ); $groupsInstance = new Groups(); $groups = $groupsInstance->getGroupsForUser( $userUid ); foreach ($groups as $grpUid => $group) { @@ -343,7 +341,7 @@ class PMDashlet extends DashletInstance implements DashletInterface self::setIncludePath(); require_once 'classes' . PATH_SEP . 'class.' . $className . '.php'; } - G::LoadClass( $className ); + eval( "\$additionalFields = $className::getXTemplate(\$className);" ); return $additionalFields; } catch (Exception $error) { diff --git a/workflow/engine/classes/class.pmDrive.php b/workflow/engine/classes/class.pmDrive.php index 16915a642..7966ea6e7 100644 --- a/workflow/engine/classes/class.pmDrive.php +++ b/workflow/engine/classes/class.pmDrive.php @@ -6,7 +6,6 @@ * @package workflow.engine.class * */ -G::LoadClass( "pmGoogleApi" ); class PMDrive extends PMGoogleApi { diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index b206e5b17..9cfcbb4e4 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -30,13 +30,6 @@ //////////////////////////////////////////////////// use ProcessMaker\Util\ElementTranslation; -if (!class_exists('Monolog\Logger')) { - Bootstrap::initVendors(); -} - -if (!class_exists('PMScript')) { - G::LoadClass('pmScript'); -} /** * ProcessMaker has made a number of its PHP functions available be used in triggers and conditions. @@ -248,7 +241,6 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter $aContext = \Bootstrap::getDefaultContextLog(); $con = Propel::getConnection( $DBConnectionUID ); $con->begin(); - G::loadClass('system'); $blackList = System::getQueryBlackList(); $aListQueries = explode('|', $blackList['queries']); $aListAllTables = explode( @@ -430,7 +422,7 @@ function evaluateFunction ($aGrid, $sExpresion) { $sExpresion = str_replace( 'Array', '$this->aFields', $sExpresion ); $sExpresion .= ';'; - G::LoadClass( 'pmScript' ); + $pmScript = new PMScript(); $pmScript->setScript( $sExpresion ); @@ -913,7 +905,6 @@ function WSProcessList () //private function to get current email configuration function getEmailConfiguration () { - G::loadClass( 'system' ); return System::getEmailConfiguration(); } @@ -971,8 +962,6 @@ function PMFSendMessage( } } - G::LoadClass("wsBase"); - $ws = new wsBase(); $result = $ws->sendMessage( $caseId, @@ -1571,7 +1560,6 @@ function WSAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMa */ function PMFTaskCase ($caseId) //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->taskCase( $caseId ); $rows = Array (); @@ -1600,7 +1588,6 @@ function PMFTaskCase ($caseId) //its test was successfull */ function PMFTaskList ($userId) //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->taskList( $userId ); $rows = Array (); @@ -1628,7 +1615,6 @@ function PMFTaskList ($userId) //its test was successfull */ function PMFUserList () //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->userList(); $rows = Array (); @@ -1679,7 +1665,6 @@ function PMFAddInputDocument( $option = "file", $file = "path_to_file/myfile.txt" ) { - G::LoadClass("case"); $g = new G(); @@ -1752,7 +1737,6 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu $sUserLogged = $_SESSION["USER_LOGGED"]; } - G::LoadClass( 'case' ); $oCase = new Cases(); $oCase->thisIsTheCurrentUser( $sApplication, $index, $sUserLogged, '', 'casesListExtJs' ); @@ -1855,7 +1839,7 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu $oOutputDocument->generate( $outputID, $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties ); //Plugin Hook PM_UPLOAD_DOCUMENT for upload document - //G::LoadClass('plugin'); + $oPluginRegistry = & PMPluginRegistry::getSingleton(); if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) { $triggerDetail = $oPluginRegistry->getTriggerInfo( PM_UPLOAD_DOCUMENT ); @@ -1937,7 +1921,6 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu */ function PMFGroupList ($regex = null, $start = null, $limit = null) //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->groupList($regex, $start, $limit); $rows = array(); @@ -1962,7 +1945,6 @@ function PMFGroupList ($regex = null, $start = null, $limit = null) //its test w */ function PMFRoleList () //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->roleList(); $rows = Array (); @@ -1991,7 +1973,6 @@ function PMFRoleList () //its test was successfull */ function PMFCaseList ($userId) //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->caseList( $userId ); $rows = Array (); @@ -2019,7 +2000,6 @@ function PMFCaseList ($userId) //its test was successfull */ function PMFProcessList () //its test was successfull { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->processList(); $rows = Array (); @@ -2049,7 +2029,6 @@ function PMFProcessList () //its test was successfull */ function PMFSendVariables ($caseId, $variables) { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->sendVariables( $caseId, $variables ); @@ -2092,7 +2071,7 @@ function PMFDerivateCase ($caseId, $delIndex, $bExecuteTriggersBeforeAssignment if (! $sUserLogged) { $sUserLogged = $_SESSION['USER_LOGGED']; } - G::LoadClass( 'wsBase' ); + $ws = new wsBase(); $result = $ws->derivateCase( $sUserLogged, $caseId, $delIndex, $bExecuteTriggersBeforeAssignment ); if (is_array($result)) { @@ -2125,8 +2104,6 @@ function PMFDerivateCase ($caseId, $delIndex, $bExecuteTriggersBeforeAssignment */ function PMFNewCaseImpersonate ($processId, $userId, $variables, $taskId = '') { - G::LoadClass( "wsBase" ); - $ws = new wsBase(); $result = $ws->newCaseImpersonate( $processId, $userId, $variables, $taskId); @@ -2157,7 +2134,6 @@ function PMFNewCaseImpersonate ($processId, $userId, $variables, $taskId = '') */ function PMFNewCase ($processId, $userId, $taskId, $variables, $status = null) { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->newCase($processId, $userId, $taskId, $variables, 0, $status); @@ -2188,7 +2164,6 @@ function PMFNewCase ($processId, $userId, $taskId, $variables, $status = null) */ function PMFAssignUserToGroup ($userId, $groupId) { - G::LoadClass( 'wsBase' ); $ws = new wsBase(); $result = $ws->assignUserToGroup( $userId, $groupId ); @@ -2222,8 +2197,6 @@ function PMFAssignUserToGroup ($userId, $groupId) */ function PMFCreateUser ($userId, $password, $firstname, $lastname, $email, $role, $dueDate = null, $status = null) { - G::LoadClass( 'wsBase' ); - $ws = new wsBase(); $result = $ws->createUser( $userId, $firstname, $lastname, $email, $role, $password, $dueDate, $status ); @@ -2263,8 +2236,6 @@ function PMFCreateUser ($userId, $password, $firstname, $lastname, $email, $role */ function PMFUpdateUser ($userUid, $userName, $firstName = null, $lastName = null, $email = null, $dueDate = null, $status = null, $role = null, $password = null) { - G::LoadClass( "wsBase" ); - $ws = new wsBase(); $result = $ws->updateUser( $userUid, $userName, $firstName, $lastName, $email, $dueDate, $status, $role, $password ); @@ -2291,8 +2262,6 @@ function PMFUpdateUser ($userUid, $userName, $firstName = null, $lastName = null */ function PMFInformationUser($userUid) { - G::LoadClass("wsBase"); - $ws = new wsBase(); $result = $ws->informationUser($userUid); @@ -2345,7 +2314,6 @@ function generateCode ($iDigits = 4, $sType = 'NUMERIC') function setCaseTrackerCode ($sApplicationUID, $sCode, $sPIN = '') { if ($sCode != '' || $sPIN != '') { - G::LoadClass( 'case' ); $oCase = new Cases(); $aFields = $oCase->loadCase( $sApplicationUID ); $aFields['APP_PROC_CODE'] = $sCode; @@ -2418,7 +2386,6 @@ function jumping ($caseId, $delIndex) */ function PMFgetLabelOption ($PROCESS, $DYNAFORM_UID, $FIELD_NAME, $FIELD_SELECTED_ID) { - G::LoadClass("pmDynaform"); $data = array(); $data["CURRENT_DYNAFORM"] = $DYNAFORM_UID; $dynaform = new pmDynaform($data); @@ -2486,11 +2453,9 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi $oStep = new Step(); $oTheStep = $oStep->loadByType( $aRow['TAS_UID'], $sStepType, $sStepUid ); $bContinue = true; - G::LoadClass( 'case' ); $oCase = new Cases(); $aFields = $oCase->loadCase( $sApplicationUID ); if ($oTheStep->getStepCondition() != '') { - G::LoadClass( 'pmScript' ); $pmScript = new PMScript(); $pmScript->setFields( $aFields['APP_DATA'] ); $pmScript->setScript( $oTheStep->getStepCondition() ); @@ -2571,8 +2536,6 @@ function PMFGetNextAssignedUser($application, $task, $delIndex = null, $userUid : null)); if ($typeTask == 'BALANCED' && !is_null($_SESSION['INDEX']) && !is_null($_SESSION['USER_LOGGED'])) { - - G::LoadClass('derivation'); $oDerivation = new Derivation(); $aDeriv = $oDerivation->prepareInformation(array('USER_UID' => $_SESSION['USER_LOGGED'], 'APP_UID' => $application, 'DEL_INDEX' => $_SESSION['INDEX'] )); @@ -2616,10 +2579,6 @@ function PMFGetNextAssignedUser($application, $task, $delIndex = null, $userUid function PMFGetUserEmailAddress ($id, $APP_UID = null, $prefix = 'usr') { - require_once 'classes/model/UsersPeer.php'; - require_once 'classes/model/AppDelegation.php'; - G::LoadClass( 'case' ); - if (is_string( $id ) && trim( $id ) == "") { return false; } @@ -2702,7 +2661,6 @@ function PMFGetUserEmailAddress ($id, $APP_UID = null, $prefix = 'usr') break; case 'grp': - G::LoadClass( 'groups' ); $oGroups = new Groups(); $oCriteria = $oGroups->getUsersGroupCriteria( $sID ); $oDataset = GroupwfPeer::doSelectRS( $oCriteria ); @@ -2758,7 +2716,6 @@ function PMFGetUserEmailAddress ($id, $APP_UID = null, $prefix = 'usr') */ function PMFGetCaseNotes ($applicationID, $type = 'array', $userUid = '') { - G::LoadClass( 'case' ); $response = Cases::getCaseNotes( $applicationID, $type, $userUid ); return $response; } @@ -2779,8 +2736,6 @@ function PMFGetCaseNotes ($applicationID, $type = 'array', $userUid = '') */ function PMFDeleteCase ($caseUid) { - G::LoadClass( "wsBase" ); - $ws = new wsBase(); $result = $ws->deleteCase( $caseUid ); @@ -2809,8 +2764,6 @@ function PMFDeleteCase ($caseUid) */ function PMFCancelCase ($caseUid, $delIndex, $userUid) { - G::LoadClass( "wsBase" ); - $ws = new wsBase(); $result = $ws->cancelCase( $caseUid, $delIndex, $userUid ); @@ -2850,8 +2803,6 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid) */ function PMFPauseCase ($caseUid, $delIndex, $userUid, $unpauseDate = null) { - G::LoadClass('wsBase'); - $ws = new wsBase(); $result = $ws->pauseCase($caseUid, $delIndex, $userUid, $unpauseDate); @@ -2890,8 +2841,6 @@ function PMFPauseCase ($caseUid, $delIndex, $userUid, $unpauseDate = null) */ function PMFUnpauseCase ($caseUid, $delIndex, $userUid) { - G::LoadClass( "wsBase" ); - $ws = new wsBase(); $result = $ws->unpauseCase( $caseUid, $delIndex, $userUid ); @@ -2923,8 +2872,6 @@ function PMFUnpauseCase ($caseUid, $delIndex, $userUid) */ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1) { - G::LoadClass("wsBase"); - $ws = new wsBase(); $result = $ws->addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail); @@ -3024,7 +2971,6 @@ function PMFSaveCurrentData () $response = 0; if (isset($_SESSION['APPLICATION']) && isset($oPMScript->aFields)) { - G::LoadClass('wsBase'); $ws = new wsBase(); $result = $ws->sendVariables($_SESSION['APPLICATION'], $oPMScript->aFields); $response = $result->status_code == 0 ? 1 : 0; @@ -3165,7 +3111,6 @@ function PMFUnCancelCase($caseUID, $userUID) */ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0) { - G::LoadClass("pmDynaform"); $fields = array(); $data = array(); @@ -3382,7 +3327,6 @@ function PMFGetTaskUID($taskName, $processUid = null) */ function PMFGetGroupUsers($GroupUID) { - G::LoadClass('groups'); $groups = new Groups(); $usersGroup = $groups->getUsersOfGroup($GroupUID, 'ALL'); return $usersGroup; diff --git a/workflow/engine/classes/class.pmLicenseManager.php b/workflow/engine/classes/class.pmLicenseManager.php index 33e33b232..447250ad4 100644 --- a/workflow/engine/classes/class.pmLicenseManager.php +++ b/workflow/engine/classes/class.pmLicenseManager.php @@ -12,7 +12,6 @@ class pmLicenseManager public function __construct($flagActivatePlugins = true) { - G::LoadClass('serverConfiguration'); $oServerConf = &serverConf::getSingleton(); $oServerConf->setProperty('LOGIN_NO_WS', true); @@ -82,7 +81,6 @@ class pmLicenseManager $this->supportStartDate = date("Y-m-d H:i:s", strtotime($this->supportStartDate)); $this->supportEndDate = date("Y-m-d H:i:s", strtotime($this->supportEndDate)); - G::LoadClass( "configuration" ); $conf = new Configurations(); if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { $this->supportStartDate = $conf->getSystemDate($this->supportStartDate); @@ -376,7 +374,7 @@ class pmLicenseManager G::SendTemporalMessage ( 'ID_ISNT_LICENSE', 'tmp-info', 'labels' ); return false; } else { - G::LoadClass ( 'serverConfiguration' ); + $oServerConf = & serverConf::getSingleton (); $oServerConf->setProperty ( 'ACTIVE_LICENSE',array(SYS_SYS => $path)); $this->saveDataLicense( $results, $path, $redirect ); diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php index c59bb1ac6..14b58d76c 100644 --- a/workflow/engine/classes/class.pmScript.php +++ b/workflow/engine/classes/class.pmScript.php @@ -56,9 +56,6 @@ if (defined('SYS_SYS') && (!defined('PATH_DATA_SITE') || !defined('PATH_WORKSPAC Bootstrap::setConstantsRelatedWs(SYS_SYS); } -//Start - Custom functions -G::LoadClass( 'pmFunctions' ); -//End - Custom functions //call plugin if (class_exists( 'folderData' )) { //$folderData = new folderData($sProUid, $proFields['PRO_TITLE'], $sAppUid, $Fields['APP_TITLE'], $sUsrUid); @@ -729,7 +726,6 @@ function handleErrors($errno, $errstr, $errfile, $errline) unset( $_SESSION['_CODE_'] ); global $oPMScript; if (isset($oPMScript) && isset($_SESSION['APPLICATION'])) { - G::LoadClass( 'case' ); $oCase = new Cases(); $oPMScript->aFields['__ERROR__'] = $errstr; $oCase->updateCase($_SESSION['APPLICATION'], array('APP_DATA' => $oPMScript->aFields)); diff --git a/workflow/engine/classes/class.pmSso.php b/workflow/engine/classes/class.pmSso.php index c74b02eee..19bda3a51 100644 --- a/workflow/engine/classes/class.pmSso.php +++ b/workflow/engine/classes/class.pmSso.php @@ -3,7 +3,6 @@ * class.pmSso.php * */ -G::LoadClass ('pmFunctions'); class pmSsoClass extends PMPlugin { function __construct() { diff --git a/workflow/engine/classes/class.pmTable.php b/workflow/engine/classes/class.pmTable.php index d7319dd07..2b34de67b 100644 --- a/workflow/engine/classes/class.pmTable.php +++ b/workflow/engine/classes/class.pmTable.php @@ -902,8 +902,6 @@ class PmTable */ public static function callPhing ($target, $buildFile = '', $options = array(), $verbose = true) { - G::loadClass( 'pmPhing' ); - $args = array (); foreach ($options as $key => $value) { $args[] = "-D$key=$value"; diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index b5546c23f..bdff3d605 100644 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -28,41 +28,6 @@ * * @package workflow.engine.ProcessMaker */ -//G::LoadThirdParty( 'pear/json', 'class.json' ); -//G::LoadClass( 'groups' ); -//G::LoadClass( 'tasks' ); -//G::LoadClass('xmlfield_InputPM'); -//G::LoadClass( 'calendar' ); -//require_once 'classes/model/AppDelegation.php'; -//require_once 'classes/model/CaseTracker.php'; -//require_once 'classes/model/CaseTrackerObject.php'; -//require_once 'classes/model/Configuration.php'; -//require_once 'classes/model/Content.php'; -//require_once 'classes/model/DbSource.php'; -//require_once 'classes/model/Dynaform.php'; -//require_once 'classes/model/Event.php'; -//require_once 'classes/model/Groupwf.php'; -//require_once 'classes/model/InputDocument.php'; -//require_once 'classes/model/ObjectPermission.php'; -//require_once 'classes/model/OutputDocument.php'; -//require_once 'classes/model/Process.php'; -//require_once 'classes/model/ProcessUser.php'; -//require_once 'classes/model/ReportTable.php'; -//require_once 'classes/model/Route.php'; -//require_once 'classes/model/CaseScheduler.php'; -//require_once 'classes/model/LogCasesScheduler.php'; -//require_once 'classes/model/Step.php'; -//require_once 'classes/model/StepSupervisor.php'; -//require_once 'classes/model/StepTrigger.php'; -//require_once 'classes/model/SubProcess.php'; -//require_once 'classes/model/SwimlanesElements.php'; -//require_once 'classes/model/Task.php'; -//require_once 'classes/model/TaskUser.php'; -//require_once 'classes/model/Triggers.php'; -//require_once 'classes/model/Users.php'; -//require_once 'classes/model/Gateway.php'; -//require_once 'classes/model/om/BaseUsers.php'; - /** * processMap - Process Map class * @@ -306,7 +271,6 @@ class processMap } $msg = array(); - G::LoadClass('derivation'); $Derivation = new Derivation(); $users = $Derivation->getAllUsersFromAnyTask($aRow1['TAS_UID']); $sw_error = false; @@ -315,7 +279,6 @@ class processMap $msg[] = G::LoadTranslation('ID_NO_USERS'); } - G::LoadClass('ArrayPeer'); $stepsCriteria = $this->getStepsCriteria($aRow1['TAS_UID']); $oDatasetSteps = ArrayBasePeer::doSelectRS($stepsCriteria); $oDatasetSteps->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -466,7 +429,7 @@ class processMap $oProcess = new Process(); if (!is_null($oProcess)) { - G::loadClass('processes'); + $calendar = new Calendar(); $files = Processes::getProcessFiles($sProcessUID, 'mail'); @@ -516,8 +479,6 @@ class processMap public function deleteProcess($sProcessUID) { try { - G::LoadClass('case'); - G::LoadClass('reportTables'); //Instance all classes necesaries $oProcess = new Process(); $oDynaform = new Dynaform(); @@ -857,7 +818,6 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['steps'] = $aSteps; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('steps'); $oCriteria->addAscendingOrderByColumn('STEP_POSITION'); @@ -980,7 +940,6 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['availableBB'] = $aBB; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('availableBB'); $oCriteria->addAscendingOrderByColumn('STEP_TYPE_OBJ'); @@ -1160,7 +1119,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['taskUsers'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('taskUsers'); $oCriteria->addDescendingOrderByColumn(TaskUserPeer::TU_RELATION); @@ -1235,7 +1194,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['availableUsers'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('availableUsers'); $oCriteria->addDescendingOrderByColumn(TaskUserPeer::TU_RELATION); @@ -1427,7 +1386,7 @@ class processMap * Task Notifications * */ if ($iForm == 7 || $iForm == 1) { - G::loadClass('processes'); + $files = Processes::getProcessFiles($aFields['PRO_UID'], 'mail'); $templates = array(); @@ -1443,7 +1402,7 @@ class processMap if ($iForm == 7) { // Additional configuration - G::loadClass('configuration'); + $oConf = new Configurations(); $oConf->loadConfig($x, 'TAS_EXTRA_PROPERTIES', $aFields['TAS_UID'], '', ''); $conf = $oConf->aConfig; @@ -1523,7 +1482,7 @@ class processMap } global $G_PUBLISH; - G::LoadClass('xmlfield_InputPM'); + $G_PUBLISH = new Publisher(); if ($sw_template) { $G_PUBLISH->AddContent('view', $sFilename); @@ -1988,7 +1947,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['outputDocArray'] = $outputDocArray; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('outputDocArray'); @@ -2052,7 +2011,7 @@ class processMap $_DBArray['inputDocArrayMain'] = $inputDocArray; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('inputDocArrayMain'); @@ -2150,115 +2109,6 @@ class processMap public function caseSchedulerList($sProcessUID = '') { try { - /* $oCaseScheduler = new CaseScheduler(); - $aRows = $oCaseScheduler->getAll(); - - //$oCaseScheduler->caseSchedulerCron(); - // g::pr($aRows); die; - - $fieldNames = Array( - 'SCH_UID' => 'char', - 'SCH_NAME' => 'char', - 'PRO_UID' => 'char', - 'TAS_UID' => 'char', - 'SCH_TIME_NEXT_RUN' => 'char', - 'SCH_LAST_RUN_TIME' => 'char', - 'SCH_STATE' => 'char', - 'SCH_LAST_STATE' => 'char', - 'USR_UID' => 'char', - 'SCH_OPTION' => 'char', - 'SCH_START_TIME' => 'char', - 'SCH_START_DATE' => 'char', - 'SCH_DAYS_PERFORM_TASK' => 'char', - 'SCH_EVERY_DAYS' => 'char', - 'SCH_WEEK_DAYS' => 'char', - 'SCH_START_DAY' => 'char', - 'SCH_MONTHS' => 'char', - 'SCH_END_DATE' => 'char', - 'SCH_REPEAT_EVERY' => 'char', - 'SCH_REPEAT_UNTIL' => 'char', - 'SCH_REPEAT_STOP_IF_RUNNING' => 'char', - 'PRO_PARENT' => 'char', - 'PRO_TIME' => 'char', - 'PRO_TIMEUNIT' => 'char', - 'PRO_STATUS' => 'char', - 'PRO_TYPE_DAY' => 'char', - 'PRO_TYPE' => 'char', - 'PRO_ASSIGNMENT' => 'char', - 'PRO_SHOW_MAP' => 'char', - 'PRO_SHOW_MESSAGE' => 'char', - 'PRO_SHOW_DELEGATE' => 'char', - 'PRO_SHOW_DYNAFORM' => 'char', - 'PRO_CATEGORY' => 'char', - 'PRO_SUB_CATEGORY' => 'char', - 'PRO_INDUSTRY' => 'char', - 'PRO_UPDATE_DATE' => 'char', - 'PRO_CREATE_DATE' => 'char', - 'PRO_CREATE_USER' => 'char', - 'PRO_HEIGHT' => 'char', - 'PRO_WIDTH' => 'char', - 'PRO_TITLE_X' => 'char', - 'PRO_TITLE_Y' => 'char', - 'PRO_DEBUG' => 'char', - 'PRO_TITLE' => 'char', - 'PRO_DESCRIPTION' => 'char', - 'TAS_TYPE' => 'char', - 'TAS_DURATION' => 'char', - 'TAS_DELAY_TYPE' => 'char', - 'TAS_TEMPORIZER' => 'char', - 'TAS_TYPE_DAY' => 'char', - 'TAS_TIMEUNIT' => 'char', - 'TAS_ALERT' => 'char', - 'TAS_PRIORITY_VARIABLE' => 'char', - 'TAS_ASSIGN_TYPE' => 'char', - 'TAS_ASSIGN_VARIABLE' => 'char', - 'TAS_ASSIGN_LOCATION' => 'char', - 'TAS_ASSIGN_LOCATION_ADHOC' => 'char', - 'TAS_TRANSFER_FLY' => 'char', - 'TAS_LAST_ASSIGNED' => 'char', - 'TAS_USER' => 'char', - 'TAS_CAN_UPLOAD' => 'char', - 'TAS_VIEW_UPLOAD' => 'char', - 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 'char', - 'TAS_CAN_CANCEL' => 'char', - 'TAS_OWNER_APP' => 'char', - 'STG_UID' => 'char', - 'TAS_CAN_PAUSE' => 'char', - 'TAS_CAN_SEND_MESSAGE' => 'char', - 'TAS_CAN_DELETE_DOCS' => 'char', - 'TAS_SELF_SERVICE' => 'char', - 'TAS_START' => 'char', - 'TAS_TO_LAST_USER' => 'char', - 'TAS_SEND_LAST_EMAIL' => 'char', - 'TAS_DERIVATION' => 'char', - 'TAS_POSX' => 'char', - 'TAS_POSY' => 'char', - 'TAS_COLOR' => 'char', - 'TAS_TITLE' => 'char', - 'TAS_DESCRIPTION' => 'char', - 'TAS_DEF_TITLE' => 'char', - 'TAS_DEF_DESCRIPTION' => 'char', - 'TAS_DEF_PROC_CODE' => 'char', - 'TAS_DEF_MESSAGE' => 'char' - ); - - - $aRows = array_merge(Array($fieldNames), $aRows); - - // g::pr($aRows); die; - - global $_DBArray; - $_DBArray['cases_scheduler'] = $aRows; - $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); - $oCriteria = new Criteria('dbarray'); - $oCriteria->setDBArrayTable('cases_scheduler'); - $G_PUBLISH = new Publisher; - - $G_PUBLISH->AddContent('propeltable', 'paged-table', '/cases/cases_Scheduler_List', $oCriteria, array('CONFIRM' => G::LoadTranslation('ID_MSG_CONFIRM_DELETE_CASE_SCHEDULER'))); - G::RenderPage('publish'); - //return true; */ - G::LoadSystem('inputfilter'); $filter = new InputFilter(); $schedulerPath = SYS_URI . "cases/cases_Scheduler_List"; $schedulerPath = $filter->xssFilterHard($schedulerPath); @@ -2426,7 +2276,7 @@ class processMap $sXmlform = 'patterns_Select'; break; case 'EVALUATE': - G::LoadClass('xmlfield_InputPM'); + $aFields['GRID_EVALUATE_TYPE']['ROU_UID'][$aRow['ROU_CASE']] = $aRow['ROU_UID']; $aFields['GRID_EVALUATE_TYPE']['ROU_NEXT_TASK'][$aRow['ROU_CASE']] = $aRow['ROU_NEXT_TASK']; $aFields['GRID_EVALUATE_TYPE']['ROU_CONDITION'][$aRow['ROU_CASE']] = $aRow['ROU_CONDITION']; @@ -2451,7 +2301,6 @@ class processMap $sXmlform = 'patterns_Parallel'; break; case 'PARALLEL-BY-EVALUATION': - G::LoadClass('xmlfield_InputPM'); $aFields['GRID_PARALLEL_EVALUATION_TYPE']['ROU_UID'][$aRow['ROU_CASE']] = $aRow['ROU_UID']; $aFields['GRID_PARALLEL_EVALUATION_TYPE']['ROU_NEXT_TASK'][$aRow['ROU_CASE']] = $aRow['ROU_NEXT_TASK']; $aFields['GRID_PARALLEL_EVALUATION_TYPE']['ROU_CONDITION'][$aRow['ROU_CASE']] = $aRow['ROU_CONDITION']; @@ -2465,12 +2314,10 @@ class processMap $sXmlform = 'patterns_ParallelByEvaluation'; break; case 'DISCRIMINATOR': - G::LoadClass('xmlfield_InputPM'); $aFields['GRID_DISCRIMINATOR_TYPE']['ROU_UID'][$aRow['ROU_CASE']] = $aRow['ROU_UID']; $aFields['GRID_DISCRIMINATOR_TYPE']['ROU_NEXT_TASK'][$aRow['ROU_CASE']] = $aRow['ROU_NEXT_TASK']; $aFields['GRID_DISCRIMINATOR_TYPE']['ROU_CONDITION'][$aRow['ROU_CASE']] = $aRow['ROU_CONDITION']; $aFields['GRID_DISCRIMINATOR_TYPE']['ROU_OPTIONAL'][$aRow['ROU_CASE']] = $aRow['ROU_OPTIONAL']; - G::LoadClass('tasks'); $oTasks = new Tasks(); $routeData = $oTasks->getRouteByType($sProcessUID, $aRow['ROU_NEXT_TASK'], $aRow['ROU_TYPE']); $aFields['ROUTE_COUNT'] = count($routeData); @@ -2830,7 +2677,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['processes'] = $aProcesses; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('processes'); return $oCriteria; @@ -2937,7 +2784,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['reports'] = $row; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('reports'); //if ($TaskFields['TAS_ASSIGN_TYPE'] == 'BALANCED') { @@ -3397,7 +3244,7 @@ class processMap */ public function getObjectsPermissionsCriteria($sProcessUID) { - G::LoadClass('case'); + $aObjectsPermissions = array(); $aObjectsPermissions[] = array('OP_UID' => 'char', 'TASK_TARGET' => 'char', 'GROUP_USER' => 'char', 'TASK_SOURCE' => 'char', 'OBJECT_TYPE' => 'char', 'OBJECT' => 'char', 'PARTICIPATED' => 'char', 'ACTION' => 'char', 'OP_CASE_STATUS' => 'char'); $oCriteria = new Criteria('workflow'); @@ -3550,7 +3397,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['objectsPermissions'] = $aObjectsPermissions; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('objectsPermissions'); return $oCriteria; @@ -3575,7 +3422,7 @@ class processMap public function getExtObjectsPermissions($start, $limit, $sProcessUID) { - G::LoadClass('case'); + $aObjectsPermissions = array(); //$aObjectsPermissions [] = array('OP_UID' => 'char', 'TASK_TARGET' => 'char', 'GROUP_USER' => 'char', 'TASK_SOURCE' => 'char', 'OBJECT_TYPE' => 'char', 'OBJECT' => 'char', 'PARTICIPATED' => 'char', 'ACTION' => 'char', 'OP_CASE_STATUS' => 'char'); $oCriteria = new Criteria('workflow'); @@ -3777,7 +3624,7 @@ class processMap $aAllDynaforms[] = array('UID' => $aRow['DYN_UID'], 'LABEL' => $aRow['DYN_TITLE']); $oDataset->next(); } - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getInputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -3786,7 +3633,7 @@ class processMap $aAllInputs[] = array('UID' => $aRow['INP_DOC_UID'], 'LABEL' => $aRow['INP_DOC_TITLE']); $oDataset->next(); } - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getOutputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -3927,7 +3774,7 @@ class processMap $oDataset->next(); } //inputs - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getInputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -3939,7 +3786,7 @@ class processMap $oDataset->next(); } //outputs - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getOutputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -4050,7 +3897,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['objects'] = $aObjects; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('objects'); $oCriteria->addAscendingOrderByColumn('CTO_POSITION'); @@ -4147,7 +3994,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['availableObjects'] = $aAvailableObjects; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('availableObjects'); return $oCriteria; @@ -4252,7 +4099,7 @@ class processMap */ public function processFilesManager($sProcessUID) { - G::LoadClass('ArrayPeer'); + global $_DBArray; global $G_PUBLISH; @@ -4332,7 +4179,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['objects'] = $aTheFiles; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('objects'); $oCriteria->addAscendingOrderByColumn('DOWNLOAD_TEXT'); @@ -5105,7 +4952,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['taskUsers'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('taskUsers'); $oCriteria->addDescendingOrderByColumn(TaskUserPeer::TU_RELATION); @@ -5296,7 +5143,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['availableBB'] = $aBB; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('availableBB'); $oCriteria->addAscendingOrderByColumn('STEP_TYPE_OBJ'); @@ -5413,7 +5260,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['steps'] = $aSteps; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('steps'); $oCriteria->addAscendingOrderByColumn('STEP_POSITION'); @@ -5788,7 +5635,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['outputDocArray'] = $outputDocArray; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('outputDocArray'); @@ -6334,7 +6181,7 @@ class processMap $aAllDynaforms[] = array('UID' => $aRow['DYN_UID'], 'LABEL' => $aRow['DYN_TITLE'] ); $oDataset->next(); } - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getInputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -6343,7 +6190,7 @@ class processMap $aAllInputs[] = array('UID' => $aRow['INP_DOC_UID'], 'LABEL' => $aRow['INP_DOC_TITLE'] ); $oDataset->next(); } - G::LoadClass('ArrayPeer'); + $oDataset = ArrayBasePeer::doSelectRS($this->getOutputDocumentsCriteria($sProcessUID)); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -6464,7 +6311,7 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['objects'] = $aObjects; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); + $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('objects'); $oCriteria->addAscendingOrderByColumn('CTO_POSITION'); @@ -6544,14 +6391,6 @@ class processMap $oDataset->next(); } return $aAvailableObjects; - /* global $_DBArray; - $_DBArray = (isset($_SESSION ['_DBArray']) ? $_SESSION ['_DBArray'] : ''); - $_DBArray ['availableObjects'] = $aAvailableObjects; - $_SESSION ['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); - $oCriteria = new Criteria('dbarray'); - $oCriteria->setDBArrayTable('availableObjects'); - return $oCriteria; */ } //new functions @@ -6734,7 +6573,6 @@ class processMap $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : ''); $_DBArray['taskUsers'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('taskUsers'); $oCriteria->addDescendingOrderByColumn(TaskUserPeer::TU_RELATION); diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index bddf3ec7b..cf1ea61a7 100644 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -24,39 +24,6 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ -//require_once 'classes/model/Content.php'; -//require_once 'classes/model/Process.php'; -//require_once 'classes/model/Task.php'; -//require_once 'classes/model/Route.php'; -//require_once 'classes/model/SwimlanesElements.php'; -//require_once 'classes/model/InputDocument.php'; -//require_once 'classes/model/ObjectPermission.php'; -//require_once 'classes/model/OutputDocument.php'; -//require_once 'classes/model/Step.php'; -//require_once 'classes/model/StepTrigger.php'; -//require_once 'classes/model/Dynaform.php'; -//require_once 'classes/model/Triggers.php'; -//require_once 'classes/model/Groupwf.php'; -//require_once 'classes/model/ReportTable.php'; -//require_once 'classes/model/ReportVar.php'; -//require_once 'classes/model/DbSource.php'; -//require_once 'classes/model/StepSupervisor.php'; -//require_once 'classes/model/SubProcess.php'; -//require_once 'classes/model/CaseTracker.php'; -//require_once 'classes/model/CaseTrackerObject.php'; -//require_once 'classes/model/Stage.php'; -//require_once 'classes/model/TaskUser.php'; -//require_once 'classes/model/FieldCondition.php'; -//require_once 'classes/model/Event.php'; -//require_once 'classes/model/CaseScheduler.php'; -//require_once 'classes/model/ProcessCategory.php'; -//require_once 'classes/model/Configuration.php'; - -//G::LoadClass( 'tasks' ); -//G::LoadClass( 'reportTables' ); -//G::LoadClass( 'processMap' ); -//G::LoadThirdParty( 'pear/json', 'class.json' ); - class Processes { @@ -6101,10 +6068,6 @@ class Processes public function getDisabledCode($processUid = null, $workspaceName = null) { try { - /*----------------------------------********---------------------------------*/ - G::LoadClass("codeScanner"); - /*----------------------------------********---------------------------------*/ - $arrayDisabledCode = array(); /*----------------------------------********---------------------------------*/ diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php index c5fef27fa..6642b536c 100644 --- a/workflow/engine/classes/class.propelTable.php +++ b/workflow/engine/classes/class.propelTable.php @@ -25,11 +25,6 @@ * */ -G::LoadClass( 'filterForm' ); -G::LoadClass( 'xmlMenu' ); -G::LoadClass( "BasePeer" ); -G::LoadClass( "ArrayPeer" ); - /** * Class pagedTable * diff --git a/workflow/engine/classes/class.report.php b/workflow/engine/classes/class.report.php index 4f06e5ba9..9aafbe2fb 100644 --- a/workflow/engine/classes/class.report.php +++ b/workflow/engine/classes/class.report.php @@ -81,7 +81,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $aProcess; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -150,7 +149,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $aProcess; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -204,7 +202,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $aProcess; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -293,7 +290,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $aProcess; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); return $oCriteria; @@ -447,7 +443,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $aProcess; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); return $oCriteria; @@ -495,7 +490,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -554,7 +548,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -606,7 +599,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -672,7 +664,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -725,7 +716,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -790,7 +780,6 @@ class Report global $_DBArray; $_DBArray['reports'] = $ROW; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reports' ); @@ -852,7 +841,6 @@ class Report } //$aData['DEL_FINISH_DATE']=$aRow['DEL_FINISH_DATE']; if ($aRow['DEL_DURATION'] != 0) { - G::LoadClass( 'dates' ); $oDates = new dates(); $aData['DEL_DURATION'] = $oDates->calculateDuration( $aData['DEL_INIT_DATE'], $aRow['DEL_FINISH_DATE'], null, null, $aRow['TAS_UID'] ); } diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php index e8eaee26f..b96446a6a 100644 --- a/workflow/engine/classes/class.reportTables.php +++ b/workflow/engine/classes/class.reportTables.php @@ -25,7 +25,6 @@ * */ -G::LoadClass( 'case' ); /** * ReportTables - Report tables class diff --git a/workflow/engine/classes/class.searchIndex.php b/workflow/engine/classes/class.searchIndex.php index 5b00cee56..14bca73be 100644 --- a/workflow/engine/classes/class.searchIndex.php +++ b/workflow/engine/classes/class.searchIndex.php @@ -294,8 +294,6 @@ class BpmnEngine_Services_SearchIndex */ public function updateIndexDocument($solrUpdateDocumentEntity) { - G::LoadClass ('solr'); - $solr = new BpmnEngine_SearchIndexAccess_Solr ($this->_solrIsEnabled, $this->_solrHost); // create list of facets @@ -309,8 +307,6 @@ class BpmnEngine_Services_SearchIndex */ public function deleteDocumentFromIndex($workspace, $idQuery) { - G::LoadClass ('solr'); - $solr = new BpmnEngine_SearchIndexAccess_Solr ($this->_solrIsEnabled, $this->_solrHost); // create list of facets @@ -323,8 +319,6 @@ class BpmnEngine_Services_SearchIndex */ public function commitIndexChanges($workspace) { - G::LoadClass ('solr'); - $solr = new BpmnEngine_SearchIndexAccess_Solr ($this->_solrIsEnabled, $this->_solrHost); // commit @@ -337,8 +331,6 @@ class BpmnEngine_Services_SearchIndex */ public function optimizeIndexChanges($workspace) { - G::LoadClass ('solr'); - $solr = new BpmnEngine_SearchIndexAccess_Solr ($this->_solrIsEnabled, $this->_solrHost); // commit diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php index 9c4cf5fb9..758748ed8 100644 --- a/workflow/engine/classes/class.serverConfiguration.php +++ b/workflow/engine/classes/class.serverConfiguration.php @@ -346,8 +346,6 @@ class serverConf { $sMySQLVersion = '?????'; if (defined("DB_HOST")) { - G::LoadClass('net'); - G::LoadClass('dbConnections'); $dbNetView = new NET(DB_HOST); $dbNetView->loginDbServer(DB_USER, DB_PASS); diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php index 5df8cb1bd..986c9588f 100644 --- a/workflow/engine/classes/class.spool.php +++ b/workflow/engine/classes/class.spool.php @@ -542,8 +542,6 @@ class spoolRun } break; case 'OPENMAIL': - G::LoadClass( 'package' ); - G::LoadClass( 'smtp' ); $pack = new package( $this->fileData ); $header = $pack->returnHeader(); $body = $pack->returnBody(); @@ -592,9 +590,6 @@ class spoolRun */ public function resendEmails ($dateResend = null, $cron = 0) { - if (!class_exists('System')) { - G::LoadClass('system'); - } $aConfiguration = System::getEmailConfiguration(); if (!isset($aConfiguration["MESS_ENABLED"])) { diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index 3140770e3..acfadbe58 100644 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -319,7 +319,6 @@ class System */ public function getUpgradedFilesList () { - G::LoadClass( 'archive' ); $this->sFilesList = new gzip_file( $this->sFilename ); $this->sFilesList->set_options( array ('basedir' => dirname( $this->sFilename ),'overwrite' => 1 ) ); @@ -579,8 +578,6 @@ class System //now include the files and classes needed for upgrade databases, dont move this files, because we //are getting the last files in this point. Even the files was in the patch we will take the new ones. include PATH_METHODS . PATH_SEP . 'setup' . PATH_SEP . 'upgrade_RBAC.php'; - G::LoadClass( 'languages' ); - G::LoadSystem( 'database_mysql' ); $bForceXml = true; $bParseSchema = true; @@ -1028,7 +1025,6 @@ class System //Return return $arrayDataEmailServerConfig; } else { - G::LoadClass("configuration"); $conf = new Configurations(); $config = $conf->load("Emails"); diff --git a/workflow/engine/classes/class.toolBar.php b/workflow/engine/classes/class.toolBar.php index b71b22ed2..842473840 100644 --- a/workflow/engine/classes/class.toolBar.php +++ b/workflow/engine/classes/class.toolBar.php @@ -164,7 +164,7 @@ class XmlForm_Field_toolButton extends XmlForm_Field case 'dropdown': $html = ''; if (isset($this->owner->values['PRO_UID'])) { - G::LoadClass('processMap'); + $criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']); $dataset = DynaformPeer::doSelectRS($criteria); if ($dataset->getRecordCount() > 0) { diff --git a/workflow/engine/classes/class.webdav.php b/workflow/engine/classes/class.webdav.php index e1d478132..c10093637 100644 --- a/workflow/engine/classes/class.webdav.php +++ b/workflow/engine/classes/class.webdav.php @@ -123,8 +123,7 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server //list all active processes if (count($paths) == 1 && $paths[0] == 'processes' && is_dir($pathProcesses)) { // try to get the process directory list - G::LoadClass('processMap'); - G::LoadClass('model/Process'); + $oProcessMap = new processMap(); $oProcess = new Process(); $c = $oProcessMap->getConditionProcessList(); diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 03229f936..0ee9c5d57 100644 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -25,43 +25,7 @@ */ //It works with the table CONFIGURATION in a WF dataBase -//require_once ("classes/model/Application.php"); -//require_once ("classes/model/AppCacheView.php"); -//require_once ("classes/model/AppDelegation.php"); -//require_once ("classes/model/AppDocument.php"); -//require_once ("classes/model/AppDelay.php"); -//require_once ("classes/model/AppNotes.php"); -//require_once ("classes/model/AppThread.php"); -//require_once ("classes/model/Department.php"); -//require_once ("classes/model/Dynaform.php"); -//require_once ("classes/model/Groupwf.php"); -//require_once ("classes/model/InputDocument.php"); -//require_once ("classes/model/Language.php"); -//require_once ("classes/model/OutputDocument.php"); -//require_once ("classes/model/Process.php"); -//require_once ("classes/model/ReportTable.php"); -//require_once ("classes/model/ReportVar.php"); -//require_once ("classes/model/Route.php"); -//require_once ("classes/model/Step.php"); -//require_once ("classes/model/StepTrigger.php"); -//require_once ("classes/model/Task.php"); -//require_once ("classes/model/TaskUser.php"); -//require_once ("classes/model/Triggers.php"); -//require_once ("classes/model/Users.php"); -//require_once ("classes/model/Session.php"); -//require_once ("classes/model/Content.php"); -//G::LoadClass( "ArrayPeer" ); -//G::LoadClass( "BasePeer" ); -G::LoadClass( 'case' ); -//G::LoadClass( 'derivation' ); -//G::LoadClass( 'groups' ); -//G::LoadClass( 'sessions' ); -//G::LoadClass( 'processes' ); -//G::LoadClass( 'processMap' ); -//G::LoadClass( 'pmScript' ); -//G::LoadClass( 'spool' ); -//G::LoadClass( 'tasks' ); -//G::LoadClass( 'wsResponse' ); + /** * Copyright (C) 2009 COLOSA @@ -327,7 +291,6 @@ class wsBase $solrEnabled = 0; if (($solrEnv = System::solrEnv()) !== false) { - G::LoadClass("AppSolr"); $appSolr = new AppSolr( $solrEnv["solr_enabled"], @@ -345,7 +308,6 @@ class wsBase if ($solrEnabled == 1) { try { - G::LoadClass("searchIndex"); $arrayData = array(); @@ -833,7 +795,6 @@ class wsBase public function taskList ($userId) { try { - G::LoadClass( 'groups' ); $oGroup = new Groups(); $aGroups = $oGroup->getActiveGroupsForAnUser( $userId ); @@ -903,9 +864,6 @@ class wsBase $gmail = 0 ) { try { - if (!class_exists('System')) { - G::LoadClass('system'); - } /*----------------------------------********---------------------------------*/ if (!empty($config)) { @@ -1599,7 +1557,6 @@ class wsBase public function removeUserFromGroup ($userId, $groupId) { try { - G::LoadClass( 'groups' ); global $RBAC; $RBAC->initRBAC(); @@ -1639,10 +1596,6 @@ class wsBase return $result; } - - //G::LoadClass('groups'); - //$oGroup = new Groups(); - //$oGroup->removeUserOfGroup($_POST['GRP_UID'], $_POST['USR_UID']); } /** @@ -2893,7 +2846,6 @@ class wsBase $result->status_code = 0; $result->message = G::loadTranslation( 'ID_SUCESSFUL' ); $result->timestamp = date( 'Y-m-d H:i:s' ); - G::LoadClass( "system" ); $result->version = System::getVersion(); $result->operatingSystem = $redhat; $result->webServer = getenv( 'SERVER_SOFTWARE' ); @@ -2930,8 +2882,6 @@ class wsBase public function getCaseNotes ($applicationID, $userUid = '') { try { - G::LoadClass( 'case' ); - $result = new wsGetCaseNotesResponse( 0, G::loadTranslation( 'ID_SUCCESS' ), Cases::getCaseNotes( $applicationID, 'array', $userUid ) ); $var = array (); @@ -3299,7 +3249,6 @@ class wsBase public function claimCase($userId, $guid, $delIndex) { try { - G::LoadClass('case'); $oCase = new Cases(); $oCase->loadCase($guid); $oCase->setCatchUser($guid, $delIndex, $userId); diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index ffd09bcb2..a3a3c84b1 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -5,9 +5,7 @@ * * @author Alexandre Rosenfeld */ -G::LoadSystem('dbMaintenance'); -G::LoadClass("cli"); -G::LoadClass("multipleFilesBackup"); + /** * class workspaceTools * @@ -666,7 +664,6 @@ class workspaceTools //require_once ('classes/model/AppCacheView.php'); //check the language, if no info in config about language, the default is 'en' - G::LoadClass("configuration"); $oConf = new Configurations(); $oConf->loadConfig($x, 'APP_CACHE_VIEW_ENGINE', '', '', '', ''); @@ -824,7 +821,6 @@ class workspaceTools //Set value of 2 to the directory structure version. $this->initPropel(true); - G::LoadClass("configuration"); $conf = new Configurations(); if (!$conf->exists("ENVIRONMENT_SETTINGS")) { $conf->aConfig = array("format" => '@userName (@firstName @lastName)', @@ -861,7 +857,6 @@ class workspaceTools */ public function upgradeDatabase($onedb = false, $checkOnly = false) { - G::LoadClass("patch"); $this->initPropel(true); p11835::$dbAdapter = $this->dbAdapter; p11835::isApplicable(); @@ -1142,19 +1137,6 @@ class workspaceTools if (isset($this->dbHost)) { - //TODO: This code stopped working with the refactoring - //require_once ("propel/Propel.php"); - //G::LoadClass('dbConnections'); - //$dbConns = new dbConnections(''); - //$availdb = ''; - //foreach( $dbConns->getDbServicesAvailables() as $key => $val ) { - //if(!empty($availdb)) - // $availdb .= ', '; - // $availdb .= $val['name']; - //} - - - G::LoadClass('net'); $dbNetView = new NET($this->dbHost); $dbNetView->loginDbServer($this->dbUser, $this->dbPass); try { @@ -1990,7 +1972,6 @@ class workspaceTools public function changeHashPassword ($workspace, $response) { $this->initPropel( true ); - G::LoadClass("enterprise"); $licensedFeatures = & PMLicensedFeatures::getSingleton(); /*----------------------------------********---------------------------------*/ if ($licensedFeatures->verifyfeature('95OY24wcXpEMzIyRmlNSnF0STNFSHJzMG9wYTJKekpLNmY2ZmRCeGtuZk5oUDloaUNhUGVjTDJBPT0=')) { @@ -2103,8 +2084,6 @@ class workspaceTools try { $this->initPropel(true); - G::LoadClass("processes"); - $process = new Processes(); //Return @@ -3529,7 +3508,6 @@ class workspaceTools public function migrateIteeToDummytask($workspaceName){ $this->initPropel(true); $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspaceName); - \G::LoadClass("configuration"); $conf = new Configurations(); \G::$sysSys = $workspaceName; \G::$pathDataSite = PATH_DATA . "sites" . PATH_SEP . \G::$sysSys . PATH_SEP; @@ -3582,14 +3560,12 @@ class workspaceTools public function upgradeConfiguration() { - G::LoadClass("configuration"); $conf = new Configurations(); $conf->aConfig = 'neoclassic'; $conf->saveConfig('SKIN_CRON', ''); } public function upgradeAuditLog($workspace){ - G::LoadClass("configuration"); $conf = new Configurations(); if (!$conf->exists('AUDIT_LOG','log')) { CLI::logging("> Updating Auditlog Config \n"); diff --git a/workflow/engine/classes/class.xmlfield_InputPM.php b/workflow/engine/classes/class.xmlfield_InputPM.php index c7b1d8592..64ba47382 100644 --- a/workflow/engine/classes/class.xmlfield_InputPM.php +++ b/workflow/engine/classes/class.xmlfield_InputPM.php @@ -528,9 +528,6 @@ function getGridsVars ($sProcessUID) function getVarsGrid ($proUid, $dynUid) { - G::LoadClass( 'dynaformhandler' ); - G::LoadClass( 'AppSolr' ); - $dynaformFields = array (); if (is_file( PATH_DATA . '/sites/'. SYS_SYS .'/xmlForms/'. $proUid .'/'.$dynUid. '.xml' ) && filesize( PATH_DATA . '/sites/'. SYS_SYS .'/xmlForms/'. $proUid .'/'. $dynUid .'.xml' ) > 0) { diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index 3e44e519f..3593829fe 100644 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -305,7 +305,6 @@ class AdditionalTables extends BaseAdditionalTables FieldsPeer::doDelete($criteria); //remove all related to pmTable - G::loadClass('pmTable'); $pmTable = new pmTable($additionalTable['ADD_TAB_NAME']); $pmTable->setDataSource($additionalTable['DBS_UID']); $pmTable->remove(); @@ -585,7 +584,6 @@ class AdditionalTables extends BaseAdditionalTables if ($oClass->validate()) { $iResult = $oClass->save(); if ($keysAutoIncrement == 1 && $aFields[$keyUIDAutoIncrement] == '' && isset($_SESSION['APPLICATION']) && $_SESSION['APPLICATION'] != '') { - G::LoadClass('case'); $oCaseKeyAuto = new Cases(); $newId = $oClass->getId(); $aFields = $oCaseKeyAuto->loadCase($_SESSION['APPLICATION']); @@ -849,7 +847,6 @@ class AdditionalTables extends BaseAdditionalTables */ public function updateReportTables($proUid, $appUid, $appNumber, $caseData, $appStatus) { - G::loadClass('pmTable'); //get all Active Report Tables $criteria = new Criteria('workflow'); $criteria->add(AdditionalTablesPeer::PRO_UID, $proUid); diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php index 76d4a4f85..856def5c4 100644 --- a/workflow/engine/classes/model/AddonsManager.php +++ b/workflow/engine/classes/model/AddonsManager.php @@ -163,7 +163,6 @@ class AddonsManager extends BaseAddonsManager public function getInstalledVersion() { if ($this->isCore()) { - G::LoadClass("system"); return (EnterpriseUtils::pmVersion(System::getVersion())); } else { if ($this->isPlugin()) { diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php index bb7cc6f85..be348a852 100644 --- a/workflow/engine/classes/model/AddonsStore.php +++ b/workflow/engine/classes/model/AddonsStore.php @@ -1,6 +1,5 @@ getActiveGroupsForAnUser($userUid); @@ -335,8 +334,6 @@ class AppCacheView extends BaseAppCacheView public function getSelfServiceCasesByEvaluate($userUid) { try { - G::LoadClass("groups"); - $arrayAppAssignSelfServiceValueData = array(); //Get APP_UIDs @@ -384,9 +381,6 @@ class AppCacheView extends BaseAppCacheView public function getUnassigned($userUid, $doCount) { //get the valid selfservice tasks for this user - if (!class_exists('Cases')) { - G::loadClass('case'); - } $oCase = new Cases(); $tasks = $this->getSelfServiceTasks( $userUid ); @@ -1689,7 +1683,6 @@ class AppCacheView extends BaseAppCacheView public function replaceRowUserData($rowData) { try { - G::loadClass('configuration'); $oConfig = new Configuration(); $aConfig = $oConfig->load('ENVIRONMENT_SETTINGS'); $aConfig = unserialize($aConfig['CFG_VALUE']); diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index d83282b14..e6c1b388e 100644 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -25,12 +25,6 @@ * */ -//require_once 'classes/model/om/BaseAppDelegation.php'; -//require_once ("classes/model/HolidayPeer.php"); -//require_once ("classes/model/TaskPeer.php"); -//require_once ("classes/model/Task.php"); -//G::LoadClass( "dates" ); - /** * Skeleton subclass for representing a row from the 'APP_DELEGATION' table. * @@ -273,7 +267,6 @@ class AppDelegation extends BaseAppDelegation $dataAbe = $resultAbe->getRow(); $flagActionsByEmail = false; if($dataAbe['ABE_TYPE']!='' && $data->USR_UID!=''){ - G::LoadClass('actionsByEmailCore'); $actionsByEmail = new actionsByEmailCoreClass(); $actionsByEmail->sendActionsByEmail($data, $dataAbe); } @@ -285,7 +278,6 @@ class AppDelegation extends BaseAppDelegation /*----------------------------------********---------------------------------*/ $licensedFeatures = &PMLicensedFeatures::getSingleton (); if ($licensedFeatures->verifyfeature ( '7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09' )) { - G::LoadClass("pmGoogleApi"); try{ $pmGoogle = new PMGoogleApi (); if ($pmGoogle->getServiceGmailStatus()) { diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php index f2f32ba7f..bbde16350 100644 --- a/workflow/engine/classes/model/AppEvent.php +++ b/workflow/engine/classes/model/AppEvent.php @@ -180,11 +180,6 @@ class AppEvent extends BaseAppEvent public function executeEvents ($sNow, $debug = false, &$log = array(), $cron = 0) { - - require_once 'classes/model/Configuration.php'; - require_once 'classes/model/Triggers.php'; - G::LoadClass( 'case' ); - $debug = 1; $oCase = new Cases(); diff --git a/workflow/engine/classes/model/AppFolder.php b/workflow/engine/classes/model/AppFolder.php index 971997ef5..8bf09e6cd 100644 --- a/workflow/engine/classes/model/AppFolder.php +++ b/workflow/engine/classes/model/AppFolder.php @@ -293,9 +293,7 @@ class AppFolder extends BaseAppFolder //require_once ("classes/model/OutputDocument.php"); //require_once ("classes/model/Users.php"); - G::LoadClass( 'case' ); $oCase = new Cases(); - G::LoadClass( 'process' ); $oProcess = new Process(); $oAppDocument = new AppDocument(); @@ -447,9 +445,7 @@ class AppFolder extends BaseAppFolder public function getDirectoryContentSortedBy ($folderID, $docIdFilter = array(), $keyword = null, $searchType = null, $limit = 0, $start = 0, $user = '', $onlyActive = false, $direction = 'ASC', $ColumnSort = 'appDocCreateDate', $search = null) { - G::LoadClass( 'case' ); $oCase = new Cases(); - G::LoadClass( 'process' ); $oProcess = new Process(); $oAppDocument = new AppDocument(); @@ -606,9 +602,7 @@ class AppFolder extends BaseAppFolder //**** start get Doc Info $oApp = new Application(); $oAppDocument = new AppDocument(); - G::LoadClass( 'case' ); $oCase = new Cases(); - G::LoadClass( 'process' ); $oProcess = new Process(); if (($oApp->exists( $appUid )) || ($appUid == "00000000000000000000000000000000")) { if ($appUid == "00000000000000000000000000000000") { diff --git a/workflow/engine/classes/model/AppHistory.php b/workflow/engine/classes/model/AppHistory.php index 7bc6542b3..55998dfb6 100644 --- a/workflow/engine/classes/model/AppHistory.php +++ b/workflow/engine/classes/model/AppHistory.php @@ -50,7 +50,6 @@ class AppHistory extends BaseAppHistory public function getDynaformHistory($PRO_UID, $TAS_UID, $APP_UID, $DYN_UID = "") { - G::LoadClass('case'); $oCase = new Cases(); $aObjectPermissions = $oCase->getAllObjects($PRO_UID, $APP_UID, $TAS_UID, $_SESSION['USER_LOGGED']); @@ -222,7 +221,6 @@ class AppHistory extends BaseAppHistory global $_DBArray; $_DBArray['DynaformsHistory'] = $aDynHistory; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass('ArrayPeer'); $oCriteria = new Criteria('dbarray'); $oCriteria->setDBArrayTable('DynaformsHistory'); $oCriteria->addAscendingOrderByColumn(AppHistoryPeer::HISTORY_DATE); diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php index 3c8cf5930..94b19a6c0 100644 --- a/workflow/engine/classes/model/AppNotes.php +++ b/workflow/engine/classes/model/AppNotes.php @@ -130,7 +130,6 @@ class AppNotes extends BaseAppNotes if ($notify) { if ($noteRecipients == "") { $noteRecipientsA = array (); - G::LoadClass( 'case' ); $oCase = new Cases(); $p = $oCase->getUsersParticipatedInCase( $appUid ); foreach ($p['array'] as $key => $userParticipated) { @@ -148,9 +147,7 @@ class AppNotes extends BaseAppNotes public function sendNoteNotification ($appUid, $usrUid, $noteContent, $noteRecipients, $sFrom = "") { try { - if (!class_exists('System')) { - G::LoadClass('system'); - } + $aConfiguration = System::getEmailConfiguration(); $msgError = ""; @@ -163,7 +160,6 @@ class AppNotes extends BaseAppNotes $aUser = $oUser->load( $usrUid ); $authorName = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>'; - G::LoadClass( 'case' ); $oCase = new Cases(); $aFields = $oCase->loadCase( $appUid ); $configNoteNotification['subject'] = G::LoadTranslation( 'ID_MESSAGE_SUBJECT_NOTE_NOTIFICATION' ) . " @#APP_TITLE "; @@ -177,7 +173,6 @@ class AppNotes extends BaseAppNotes $sSubject = G::replaceDataField( $configNoteNotification['subject'], $aFields ); $sBody = nl2br( G::replaceDataField( $configNoteNotification['body'], $aFields ) ); - G::LoadClass( 'spool' ); $oUser = new Users(); $recipientsArray = explode( ",", $noteRecipients ); @@ -224,7 +219,6 @@ class AppNotes extends BaseAppNotes $response = $this->postNewNote($applicationUid, $userUid, $note, false); if ($sendMail == 1) { - G::LoadClass("case"); $case = new Cases(); diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index b49fe802e..ac84e1451 100644 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -454,8 +454,6 @@ class CaseScheduler extends BaseCaseScheduler $pluginParts = explode("--", $row["CASE_SH_PLUGIN_UID"]); if (count($pluginParts) == 2) { - //Plugins - G::LoadClass("plugin"); //Here we are loading all plugins registered //The singleton has a list of enabled plugins diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php index dfd60954b..9d7e07c19 100644 --- a/workflow/engine/classes/model/Content.php +++ b/workflow/engine/classes/model/Content.php @@ -361,7 +361,6 @@ class Content extends BaseContent FROM CONTENT ORDER BY CON_ID, CON_CATEGORY, CON_PARENT, CON_LANG"; - G::LoadClass( "wsTools" ); $workSpace = new workspaceTools( $workSpace ); $workSpace->getDBInfo(); diff --git a/workflow/engine/classes/model/DashboardIndicator.php b/workflow/engine/classes/model/DashboardIndicator.php index 65a0eb26b..d98d735fa 100644 --- a/workflow/engine/classes/model/DashboardIndicator.php +++ b/workflow/engine/classes/model/DashboardIndicator.php @@ -29,7 +29,6 @@ class DashboardIndicator extends BaseDashboardIndicator } function loadbyDasUid ($dasUid, $vcompareDate, $vmeasureDate, $userUid) { - G::loadClass('indicatorsCalculator'); $calculator = new \IndicatorsCalculator(); try { diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php index 7c11bde98..1894e5501 100644 --- a/workflow/engine/classes/model/Department.php +++ b/workflow/engine/classes/model/Department.php @@ -550,7 +550,6 @@ class Department extends BaseDepartment $row = $rs->getRow(); } - G::LoadClass( 'ArrayPeer' ); global $_DBArray; $_DBArray['DepartmentUserList'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php index b5d0e8927..498f93f91 100644 --- a/workflow/engine/classes/model/Dynaform.php +++ b/workflow/engine/classes/model/Dynaform.php @@ -25,10 +25,6 @@ * */ -//require_once 'classes/model/om/BaseDynaform.php'; -//require_once 'classes/model/Content.php'; -//require_once ('classes/model/AdditionalTables.php'); -//G::LoadClass( 'dynaFormField' ); /** * Skeleton subclass for representing a row from the 'DYNAFORM' table. diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index 2b6ed8144..55e5158cc 100644 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -425,7 +425,6 @@ class Event extends BaseEvent try { $rowsCreated = 0; $rowsRejected = 0; - G::LoadClass( 'calendar' ); $oCalendar = new calendar(); //SELECT @@ -551,7 +550,6 @@ class Event extends BaseEvent try { $rowsCreated = 0; $rowsRejected = 0; - G::LoadClass( 'calendar' ); $oCalendar = new calendar(); // SELECT TASK2.* , // EVENT.EVN_UID, EVENT.PRO_UID, EVENT.EVN_TAS_UID_FROM, @@ -686,7 +684,6 @@ class Event extends BaseEvent foreach ($aRows as $aData) { // if the events has a condition if (trim( $aData['EVN_CONDITIONS'] ) != '') { - G::LoadClass( 'case' ); $oCase = new Cases(); $aFields = $oCase->loadCase( $APP_UID ); @@ -875,7 +872,6 @@ class Event extends BaseEvent public function toCalculateTime ($aData, $iDate = null) { - G::LoadClass( 'calendar' ); $oCalendar = new calendar(); $iDate = isset( $iDate ) ? $iDate : date( 'Y-m-d H:i:s' ); diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php index 1d510356f..eee05771f 100644 --- a/workflow/engine/classes/model/Groupwf.php +++ b/workflow/engine/classes/model/Groupwf.php @@ -373,11 +373,6 @@ class Groupwf extends BaseGroupwf public function filterGroup ($filter, $start, $limit) { - require_once 'classes/model/Groupwf.php'; - require_once 'classes/model/TaskUser.php'; - require_once 'classes/model/GroupUser.php'; - G::LoadClass( 'configuration' ); - $co = new Configurations(); $config = $co->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] ); $env = $co->getConfiguration( 'ENVIRONMENT_SETTINGS', '' ); diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php index 49708f72a..1de80ac57 100644 --- a/workflow/engine/classes/model/Language.php +++ b/workflow/engine/classes/model/Language.php @@ -305,9 +305,6 @@ class Language extends BaseLanguage //export public function export () { - G::LoadSystem( 'i18n_po' ); - G::LoadClass( "system" ); - //get labels MichelangeloFE try { $oTranslation = new Translation(); @@ -688,9 +685,6 @@ class Language extends BaseLanguage throw new Exception( 'Translation.php not exist in plugin ' . $plugin); } - G::LoadSystem( 'i18n_po' ); - G::LoadClass( "system" ); - $language = new Language(); $locale = $language; diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 562c01b6e..2f6a714ff 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -300,8 +300,6 @@ class ListUnassigned extends BaseListUnassigned public function getSelfServiceCasesByEvaluate($userUid) { try { - G::LoadClass("groups"); - $arrayAppAssignSelfServiceValueData = array(); //Get APP_UIDs @@ -379,8 +377,6 @@ class ListUnassigned extends BaseListUnassigned $row = $rs->getRow(); } - //check groups assigned to SelfService task - G::LoadClass('groups'); $group = new Groups(); $aGroups = $group->getActiveGroupsForAnUser($userUid); diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index e69ce6c6b..9e772037a 100644 --- a/workflow/engine/classes/model/Process.php +++ b/workflow/engine/classes/model/Process.php @@ -327,7 +327,6 @@ class Process extends BaseProcess $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; } - G::loadClass( 'configuration' ); $oConf = new Configurations(); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); @@ -667,7 +666,6 @@ class Process extends BaseProcess $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; } - G::loadClass( 'configuration' ); $oConf = new Configurations(); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); diff --git a/workflow/engine/classes/model/Task.php b/workflow/engine/classes/model/Task.php index 2e72dc8a7..e083517ba 100644 --- a/workflow/engine/classes/model/Task.php +++ b/workflow/engine/classes/model/Task.php @@ -489,7 +489,6 @@ class Task extends BaseTask $this->setNew(false); /*----------------------------------********---------------------------------*/ - G::LoadClass("indicatorsCalculator"); $indicator = new indicatorsCalculator(); $data = $indicator->suggestedTimeForTask($TasUid); $aFields["TAS_AVERAGE"] = $data['average']; @@ -724,7 +723,6 @@ class Task extends BaseTask public function setTasCalendar($taskUid, $calendarUid) { //Save Calendar ID for this process - G::LoadClass("calendar"); $calendarObj = new Calendar(); $calendarObj->assignCalendarTo($taskUid, $calendarUid, 'TASK'); } diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 0b6e0d8f9..df4dddf23 100644 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -547,7 +547,6 @@ class Translation extends BaseTranslation public function getInfoFromPOFile ($file) { - G::loadClass( 'i18n_po' ); $POFile = new i18n_PO( $file ); $POFile->readInit(); $POHeaders = $POFile->getHeaders(); diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 6e5240d4f..b2b6e261c 100644 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -285,13 +285,6 @@ class Users extends BaseUsers } try { - require_once ("classes/model/IsoCountry.php"); - require_once ("classes/model/IsoLocation.php"); - require_once ("classes/model/IsoSubdivision.php"); - require_once ("classes/model/Language.php"); - - G::LoadClass( "calendar" ); - $aFields = $this->load( $userUid ); $c = new Criteria( "workflow" ); diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php index 4ff1b175b..b54e89a1e 100644 --- a/workflow/engine/classes/model/UsersProperties.php +++ b/workflow/engine/classes/model/UsersProperties.php @@ -171,7 +171,6 @@ class UsersProperties extends BaseUsersProperties } } if (PPP_EXPIRATION_IN > 0) { - G::LoadClass( 'calendar' ); $oCalendar = new calendar(); if ($oCalendar->pmCalendarUid == '') { @@ -263,7 +262,6 @@ class UsersProperties extends BaseUsersProperties $url = '/sys' . SYS_SYS . '/' . $this->lang . '/' . SYS_SKIN . '/main'; } global $RBAC; - G::loadClass( 'configuration' ); $oConf = new Configurations(); $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' ); if (sizeof( $oConf->aConfig ) > 0) { @@ -388,7 +386,6 @@ class UsersProperties extends BaseUsersProperties public function _getDefaultLocation () { global $RBAC; - G::loadClass( 'configuration' ); $oConf = new Configurations(); $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' ); diff --git a/workflow/engine/controllers/adhocUserProxy.php b/workflow/engine/controllers/adhocUserProxy.php index b98439cd0..729b420f4 100644 --- a/workflow/engine/controllers/adhocUserProxy.php +++ b/workflow/engine/controllers/adhocUserProxy.php @@ -1,15 +1,10 @@ getGroupsOfTask( $_SESSION['TASK'], 2 ); $aAdhocUsers = array (); diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php index 46ab93382..16e4c7061 100644 --- a/workflow/engine/controllers/admin.php +++ b/workflow/engine/controllers/admin.php @@ -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 ); diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index dc3c22f7f..2e47512ee 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -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' => '', diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index 59734e78e..191329456 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -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) { diff --git a/workflow/engine/controllers/caseSchedulerProxy.php b/workflow/engine/controllers/caseSchedulerProxy.php index 87adc338a..71a848568 100644 --- a/workflow/engine/controllers/caseSchedulerProxy.php +++ b/workflow/engine/controllers/caseSchedulerProxy.php @@ -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) { diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index 98890aec2..1bb2f8e6f 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -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']); diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index d19c38d52..c2e65b921 100644 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -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'] ); diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 36a2ebe3b..759f807da 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -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 diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index 88ca6494e..f666ed0ce 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -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 ); diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index 88726845d..ea7e6a15f 100644 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -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)) { diff --git a/workflow/engine/controllers/pmGmail.php b/workflow/engine/controllers/pmGmail.php index e54af2863..6eea33ad7 100644 --- a/workflow/engine/controllers/pmGmail.php +++ b/workflow/engine/controllers/pmGmail.php @@ -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(); diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php index 57672499c..4d1099d80 100644 --- a/workflow/engine/controllers/pmTables.php +++ b/workflow/engine/controllers/pmTables.php @@ -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; diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 3db3891ae..4d3b85fb9 100644 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -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); diff --git a/workflow/engine/controllers/processOptionsProxy.php b/workflow/engine/controllers/processOptionsProxy.php index 53845f719..4e400431c 100644 --- a/workflow/engine/controllers/processOptionsProxy.php +++ b/workflow/engine/controllers/processOptionsProxy.php @@ -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; diff --git a/workflow/engine/controllers/processProxy.php b/workflow/engine/controllers/processProxy.php index 90cf66bd9..f39b4871b 100644 --- a/workflow/engine/controllers/processProxy.php +++ b/workflow/engine/controllers/processProxy.php @@ -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) { diff --git a/workflow/engine/controllers/webEntryProxy.php b/workflow/engine/controllers/webEntryProxy.php index ff246dc37..91dadf801 100644 --- a/workflow/engine/controllers/webEntryProxy.php +++ b/workflow/engine/controllers/webEntryProxy.php @@ -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; diff --git a/workflow/engine/includes/inc.application.php b/workflow/engine/includes/inc.application.php index fec753d80..eaa9ac9f6 100644 --- a/workflow/engine/includes/inc.application.php +++ b/workflow/engine/includes/inc.application.php @@ -75,7 +75,7 @@ class App $partnerid = $HTTP_SESSION_VARS['CURRENT_PARTNER']; $mdbc = new DBConnection(); - G::LoadClass( "slip" ); + $slip = new Slip; $slip->SetTo( $mdbc ); $slip->Load( $slipid ); @@ -95,7 +95,7 @@ class App $partnerid = $HTTP_SESSION_VARS['CURRENT_PARTNER']; $mdbc = new DBConnection(); - G::LoadClass( "slip" ); + $slip = new Slip; $slip->SetTo( $mdbc ); $slip->Load( $slipid ); diff --git a/workflow/engine/menus/caseTracker.php b/workflow/engine/menus/caseTracker.php index 7b37701bf..450f4bb60 100644 --- a/workflow/engine/menus/caseTracker.php +++ b/workflow/engine/menus/caseTracker.php @@ -35,7 +35,6 @@ if (file_exists ( PATH_CORE . 'menus/plugin.php')) { require_once (PATH_CORE . 'menus/plugin.php'); } - G::LoadClass('case'); $case = new Cases(); $caseTracker = $case->caseTrackerPermissions( $_SESSION['PROCESS']); if ($caseTracker['CT_MAP_TYPE']) { diff --git a/workflow/engine/menus/processes.php b/workflow/engine/menus/processes.php index 5bb8a852f..b65cda1f1 100644 --- a/workflow/engine/menus/processes.php +++ b/workflow/engine/menus/processes.php @@ -41,7 +41,7 @@ $G_TMP_MENU->AddIdRawOption('OUTPUTDOCS', '', G::LoadTranslation('ID_OUTPUT_DO $G_TMP_MENU->AddIdRawOption('TRIGGERS', '', G::LoadTranslation('ID_TRIGGERS'),"",'Pm.data.render.buildingBlocks.injector(\'triggers\'); return false;','','ss_sprite ss_cog'); //$G_TMP_MENU->AddIdRawOption('MESSAGES', '', G::LoadTranslation('ID_MESSAGES'),"/images/mail.gif",'Pm.data.render.buildingBlocks.injector(\'messages\'); return false;'); -G::LoadClass('reportTables'); + if (ReportTables::tableExist()) { //DEPRECATED $G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '', G::LoadTranslation('ID_REPORT_TABLESOLD'),"",'Pm.data.render.buildingBlocks.injector(\'reportTables2\'); return false;','','ss_sprite ss_table'); $G_TMP_MENU->AddIdRawOption('REPORT_TABLES', '', G::LoadTranslation('ID_REPORT_TABLES'),"",'Pm.data.render.buildingBlocks.injector(\'reportTables\'); return false;','','ss_sprite ss_table'); diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index f1c7f68d7..f49490e16 100644 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -737,7 +737,6 @@ function sortContent() function openPMFolder() { $WIDTH_PANEL = 350; - G::LoadClass ('tree'); $folderContent = $oPMFolder->getFolderList ($_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ? "" : $_POST ['folderID'] : $rootFolder); //krumo($folderContent); @@ -826,7 +825,6 @@ function getPMFolderContent() $_DBArray ['PM_FOLDER_DOC'] = $folderContent; $_SESSION ['_DBArray'] = $_DBArray; - G::LoadClass ('ArrayPeer'); $c = new Criteria ('dbarray'); $c->setDBArrayTable ('PM_FOLDER_DOC'); $c->addAscendingOrderByColumn ('id'); @@ -1121,25 +1119,6 @@ function uploadDocument() $finalResponse=str_replace('"'.$key.'"',$originalFunction,$finalResponse); } echo ($finalResponse); - - /* - //krumo($_POST); - G::LoadClass ('case'); - $oCase = new Cases (); - - $G_PUBLISH = new Publisher (); - $Fields ['DOC_UID'] = $_POST ['docID']; - $Fields ['APP_DOC_UID'] = $_POST ['appDocId']; - $Fields ['actionType'] = $_POST ['actionType']; - $Fields ['docVersion'] = $_POST ['docVersion']; - - $Fields ['appId'] = $_POST ['appId']; - $Fields ['docType'] = $_POST ['docType']; - $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, - 'appFolderSaveDocument?UID=' . $_POST ['docID'] . '&appId=' . $_POST ['appId'] . '&docType=' . - $_POST ['docType']); - G::RenderPage ('publish', 'raw'); - */ } function copyAction() { @@ -1344,7 +1323,6 @@ function documentVersionHistory() $_DBArray ['PM_FOLDER_DOC_HISTORY'] = $folderContent; $_SESSION ['_DBArray'] = $_DBArray; - G::LoadClass ('ArrayPeer'); $c = new Criteria ('dbarray'); $c->setDBArrayTable ('PM_FOLDER_DOC_HISTORY'); $c->addAscendingOrderByColumn ('id'); @@ -1697,19 +1675,6 @@ function uploadExternalDocument() } } print_r(G::json_encode($response)); - /* - G::LoadClass ('case'); - $oCase = new Cases (); - - $G_PUBLISH = new Publisher (); - $Fields ['DOC_UID'] = "-1"; - - $Fields ['appId'] = "00000000000000000000000000000000"; - - $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, - 'appFolderSaveDocument?UID=-1&appId=' . $Fields ['appId'] . "&folderId=" . $_POST ['folderID']); - G::RenderPage ('publish', 'raw'); - */ } function newFolder() diff --git a/workflow/engine/methods/authSources/authSources_Ajax.php b/workflow/engine/methods/authSources/authSources_Ajax.php index 9b59ad831..d84ced256 100644 --- a/workflow/engine/methods/authSources/authSources_Ajax.php +++ b/workflow/engine/methods/authSources/authSources_Ajax.php @@ -72,7 +72,6 @@ try { global $_DBArray; $_DBArray['users'] = $aUsers; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'users' ); $aData = Array ('Checkbox' => '0','FullName' => '0' @@ -95,9 +94,9 @@ try { G::RenderPage( 'publish', 'raw' ); break; case 'authSourcesList': - require_once PATH_RBAC . 'model/AuthenticationSource.php'; + global $RBAC; - G::LoadClass( 'configuration' ); + $co = new Configurations(); $config = $co->getConfiguration( 'authSourcesList', 'pageSize', '', $_SESSION['USER_LOGGED'] ); $limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20; diff --git a/workflow/engine/methods/authSources/authSources_Edit.php b/workflow/engine/methods/authSources/authSources_Edit.php index 3ea20934d..8681546f8 100644 --- a/workflow/engine/methods/authSources/authSources_Edit.php +++ b/workflow/engine/methods/authSources/authSources_Edit.php @@ -87,8 +87,6 @@ if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') { $pluginEnabled = 1; if ($pluginEnabled == 1) { - //The attributes the users - G::LoadClass("pmFunctions"); $data = executeQuery("DESCRIBE USERS"); $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX"); diff --git a/workflow/engine/methods/authSources/authSources_List.php b/workflow/engine/methods/authSources/authSources_List.php index 437cdb169..fa691a4e5 100644 --- a/workflow/engine/methods/authSources/authSources_List.php +++ b/workflow/engine/methods/authSources/authSources_List.php @@ -29,7 +29,6 @@ if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) { die(); } -G::LoadClass( 'configuration' ); $c = new Configurations(); $configPage = $c->getConfiguration( 'authSourcesList', 'pageSize', '', $_SESSION['USER_LOGGED'] ); $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20; @@ -47,8 +46,8 @@ $oHeadPublisher->addExtJsScript( 'authSources/authSourcesList', false ); //addin if ($licensedFeatures->verifyfeature('sywN09PSzh1MVdOajZBdnhMbFhCSnpNT1lLTEFwVklmOTE=')) { $oHeadPublisher->addExtJsScript( 'authSources/authSourcesListSyn', false ); //adding a javascript file .js } -/*----------------------------------********---------------------------------*/ -$oHeadPublisher->addContent( 'authSources/authSourcesList' ); //adding a html file .html. +/*----------------------------------********---------------------------------*/ +$oHeadPublisher->addContent( 'authSources/authSourcesList' ); //adding a html file .html. $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); $oHeadPublisher->assign( 'CONFIG', $Config ); G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/methods/authSources/authSources_New.php b/workflow/engine/methods/authSources/authSources_New.php index 44501902f..33bb2afa7 100644 --- a/workflow/engine/methods/authSources/authSources_New.php +++ b/workflow/engine/methods/authSources/authSources_New.php @@ -41,7 +41,6 @@ if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER' $pluginEnabled = 1; if ($pluginEnabled == 1) { //The attributes the users - G::LoadClass("pmFunctions"); $data = executeQuery("DESCRIBE USERS"); $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX"); diff --git a/workflow/engine/methods/authSources/authSources_SearchUsers.php b/workflow/engine/methods/authSources/authSources_SearchUsers.php index b33e2ff58..072e39d05 100644 --- a/workflow/engine/methods/authSources/authSources_SearchUsers.php +++ b/workflow/engine/methods/authSources/authSources_SearchUsers.php @@ -47,7 +47,7 @@ if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER' $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_FEATURE_MISSING' ) ) ); G::RenderPage( 'publish', 'blank' ); } else { - G::LoadClass('configuration'); + $c = new Configurations(); $configPage = $c->getConfiguration('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']); $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20; diff --git a/workflow/engine/methods/authSources/ldapAdvancedProxy.php b/workflow/engine/methods/authSources/ldapAdvancedProxy.php index 8111874ce..196f9cc1f 100644 --- a/workflow/engine/methods/authSources/ldapAdvancedProxy.php +++ b/workflow/engine/methods/authSources/ldapAdvancedProxy.php @@ -1,5 +1,4 @@ assignCalendarTo($sUserUID, '00000000000000000000000000000001', 'USER'); diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 1993dd5dd..e32581e73 100644 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -82,9 +82,6 @@ class Ajax public function getCaseMenu($params) { - - G::LoadClass("configuration"); - G::LoadClass("case"); global $G_TMP_MENU; global $sStatus; $sStatus = $params['app_status']; @@ -123,7 +120,7 @@ class Ajax print G::json_encode( $response ); die(); } - G::LoadClass('applications'); + $applications = new Applications(); $proUid = isset($_SESSION['PROCESS']) ? $_SESSION['PROCESS'] : ''; @@ -268,8 +265,6 @@ class Ajax global $G_TABLE; global $RBAC; - G::LoadClass('processMap'); - $oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html'); $oTemplatePower->prepare(); $G_PUBLISH = new Publisher(); @@ -381,7 +376,6 @@ class Ajax $processData['PRO_AUTHOR'] = '(USER DELETED)'; } - G::LoadClass('configuration'); $conf = new Configurations(); $conf->getFormats(); $processData['PRO_CREATE_DATE'] = $conf->getSystemDate($processData['PRO_CREATE_DATE']); @@ -397,7 +391,7 @@ class Ajax print G::json_encode( $response ); die(); } - G::LoadClass('tasks'); + $task = new Task(); if ($_SESSION['TASK'] == '-1') { $_SESSION['TASK'] = $_SESSION['CURRENT_TASK']; @@ -412,7 +406,6 @@ class Ajax public function caseHistory() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -425,7 +418,6 @@ class Ajax public function messageHistory() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -438,7 +430,6 @@ class Ajax public function dynaformHistory() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -451,7 +442,7 @@ class Ajax public function changeLogHistory() { global $G_PUBLISH; - G::loadClass('configuration'); + $idHistory = sprintf( '%s_%s_%s', $_SESSION['PROCESS'], @@ -477,7 +468,6 @@ class Ajax die(); } global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -491,7 +481,6 @@ class Ajax public function uploadedDocumentsSummary() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -505,7 +494,6 @@ class Ajax public function generatedDocuments() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -519,7 +507,6 @@ class Ajax public function generatedDocumentsSummary() { global $G_PUBLISH; - G::loadClass('configuration'); $oHeadPublisher = & headPublisher::getSingleton(); $conf = new Configurations(); @@ -985,7 +972,7 @@ class Ajax $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP"] = "#"; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_ACTION"] = "return false;"; - G::LoadClass('pmDynaform'); + $FieldsPmDynaform = $Fields; $FieldsPmDynaform["PRO_UID"] = $_SESSION['PROCESS']; $FieldsPmDynaform["CURRENT_DYNAFORM"] = $_REQUEST['DYN_UID']; @@ -1046,7 +1033,6 @@ if (!($ajax instanceof Ajax)) { $ajax = new Ajax(); } -G::LoadClass('case'); $action = $_REQUEST['action']; diff --git a/workflow/engine/methods/cases/caseConsolidated.php b/workflow/engine/methods/cases/caseConsolidated.php index fb11661fd..3b61d2f25 100644 --- a/workflow/engine/methods/cases/caseConsolidated.php +++ b/workflow/engine/methods/cases/caseConsolidated.php @@ -1,6 +1,4 @@ fields["CURRENT_DYNAFORM"] = $sDynUid; diff --git a/workflow/engine/methods/cases/caseHistory_Ajax.php b/workflow/engine/methods/cases/caseHistory_Ajax.php index feded6eff..30312621b 100644 --- a/workflow/engine/methods/cases/caseHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseHistory_Ajax.php @@ -26,9 +26,6 @@ $actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null; if ($actionAjax == 'historyGridList_JXP') { - G::LoadClass('case'); - G::LoadClass("BasePeer"); - global $G_PUBLISH; $criteria = Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']); diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index 7bddbc5f3..d5cc39ccd 100644 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -43,9 +43,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { $_REQUEST['limit'] = 20; } - G::LoadClass( 'case' ); - G::LoadClass( "BasePeer" ); - $dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'ASC'; $sort = isset( $_POST['sort'] ) ? $_POST['sort'] : ''; @@ -160,7 +157,6 @@ if ($actionAjax == 'showHistoryMessage') { getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ); - G::LoadClass('system'); - $aSetup = System::getEmailConfiguration(); $oSpool = new spoolRun(); diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php index c0f077ca8..41303a154 100644 --- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php +++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php @@ -7,10 +7,6 @@ $oCriteria = new Criteria("workflow"); $oCriteria->add(CaseConsolidatedCorePeer::CON_STATUS, 'ACTIVE'); $activeNumRows = CaseConsolidatedCorePeer::doCount($oCriteria); -G::LoadClass("BasePeer"); -G::LoadClass("configuration"); -G::loadClass("pmFunctions"); - $headPublisher = &headPublisher::getSingleton(); $usrUid = $_SESSION["USER_LOGGED"]; $conf = new Configurations(); diff --git a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php index add2142b9..31e34b8fb 100644 --- a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php +++ b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php @@ -77,7 +77,7 @@ function casesShowOuputDocumentExist ($url) if ($actionAjax == 'casesGenerateDocumentPage') { global $G_PUBLISH; $oHeadPublisher = & headPublisher::getSingleton(); - G::loadClass( 'configuration' ); + $conf = new Configurations(); $oHeadPublisher->addExtJsScript( 'cases/casesGenerateDocumentPage', true ); //adding a javascript file .js $oHeadPublisher->addContent( 'cases/casesGenerateDocumentPage' ); //adding a html file .html. @@ -86,8 +86,6 @@ if ($actionAjax == 'casesGenerateDocumentPage') { G::RenderPage( 'publish', 'extJs' ); } if ($actionAjax == 'generateDocumentGrid_Ajax') { - G::LoadClass( 'case' ); - G::LoadClass( "BasePeer" ); global $G_PUBLISH; $oCase = new Cases(); @@ -119,7 +117,7 @@ if ($actionAjax == 'generateDocumentGrid_Ajax') { } //!dateFormat - G::LoadClass( 'configuration' ); + $conf = new Configurations(); try { $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' ); diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php index 39937ef48..e2d085a20 100644 --- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php +++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php @@ -33,7 +33,7 @@ $actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null; if ($actionAjax == "historyDynaformPage") { global $G_PUBLISH; $oHeadPublisher = & headPublisher::getSingleton(); - G::loadClass( 'configuration' ); + $conf = new Configurations(); $oHeadPublisher->addExtJsScript( 'cases/caseHistoryDynaformPage', true ); //adding a javascript file .js $oHeadPublisher->addContent( 'cases/caseHistoryDynaformPage' ); //adding a html file .html. @@ -41,8 +41,6 @@ if ($actionAjax == "historyDynaformPage") { G::RenderPage( 'publish', 'extJs' ); } if ($actionAjax == 'historyDynaformGrid_Ajax') { - G::LoadClass( 'case' ); - G::LoadClass( "BasePeer" ); global $G_PUBLISH; $oCase = new Cases(); @@ -104,7 +102,6 @@ if ($actionAjax == 'showHistoryMessage') { loadCase( $_SESSION['APPLICATION'] ); @@ -481,7 +476,7 @@ if ($actionAjax == 'historyDynaformGridPreview') { $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID']; $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID']; - G::LoadClass('pmDynaform'); + $FieldsPmDynaform = $Fields; $FieldsPmDynaform["CURRENT_DYNAFORM"] = $_GET['DYN_UID']; $a = new pmDynaform(\ProcessMaker\Util\DateTime::convertUtcToTimeZone($FieldsPmDynaform)); diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index b0d0daba7..5ed715ddc 100644 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -55,9 +55,6 @@ switch ($action) { } /*----------------------------------********---------------------------------*/ -G::LoadClass("BasePeer"); -G::LoadClass("configuration"); - $oHeadPublisher = & headPublisher::getSingleton(); // oHeadPublisher->setExtSkin( 'xtheme-blue'); //get the configuration for this action @@ -123,7 +120,6 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == " $action == "unassigned" || $action == "search") { $solrConfigured = ($solrConf = System::solrEnv()) !== false ? 1 : 0; if ($solrConfigured == 1) { - G::LoadClass('AppSolr'); $applicationSolrIndex = new AppSolr( $solrConf['solr_enabled'], $solrConf['solr_host'], @@ -189,7 +185,6 @@ $reassignCase = ($RBAC->userCanAccess( 'PM_REASSIGNCASE' ) == 1) ? 'true' : ' $reassignCaseSup = ($RBAC->userCanAccess( 'PM_REASSIGNCASE_SUPERVISOR' ) == 1) ? 'true':'false'; $oHeadPublisher->assign( 'varReassignCase', $reassignCase ); $oHeadPublisher->assign( 'varReassignCaseSupervisor', $reassignCaseSup ); -G::LoadClass( 'configuration' ); $c = new Configurations(); $oHeadPublisher->addExtJsScript( 'app/main', true ); $oHeadPublisher->addExtJsScript( 'cases/casesList', false ); //adding a javascript file .js diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php index 3948f5987..8465db24c 100644 --- a/workflow/engine/methods/cases/casesListExtJsRedirector.php +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -6,7 +6,7 @@ $pathDerivateGmail = 'derivatedGmail'; $statusPMGmail = false; $licensedFeatures = &PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) { - G::LoadClass( "pmGoogleApi" ); + $pmGoogle = new PMGoogleApi(); $statusPMGmail = $pmGoogle->getServiceGmailStatus(); } diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php index 9cc236847..470a75938 100644 --- a/workflow/engine/methods/cases/casesList_Ajax.php +++ b/workflow/engine/methods/cases/casesList_Ajax.php @@ -28,7 +28,6 @@ if (!isset($_SESSION['USER_LOGGED'])) { * For more information, contact Colosa Inc, 2566 Le Jeune Rd., * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ -G::LoadClass( 'case' ); $actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null; @@ -303,7 +302,6 @@ if ($actionAjax == 'showHistoryMessage') { validatePost (); /* @author Alvaro Campos Sanchez */ -/* Includes */ -G::LoadClass( 'case' ); if (!is_array($_POST['form'])) { $_POST['form'] = array(); diff --git a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php index f48425ec6..161ae3f73 100644 --- a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php +++ b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php @@ -28,7 +28,6 @@ $_POST['action'] = get_ajax_value( 'action' ); switch ($_POST['action']) { case 'updatePageSize': - G::LoadClass( 'configuration' ); $c = new Configurations(); $arr['pageSize'] = $_REQUEST['size']; $arr['dateSave'] = date( 'Y-m-d H:i:s' ); diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php index 5cd558bb3..91ba58df7 100644 --- a/workflow/engine/methods/cases/casesStartPage.php +++ b/workflow/engine/methods/cases/casesStartPage.php @@ -14,14 +14,12 @@ switch ($page) { case "startCase": $oHeadPublisher->addExtJsScript( 'cases/casesStartCase', true ); //adding a javascript file .js $oHeadPublisher->addContent( 'cases/casesStartCase' ); //adding a html file .html. - G::LoadClass( 'configuration' ); $c = new Configurations(); $oHeadPublisher->assign( 'FORMATS', $c->getFormats() ); $oHeadPublisher->assign('isIE', Bootstrap::isIE()); break; case "documents": - G::LoadClass( 'configuration' ); $c = new Configurations(); $configPage = $c->getConfiguration( 'documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED'] ); $configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' ); diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index e50806ab7..8c403350e 100644 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -32,9 +32,6 @@ $functionName( $functionParams ); function getProcessList () { - G::LoadClass( 'case' ); - G::LoadClass( 'process' ); - G::LoadClass( 'calendar' ); $calendar = new Calendar(); $oProcess = new Process(); $oCase = new Cases(); @@ -179,8 +176,6 @@ function lookinginforContentProcess ($sproUid) function startCase () { - G::LoadClass( 'case' ); - G::LoadSystem('inputfilter'); $filter = new InputFilter(); $_POST = $filter->xssFilterHard($_POST); $_REQUEST = $filter->xssFilterHard($_REQUEST); @@ -239,9 +234,6 @@ function startCase () function getSimpleDashboardData () { - G::LoadClass( "BasePeer" ); - require_once ("classes/model/AppCacheView.php"); - require_once 'classes/model/Process.php'; $sUIDUserLogged = $_SESSION['USER_LOGGED']; $Criteria = new Criteria( 'workflow' ); diff --git a/workflow/engine/methods/cases/casesToReviseTreeContent.php b/workflow/engine/methods/cases/casesToReviseTreeContent.php index 9960e5571..b06c6123d 100644 --- a/workflow/engine/methods/cases/casesToReviseTreeContent.php +++ b/workflow/engine/methods/cases/casesToReviseTreeContent.php @@ -41,7 +41,6 @@ class ExtJsTreeNode extends TreeNode } } -G::LoadClass( 'case' ); $o = new Cases(); $PRO_UID = $_SESSION['PROCESS']; diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index b56cef529..1cae644ba 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -35,7 +35,6 @@ if (!isset($_SESSION['USER_LOGGED'])) { * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ -G::LoadClass( 'case' ); $oCase = new Cases(); //if($RBAC->userCanAccess('PM_ALLCASES') < 0) { @@ -91,7 +90,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { G::RenderPage( 'publish', 'raw' ); break; case 'showProcessMap': - G::LoadClass( 'processMap' ); + $oTemplatePower = new TemplatePower( PATH_TPL . 'processes/processes_Map.html' ); $oTemplatePower->prepare(); $G_PUBLISH = new Publisher(); @@ -179,7 +178,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { G::RenderPage( 'publish', 'raw' ); break; case 'showTransferHistory': - G::LoadClass( "case" ); $c = Cases::getTransferHistoryCriteria( $_SESSION['APPLICATION'] ); $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_TransferHistory', $c, array () ); @@ -254,7 +252,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { // switch verify $_POST['TAS_ASSIGN_TYPE'] case 'BALANCED': $USR_UID = $filter->xssFilterHard($_POST['USR_UID']); - G::LoadClass( 'user' ); $oUser = new User( new DBConnection() ); $oUser->load( $USR_UID ); $oUser->Fields['USR_FIRSTNAME'] = $filter->xssFilterHard($oUser->Fields['USR_FIRSTNAME']); @@ -312,7 +309,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { case 'EVALUATE': $TAS_ASSIGN_VARIABLE = $filter->xssFilterHard($_POST['TAS_ASSIGN_VARIABLE']); $APPLICATION = $filter->xssFilterHard($_SESSION['APPLICATION']); - G::LoadClass( 'application' ); $oApplication = new Application( new DBConnection() ); $oApplication->load( $APPLICATION ); $sUser = ''; @@ -322,7 +318,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { } } if ($sUser != '') { - G::LoadClass( 'user' ); $oUser = new User( new DBConnection() ); $oUser->load( $sUser ); echo $oUser->Fields['USR_FIRSTNAME'] . ' ' . $oUser->Fields['USR_LASTNAME'] . ''; @@ -420,8 +415,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { $oCase->removeCase( $sApplicationUID ); break; case 'view_reassignCase': - G::LoadClass( 'groups' ); - G::LoadClass( 'tasks' ); $oTasks = new Tasks(); $aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 1 ); @@ -547,8 +540,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { G::RenderPage( 'publish', 'raw' ); break; case 'uploadDocumentGrid_Ajax': - G::LoadClass('case'); - G::LoadClass("BasePeer"); global $G_PUBLISH; $arrayToTranslation = array( @@ -600,9 +591,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { break; case 'generateDocumentGrid_Ajax': - G::LoadClass( 'case' ); - G::LoadClass( "BasePeer" ); - G::LoadClass( 'configuration' ); global $G_PUBLISH; $oCase = new Cases(); @@ -729,8 +717,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { G::RenderPage( 'publish', 'raw' ); break; case 'adhocAssignmentUsers': - G::LoadClass( 'groups' ); - G::LoadClass( 'tasks' ); + $oTasks = new Tasks(); $aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 2 ); $aAdhocUsers = array (); @@ -793,15 +780,11 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { /* @Author Erik Amaru Ortiz */ case 'resendMessage': //require_once 'classes/model/Configuration.php'; - G::LoadClass( 'spool' ); $oCase = new Cases(); $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ); //print_r($data); - - G::LoadClass("system"); - $aSetup = System::getEmailConfiguration(); $passwd = $aSetup['MESS_PASSWORD']; @@ -849,10 +832,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { $APP_UIDS = explode( ',', $_POST['APP_UIDS'] ); $sReassignFromUser = $_POST['FROM_USR_ID']; - G::LoadClass( 'tasks' ); - G::LoadClass( 'groups' ); - G::LoadClass( 'case' ); - $oTasks = new Tasks(); $oGroups = new Groups(); $oUser = new Users(); @@ -900,7 +879,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { global $_DBArray; $_DBArray['reassign_byuser'] = $aCasesList; - G::LoadClass( 'ArrayPeer' ); $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reassign_byuser' ); $G_PUBLISH = new Publisher(); @@ -909,7 +887,6 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { break; /* @Author Erik Amaru Ortiz */ case 'reassignByUser': - G::LoadClass( 'case' ); $oCases = new Cases(); $aCases = Array (); diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php index 2ee4384ec..e554c1512 100644 --- a/workflow/engine/methods/cases/cases_CatchExecute.php +++ b/workflow/engine/methods/cases/cases_CatchExecute.php @@ -49,7 +49,6 @@ if (isset( $_POST['form']['BTN_CANCEL'] )) { } /* Includes */ -G::LoadClass( 'case' ); $oCase = new Cases(); $sAppUid = $_SESSION['APPLICATION']; @@ -73,7 +72,6 @@ if ($aDelegation['USR_UID'] == "") { } if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) { - G::LoadClass("AppDocumentDrive"); $drive = new AppDocumentDrive(); if ($drive->getStatusDrive()) { //add users email next task diff --git a/workflow/engine/methods/cases/cases_CatchSelfService.php b/workflow/engine/methods/cases/cases_CatchSelfService.php index 82aafb5df..a7f4b1f13 100644 --- a/workflow/engine/methods/cases/cases_CatchSelfService.php +++ b/workflow/engine/methods/cases/cases_CatchSelfService.php @@ -35,9 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -G::LoadClass( 'case' ); - $oCase = new Cases(); $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] ); diff --git a/workflow/engine/methods/cases/cases_Delete.php b/workflow/engine/methods/cases/cases_Delete.php index 24cdb8939..96511c3f6 100644 --- a/workflow/engine/methods/cases/cases_Delete.php +++ b/workflow/engine/methods/cases/cases_Delete.php @@ -35,9 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -G::LoadClass( 'case' ); - /* Process the info */ try { $oCase = new Cases(); diff --git a/workflow/engine/methods/cases/cases_DeleteDocument.php b/workflow/engine/methods/cases/cases_DeleteDocument.php index 26db38ec9..ec7cb8407 100644 --- a/workflow/engine/methods/cases/cases_DeleteDocument.php +++ b/workflow/engine/methods/cases/cases_DeleteDocument.php @@ -35,10 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -require_once ("classes/model/AppDocumentPeer.php"); -G::LoadClass( 'case' ); - /* GET , POST & $_SESSION Vars */ /* Process the info */ diff --git a/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php b/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php index 3980caa86..a698a16cc 100644 --- a/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php +++ b/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php @@ -35,10 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -require_once ("classes/model/AppDocumentPeer.php"); -G::LoadClass( 'case' ); - /* GET , POST & $_SESSION Vars */ /* Process the info */ diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index 7c16bb8a7..7446fbe3d 100644 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -194,7 +194,6 @@ try { /*----------------------------------********---------------------------------*/ $licensedFeatures = &PMLicensedFeatures::getSingleton (); if ($licensedFeatures->verifyfeature ( '7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09' )) { - G::LoadClass ( "pmGoogleApi" ); $pmGoogle = new PMGoogleApi (); if ($pmGoogle->getServiceGmailStatus ()) { $flagGmail = true; @@ -249,7 +248,7 @@ try { // Set users drive - start $licensedFeatures = &PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) { - G::LoadClass("AppDocumentDrive"); + $drive = new AppDocumentDrive(); if ($drive->getStatusDrive()) { //add users email next task diff --git a/workflow/engine/methods/cases/cases_New.php b/workflow/engine/methods/cases/cases_New.php index 23f2004cc..f2a376fd9 100644 --- a/workflow/engine/methods/cases/cases_New.php +++ b/workflow/engine/methods/cases/cases_New.php @@ -55,9 +55,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -G::LoadClass( 'case' ); - /* GET , POST & $_SESSION Vars */ /* Menues */ diff --git a/workflow/engine/methods/cases/cases_NextStep.php b/workflow/engine/methods/cases/cases_NextStep.php index 04b6de103..3b11b1cab 100644 --- a/workflow/engine/methods/cases/cases_NextStep.php +++ b/workflow/engine/methods/cases/cases_NextStep.php @@ -30,8 +30,7 @@ if (!isset($_SESSION['USER_LOGGED'])) { if (($RBAC_Response = $RBAC->userCanAccess( "PM_CASES" )) != 1) { return $RBAC_Response; } - //go to the next step -G::LoadClass( 'case' ); + $oCase = new Cases(); $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] ); $_SESSION['STEP_POSITION'] = $aNextStep['POSITION']; diff --git a/workflow/engine/methods/cases/cases_Open.php b/workflow/engine/methods/cases/cases_Open.php index 8691ef45d..4405c598c 100644 --- a/workflow/engine/methods/cases/cases_Open.php +++ b/workflow/engine/methods/cases/cases_Open.php @@ -41,10 +41,6 @@ if ($RBAC->userCanAccess( 'PM_CASES' ) != 1) { } } -/* Includes */ -require_once 'classes/model/AppDelay.php'; -G::LoadClass( 'case' ); - $oCase = new Cases(); //cleaning the case session data diff --git a/workflow/engine/methods/cases/cases_OpenToRevise.php b/workflow/engine/methods/cases/cases_OpenToRevise.php index 7f10a9ed6..bac698be7 100644 --- a/workflow/engine/methods/cases/cases_OpenToRevise.php +++ b/workflow/engine/methods/cases/cases_OpenToRevise.php @@ -38,8 +38,6 @@ if ($RBAC->userCanAccess( 'PM_SUPERVISOR' ) != 1) { } } - /* Includes */ -G::LoadClass( 'case' ); /* GET , POST & $_SESSION Vars */ if (isset( $_SESSION['APPLICATION'] )) { diff --git a/workflow/engine/methods/cases/cases_PrintView.php b/workflow/engine/methods/cases/cases_PrintView.php index 64bf8356e..221f1f49a 100644 --- a/workflow/engine/methods/cases/cases_PrintView.php +++ b/workflow/engine/methods/cases/cases_PrintView.php @@ -40,7 +40,6 @@ try { $oDynaform = new Dynaform(); $aDyn = $oDynaform->load( $currentDynUid ); - G::LoadClass( 'case' ); $oCase = new Cases(); if (isset( $_SESSION['APPLICATION'] )) { diff --git a/workflow/engine/methods/cases/cases_Reassign.php b/workflow/engine/methods/cases/cases_Reassign.php index 09ebd0fd7..e3b00df06 100644 --- a/workflow/engine/methods/cases/cases_Reassign.php +++ b/workflow/engine/methods/cases/cases_Reassign.php @@ -49,9 +49,9 @@ try { $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); $c = 0; - G::LoadClass( 'tasks' ); + $oTasks = new Tasks(); - G::LoadClass( 'groups' ); + $oGroups = new Groups(); require_once 'classes/model/Users.php'; $oUser = new Users(); diff --git a/workflow/engine/methods/cases/cases_ReassignByUser.php b/workflow/engine/methods/cases/cases_ReassignByUser.php index f2990a598..fd8fc338d 100644 --- a/workflow/engine/methods/cases/cases_ReassignByUser.php +++ b/workflow/engine/methods/cases/cases_ReassignByUser.php @@ -63,7 +63,7 @@ try { $oDataset = UsersPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); /////////////////////// - G::loadClass( 'configuration' ); + $oConf = new Configurations(); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); @@ -88,8 +88,6 @@ try { if ($_GET['REASSIGN_USER'] != '') { - G::LoadClass( 'tasks' ); - G::LoadClass( 'groups' ); $oTasks = new Tasks(); $oGroups = new Groups(); $oUser = new Users(); @@ -129,7 +127,7 @@ try { global $_DBArray; $_DBArray['reassign_byuser'] = $aCasesList; $_SESSION['_DBArray'] = $_DBArray; - G::LoadClass( 'ArrayPeer' ); + $oCriteria = new Criteria( 'dbarray' ); $oCriteria->setDBArrayTable( 'reassign_byuser' ); diff --git a/workflow/engine/methods/cases/cases_Reassign_save.php b/workflow/engine/methods/cases/cases_Reassign_save.php index e10b7cd7d..c6c7c761a 100644 --- a/workflow/engine/methods/cases/cases_Reassign_save.php +++ b/workflow/engine/methods/cases/cases_Reassign_save.php @@ -35,8 +35,7 @@ try { die(); break; } - //print_r($_POST); die; - G::LoadClass( 'case' ); + $oCase = new Cases(); if ($_POST['USERS'] != '') { @@ -44,7 +43,6 @@ try { } - require_once 'classes/model/Users.php'; $oUser = new Users(); $aUser = $oUser->load( $_POST['USERS'] ); @@ -52,7 +50,6 @@ try { $Fields['USERS'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' (' . $aUser['USR_USERNAME'] . ')'; - G::LoadClass( 'case' ); $oCases = new Cases(); $aCases = $oCases->loadCase( $_POST['APP_UID'], $_POST['DEL_INDEX'] ); diff --git a/workflow/engine/methods/cases/cases_Resume.php b/workflow/engine/methods/cases/cases_Resume.php index 931909d44..4c83a50cc 100644 --- a/workflow/engine/methods/cases/cases_Resume.php +++ b/workflow/engine/methods/cases/cases_Resume.php @@ -35,9 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -G::LoadClass( 'case' ); - /* GET , POST & $_SESSION Vars */ /* Menues */ diff --git a/workflow/engine/methods/cases/cases_Save.php b/workflow/engine/methods/cases/cases_Save.php index 3831ae2b5..faf1876f1 100644 --- a/workflow/engine/methods/cases/cases_Save.php +++ b/workflow/engine/methods/cases/cases_Save.php @@ -35,9 +35,6 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) { break; } -/* Includes */ -G::LoadClass( 'case' ); - /* GET , POST & $_SESSION Vars */ /* unset any variable, because we are starting a new case */ diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index 19dfdee9f..430b73821 100644 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -132,9 +132,6 @@ try { $oForm = new Form( $_SESSION["PROCESS"] . "/" . $_GET["UID"], PATH_DYNAFORM ); $oForm->validatePost(); - //Includes - G::LoadClass( "case" ); - //Load the variables $oCase = new Cases(); $oCase->thisIsTheCurrentUser( $_SESSION["APPLICATION"], $_SESSION["INDEX"], $_SESSION["USER_LOGGED"], "REDIRECT", "casesListExtJs" ); @@ -144,7 +141,6 @@ try { $dataFields = $Fields["APP_DATA"]; $dataFields["CURRENT_DYNAFORM"] = $_GET['UID']; - G::LoadClass('pmDynaform'); $oPmDynaform = new pmDynaform($dataFields); $pmdynaform = $oPmDynaform->validatePost($pmdynaform); diff --git a/workflow/engine/methods/cases/cases_SaveDataSupervisor.php b/workflow/engine/methods/cases/cases_SaveDataSupervisor.php index 65e5a34be..b456cbafb 100644 --- a/workflow/engine/methods/cases/cases_SaveDataSupervisor.php +++ b/workflow/engine/methods/cases/cases_SaveDataSupervisor.php @@ -39,9 +39,6 @@ if ($flagDynaFormNewVersion) { $oForm = new Form( $_SESSION['PROCESS'] . '/' . $_GET['UID'], PATH_DYNAFORM ); $oForm->validatePost(); -/* Includes */ -G::LoadClass( 'case' ); - //load the variables $oCase = new Cases(); $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); diff --git a/workflow/engine/methods/cases/cases_SaveDocument.php b/workflow/engine/methods/cases/cases_SaveDocument.php index 2cd53b388..ae948fc46 100644 --- a/workflow/engine/methods/cases/cases_SaveDocument.php +++ b/workflow/engine/methods/cases/cases_SaveDocument.php @@ -59,8 +59,6 @@ if ((isset( $_FILES['form'] )) && ($_FILES['form']['error']['APP_DOC_FILENAME'] die(); } -G::LoadClass("case"); - $inputDocumentUid = $_GET["UID"]; //$_POST["form"]["DOC_UID"] $appDocUid = (isset($_POST["form"]["APP_DOC_UID"]))? $_POST["form"]["APP_DOC_UID"] : ""; $docVersion = (isset($_POST["form"]["docVersion"]))? intval($_POST["form"]["docVersion"]) : ""; diff --git a/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php b/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php index 7aa278c50..25a6c268b 100644 --- a/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php +++ b/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php @@ -1,12 +1,8 @@ '; -require_once ("classes/model/TaskPeer.php"); -require_once ("classes/model/ProcessPeer.php"); -require_once ("classes/model/TaskUserPeer.php"); -G::LoadClass( 'Content' ); + $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); diff --git a/workflow/engine/methods/cases/cases_SchedulerGetTasks.php b/workflow/engine/methods/cases/cases_SchedulerGetTasks.php index 7420bcc46..c0baa6992 100644 --- a/workflow/engine/methods/cases/cases_SchedulerGetTasks.php +++ b/workflow/engine/methods/cases/cases_SchedulerGetTasks.php @@ -1,11 +1,10 @@