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

Improvement list plugins and features

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-05-10 16:32:01 -04:00
parent 2a21f8ecdf
commit e42c84781d
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.pmLicenseManager.php
View File

@@ -56,7 +56,7 @@ class pmLicenseManager
$this->licensedfeatures = array(); $this->licensedfeatures = array();
$this->licensedfeaturesList = array(); $this->licensedfeaturesList = array();
if (in_array($this->result, $validStatus)) { if (in_array($this->result, $validStatus)) {
$this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK<6B>DoqCt2Kqgpq6Vg37s"; $this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK<6B>DoqCt2Kqgpq6Vg37s";
$info['FIRST_NAME'] = $results['DATA']['FIRST_NAME']; $info['FIRST_NAME'] = $results['DATA']['FIRST_NAME'];
$info['LAST_NAME'] = $results['DATA']['LAST_NAME']; $info['LAST_NAME'] = $results['DATA']['LAST_NAME'];
$info['DOMAIN_WORKSPACE'] = $results['DATA']['DOMAIN_WORKSPACE']; $info['DOMAIN_WORKSPACE'] = $results['DATA']['DOMAIN_WORKSPACE'];
@@ -75,6 +75,7 @@ class pmLicenseManager
$resultsRegister = $results['LIC']; $resultsRegister = $results['LIC'];
$this->server = $results['LIC']['SRV']; $this->server = $results['LIC']['SRV'];
$this->file = $results['LIC']['FILE']; $this->file = $results['LIC']['FILE'];
$this->workspace = isset($results['LIC']['WORKSPACE']) ? $results['LIC']['WORKSPACE'] : 'pmLicenseSrv';
$this->licenseSerial = (isset($results['LIC']['SERIAL'])) ? $results['LIC']['SERIAL'] : ''; $this->licenseSerial = (isset($results['LIC']['SERIAL'])) ? $results['LIC']['SERIAL'] : '';
$this->supportStartDate = (isset($results['DATA']['SUPPORT_START_DATE'])) ? $results['DATA']['SUPPORT_START_DATE'] : ''; $this->supportStartDate = (isset($results['DATA']['SUPPORT_START_DATE'])) ? $results['DATA']['SUPPORT_START_DATE'] : '';
$this->supportEndDate = (isset($results['DATA']['SUPPORT_END_DATE'])) ? $results['DATA']['SUPPORT_END_DATE'] : ''; $this->supportEndDate = (isset($results['DATA']['SUPPORT_END_DATE'])) ? $results['DATA']['SUPPORT_END_DATE'] : '';

8
workflow/engine/classes/model/AddonsStore.php
View File

@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME); $criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
$criteria->addSelectColumn("*"); $criteria->addSelectColumn("*");
$criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL); $criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL);
$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL); //$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
foreach (AddonsStorePeer::doSelect($criteria) as $store) { foreach (AddonsStorePeer::doSelect($criteria) as $store) {
$store->clear(); $store->clear();
@@ -53,7 +53,8 @@ class AddonsStore extends BaseAddonsStore
if (AddonsStorePeer::retrieveByPK($licenseManager->id) === null) { if (AddonsStorePeer::retrieveByPK($licenseManager->id) === null) {
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches); preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]); $realId = urlencode($matches[1]);
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId"; $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
self::addStore($licenseManager->id, $addonLocation); self::addStore($licenseManager->id, $addonLocation);
@@ -547,7 +548,8 @@ class AddonsStore extends BaseAddonsStore
$addon->setAddonStatus(isset($addonInfo->status)? $addonInfo->status : ""); $addon->setAddonStatus(isset($addonInfo->status)? $addonInfo->status : "");
$addon->setAddonType(isset($addonInfo->type)? $addonInfo->type : ""); $addon->setAddonType(isset($addonInfo->type)? $addonInfo->type : "");
$addon->setAddonPublisher(isset($addonInfo->publisher)? $addonInfo->publisher : ""); $addon->setAddonPublisher(isset($addonInfo->publisher)? $addonInfo->publisher : "");
$addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/syspmLicenseSrv/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid); $workspace = (isset($pmLicenseManagerO->workspace)) ? $pmLicenseManagerO->workspace : 'pmLicenseSrv';
$addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/sys".$workspace."/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid);
$addon->setAddonDownloadMd5(isset($addonInfo->download_md5)? $addonInfo->download_md5 : ""); $addon->setAddonDownloadMd5(isset($addonInfo->download_md5)? $addonInfo->download_md5 : "");
$addon->setAddonReleaseDate(isset($addonInfo->release_date)? $addonInfo->release_date : ""); $addon->setAddonReleaseDate(isset($addonInfo->release_date)? $addonInfo->release_date : "");
$addon->setAddonReleaseType(isset($addonInfo->release_type)? $addonInfo->release_type : ''); $addon->setAddonReleaseType(isset($addonInfo->release_type)? $addonInfo->release_type : '');

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

@@ -78,7 +78,8 @@ try {
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches); preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]); $realId = urlencode($matches[1]);
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId"; $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
/////// ///////
$cnn = Propel::getConnection("workflow"); $cnn = Propel::getConnection("workflow");
@@ -261,8 +262,8 @@ try {
/////// ///////
$licenseManager = &pmLicenseManager::getSingleton(); $licenseManager = &pmLicenseManager::getSingleton();
$server = $licenseManager->server; $server = $licenseManager->server;
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/syspmLicenseSrv/en/green/services/rest"; $url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) { if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server \"$server\" not available.")); throw (new Exception("Server \"$server\" not available."));

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

@@ -121,8 +121,9 @@ switch ($option) {
/////// ///////
$licenseManager = &pmLicenseManager::getSingleton(); $licenseManager = &pmLicenseManager::getSingleton();
$server = isset($licenseManager->server) ? $licenseManager->server : ''; $server = isset($licenseManager->server) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/syspmLicenseSrv/en/green/services/rest"; $url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) { if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server '$server' not available.")); throw (new Exception("Server '$server' not available."));
@@ -296,8 +297,9 @@ switch ($option) {
/////// ///////
$licenseManager = &pmLicenseManager::getSingleton(); $licenseManager = &pmLicenseManager::getSingleton();
$server = (isset($licenseManager->server)) ? $licenseManager->server : ''; $server = (isset($licenseManager->server)) ? $licenseManager->server : '';
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$url = "http://$server/syspmLicenseSrv/en/green/services/rest"; $url = "http://$server/sys".$workspace."/en/green/services/rest";
if (EnterpriseUtils::checkConnectivity($url) == false) { if (EnterpriseUtils::checkConnectivity($url) == false) {
throw (new Exception("Server '$server' not available.")); throw (new Exception("Server '$server' not available."));
@@ -338,7 +340,7 @@ switch ($option) {
$results = file_get_contents($url, false, $context); $results = file_get_contents($url, false, $context);
$results = G::json_decode($results); $results = G::json_decode($results);
$results = $results[0]; $results = isset($results[0]) ? $results[0] :array();
$pmVersion = EnterpriseUtils::pmVersion(PM_VERSION); $pmVersion = EnterpriseUtils::pmVersion(PM_VERSION);
$versions = array(); $versions = array();

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

@@ -22,8 +22,9 @@ if ($aux['extension'] != 'dat') {
$licenseManager = new pmLicenseManager(); $licenseManager = new pmLicenseManager();
preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches); preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
$realId = urlencode($matches[1]); $realId = urlencode($matches[1]);
$workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
$addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId"; $addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
/////// ///////
$cnn = Propel::getConnection("workflow"); $cnn = Propel::getConnection("workflow");