From 9e0e005c37a56a82e926b0fe93dca2b9020318b0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 22 May 2015 11:35:51 -0400 Subject: [PATCH 1/4] PM-2762 --- gulliver/system/class.g.php | 2 ++ .../engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php | 4 ++++ workflow/engine/src/ProcessMaker/Services/Api/System.php | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 69feae7d6..e8928a7ed 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5354,11 +5354,13 @@ class G $ipClient = G::getIpAddress(); $licensedFeatures = PMLicensedFeatures::getSingleton(); + /*----------------------------------********---------------------------------*/ if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); } + /*----------------------------------********---------------------------------*/ } /** diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php index 6fde65015..611d81910 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php @@ -11,6 +11,7 @@ class ActionsByEmail public function saveConfiguration($params) { + /*----------------------------------********---------------------------------*/ if (\PMLicensedFeatures ::getSingleton() ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { @@ -31,10 +32,12 @@ class ActionsByEmail break; } } + /*----------------------------------********---------------------------------*/ } public function loadConfiguration($params) { + /*----------------------------------********---------------------------------*/ if ($params['type'] != 'activity' || !\PMLicensedFeatures ::getSingleton() @@ -42,6 +45,7 @@ class ActionsByEmail { return false; } + /*----------------------------------********---------------------------------*/ require_once 'classes/model/AbeConfiguration.php'; $criteria = new \Criteria(); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/System.php b/workflow/engine/src/ProcessMaker/Services/Api/System.php index 2c43cd0f7..f7106fed6 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/System.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/System.php @@ -52,7 +52,7 @@ class System extends Api } } - /** + /**t * @return array * * @author Gustavo Cruz @@ -64,6 +64,7 @@ class System extends Api { try { $enabledFeatures = array(); + /*----------------------------------********---------------------------------*/ $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0='); foreach ($keys as $key) { if (\PMLicensedFeatures @@ -72,6 +73,7 @@ class System extends Api $enabledFeatures[] = $key; } } + /*----------------------------------********---------------------------------*/ return $enabledFeatures; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); From f63be7127563153aa0f52b5b6d8823b7fd701088 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 22 May 2015 11:40:01 -0400 Subject: [PATCH 2/4] PM-2762 --- workflow/engine/src/ProcessMaker/Services/Api/System.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/System.php b/workflow/engine/src/ProcessMaker/Services/Api/System.php index f7106fed6..9e49e74ae 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/System.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/System.php @@ -52,7 +52,7 @@ class System extends Api } } - /**t + /** * @return array * * @author Gustavo Cruz From 1d71964fd6b911a3072147ada674e3552261d343 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 22 May 2015 12:11:41 -0400 Subject: [PATCH 3/4] PM-2762 --- gulliver/system/class.g.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index e8928a7ed..a9dbb3161 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5353,8 +5353,8 @@ class G $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace ); $ipClient = G::getIpAddress(); - $licensedFeatures = PMLicensedFeatures::getSingleton(); /*----------------------------------********---------------------------------*/ + $licensedFeatures = PMLicensedFeatures::getSingleton(); if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; From b6a1bf7769697129dc1a3054dabb2fa2a03b1af6 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Fri, 22 May 2015 12:19:43 -0400 Subject: [PATCH 4/4] PM-2762 --- .../engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php index 611d81910..6fde65015 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php @@ -11,7 +11,6 @@ class ActionsByEmail public function saveConfiguration($params) { - /*----------------------------------********---------------------------------*/ if (\PMLicensedFeatures ::getSingleton() ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { @@ -32,12 +31,10 @@ class ActionsByEmail break; } } - /*----------------------------------********---------------------------------*/ } public function loadConfiguration($params) { - /*----------------------------------********---------------------------------*/ if ($params['type'] != 'activity' || !\PMLicensedFeatures ::getSingleton() @@ -45,7 +42,6 @@ class ActionsByEmail { return false; } - /*----------------------------------********---------------------------------*/ require_once 'classes/model/AbeConfiguration.php'; $criteria = new \Criteria();