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

Merged in feature/HOR-3771 (pull request #6005)

Browse Source 
HOR-3771

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
David Callizaya
2017-08-23 19:46:56 +00:00
committed by Julio Cesar Laura Avendaño
parent 2a4b0fed24 a92d230080
commit c5bbf5c851
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1427,7 +1427,7 @@ class adminProxy extends HttpProxyController
} }
//Database server Version (MySQL version) //Database server Version (MySQL version)
$installer = new Installer(); $installer = new InstallerModule();
$systemInfo = $installer->getSystemInfo(); $systemInfo = $installer->getSystemInfo();
try { try {
$params['mysql'] = mysql_get_server_info(); $params['mysql'] = mysql_get_server_info();

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

@@ -1,11 +1,12 @@
<?php <?php
use ProcessMaker\Core\System; use ProcessMaker\Core\System;
global $translation; global $translation;
include PATH_LANGUAGECONT . "translation." . SYS_LANG; include PATH_LANGUAGECONT . "translation." . SYS_LANG;
class Installer extends Controller class InstallerModule extends Controller
{ {
public $path_config; public $path_config;
public $path_languages; public $path_languages;

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

@@ -26,7 +26,7 @@ switch ($option) {
default: default:
require_once (PATH_CONTROLLERS . "installer.php"); require_once (PATH_CONTROLLERS . "installer.php");
$installer = new Installer(); $installer = new InstallerModule();
$systemInfo = $installer->getSystemInfo(); $systemInfo = $installer->getSystemInfo();

4
workflow/public_html/sysGeneric.php
View File

@@ -523,7 +523,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
transactionLog(PATH_CONTROLLERS.'installer.php'); transactionLog(PATH_CONTROLLERS.'installer.php');
$pathFile = PATH_CONTROLLERS . 'installer.php'; $pathFile = PATH_CONTROLLERS . 'installer.php';
require_once ($pathFile); require_once ($pathFile);
$controller = 'Installer'; $controller = InstallerModule::class;
// if the method name is empty set default to index method // if the method name is empty set default to index method
if (strpos( SYS_TARGET, '/' ) !== false) { if (strpos( SYS_TARGET, '/' ) !== false) {
@@ -535,7 +535,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
$controllerAction = ($controllerAction != '' && $controllerAction != 'login') ? $controllerAction : 'index'; $controllerAction = ($controllerAction != '' && $controllerAction != 'login') ? $controllerAction : 'index';
// create the installer controller and call its method // create the installer controller and call its method
if (is_callable( Array ('Installer',$controllerAction if (is_callable( Array (InstallerModule::class,$controllerAction
) )) { ) )) {
$installer = new $controller(); $installer = new $controller();
$installer->setHttpRequestData( $_REQUEST ); $installer->setHttpRequestData( $_REQUEST );