From e7385e510a1a484c4855254dcf18b34e4e81b0cb Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Mon, 8 Jan 2018 16:09:45 -0400 Subject: [PATCH] HOR-4229 --- workflow/engine/PmBootstrap.php | 8 ++++---- .../controllers/{installer.php => InstallerModule.php} | 2 -- workflow/engine/controllers/adminProxy.php | 2 +- workflow/engine/methods/setup/systemInfo.php | 2 +- workflow/engine/templates/setup/systemInfo.js | 2 +- workflow/public_html/bootstrap.php | 8 ++++---- workflow/public_html/sysGeneric.php | 9 ++++----- 7 files changed, 15 insertions(+), 18 deletions(-) rename workflow/engine/controllers/{installer.php => InstallerModule.php} (99%) diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php index 0d1e5870e..0879b43f6 100644 --- a/workflow/engine/PmBootstrap.php +++ b/workflow/engine/PmBootstrap.php @@ -211,8 +211,8 @@ class PmBootstrap extends Bootstrap { // new installer, extjs based define('PATH_DATA', PATH_C); - require_once ( PATH_CONTROLLERS . 'installer.php' ); - $controller = 'Installer'; + require_once ( PATH_CONTROLLERS . 'InstallerModule.php' ); + $controller = InstallerModule::class; // if the method name is empty set default to index method if (strpos(SYS_TARGET, '/') !== false) { @@ -225,7 +225,7 @@ class PmBootstrap extends Bootstrap $controllerAction = ($controllerAction != '' && $controllerAction != 'login')? $controllerAction: 'index'; // create the installer controller and call its method - if( is_callable(Array('Installer', $controllerAction)) ) { + if (is_callable([InstallerModule::class, $controllerAction])) { $installer = new $controller(); $installer->setHttpRequestData($_REQUEST); $installer->call($controllerAction); @@ -307,7 +307,7 @@ class PmBootstrap extends Bootstrap $noLoginFolders[] = 'services'; $noLoginFolders[] = 'tracker'; - $noLoginFolders[] = 'installer'; + $noLoginFolders[] = 'InstallerModule'; // This sentence is used when you lost the Session if (! in_array(SYS_TARGET, $noLoginFiles) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/InstallerModule.php similarity index 99% rename from workflow/engine/controllers/installer.php rename to workflow/engine/controllers/InstallerModule.php index aca7f0526..36a47fb7c 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/InstallerModule.php @@ -118,8 +118,6 @@ class InstallerModule extends Controller public function getSystemInfo () { - //$echo ""; - //print_r ($valu);die(); $this->setResponseType( 'json' ); // PHP info and verification diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 379e528d6..69513cf08 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1383,7 +1383,7 @@ class adminProxy extends HttpProxyController public function generateInfoSupport () { - require_once (PATH_CONTROLLERS . "installer.php"); + require_once (PATH_CONTROLLERS . "InstallerModule.php"); $params = array (); $oServerConf = &ServerConf::getSingleton(); diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php index fd8a25e84..a7f782ded 100644 --- a/workflow/engine/methods/setup/systemInfo.php +++ b/workflow/engine/methods/setup/systemInfo.php @@ -24,7 +24,7 @@ switch ($option) { G::RenderPage("publish", "extJs"); break; default: - require_once (PATH_CONTROLLERS . "installer.php"); + require_once (PATH_CONTROLLERS . "InstallerModule.php"); $installer = new InstallerModule(); diff --git a/workflow/engine/templates/setup/systemInfo.js b/workflow/engine/templates/setup/systemInfo.js index 5d666ee10..17195a582 100644 --- a/workflow/engine/templates/setup/systemInfo.js +++ b/workflow/engine/templates/setup/systemInfo.js @@ -13,7 +13,7 @@ systemInfo.application = { switch (option) { case "SYS": - url = "../installer/getSystemInfo"; + url = "../InstallerModule/getSystemInfo"; break; } diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php index eeadf65e5..5cff62984 100644 --- a/workflow/public_html/bootstrap.php +++ b/workflow/public_html/bootstrap.php @@ -284,8 +284,8 @@ use ProcessMaker\Plugins\PluginRegistry; // new installer, extjs based define('PATH_DATA', PATH_C); - require_once ( PATH_CONTROLLERS . 'installer.php' ); - $controller = 'Installer'; + require_once ( PATH_CONTROLLERS . 'InstallerModule.php' ); + $controller = InstallerModule::class; // if the method name is empty set default to index method if (strpos(SYS_TARGET, '/') !== false) { @@ -298,7 +298,7 @@ use ProcessMaker\Plugins\PluginRegistry; $controllerAction = ($controllerAction != '' && $controllerAction != 'login')? $controllerAction: 'index'; // create the installer controller and call its method - if( is_callable(Array('Installer', $controllerAction)) ) { + if (is_callable([InstallerModule::class, $controllerAction])) { $installer = new $controller(); $installer->setHttpRequestData($_REQUEST); $installer->call($controllerAction); @@ -628,7 +628,7 @@ use ProcessMaker\Plugins\PluginRegistry; $noLoginFolders[] = 'services'; $noLoginFolders[] = 'tracker'; - $noLoginFolders[] = 'installer'; + $noLoginFolders[] = 'InstallerModule'; // This sentence is used when you lost the Session if (! in_array(SYS_TARGET, $noLoginFiles) diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 6dfdac249..f2ddb4600 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -520,8 +520,8 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) { // new installer, extjs based define( 'PATH_DATA', PATH_C ); //NewRelic Snippet - By JHL - transactionLog(PATH_CONTROLLERS.'installer.php'); - $pathFile = PATH_CONTROLLERS . 'installer.php'; + transactionLog(PATH_CONTROLLERS . 'InstallerModule.php'); + $pathFile = PATH_CONTROLLERS . 'InstallerModule.php'; require_once ($pathFile); $controller = InstallerModule::class; @@ -535,8 +535,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) { $controllerAction = ($controllerAction != '' && $controllerAction != 'login') ? $controllerAction : 'index'; // create the installer controller and call its method - if (is_callable( Array (InstallerModule::class,$controllerAction - ) )) { + if (is_callable([InstallerModule::class, $controllerAction])) { $installer = new $controller(); $installer->setHttpRequestData( $_REQUEST ); //NewRelic Snippet - By JHL @@ -968,7 +967,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) { $noLoginFolders[] = 'services'; $noLoginFolders[] = 'tracker'; - $noLoginFolders[] = 'installer'; + $noLoginFolders[] = 'InstallerModule'; // This sentence is used when you lost the Session if (! in_array( SYS_TARGET, $noLoginFiles ) && ! in_array( SYS_COLLECTION, $noLoginFolders ) && $bWE != true && $collectionPlugin != 'services') {