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

BUG-12021 Audit Log

Browse Source 
Ip client column added
This commit is contained in:
norahmollo
2014-10-08 09:50:54 -04:00
parent ea34a212ef
commit 0fae3652d3
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5277,12 +5277,13 @@ class G
{ {
$oServerConf = & serverConf::getSingleton(); $oServerConf = & serverConf::getSingleton();
$sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS );
$ipClient = G::getIpAddress();
if ($sflagAudit) { if ($sflagAudit) {
$workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; $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 ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log");
} }
} }

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

@@ -1056,6 +1056,7 @@ class adminProxy extends HttpProxyController
try { try {
list($imageWidth, $imageHeight, $imageType) = @getimagesize($dir . '/' . 'tmp' . $fileName); list($imageWidth, $imageHeight, $imageType) = @getimagesize($dir . '/' . 'tmp' . $fileName);
G::resizeImage($dir . '/tmp' . $fileName, $imageWidth, 49, $dir . '/' . $fileName); G::resizeImage($dir . '/tmp' . $fileName, $imageWidth, 49, $dir . '/' . $fileName);
G::auditLog("UploadLogo", $fileName);
} catch (Exception $e) { } catch (Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();
} }
@@ -1073,7 +1074,6 @@ class adminProxy extends HttpProxyController
} elseif ($_FILES['img']['type'] != '') { } elseif ($_FILES['img']['type'] != '') {
$failed = "1"; $failed = "1";
} }
G::auditLog("UploadLogo", $fileName);
echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $_FILES['img']['type'] . '"}'; echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $_FILES['img']['type'] . '"}';
exit(); exit();
} }

11
workflow/engine/methods/setup/auditLogAjax.php
View File

@@ -19,9 +19,10 @@ function auditLogArraySet ($str, $filter)
if (count( $arrayAux ) > 1) { if (count( $arrayAux ) > 1) {
$date = (isset( $arrayAux[0] )) ? trim( $arrayAux[0] ) : ""; $date = (isset( $arrayAux[0] )) ? trim( $arrayAux[0] ) : "";
$workspace = (isset( $arrayAux[1] )) ? trim( $arrayAux[1] ) : ""; $workspace = (isset( $arrayAux[1] )) ? trim( $arrayAux[1] ) : "";
$user = (isset( $arrayAux[3] )) ? trim( $arrayAux[3] ) : ""; $ip = (isset( $arrayAux[2] )) ? trim( $arrayAux[2] ) : "";
$action = (isset( $arrayAux[4] )) ? trim( $arrayAux[4] ) : ""; $user = (isset( $arrayAux[4] )) ? trim( $arrayAux[4] ) : "";
$description = (isset( $arrayAux[5] )) ? trim( $arrayAux[5] ) : ""; $action = (isset( $arrayAux[5] )) ? trim( $arrayAux[5] ) : "";
$description = (isset( $arrayAux[6] )) ? trim( $arrayAux[6] ) : "";
} }
$mktDate = (! empty( $date )) ? mktimeDate( $date ) : 0; $mktDate = (! empty( $date )) ? mktimeDate( $date ) : 0;
@@ -48,7 +49,7 @@ function auditLogArraySet ($str, $filter)
$sw = 0; $sw = 0;
$string = $filter["description"]; $string = $filter["description"];
if ( (stristr($date, $string) !== false) || (stristr($user, $string) !== false) || (stristr($action, $string) !== false) || (stristr($description, $string) !== false) ) { if ( (stristr($date, $string) !== false) || (stristr($ip, $string) !== false) || (stristr($user, $string) !== false) || (stristr($action, $string) !== false) || (stristr($description, $string) !== false) ) {
$sw = 1; $sw = 1;
} }
} }
@@ -56,7 +57,7 @@ function auditLogArraySet ($str, $filter)
$arrayData = array (); $arrayData = array ();
if ($sw == 1) { if ($sw == 1) {
$arrayData = array ("DATE" => $date, "USER" => $user, "ACTION" => $action, "DESCRIPTION" => $description); $arrayData = array ("DATE" => $date, "USER" => $user, "IP" =>$ip, "ACTION" => $action, "DESCRIPTION" => $description);
} }
return $arrayData; return $arrayData;

5
workflow/engine/templates/setup/auditLog.js
View File

@@ -43,6 +43,7 @@ audit.application = {
if (typeof record != "undefined") { if (typeof record != "undefined") {
var strData = "<b>" + _("ID_DATE_LABEL") + "</b><br />" + record.get("DATE") + "<br />"; var strData = "<b>" + _("ID_DATE_LABEL") + "</b><br />" + record.get("DATE") + "<br />";
strData = strData + "<b>" + _("ID_USER") + "</b><br />" + record.get("WORKSPACE") + "<br />"; strData = strData + "<b>" + _("ID_USER") + "</b><br />" + record.get("WORKSPACE") + "<br />";
strData = strData + "<b>" + _("ID_IP") + "</b><br />" + record.get("IP") + "<br />";
strData = strData + "<b>" + _("ID_ACTION") + "</b><br />" + record.get("ACTION") + "<br />"; strData = strData + "<b>" + _("ID_ACTION") + "</b><br />" + record.get("ACTION") + "<br />";
strData = strData + "<b>" + _("ID_DESCRIPTION") + "</b><br />" + record.get("DESCRIPTION") + "<br />"; strData = strData + "<b>" + _("ID_DESCRIPTION") + "</b><br />" + record.get("DESCRIPTION") + "<br />";
@@ -65,6 +66,7 @@ audit.application = {
fields: [ fields: [
{name: "DATE"}, {name: "DATE"},
{name: "USER"}, {name: "USER"},
{name: "IP"},
{name: "ACTION"}, {name: "ACTION"},
{name: "DESCRIPTION"} {name: "DESCRIPTION"}
] ]
@@ -161,8 +163,9 @@ audit.application = {
}, },
columns: [ columns: [
{id: "ID", dataIndex: "DATE", hidden: true, hideable: false}, {id: "ID", dataIndex: "DATE", hidden: true, hideable: false},
{header: _("ID_DATE_LABEL"), dataIndex: "DATE", width: 10}, {header: _("ID_DATE_LABEL"), dataIndex: "DATE", width: 15},
{header: _("ID_USER"), dataIndex: "USER", width: 15}, {header: _("ID_USER"), dataIndex: "USER", width: 15},
{header: _("ID_IP"), dataIndex: "IP", width: 10},
{header: _("ID_ACTION"), dataIndex: "ACTION", width: 15}, {header: _("ID_ACTION"), dataIndex: "ACTION", width: 15},
{header: _("ID_DESCRIPTION"), dataIndex: "DESCRIPTION"} {header: _("ID_DESCRIPTION"), dataIndex: "DESCRIPTION"}
] ]