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

HOR-3610

Browse Source 
Fix System class conflict.
This commit is contained in:
davidcallizaya
2017-08-03 18:44:57 -04:00
parent f0c2511968
commit 81149399da
362 changed files with 1843 additions and 127409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/public_html/app.php
View File

@@ -1,4 +1,5 @@
<?php
require_once(__DIR__ . '/../../bootstrap/autoload.php');
register_shutdown_function(
create_function(
"",
@@ -19,36 +20,6 @@ if (isset($_SERVER['UNENCODED_URL'])) {
try {
$rootDir = realpath(__DIR__ . "/../../") . DIRECTORY_SEPARATOR;
require $rootDir . "framework/src/Maveriks/Util/ClassLoader.php";
$loader = Maveriks\Util\ClassLoader::getInstance();
$loader->add($rootDir . 'framework/src/', "Maveriks");
if (! is_dir($rootDir . 'vendor')) {
if (file_exists($rootDir . 'composer.phar')) {
throw new Exception(
"ERROR: Vendors are missing!" . PHP_EOL .
"Please execute the following command to install vendors:" .PHP_EOL.PHP_EOL.
"$>php composer.phar install"
);
} else {
throw new Exception(
"ERROR: Vendors are missing!" . PHP_EOL .
"Please execute the following commands to prepare/install vendors:" .PHP_EOL.PHP_EOL.
"$>curl -sS https://getcomposer.org/installer | php" . PHP_EOL .
"$>php composer.phar install"
);
}
}
$loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker");
$loader->add($rootDir . 'workflow/engine/src/');
// add vendors to autoloader
$loader->add($rootDir . 'vendor/luracast/restler/vendor', "Luracast");
$loader->add($rootDir . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");
$loader->addClass("Bootstrap", $rootDir . 'gulliver/system/class.bootstrap.php');
$loader->addModelClassPath($rootDir . "workflow/engine/classes/model/");
$app = new Maveriks\WebApplication();
$app->setRootDir($rootDir);

2
workflow/public_html/bootstrap.php
View File

@@ -62,7 +62,7 @@
ini_set('session.cookie_lifetime', $timelife);
session_start();
$config = System::getSystemConfiguration();
$config = PMSystem::getSystemConfiguration();
//$e_all = defined('E_DEPRECATED') ? E_ALL & ~E_DEPRECATED : E_ALL;
//$e_all = defined('E_STRICT') ? $e_all & ~E_STRICT : $e_all;

2
workflow/public_html/sysGeneric.php
View File

@@ -504,8 +504,6 @@ if (defined( 'PATH_DATA' ) && file_exists( PATH_DATA )) {
//Instance Server Configuration Singleton
$oServerConf = & serverConf::getSingleton();
}
$pathFile = PATH_THIRDPARTY . '/pear/PEAR.php';
require_once $pathFile;