[geeklog-cvs] Auth_Enterprise/Enterprise/Server DB.php,1.3,1.4

[jellybob at iowaoutdoors.org]

Update of /var/cvs/Auth_Enterprise/Enterprise/Server
In directory www:/tmp/cvs-serv2150/Enterprise/Server

Modified Files:
	DB.php 
Log Message:
Fixed changePasswordByAdmin


Index: DB.php
===================================================================
RCS file: /var/cvs/Auth_Enterprise/Enterprise/Server/DB.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DB.php	8 Jul 2004 14:53:45 -0000	1.3
--- DB.php	8 Jul 2004 15:48:15 -0000	1.4
***************
*** 162,165 ****
--- 162,166 ----
              
              $this->isAuthenticated = true;
+             $this->_user = $user;
              
              return $user;
***************
*** 328,332 ****
      {
          // Make sure admin is authenticated
!         if (!$this->isAuthenticated) {
              try {
                  $userObj = $this->authenticate($adminUserName, $adminPassword);
--- 329,333 ----
      {
          // Make sure admin is authenticated
!         if (($userObj = $this->isAuthenticated()) === false) {
              try {
                  $userObj = $this->authenticate($adminUserName, $adminPassword);
***************
*** 347,351 ****
          
          // Make sure password adhere's to our password rules
!         if (!AEPasswordGenerator::isValidPassword($newPassword)) {
              throw new AEPasswordInvalid();
          }
--- 348,352 ----
          
          // Make sure password adhere's to our password rules
!         if (!Auth_Enterprise_PasswordGenerator::isValidPassword($newPassword)) {
              throw new AEPasswordInvalid();
          }
***************
*** 537,541 ****
                  if (!$this->privilegeExists($curPriv)) {
                      throw new AEInvalidPrivilege(sprintf('Privilege %s does not exist
!                         for application %s', $curPriv->getPrivilegeCode(), $this->appId));
                  }
              } catch (AESQLException $e) {
--- 538,542 ----
                  if (!$this->privilegeExists($curPriv)) {
                      throw new AEInvalidPrivilege(sprintf('Privilege %s does not exist
!                         for application %s', $curPriv->getPrivilegeCode(), $this->options['appId']));
                  }
              } catch (AESQLException $e) {
***************
*** 564,568 ****
          foreach ($privArray as $curPriv) {
              $result = $this->db->execute($prepStmt, array($curPriv->getPrivilegeCode(),
!                 $this->appId, $userName));
              if (DB::isError($result)) {
                  if ($this->db->provides('transactions')) {
--- 565,569 ----
          foreach ($privArray as $curPriv) {
              $result = $this->db->execute($prepStmt, array($curPriv->getPrivilegeCode(),
!                 $this->options['appId'], $userName));
              if (DB::isError($result)) {
                  if ($this->db->provides('transactions')) {
***************
*** 777,781 ****
              WHERE ap_app_id = ?
              AND ap_priv_cd = ?');
!         $result = $this->db->execute($prepStmt, array($this->appId, $privObj->getPrivilegeCode()));
          if (DB::isError($result)) {
              throw new AESQLException($result->toString());
--- 778,782 ----
              WHERE ap_app_id = ?
              AND ap_priv_cd = ?');
!         $result = $this->db->execute($prepStmt, array($this->options['appId'], $privObj->getPrivilegeCode()));
          if (DB::isError($result)) {
              throw new AESQLException($result->toString());
***************
*** 1034,1043 ****
      {
          $numRows = $sqlResult->numRows();
!         $tmpPriv = new Enterprise_Privilege();
          $privArray = array();
          
          for ($i = 1; $i <= $numRows; $i++) {
              $row = $sqlResult->fetchRow();
!             $tmpPriv = new Enterprise_Privilege();
              $tmpPriv->setPrivilegeCode($row[0]);
              $tmpPriv->setPrivilegeDesc($row[1]);
--- 1035,1044 ----
      {
          $numRows = $sqlResult->numRows();
!         $tmpPriv = new Auth_Enterprise_Privilege();
          $privArray = array();
          
          for ($i = 1; $i <= $numRows; $i++) {
              $row = $sqlResult->fetchRow();
!             $tmpPriv = new Auth_Enterprise_Privilege();
              $tmpPriv->setPrivilegeCode($row[0]);
              $tmpPriv->setPrivilegeDesc($row[1]);