BUG 9775 Las Ñ no son discriminadas para los usernames SLOVED

- Adjustment in the standarized.

rbac/engine/classes/model/RbacUsers.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RbacUsers.php
  * @package  rbac-classes-model
@@ -28,7 +29,6 @@
  */
 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,14 +61,16 @@ 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');
@@ -77,7 +81,8 @@ class RbacUsers extends BaseRbacUsers {
                 //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_PASSWORD'] == md5($sPassword) ||
+                        'md5:' . $aFields['USR_PASSWORD'] === $sPassword) {
                         if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
                             return -4;
                         }
@@ -94,42 +99,42 @@ 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;
+        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')
+            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);;
+                $this->fields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
+                ;
                 return 1;
-      }
+            } else {
-      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');
@@ -142,36 +147,33 @@ class RbacUsers extends BaseRbacUsers {
             } else {
                 return false;
             }
-    }
+        } catch (Exception $oError) {
-    catch (Exception $oError) {
             throw($oError);
         }
     }
 
-  function verifyUserId($sUserId)
+    public function verifyUserId($sUserId)
     {
         //invalid user
-    if ( $sUserId == '' ) return 0;
+        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')
+            if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
-      {
                 return 1;
-      }
+            } else {
-      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 {
@@ -183,14 +185,14 @@ class RbacUsers extends BaseRbacUsers {
                 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();
@@ -212,34 +214,35 @@ class RbacUsers extends BaseRbacUsers {
               }
               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');
@@ -257,7 +260,8 @@ 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);
 
@@ -279,5 +283,6 @@ class RbacUsers extends BaseRbacUsers {
         }
         return $aUsers;
     }
+}
 
-} // Users
+// Users