diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php index 7d7daec9d..36e38a3e3 100644 --- a/workflow/engine/classes/model/AddonsStore.php +++ b/workflow/engine/classes/model/AddonsStore.php @@ -100,13 +100,12 @@ class AddonsStore extends BaseAddonsStore } $sw = 1; - $addonInLicense = in_array($addon->getAddonId(), $licenseManager->features); - - if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) { - $sw = 0; - } - if ($type == 'plugin') { + $addonInLicense = in_array($addon->getAddonId(), $licenseManager->features); + + if ($sw == 1 && $addon->getAddonId() != "enterprise" && !$addonInLicense) { + $sw = 0; + } if ($sw == 1 && $addon->isInstalled()) { if ($addon->isEnabled()) { $status = "installed"; @@ -126,7 +125,8 @@ class AddonsStore extends BaseAddonsStore } else { $status = "available"; $enabled = false; - if (!$addonInLicense && in_array($addon->getAddonName(), $licenseManager->licensedfeatures) == 1) { + $addonInLicense = in_array($addon->getAddonId(), $licenseManager->licensedfeatures); + if (in_array($addon->getAddonName(), $licenseManager->licensedfeatures) == 1) { $status = "installed"; $enabled = true; } diff --git a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css index fa21b0a80..23fbce207 100644 --- a/workflow/engine/skinEngine/neoclassic/css/loginStyle.css +++ b/workflow/engine/skinEngine/neoclassic/css/loginStyle.css @@ -41,6 +41,7 @@ img.img-responsive { margin-bottom: 20px; margin-left: 50px; margin-right: 50px; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; } .login .panel-default > .panel-heading { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php index 4a1993331..5899b59b0 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php @@ -227,7 +227,7 @@ class MessageEventDefinition $flagCheckData = (isset($arrayData["MSGT_UID"]) && $arrayData["MSGT_UID"] . "" != "")? true : $flagCheckData; $flagCheckData = (isset($arrayData["MSGED_VARIABLES"]))? true : $flagCheckData; - if ($flagCheckData && $arrayFinalData["MSGT_UID"] . "" != "") { + if (isset($arrayFinalData["MSGT_UID"]) && $arrayFinalData["MSGT_UID"] . "" != "" && $flagCheckData) { $arrayMessageTypeVariable = array(); $arrayMessageTypeData = $messageType->getMessageType($arrayFinalData["MSGT_UID"], true); @@ -632,3 +632,4 @@ class MessageEventDefinition } } } +