diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 868b9a1da..0207b2876 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5294,13 +5294,13 @@ class G */ public static function auditLog($actionToLog, $valueToLog = "") { + $workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; $oServerConf = & serverConf::getSingleton(); - $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); + $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace ); $ipClient = G::getIpAddress(); $licensedFeatures = PMLicensedFeatures::getSingleton(); 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'; $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/bin/cron_single.php b/workflow/engine/bin/cron_single.php index a02100e11..d78f0cd47 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -334,6 +334,9 @@ Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . "class.xmlDocume 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"); if (!defined('SYS_SYS')) { diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index 90c65b696..4df172100 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -170,7 +170,7 @@ class System */ public static function getSysInfo () { - $ipe = explode( " ", $_SERVER['SSH_CONNECTION'] ); + $ipe = isset($_SERVER['SSH_CONNECTION']) ? explode( " ", $_SERVER['SSH_CONNECTION'] ) : array(); if (getenv( 'HTTP_CLIENT_IP' )) { $ip = getenv( 'HTTP_CLIENT_IP' ); @@ -215,8 +215,8 @@ class System $Fields['SYSTEM'] = $distro; $Fields['PHP'] = phpversion(); $Fields['PM_VERSION'] = self::getVersion(); - $Fields['SERVER_ADDR'] = $ipe[2]; //lookup($ipe[2]); - $Fields['IP'] = $ipe[0]; //lookup($ipe[0]); + $Fields['SERVER_ADDR'] = isset($ipe[2]) ? $ipe[2] : ''; //lookup($ipe[2]); + $Fields['IP'] = isset($ipe[0]) ? $ipe[0] : ''; //lookup($ipe[0]); $Fields['PLUGINS_LIST'] = System::getPlugins(); @@ -823,14 +823,14 @@ class System public static function verifyRbacSchema ($aOldSchema) { $aChanges = array (); - + foreach ($aOldSchema as $sTableName => $aColumns) { if(substr($sTableName, 0,4) != 'RBAC') { $aChanges[] = $sTableName; } } - - return $aChanges; + + return $aChanges; } /** diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index dd29d4103..391160c6a 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1675,7 +1675,7 @@ class workspaceTools $endpoint = sprintf( '%s/sys%s/%s/%s/oauth2/grant', - $SERVER_INFO['HTTP_ORIGIN'], + isset($SERVER_INFO['HTTP_ORIGIN']) ? $SERVER_INFO['HTTP_ORIGIN'] : '', $workspace, $lang, $skin diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php index ff263c879..7763e6fb6 100755 --- a/workflow/engine/controllers/newSiteProxy.php +++ b/workflow/engine/controllers/newSiteProxy.php @@ -43,7 +43,7 @@ class newSiteProxy extends HttpProxyController $dbRb = $result['result']['database']['ao']['ao_db_rb']['status']; $dbRp = $result['result']['database']['ao']['ao_db_rp']['status']; $wsAction = ($action != '') ? 1 : 0; - if ($dbWf && $dbRb && $dbRp && $action) { + if ($dbWf && $action) { $this->success = true; //echo $json->encode($result); } else {