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

HOR-4229

Browse Source
This commit is contained in:
Paula Quispe
2018-01-08 16:09:45 -04:00
parent 4c63633189
commit e7385e510a
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/PmBootstrap.php
View File

@@ -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)

2
workflow/engine/controllers/installer.php → workflow/engine/controllers/InstallerModule.php
View File

@@ -118,8 +118,6 @@ class InstallerModule extends Controller
public function getSystemInfo ()
{
//$echo "<script> document.write(TRANSLATIONS) </script>";
//print_r ($valu);die();
$this->setResponseType( 'json' );
// PHP info and verification

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

@@ -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();

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

@@ -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();

2
workflow/engine/templates/setup/systemInfo.js
View File

@@ -13,7 +13,7 @@ systemInfo.application = {
switch (option) {
case "SYS":
url = "../installer/getSystemInfo";
url = "../InstallerModule/getSystemInfo";
break;
}

8
workflow/public_html/bootstrap.php
View File

@@ -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)

9
workflow/public_html/sysGeneric.php
View File

@@ -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') {