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

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-816

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-11-04 09:03:52 -04:00
parent d8d8927856 e7295188f2
commit 75556a6159
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5294,13 +5294,13 @@ class G
*/ */
public static function auditLog($actionToLog, $valueToLog = "") public static function auditLog($actionToLog, $valueToLog = "")
{ {
$workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined';
$oServerConf = & serverConf::getSingleton(); $oServerConf = & serverConf::getSingleton();
$sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace );
$ipClient = G::getIpAddress(); $ipClient = G::getIpAddress();
$licensedFeatures = PMLicensedFeatures::getSingleton(); $licensedFeatures = PMLicensedFeatures::getSingleton();
if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
$workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined';
$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");

3
workflow/engine/bin/cron_single.php
View File

@@ -334,6 +334,9 @@ Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . "class.xmlDocume
Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/class.wsResponse.php"); Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/class.wsResponse.php");
Bootstrap::registerClass('PMLicensedFeatures', PATH_HOME . "engine/classes/class.LicensedFeatures.php");
Bootstrap::registerClass('AddonsManagerPeer', PATH_HOME . "engine/classes/model/AddonsManagerPeer.php");
G::LoadClass("dates"); G::LoadClass("dates");
if (!defined('SYS_SYS')) { if (!defined('SYS_SYS')) {

12
workflow/engine/classes/class.system.php
View File

@@ -170,7 +170,7 @@ class System
*/ */
public static function getSysInfo () public static function getSysInfo ()
{ {
$ipe = explode( " ", $_SERVER['SSH_CONNECTION'] ); $ipe = isset($_SERVER['SSH_CONNECTION']) ? explode( " ", $_SERVER['SSH_CONNECTION'] ) : array();
if (getenv( 'HTTP_CLIENT_IP' )) { if (getenv( 'HTTP_CLIENT_IP' )) {
$ip = getenv( 'HTTP_CLIENT_IP' ); $ip = getenv( 'HTTP_CLIENT_IP' );
@@ -215,8 +215,8 @@ class System
$Fields['SYSTEM'] = $distro; $Fields['SYSTEM'] = $distro;
$Fields['PHP'] = phpversion(); $Fields['PHP'] = phpversion();
$Fields['PM_VERSION'] = self::getVersion(); $Fields['PM_VERSION'] = self::getVersion();
$Fields['SERVER_ADDR'] = $ipe[2]; //lookup($ipe[2]); $Fields['SERVER_ADDR'] = isset($ipe[2]) ? $ipe[2] : ''; //lookup($ipe[2]);
$Fields['IP'] = $ipe[0]; //lookup($ipe[0]); $Fields['IP'] = isset($ipe[0]) ? $ipe[0] : ''; //lookup($ipe[0]);
$Fields['PLUGINS_LIST'] = System::getPlugins(); $Fields['PLUGINS_LIST'] = System::getPlugins();
@@ -823,14 +823,14 @@ class System
public static function verifyRbacSchema ($aOldSchema) public static function verifyRbacSchema ($aOldSchema)
{ {
$aChanges = array (); $aChanges = array ();
foreach ($aOldSchema as $sTableName => $aColumns) { foreach ($aOldSchema as $sTableName => $aColumns) {
if(substr($sTableName, 0,4) != 'RBAC') { if(substr($sTableName, 0,4) != 'RBAC') {
$aChanges[] = $sTableName; $aChanges[] = $sTableName;
} }
} }
return $aChanges; return $aChanges;
} }
/** /**

2
workflow/engine/classes/class.wsTools.php
View File

@@ -1675,7 +1675,7 @@ class workspaceTools
$endpoint = sprintf( $endpoint = sprintf(
'%s/sys%s/%s/%s/oauth2/grant', '%s/sys%s/%s/%s/oauth2/grant',
$SERVER_INFO['HTTP_ORIGIN'], isset($SERVER_INFO['HTTP_ORIGIN']) ? $SERVER_INFO['HTTP_ORIGIN'] : '',
$workspace, $workspace,
$lang, $lang,
$skin $skin

2
workflow/engine/controllers/newSiteProxy.php
View File

@@ -43,7 +43,7 @@ class newSiteProxy extends HttpProxyController
$dbRb = $result['result']['database']['ao']['ao_db_rb']['status']; $dbRb = $result['result']['database']['ao']['ao_db_rb']['status'];
$dbRp = $result['result']['database']['ao']['ao_db_rp']['status']; $dbRp = $result['result']['database']['ao']['ao_db_rp']['status'];
$wsAction = ($action != '') ? 1 : 0; $wsAction = ($action != '') ? 1 : 0;
if ($dbWf && $dbRb && $dbRp && $action) { if ($dbWf && $action) {
$this->success = true; $this->success = true;
//echo $json->encode($result); //echo $json->encode($result);
} else { } else {