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

HOR-3670

Browse Source 
Fix class name PmLicenseManager.
This commit is contained in:
David Callizaya
2017-08-11 16:24:12 -04:00
parent fd2786ae1d
commit ab9c67fb47
19 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/enterprise/addonsStore.php
View File

@@ -2,7 +2,7 @@
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
$oHeadPublisher = &headPublisher::getSingleton();
if (isset($licenseManager->date) && is_array($licenseManager->date)) {

6
workflow/engine/methods/enterprise/addonsStoreAction.php
View File

@@ -51,12 +51,12 @@ try {
$dir = PATH_DATA_SITE;
G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
//reading the file that was uploaded
$oPmLicenseManager = &pmLicenseManager::getSingleton();
$oPmLicenseManager = &PmLicenseManager::getSingleton();
$response = $oPmLicenseManager->installLicense($dir . $aInfoLoadFile["name"]);
///////
//This command also find the following file "AddonsStore.php"
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
@@ -210,7 +210,7 @@ try {
}
///////
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
$server = $licenseManager->server;
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/sys".$workspace."/en/green/services/rest";

2
workflow/engine/methods/enterprise/enterprise.php
View File

@@ -133,7 +133,7 @@ class enterprisePlugin extends PMPlugin
require_once (PATH_CORE . 'classes/model/AddonsStore.php');
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
AddonsStore::updateAll(false);
}

4
workflow/engine/methods/enterprise/processMakerAjax.php
View File

@@ -116,7 +116,7 @@ switch ($option) {
}
///////
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
$server = isset($licenseManager->server) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
@@ -292,7 +292,7 @@ switch ($option) {
}
///////
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
$server = (isset($licenseManager->server)) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';

4
workflow/engine/methods/login/licenseUpdate.php
View File

@@ -15,11 +15,11 @@ if ($aux['extension'] != 'dat') {
G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
//reading the file that was uploaded
$licenseManager =& pmLicenseManager::getSingleton();
$licenseManager =& PmLicenseManager::getSingleton();
$response = $licenseManager->installLicense($dir . $aInfoLoadFile["name"], false, false);
if ($response) {
$licenseManager = new pmLicenseManager();
$licenseManager = new PmLicenseManager();
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]);
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';

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

@@ -208,7 +208,7 @@ $_SESSION['NW_PASSWORD2'] = $pass1;
/*----------------------------------********---------------------------------*/
$licenseManager =& pmLicenseManager::getSingleton();
$licenseManager =& PmLicenseManager::getSingleton();
if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
$G_PUBLISH = new Publisher();
$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));

8
workflow/engine/methods/setup/pluginsImportFile.php
View File

@@ -105,12 +105,12 @@ try {
require_once ('classes/model/AddonsStore.php');
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
AddonsStore::updateAll(false);
$message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
G::SendMessageText($message, "INFO");
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
}
}
@@ -179,12 +179,12 @@ try {
require_once ('classes/model/AddonsStore.php');
AddonsStore::checkLicenseStore();
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
AddonsStore::updateAll(false);
$message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
G::SendMessageText($message, "INFO");
$licenseManager = &pmLicenseManager::getSingleton();
$licenseManager = &PmLicenseManager::getSingleton();
die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
}
}