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

HOR-2096

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-10-20 16:00:08 -04:00
parent 6384d57960
commit 761402ca42
6 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
workflow/engine/classes/model/LoginLog.php
View File

@@ -27,26 +27,19 @@ class LoginLog extends BaseLoginLog
*/ */
public function create($aData) public function create($aData)
{ {
$con = Propel::getConnection("workflow"); $con = Propel::getConnection( LoginLogPeer::DATABASE_NAME );
try { try {
$tableName = 'LOGIN_LOG'; $this->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
$columns = array('LOG_UID', 'LOG_STATUS', 'LOG_IP', 'LOG_SID', 'LOG_INIT_DATE', 'LOG_CLIENT_HOSTNAME', 'USR_UID'); if ($this->validate()) {
$con->begin();
$sql = "INSERT INTO " . $tableName $result = $this->save();
. " (" . implode(",", $columns) . ")" $con->commit();
. " VALUES (" } else {
. "'" . $aData['LOG_UID'] . "'" . ',' $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
. "'" . $aData['LOG_STATUS'] . "'" . ',' $e->aValidationFailures = $this->getValidationFailures();
. "'" . $aData['LOG_IP'] . "'" . ',' throw ($e);
. "'" . $aData['LOG_SID'] . "'" . ',' }
. "'" . $aData['LOG_INIT_DATE'] . "'" . ',' return $result;
. "'" . $aData['LOG_CLIENT_HOSTNAME'] . "'" . ','
. "'" . $aData['USR_UID'] . "'" .
")";
$stmt = $con->createStatement();
$stmt->executeQuery($sql);
return true;
} catch (Exception $e) { } catch (Exception $e) {
$con->rollback(); $con->rollback();
throw ($e); throw ($e);
@@ -75,7 +68,7 @@ class LoginLog extends BaseLoginLog
$con = Propel::getConnection( LoginLogPeer::DATABASE_NAME ); $con = Propel::getConnection( LoginLogPeer::DATABASE_NAME );
try { try {
$con->begin(); $con->begin();
$this->load( $fields['LOG_UID'] ); $this->load( $fields['LOG_ID'] );
$this->fromArray( $fields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $fields, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) { if ($this->validate()) {
$result = $this->save(); $result = $this->save();

14
workflow/engine/classes/model/LoginLogPeer.php
View File

@@ -24,20 +24,6 @@
*/ */
class LoginLogPeer extends BaseLoginLogPeer class LoginLogPeer extends BaseLoginLogPeer
{ {
public static function retrieveByPK($pk, $con = null)
{
if ($con === null) {
$con = Propel::getConnection(self::DATABASE_NAME);
}
$criteria = new Criteria(LoginLogPeer::DATABASE_NAME);
$criteria->add(LoginLogPeer::LOG_UID, $pk);
$v = LoginLogPeer::doSelect($criteria, $con);
return !empty($v) > 0 ? $v[0] : null;
}
} }

10
workflow/engine/config/schema.xml
View File

@@ -2197,6 +2197,16 @@
<column name="LOG_END_DATE" type="TIMESTAMP" required="false"/> <column name="LOG_END_DATE" type="TIMESTAMP" required="false"/>
<column name="LOG_CLIENT_HOSTNAME" type="VARCHAR" size="100" required="true" default=""/> <column name="LOG_CLIENT_HOSTNAME" type="VARCHAR" size="100" required="true" default=""/>
<column name="USR_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="USR_UID" type="VARCHAR" size="32" required="true" default=""/>
<index name="indexLoginLogSelect">
<index-column name="LOG_SID"/>
<index-column name="USR_UID"/>
<index-column name="LOG_STATUS"/>
<index-column name="LOG_END_DATE"/>
<vendor type="mysql">
<parameter name="Table" value="LOGIN_LOG"/>
<parameter name="Key_name" value="indexLoginLogSelect"/>
</vendor>
</index>
</table> </table>
<table name="USERS_PROPERTIES"> <table name="USERS_PROPERTIES">
<vendor type="mysql"> <vendor type="mysql">

1
workflow/engine/controllers/main.php
View File

@@ -144,6 +144,7 @@ class Main extends Controller
if ($aRow) { if ($aRow) {
if ($aRow['LOG_STATUS'] != 'CLOSED' && $aRow['LOG_END_DATE'] == null) { if ($aRow['LOG_STATUS'] != 'CLOSED' && $aRow['LOG_END_DATE'] == null) {
$weblog = new LoginLog(); $weblog = new LoginLog();
$aLog['LOG_ID'] = $aRow['LOG_ID'];
$aLog['LOG_UID'] = $aRow['LOG_UID']; $aLog['LOG_UID'] = $aRow['LOG_UID'];
$aLog['LOG_STATUS'] = 'CLOSED'; $aLog['LOG_STATUS'] = 'CLOSED';
$aLog['LOG_IP'] = $aRow['LOG_IP']; $aLog['LOG_IP'] = $aRow['LOG_IP'];

5
workflow/engine/data/mysql/schema.sql
View File

@@ -1014,7 +1014,7 @@ DROP TABLE IF EXISTS `LOGIN_LOG`;
CREATE TABLE `LOGIN_LOG` CREATE TABLE `LOGIN_LOG`
( (
`LOG_ID` INTEGER NOT NULL AUTO_INCREMENT, `LOG_ID` INTEGER NOT NULL AUTO_INCREMENT,
`LOG_UID` VARCHAR(32) default '' NOT NULL, `LOG_UID` VARCHAR(32) default '' NOT NULL,
`LOG_STATUS` VARCHAR(100) default '' NOT NULL, `LOG_STATUS` VARCHAR(100) default '' NOT NULL,
`LOG_IP` VARCHAR(15) default '' NOT NULL, `LOG_IP` VARCHAR(15) default '' NOT NULL,
@@ -1023,7 +1023,8 @@ CREATE TABLE `LOGIN_LOG`
`LOG_END_DATE` DATETIME, `LOG_END_DATE` DATETIME,
`LOG_CLIENT_HOSTNAME` VARCHAR(100) default '' NOT NULL, `LOG_CLIENT_HOSTNAME` VARCHAR(100) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL, `USR_UID` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`LOG_ID`) PRIMARY KEY (`LOG_ID`),
KEY `indexLoginLogSelect`(`LOG_SID`, `USR_UID`, `LOG_STATUS`, `LOG_END_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- USERS_PROPERTIES #-- USERS_PROPERTIES

1
workflow/engine/methods/login/login.php
View File

@@ -88,6 +88,7 @@ if (isset ($_SESSION['USER_LOGGED'])) {
$weblog = new LoginLog(); $weblog = new LoginLog();
$endDate = date('Y-m-d H:i:s'); $endDate = date('Y-m-d H:i:s');
$aLog = array(); $aLog = array();
$aLog['LOG_ID'] = $aRow['LOG_ID'];
$aLog['LOG_UID'] = $aRow['LOG_UID']; $aLog['LOG_UID'] = $aRow['LOG_UID'];
$aLog['LOG_STATUS'] = 'CLOSED'; $aLog['LOG_STATUS'] = 'CLOSED';
$aLog['LOG_IP'] = $aRow['LOG_IP']; $aLog['LOG_IP'] = $aRow['LOG_IP'];