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

BUG 9775 Las Ñ no son discriminadas para los usernames SLOVED

Browse Source 
- Adjustment in the standarized.
This commit is contained in:
Hector Cortez
2012-10-08 14:54:58 -04:00
parent ceaa97f2cc
commit 2a1b60c52b
1 changed files with 241 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
rbac/engine/classes/model/RbacUsers.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* RbacUsers.php
* @package rbac-classes-model
@@ -23,12 +24,11 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/**
/**
* @access public
*/
require_once 'classes/model/om/BaseRbacUsers.php';
/**
* Skeleton subclass for representing a row from the 'USERS' table.
*
@@ -40,7 +40,9 @@ require_once 'classes/model/om/BaseRbacUsers.php';
*
* @package rbac-classes-model
*/
class RbacUsers extends BaseRbacUsers {
class RbacUsers extends BaseRbacUsers
{
/**
* Autentificacion de un usuario a traves de la clase RBAC_user
*
@@ -59,29 +61,32 @@ class RbacUsers extends BaseRbacUsers {
* -4: usuario vencido
* n : uid de usuario
*/
function verifyLogin($sUsername, $sPassword )
public function verifyLogin($sUsername, $sPassword)
{
//invalid user
if ( $sUsername == '' ) return -1;
if ($sUsername == '') {
return -1;
}
//invalid password
if ( $sPassword == '' ) return -2;
if ($sPassword == '') {
return -2;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria( 'rbac' );
$c->add ( RbacUsersPeer::USR_USERNAME, $sUsername );
$rs = RbacUsersPeer::doSelect( $c );
if ( is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers' ) {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
//verify password with md5, and md5 format
//if ( $aFields['USR_PASSWORD'] == md5 ($sPassword ) ) {
if (mb_strtoupper($sUsername, 'utf-8') === mb_strtoupper($aFields['USR_USERNAME'], 'utf-8')) {
if ( $aFields['USR_PASSWORD'] == md5 ($sPassword ) || 'md5:'.$aFields['USR_PASSWORD'] === $sPassword) {
if ($aFields['USR_DUE_DATE'] < date('Y-m-d') ) {
if ($aFields['USR_PASSWORD'] == md5($sPassword) ||
'md5:' . $aFields['USR_PASSWORD'] === $sPassword) {
if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
return -4;
}
if ($aFields['USR_STATUS'] != 1 ) {
if ($aFields['USR_STATUS'] != 1) {
return -3;
}
return $aFields['USR_UID'];
@@ -94,103 +99,100 @@ class RbacUsers extends BaseRbacUsers {
} else {
return -1;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
return -1;
}
function verifyUser($sUsername)
public function verifyUser($sUsername)
{
//invalid user
if ( $sUsername == '' ) return 0;
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria( 'rbac' );
$c->add ( RbacUsersPeer::USR_USERNAME, $sUsername );
$rs = RbacUsersPeer::doSelect( $c );
if (is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers')
{
//return the row for futher check of which Autentificacion method belongs this user
$this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);;
return 1;
}
else
{
if ($sUsername == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
//return the row for futher check of which Autentificacion method belongs this user
$this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
;
return 1;
} else {
return 0;
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function getByUsername($sUsername)
public function getByUsername($sUsername)
{
//invalid user
if ( $sUsername == '' ) return 0;
if ($sUsername == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria( 'rbac' );
$c->add ( RbacUsersPeer::USR_USERNAME, $sUsername );
$rs = RbacUsersPeer::doSelect( $c );
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_USERNAME, $sUsername);
$rs = RbacUsersPeer::doSelect($c);
if ( is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers' ) {
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
return $aFields;
} else {
return false;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function verifyUserId($sUserId)
public function verifyUserId($sUserId)
{
//invalid user
if ( $sUserId == '' ) return 0;
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria( 'rbac' );
$c->add ( RbacUsersPeer::USR_UID, $sUserId );
$rs = RbacUsersPeer::doSelect( $c );
if (is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers')
{
return 1;
}
else
{
if ($sUserId == '') {
return 0;
}
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_UID, $sUserId);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
return 1;
} else {
return 0;
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function load($sUsrUid)
public function load($sUsrUid)
{
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$c = new Criteria( 'rbac' );
$c->add ( RbacUsersPeer::USR_UID, $sUsrUid );
$rs = RbacUsersPeer::doSelect( $c );
if ( is_array($rs) && isset( $rs[0] ) && is_object($rs[0]) && get_class ( $rs[0] ) == 'RbacUsers' ) {
$c = new Criteria('rbac');
$c->add(RbacUsersPeer::USR_UID, $sUsrUid);
$rs = RbacUsersPeer::doSelect($c);
if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
$aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
return $aFields;
}
return false;
}
catch ( Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
return $res;
}
function create($aData) {
public function create($aData)
{
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$oRBACUsers = new RbacUsers();
@@ -203,7 +205,7 @@ class RbacUsers extends BaseRbacUsers {
$iResult = $oRBACUsers->save();
//$oConnection->commit();
return $aData['USR_UID'];
/*}
/* }
else {
$sMessage = '';
$aValidationFailures = $oRBACUsers->getValidationFailures();
@@ -211,45 +213,46 @@ class RbacUsers extends BaseRbacUsers {
$sMessage .= $oValidationFailure->getMessage() . '<br />';
}
throw(new Exception('The registry cannot be created!<br />' . $sMessage));
}*/
}
catch (Exception $oError) {
} */
} catch (Exception $oError) {
$oConnection->rollback();
throw($oError);
}
}
function update($aData) {
public function update($aData)
{
$oConnection = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
try {
$this->fromArray($aData, BasePeer::TYPE_FIELDNAME);
$this->setNew(false);
$iResult = $this->save();
}
catch (Exception $oError) {
} catch (Exception $oError) {
$oConnection->rollback();
throw($oError);
}
}
function remove($sUserUID = '') {
public function remove($sUserUID = '')
{
$this->setUsrUid($sUserUID);
$this->delete();
}
//Added by Qennix at Feb 14th, 2011
//Gets an associative array with total users by authentication sources
function getAllUsersByAuthSource(){
public function getAllUsersByAuthSource()
{
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
$oCriteria->add(RbacUsersPeer::USR_STATUS,'CLOSED',Criteria::NOT_EQUAL);
$oCriteria->add(RbacUsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
$oCriteria->addGroupByColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$oDataset = RbacUsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aAuth = Array();
while ($oDataset->next()){
while ($oDataset->next()) {
$row = $oDataset->getRow();
$aAuth[$row['UID_AUTH_SOURCE']] = $row['CNT'];
}
@@ -257,27 +260,29 @@ class RbacUsers extends BaseRbacUsers {
}
//Returns all users with auth_source
function getListUsersByAuthSource($auth_source){
public function getListUsersByAuthSource($auth_source)
{
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RbacUsersPeer::USR_UID);
if ($auth_source=='00000000000000000000000000000000'){
if ($auth_source == '00000000000000000000000000000000') {
$oCriteria->add(
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE,$auth_source, Criteria::EQUAL)->addOr(
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE,'', Criteria::EQUAL)
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, $auth_source, Criteria::EQUAL)->addOr(
$oCriteria->getNewCriterion(RbacUsersPeer::UID_AUTH_SOURCE, '', Criteria::EQUAL)
));
}else{
} else {
$oCriteria->add(RbacUsersPeer::UID_AUTH_SOURCE, $auth_source, Criteria::EQUAL);
}
$oCriteria->add(RbacUsersPeer::USR_STATUS,0,Criteria::NOT_EQUAL);
$oCriteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
$oDataset = RbacUsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aUsers = array();
while($oDataset->next()){
while ($oDataset->next()) {
$row = $oDataset->getRow();
$aUsers[] = $row['USR_UID'];
}
return $aUsers;
}
}
} // Users
// Users