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

IMPROVEMENT related to change from rbac.USERS to rbac.RBAC_USERS

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-09-17 10:57:33 -04:00
parent d38808c062
commit a9cb851a02
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/bin/tasks/templates/usersList.php.tpl
View File

@@ -7,7 +7,7 @@ $G_ID_SUB_MENU_SELECTED = 'USERS';
$con = Propel::getConnection('rbac'); $con = Propel::getConnection('rbac');
$sql = "SELECT USR_UID, USR_USERNAME, USR_FIRSTNAME, USR_LASTNAME, USR_EMAIL, USR_STATUS FROM USERS"; $sql = "SELECT USR_UID, USR_USERNAME, USR_FIRSTNAME, USR_LASTNAME, USR_EMAIL, USR_STATUS FROM RBAC_USERS";
$stmt = $con->createStatement(); $stmt = $con->createStatement();
$rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC); $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
$rs->next(); $rs->next();
@@ -24,7 +24,7 @@ $G_ID_SUB_MENU_SELECTED = 'USERS';
G::LoadClass( 'ArrayPeer'); G::LoadClass( 'ArrayPeer');
$c = new Criteria ('dbarray'); $c = new Criteria ('dbarray');
$c->setDBArrayTable('user'); $c->setDBArrayTable('user');
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'users/usersList', $c ); $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'users/usersList', $c );
G::RenderPage('publish'); G::RenderPage('publish');

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) { if ($tableExists) {
$con = Propel::getConnection( $Fields['PME_SQLCONNECTION'] ); $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 (); $result = Array ();
$i = 0; $i = 0;
while ($rs->next()) { while ($rs->next()) {

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

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