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

HOR-3670

Browse Source 
Fixed EnterpriseClass name
Moved side effects code to class G helper and called from boot scripts
This commit is contained in:
David Callizaya
2017-08-11 15:11:24 -04:00
parent 1803df36dc
commit 5b90f9e24a
8 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/Maveriks/WebApplication.php
View File

@@ -448,6 +448,7 @@ class WebApplication
define("PATH_CONTROLLERS", PATH_CORE . "controllers" . PATH_SEP);
define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
G::defineConstants();
$arraySystemConfiguration = \PmSystem::getSystemConfiguration();
ini_set('date.timezone', $arraySystemConfiguration['time_zone']); //Set Time Zone

14
gulliver/system/class.g.php
View File

@@ -5823,6 +5823,20 @@ class G
$_SESSION['_DATA_TRIGGER_']['_TRI_LOG_'] = true;
}
}
/**
* Define the Processmaker constants.
*
*/
public static function defineConstants()
{
//Moved from Enterprise class.
if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
include (PATH_METHODS . "login/version-pmos.php");
} else {
define("PM_VERSION", "2.0.0");
}
}
}
/**

2
rbac/engine/config/paths.php
View File

@@ -81,4 +81,4 @@
if (!is_dir(PATH_SMARTY_C)) G::mk_dir(PATH_SMARTY_C);
if (!is_dir(PATH_SMARTY_CACHE)) G::mk_dir(PATH_SMARTY_CACHE);
?>
G::defineConstants();

11
workflow/engine/classes/EnterpriseClass.php
View File

@@ -1,15 +1,6 @@
<?php
if (!defined("PM_VERSION")) {
if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
include (PATH_METHODS . "login/version-pmos.php");
} else {
define("PM_VERSION", "2.0.0");
}
}
class enterpriseClass extends PMPlugin
class EnterpriseClass extends PMPlugin
{
public function __construct()
{

2
workflow/engine/classes/WorkspaceTools.php
View File

@@ -1985,7 +1985,7 @@ class WorkspaceTools
$licensedFeatures = & PMLicensedFeatures::getSingleton();
/*----------------------------------********---------------------------------*/
if ($licensedFeatures->verifyfeature('95OY24wcXpEMzIyRmlNSnF0STNFSHJzMG9wYTJKekpLNmY2ZmRCeGtuZk5oUDloaUNhUGVjTDJBPT0=')) {
enterpriseClass::setHashPassword($response);
EnterpriseClass::setHashPassword($response);
} else {
return false;
}

1
workflow/engine/config/paths.php
View File

@@ -142,3 +142,4 @@
define('PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess');
define('PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download');
G::defineConstants();

2
workflow/engine/methods/login/authentication.php
View File

@@ -180,7 +180,7 @@ try {
if ($oPluginRegistry->existsTrigger ( PM_LOGIN )) {
$oPluginRegistry->executeTriggers ( PM_LOGIN , $loginInfo );
}
enterpriseClass::enterpriseSystemUpdate($loginInfo);
EnterpriseClass::enterpriseSystemUpdate($loginInfo);
$_SESSION['USER_LOGGED'] = $uid;
$_SESSION['USR_USERNAME'] = $usr;
} else {

2
workflow/public_html/sysGeneric.php
View File

@@ -283,6 +283,8 @@ define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
G::defineConstants();
$config = Bootstrap::getSystemConfiguration();
// starting session