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

PM-2762

Browse Source
This commit is contained in:
dheeyi
2015-05-22 11:35:51 -04:00
parent 815d622258
commit 9e0e005c37
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.g.php
View File

@@ -5354,11 +5354,13 @@ class G
$ipClient = G::getIpAddress(); $ipClient = G::getIpAddress();
$licensedFeatures = PMLicensedFeatures::getSingleton(); $licensedFeatures = PMLicensedFeatures::getSingleton();
/*----------------------------------********---------------------------------*/
if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
$username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User';
$fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-';
G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log");
} }
/*----------------------------------********---------------------------------*/
} }
/** /**

4
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -11,6 +11,7 @@ class ActionsByEmail
public function saveConfiguration($params) public function saveConfiguration($params)
{ {
/*----------------------------------********---------------------------------*/
if (\PMLicensedFeatures if (\PMLicensedFeatures
::getSingleton() ::getSingleton()
->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
@@ -31,10 +32,12 @@ class ActionsByEmail
break; break;
} }
} }
/*----------------------------------********---------------------------------*/
} }
public function loadConfiguration($params) public function loadConfiguration($params)
{ {
/*----------------------------------********---------------------------------*/
if ($params['type'] != 'activity' if ($params['type'] != 'activity'
|| !\PMLicensedFeatures || !\PMLicensedFeatures
::getSingleton() ::getSingleton()
@@ -42,6 +45,7 @@ class ActionsByEmail
{ {
return false; return false;
} }
/*----------------------------------********---------------------------------*/
require_once 'classes/model/AbeConfiguration.php'; require_once 'classes/model/AbeConfiguration.php';
$criteria = new \Criteria(); $criteria = new \Criteria();

4
workflow/engine/src/ProcessMaker/Services/Api/System.php
View File

@@ -52,7 +52,7 @@ class System extends Api
} }
} }
/** /**t
* @return array * @return array
* *
* @author Gustavo Cruz <gustavo.cruz@colosa.com> * @author Gustavo Cruz <gustavo.cruz@colosa.com>
@@ -64,6 +64,7 @@ class System extends Api
{ {
try { try {
$enabledFeatures = array(); $enabledFeatures = array();
/*----------------------------------********---------------------------------*/
$keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0='); $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=');
foreach ($keys as $key) { foreach ($keys as $key) {
if (\PMLicensedFeatures if (\PMLicensedFeatures
@@ -72,6 +73,7 @@ class System extends Api
$enabledFeatures[] = $key; $enabledFeatures[] = $key;
} }
} }
/*----------------------------------********---------------------------------*/
return $enabledFeatures; return $enabledFeatures;
} catch (\Exception $e) { } catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));