fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in marcoAntonioNina/processmaker (pull request #2192)

Browse Source 
Improvement install plugin interface Enterprise manager
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-14 11:21:36 -04:00
parent 1b2ce0c636 d538e045cc
commit dfa6cbf31a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.license.app.php
View File

@@ -420,9 +420,11 @@ class license_application extends padl
$DATA = $this->_unwrap_license($dat_str);
if (is_array($DATA)) {
# missing / incorrect id therefore it has been tampered with
if ($DATA['ID'] != G::encryptOld($this->ID1)) {
/*
*Disable to accept licenses from other workspaces
*if ($DATA['ID'] != G::encryptOld($this->ID1)) {
$DATA['RESULT'] = 'CORRUPT';
}
}*/
if ($this->USE_TIME) {
# the license is being used before it's official start
if ($DATA['DATE']['START'] > time() + $this->START_DIF) {

5
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -429,8 +429,8 @@ class PMPluginRegistry
$plugins = array ();
$namePlugin = array ();
foreach ($files as $f) {
//if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
//if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
$plugins[] = $matches[1];
}
if (preg_match( "/^.*($pluginName)\.php$/", $f["filename"], $matches )) {
@@ -485,7 +485,6 @@ class PMPluginRegistry
*/
$res = $tar->extract( PATH_PLUGINS );
if (! file_exists( PATH_PLUGINS . $pluginFile )) {
throw (new Exception( "File \"$pluginFile\" doesn't exist" ));
}

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

@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
$criteria->addSelectColumn("*");
$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) {
$store->clear();

3
workflow/engine/templates/enterprise/addonsStore.js
View File

@@ -472,7 +472,8 @@ Ext.onReady(function() {
method: "POST"
}),
baseParams: {
"action": "addonsList"
"action": "addonsList",
"force" : true
},
//url: "addonsStoreAction?action=addonsList",