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

PM-490 Error al ingresar al ws de la version 2.0.45 SOLVED

Browse Source 
- al realizar el backup de una version 2.0.45 no se reconocen las licencias activadas.
- Se añade una validacion para redirecionar el path de la licencia ACTIVA.
This commit is contained in:
Marco Antonio Nina
2014-10-17 12:30:25 -04:00
parent 6a65d987ba
commit 27e3b3539c
2 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
workflow/engine/classes/class.wsTools.php
View File

@@ -64,7 +64,7 @@ class workspaceTools
{ {
$start = microtime(true); $start = microtime(true);
CLI::logging("> Verify enterprise old...\n"); CLI::logging("> Verify enterprise old...\n");
$this->verifyEnterprise($workSpace); $this->verifyFilesOldEnterprise($workSpace);
$stop = microtime(true); $stop = microtime(true);
$final = $stop - $start; $final = $stop - $start;
CLI::logging("<*> Verify took $final seconds.\n"); CLI::logging("<*> Verify took $final seconds.\n");
@@ -1529,8 +1529,8 @@ class workspaceTools
CLI::logging(CLI::info("$versionOld < $versionPresent") . "\n"); CLI::logging(CLI::info("$versionOld < $versionPresent") . "\n");
$start = microtime(true); $start = microtime(true);
CLI::logging("> Verify enterprise old...\n"); CLI::logging("> Verify files enterprise old...\n");
$workspace->verifyEnterprise($workspaceName); $workspace->verifyFilesOldEnterprise($workspaceName);
$stop = microtime(true); $stop = microtime(true);
$final = $stop - $start; $final = $stop - $start;
CLI::logging("<*> Verify took $final seconds.\n"); CLI::logging("<*> Verify took $final seconds.\n");
@@ -1543,6 +1543,13 @@ class workspaceTools
$final = $stop - $start; $final = $stop - $start;
CLI::logging("<*> Database Upgrade Process took $final seconds.\n"); CLI::logging("<*> Database Upgrade Process took $final seconds.\n");
} }
$start = microtime(true);
CLI::logging("> Verify License Enterprise...\n");
$workspace->verifyLicenseEnterprise($workspaceName);
$stop = microtime(true);
$final = $stop - $start;
CLI::logging("<*> Verify took $final seconds.\n");
$start = microtime(true); $start = microtime(true);
CLI::logging("> Updating cache view...\n"); CLI::logging("> Updating cache view...\n");
$workspace->upgradeCacheView(true, false, $lang); $workspace->upgradeCacheView(true, false, $lang);
@@ -1677,7 +1684,7 @@ class workspaceTools
return true; return true;
} }
public function verifyEnterprise ($workspace) public function verifyFilesOldEnterprise ($workspace)
{ {
$this->initPropel( true ); $this->initPropel( true );
$pathBackup = PATH_DATA . 'backups'; $pathBackup = PATH_DATA . 'backups';
@@ -1731,5 +1738,28 @@ class workspaceTools
} }
} }
} }
public function verifyLicenseEnterprise ($workspace)
{
$this->initPropel( true );
require_once ("classes/model/LicenseManager.php");
$oCriteria = new Criteria('workflow');
$oCriteria->add(LicenseManagerPeer::LICENSE_STATUS, 'ACTIVE');
$oDataset = LicenseManagerPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$row = array();
if ($oDataset->next()) {
$row = $oDataset->getRow();
$tr = LicenseManagerPeer::retrieveByPK ( $row['LICENSE_UID'] );
$pos = strpos( $row['LICENSE_PATH'], 'license_' );
$license = substr( $row['LICENSE_PATH'], $pos, strlen($row['LICENSE_PATH']));
$tr->setLicensePath ( PATH_DATA . "sites/" . $workspace . "/licenses/" . $license);
$tr->setLicenseWorkspace ( $workspace );
$res = $tr->save ();
}
}
} }

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

@@ -426,25 +426,27 @@ class AddonsStore extends BaseAddonsStore
} }
} else { } else {
$list = unserialize($pmLicenseManagerO->licensedfeaturesList); $list = unserialize($pmLicenseManagerO->licensedfeaturesList);
foreach ($list['addons'] as $key => $feature) { if (is_array($list)) {
$addon = new AddonsManager(); foreach ($list['addons'] as $key => $feature) {
$addon->setAddonId($feature['name']); $addon = new AddonsManager();
$addon->setStoreId($feature['guid']); $addon->setAddonId($feature['name']);
$addon->setAddonName($feature['name']); $addon->setStoreId($feature['guid']);
$addon->setAddonDescription($feature['description']); $addon->setAddonName($feature['name']);
$addon->setAddonNick($feature['nick']); $addon->setAddonDescription($feature['description']);
$addon->setAddonVersion(""); $addon->setAddonNick($feature['nick']);
$addon->setAddonStatus($feature['status']); $addon->setAddonVersion("");
$addon->setAddonType("features"); $addon->setAddonStatus($feature['status']);
$addon->setAddonPublisher("Colosa"); $addon->setAddonType("features");
$addon->setAddonDownloadUrl(""); $addon->setAddonPublisher("Colosa");
$addon->setAddonDownloadMd5(""); $addon->setAddonDownloadUrl("");
$addon->setAddonReleaseDate(null); $addon->setAddonDownloadMd5("");
$addon->setAddonReleaseType('localRegistry'); $addon->setAddonReleaseDate(null);
$addon->setAddonReleaseNotes(""); $addon->setAddonReleaseType('localRegistry');
$addon->setAddonState(""); $addon->setAddonReleaseNotes("");
$addon->setAddonState("");
$addon->save(); $addon->save();
}
} }
} }