From 71c7f7d1278b6f442d96fb730d9eab6b727d5fca Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina Mena <marcoantonina@gmail.com>
Date: Wed, 13 May 2015 17:15:18 -0400
Subject: [PATCH 1/2] Improvement install plugin interface Enterprise manager

---
 workflow/engine/classes/class.pluginRegistry.php    | 5 ++---
 workflow/engine/classes/model/AddonsStore.php       | 2 +-
 workflow/engine/templates/enterprise/addonsStore.js | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php
index e6f77843f..b62e6c6e2 100755
--- a/workflow/engine/classes/class.pluginRegistry.php
+++ b/workflow/engine/classes/class.pluginRegistry.php
@@ -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" ));
         }
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 36e38a3e3..ed3992ffb 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -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();
diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js
index 898899bb1..c181c1422 100644
--- a/workflow/engine/templates/enterprise/addonsStore.js
+++ b/workflow/engine/templates/enterprise/addonsStore.js
@@ -472,7 +472,8 @@ Ext.onReady(function() {
       method: "POST"
     }),
     baseParams: {
-        "action": "addonsList"
+        "action": "addonsList",
+        "force" : true
     },
 
     //url: "addonsStoreAction?action=addonsList",

From 08837aa6f29f7243ea85de4197182cf2e91fda95 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina Mena <marcoantonina@gmail.com>
Date: Thu, 14 May 2015 09:57:34 -0400
Subject: [PATCH 2/2] Improvement accept id licencse

---
 workflow/engine/classes/class.license.app.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.license.app.php b/workflow/engine/classes/class.license.app.php
index d46d57fc2..1594fddb7 100644
--- a/workflow/engine/classes/class.license.app.php
+++ b/workflow/engine/classes/class.license.app.php
@@ -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) {