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

Merge remote branch 'upstream/master' into BUG-14990

Browse Source
This commit is contained in:
jennylee
2014-09-17 12:00:41 -04:00
parent cd7cd2c70f 9a493a7599
commit 5bd0e94104
11 changed files with 807 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/methods/dynaforms/fields_Edit.php
View File

@@ -175,7 +175,11 @@ if (! (isset( $fields->Fields['XMLNODE_NAME'] ) && ($fields->Fields['XMLNODE_NAM
}
if ($tableExists) {
$con = Propel::getConnection( $Fields['PME_SQLCONNECTION'] );
$rs = $con->executeQuery( "SHOW COLUMNS FROM USERS" );
if ($Fields['PME_SQLCONNECTION'] == 'rbac') {
$rs = $con->executeQuery( "SHOW COLUMNS FROM RBAC_USERS" );
} else {
$rs = $con->executeQuery( "SHOW COLUMNS FROM USERS" );
}
$result = Array ();
$i = 0;
while ($rs->next()) {

4
workflow/engine/methods/login/authentication.php
View File

@@ -102,12 +102,12 @@ try {
if (PPP_FAILED_LOGINS > 0) {
if ($_SESSION['FAILED_LOGINS'] >= PPP_FAILED_LOGINS) {
$oConnection = Propel::getConnection('rbac');
$oStatement = $oConnection->prepareStatement("SELECT USR_UID FROM USERS WHERE USR_USERNAME = '" . $usr . "'");
$oStatement = $oConnection->prepareStatement("SELECT USR_UID FROM RBAC_USERS WHERE USR_USERNAME = '" . $usr . "'");
$oDataset = $oStatement->executeQuery();
if ($oDataset->next()) {
$sUserUID = $oDataset->getString('USR_UID');
$oConnection = Propel::getConnection('rbac');
$oStatement = $oConnection->prepareStatement("UPDATE USERS SET USR_STATUS = 0 WHERE USR_UID = '" . $sUserUID . "'");
$oStatement = $oConnection->prepareStatement("UPDATE RBAC_USERS SET USR_STATUS = 0 WHERE USR_UID = '" . $sUserUID . "'");
$oStatement->executeQuery();
$oConnection = Propel::getConnection('workflow');
$oStatement = $oConnection->prepareStatement("UPDATE USERS SET USR_STATUS = 'INACTIVE' WHERE USR_UID = '" . $sUserUID . "'");