From c2c5d0e4badfae0efea8c410822cd8855923fe23 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 10 Aug 2017 15:50:36 -0400 Subject: [PATCH] HOR-3661 --- .../templates/pluginOnTransitList.php.tpl | 1 - workflow/engine/PmBootstrap.php | 1 - workflow/engine/bin/cron.php | 1 - workflow/engine/bin/cron_single.php | 32 ------------------- workflow/engine/bin/reindex_solr.php | 1 - workflow/engine/bin/verify_solr.php | 2 -- .../engine/classes/class.applications.php | 8 ----- .../engine/classes/class.pluginRegistry.php | 4 --- workflow/engine/classes/class.wsTools.php | 2 -- workflow/engine/config/paths.php | 1 - workflow/engine/controllers/appProxy.php | 5 --- workflow/engine/controllers/home.php | 4 --- workflow/engine/controllers/pmTables.php | 1 - .../methods/appFolder/appFolderAjax.php | 2 -- .../engine/methods/cases/cases_SaveData.php | 1 - .../cases/cases_SaveDataSupervisor.php | 2 -- .../engine/methods/dynaforms/fields_Ajax.php | 2 -- .../methods/inputdocs/inputdocs_Save.php | 3 -- .../ProcessMaker/BusinessModel/Dashboard.php | 4 +-- workflow/public_html/sysGeneric.php | 5 --- 20 files changed, 1 insertion(+), 81 deletions(-) diff --git a/gulliver/bin/tasks/templates/pluginOnTransitList.php.tpl b/gulliver/bin/tasks/templates/pluginOnTransitList.php.tpl index d6aae73da..f95be3549 100644 --- a/gulliver/bin/tasks/templates/pluginOnTransitList.php.tpl +++ b/gulliver/bin/tasks/templates/pluginOnTransitList.php.tpl @@ -27,7 +27,6 @@ $xmlfile = '{className}/{className}OnTransitList'; /* Render page */ - //require_once ( 'classes/class.extendGulliver.php' ); $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent( 'propeltable', '{className}/paged-table', '{className}/{className}OnTransitList', $Criteria ); G::RenderPage( "publish" ); diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php index 8b5336a63..ec4b5aa82 100644 --- a/workflow/engine/PmBootstrap.php +++ b/workflow/engine/PmBootstrap.php @@ -66,7 +66,6 @@ class PmBootstrap extends Bootstrap // pm workflow classes (static load) $this->autoloader->registerClass('System', PATH_CORE . 'classes/class.system'); - //$this->autoloader->registerClass('Services_JSON', PATH_THIRDPARTY .'pear/json/class.json'); $this->autoloader->registerClass('Smarty', PATH_THIRDPARTY . 'smarty/libs/Smarty.class'); $this->autoloader->registerClass('Propel', PATH_THIRDPARTY . 'propel/Propel'); diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 8db5a180c..cdf5df7c2 100644 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -72,7 +72,6 @@ try { $classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP, 'ProcessMaker'); $classLoader->add(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'src' . PATH_SEP); $classLoader->addClass('Bootstrap', PATH_TRUNK . 'gulliver' . PATH_SEP . 'system' . PATH_SEP . 'class.bootstrap.php'); - Bootstrap::initVendors(); $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP); //Load classes diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 1aa83d9cd..710251773 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -90,38 +90,6 @@ try { spl_autoload_register(['Bootstrap', 'autoloadClass']); - //DATABASE propel classes used in 'Cases' Options - Bootstrap::registerClass('AuthenticationSourcePeer', PATH_RBAC . 'model' . PATH_SEP . 'AuthenticationSourcePeer.php'); - Bootstrap::registerClass('BaseAuthenticationSource', PATH_RBAC . 'model' . PATH_SEP . 'om' . PATH_SEP . 'BaseAuthenticationSource.php'); - Bootstrap::registerClass('AuthenticationSource', PATH_RBAC . 'model' . PATH_SEP . 'AuthenticationSource.php'); - Bootstrap::registerClass('RolesPeer', PATH_RBAC . 'model' . PATH_SEP . 'RolesPeer.php'); - Bootstrap::registerClass('BaseRoles', PATH_RBAC . 'model' . PATH_SEP . 'om' . PATH_SEP . 'BaseRoles.php'); - Bootstrap::registerClass('Roles', PATH_RBAC . 'model' . PATH_SEP . 'Roles.php'); - - require_once(PATH_RBAC . 'model' . PATH_SEP . 'UsersRolesPeer.php'); - require_once(PATH_RBAC . 'model' . PATH_SEP . 'om' . PATH_SEP . 'BaseUsersRoles.php'); - require_once(PATH_RBAC . 'model' . PATH_SEP . 'UsersRoles.php'); - - Bootstrap::registerClass('PMLicensedFeatures', PATH_CLASSES . 'class.licensedFeatures.php'); - Bootstrap::registerClass('serverConf', PATH_CLASSES . 'class.serverConfiguration.php'); - Bootstrap::registerClass('calendar', PATH_CLASSES . 'class.calendar.php'); - Bootstrap::registerClass('groups', PATH_CLASSES . 'class.groups.php'); - - Bootstrap::registerClass('Entity_Base', PATH_HOME . 'engine/classes/entities/Base.php'); - Bootstrap::registerClass('Entity_AppSolrQueue', PATH_HOME . 'engine/classes/entities/AppSolrQueue.php'); - Bootstrap::registerClass('XMLDB', PATH_HOME . 'engine/classes/class.xmlDb.php'); - Bootstrap::registerClass('DynaformHandler', PATH_GULLIVER . 'class.dynaformhandler.php'); - Bootstrap::registerClass('DynaFormField', PATH_HOME . 'engine/classes/class.dynaFormField.php'); - Bootstrap::registerClass('SolrRequestData', PATH_HOME . 'engine/classes/entities/SolrRequestData.php'); - Bootstrap::registerClass('SolrUpdateDocument', PATH_HOME . 'engine/classes/entities/SolrUpdateDocument.php'); - Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . 'class.xmlDocument.php'); - Bootstrap::registerClass('wsResponse', PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.wsResponse.php'); - Bootstrap::initVendors(); - - /*----------------------------------********---------------------------------*/ - Bootstrap::registerClass('dashboards', PATH_HOME . 'engine/classes/class.dashboards.php'); - /*----------------------------------********---------------------------------*/ - //Set variables /*----------------------------------********---------------------------------*/ $dateInit = null; diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php index dfd040ca4..a277a001e 100644 --- a/workflow/engine/bin/reindex_solr.php +++ b/workflow/engine/bin/reindex_solr.php @@ -115,7 +115,6 @@ if (! defined ('PATH_HOME')) { define( 'PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP ); require_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php'); - require_once (PATH_GULLIVER . "class.bootstrap.php"); spl_autoload_register(array('Bootstrap', 'autoloadClass')); } diff --git a/workflow/engine/bin/verify_solr.php b/workflow/engine/bin/verify_solr.php index e146ab9e1..e1debf6a2 100644 --- a/workflow/engine/bin/verify_solr.php +++ b/workflow/engine/bin/verify_solr.php @@ -86,8 +86,6 @@ if (! defined ('PATH_HOME')) { 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')); diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index f34ce1222..88256fd91 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -236,14 +236,6 @@ class Applications $dateFrom = isset($dateFrom)? $dateFrom : ""; $dateTo = isset($dateTo)? $dateTo : ""; - //require_once ("classes/model/AppCacheView.php"); - //require_once ("classes/model/AppDelegation.php"); - //require_once ("classes/model/AdditionalTables.php"); - //require_once ("classes/model/AppDelay.php"); - //require_once ("classes/model/Fields.php"); - //require_once ("classes/model/Users.php"); - //require_once ("classes/model/Process.php"); - $oAppCache = new AppCacheView(); if ($configuration == true) { diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php index 79026e308..1ff5b81e3 100644 --- a/workflow/engine/classes/class.pluginRegistry.php +++ b/workflow/engine/classes/class.pluginRegistry.php @@ -210,9 +210,6 @@ class PMPluginRegistry */ public function registerPlugin ($sNamespace, $sFilename = null) { - //require_once ($sFilename); - - $sClassName = $sNamespace . "plugin"; $plugin = new $sClassName( $sNamespace, $sFilename ); @@ -285,7 +282,6 @@ class PMPluginRegistry $pluginSrcDir = PATH_PLUGINS . $detail->sNamespace . PATH_SEP . 'src'; if (is_dir($pluginSrcDir)) { - //Bootstrap::registerDir($detail->sNamespace.'/src', $pluginSrcDir); $loader = \Maveriks\Util\ClassLoader::getInstance(); $loader->add($pluginSrcDir); } diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index d64660ac8..561ecb431 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -467,7 +467,6 @@ class workspaceTools foreach ($information as $key => $value) { $arrayLang[] = trim($value['LOCALE']); } - //require_once ('classes/model/Content.php'); $regenerateContent = new Content(); $regenerateContent->regenerateContent($arrayLang, $workSpace); } @@ -662,7 +661,6 @@ class workspaceTools { $this->initPropel(true); - //require_once ('classes/model/AppCacheView.php'); //check the language, if no info in config about language, the default is 'en' $oConf = new Configurations(); diff --git a/workflow/engine/config/paths.php b/workflow/engine/config/paths.php index 3e08b352b..3a1b86dde 100644 --- a/workflow/engine/config/paths.php +++ b/workflow/engine/config/paths.php @@ -69,7 +69,6 @@ // include Gulliver Class require_once( PATH_GULLIVER . PATH_SEP . 'class.g.php'); // include Bootstrap Class - require_once (PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php'); if(file_exists(FILE_PATHS_INSTALLED)) { // backward compatibility; parsing old definitions in the compiled path constant diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index 191329456..b62a725fe 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -91,8 +91,6 @@ class AppProxy extends HttpProxyController ); } - //require_once ("classes/model/AppNotes.php"); - $usrUid = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : ""; $appNotes = new AppNotes(); $response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit ); @@ -113,9 +111,6 @@ class AppProxy extends HttpProxyController */ function postNote ($httpData) { - //require_once ("classes/model/AppNotes.php"); - - //extract(getExtJSParams()); if (isset( $httpData->appUid ) && trim( $httpData->appUid ) != "") { $appUid = $httpData->appUid; } else { diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 4ac15c7fd..6e0f2e5c3 100644 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -180,8 +180,6 @@ class Home extends Controller public function indexSingle ($httpData) { - require_once 'classes/model/Step.php'; - $step = new Step(); $solrEnabled = false; @@ -377,7 +375,6 @@ class Home extends Controller $sort = "APP_CACHE_VIEW.APP_NUMBER", $category = null) { - require_once ("classes/model/AppNotes.php"); $appNotes = new AppNotes(); @@ -638,7 +635,6 @@ class Home extends Controller function getCategoryArray () { - require_once 'classes/model/ProcessCategory.php'; $category = array(); $category[] = array ("",G::LoadTranslation( "ID_ALL_CATEGORIES" )); diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php index 5ed01b43d..65a58531c 100644 --- a/workflow/engine/controllers/pmTables.php +++ b/workflow/engine/controllers/pmTables.php @@ -122,7 +122,6 @@ class pmTables extends Controller */ public function data ($httpData) { - require_once 'classes/model/AdditionalTables.php'; $additionalTables = new AdditionalTables(); $tableDef = $additionalTables->load( $httpData->id, true ); diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index f95f32645..23b8ffeeb 100644 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -160,8 +160,6 @@ function sendJsonResultGeneric($response, $callback) function expandNode() { - //require_once ("classes/model/AppFolder.php"); - extract(getExtJSParams()); $oPMFolder = new AppFolder(); diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index 430b73821..b8fe5b4ba 100644 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -303,7 +303,6 @@ try { } //Save files - //require_once ("classes/model/AppDocument.php"); if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) { $oInputDocument = new \ProcessMaker\BusinessModel\Cases\InputDocument(); diff --git a/workflow/engine/methods/cases/cases_SaveDataSupervisor.php b/workflow/engine/methods/cases/cases_SaveDataSupervisor.php index b456cbafb..cff4b68e5 100644 --- a/workflow/engine/methods/cases/cases_SaveDataSupervisor.php +++ b/workflow/engine/methods/cases/cases_SaveDataSupervisor.php @@ -128,8 +128,6 @@ if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) { } if ($indocUid != null) { - //require_once ("classes/model/AppFolder.php"); - //require_once ("classes/model/InputDocument.php"); $oInputDocument = new InputDocument(); $aID = $oInputDocument->load( $indocUid ); diff --git a/workflow/engine/methods/dynaforms/fields_Ajax.php b/workflow/engine/methods/dynaforms/fields_Ajax.php index cb2cb73ae..3bcd63bc8 100644 --- a/workflow/engine/methods/dynaforms/fields_Ajax.php +++ b/workflow/engine/methods/dynaforms/fields_Ajax.php @@ -47,8 +47,6 @@ if (isset( $_SESSION['CURRENT_PAGE_INITILIZATION'] )) { eval( $_SESSION['CURRENT_PAGE_INITILIZATION'] ); } -//require_once (PATH_THIRDPARTY . 'pear/json/class.json.php'); -//$json = new Services_JSON(); $G_FORM = new form( G::getUIDName( urlDecode( $_POST['form'] ) ) ); $G_FORM->id = urlDecode( $_POST['form'] ); $G_FORM->values = $_SESSION[$G_FORM->id]; diff --git a/workflow/engine/methods/inputdocs/inputdocs_Save.php b/workflow/engine/methods/inputdocs/inputdocs_Save.php index 4511380f0..529390350 100644 --- a/workflow/engine/methods/inputdocs/inputdocs_Save.php +++ b/workflow/engine/methods/inputdocs/inputdocs_Save.php @@ -45,9 +45,6 @@ try { // Bootstrap::mylog("post:".$_POST['function']); switch ($sfunction) { case 'lookForNameInput': - //require_once ('classes/model/Content.php'); - //require_once ("classes/model/InputDocument.php"); - $snameInput = urldecode( $_POST['NAMEINPUT'] ); $sPRO_UID = urldecode( $_POST['proUid'] ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php index d83b4ba37..a321947d2 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php @@ -390,8 +390,7 @@ class Dashboard { $data['USR_UID'] = $usrUid; $data['PRO_UID'] = ""; $data['APP_UID'] = ""; - - //require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Configuration.php"); + $oConfig = new \Configuration(); $response = $oConfig->create($data); @@ -409,7 +408,6 @@ class Dashboard { */ public function getConfig($usr_uid) { - //require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Configuration.php"); $oConfig = new \Configuration(); $response = array(); diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 8c2e0961f..d2da8912b 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -218,7 +218,6 @@ define( 'PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mssql' . P define( 'PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP ); // include Gulliver Class -require_once (PATH_GULLIVER . "class.bootstrap.php"); if (file_exists( FILE_PATHS_INSTALLED )) { @@ -651,8 +650,6 @@ if (file_exists( $sSerializedFile )) { } // setup propel definitions and logging //changed to autoloader -//require_once ("propel/Propel.php"); -//require_once ("creole/Creole.php"); if (defined( 'DEBUG_SQL_LOG' ) && DEBUG_SQL_LOG) { define( 'PM_PID', mt_rand( 1, 999999 ) ); @@ -798,8 +795,6 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') { die(); } - Bootstrap::initVendors(); - $isWebEntry = \ProcessMaker\BusinessModel\WebEntry::isWebEntry(SYS_COLLECTION, $phpFile); if (\Bootstrap::getDisablePhpUploadExecution() === 1 && !$isWebEntry) { $message = \G::LoadTranslation('THE_PHP_FILES_EXECUTION_WAS_DISABLED');