Changeset 179
- Timestamp:
- 05/24/06 23:55:03 (3 years ago)
- Files:
-
- trunk/lib/jelix-modules/users/controllers/default.rdf.php (modified) (1 diff)
- trunk/lib/jelix/auth/jAuthDriverDb.class.php (modified) (6 diffs)
- trunk/lib/jelix/dao/jDaoConditions.class.php (modified) (4 diffs)
- trunk/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
- trunk/lib/jelix/forms/jFormsDatasource.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix-modules/users/controllers/default.rdf.php
r178 r179 19 19 $letter = $this->param('letter'); 20 20 21 $dao = jD AO::get('auth~jelixuser');21 $dao = jDao::get('auth~jelixuser'); 22 22 if($letter =='') 23 23 $rep->datas = array(); //$dao->findAll(); trunk/lib/jelix/auth/jAuthDriverDb.class.php
r171 r179 29 29 30 30 public function saveNewUser($user){ 31 $dao = jD AO::get($this->_params['dao']);31 $dao = jDao::get($this->_params['dao']); 32 32 $dao->insert($user); 33 33 return true; … … 35 35 36 36 public function removeUser($login){ 37 $dao = jD AO::get($this->_params['dao']);37 $dao = jDao::get($this->_params['dao']); 38 38 $dao->deleteByLogin($login); 39 39 return true; … … 41 41 42 42 public function updateUser($user){ 43 $dao = jD AO::get($this->_params['dao']);43 $dao = jDao::get($this->_params['dao']); 44 44 $dao->update($user); 45 45 return true; … … 47 47 48 48 public function getUser($login){ 49 $dao = jD AO::get($this->_params['dao']);49 $dao = jDao::get($this->_params['dao']); 50 50 return $dao->getByLogin($login); 51 51 } 52 52 53 53 public function createUser($login,$password){ 54 $user = jD AO::createRecord($this->_params['dao']);54 $user = jDao::createRecord($this->_params['dao']); 55 55 $user->login = $login; 56 56 $user->password = $password; … … 59 59 60 60 public function getUserList($pattern){ 61 $dao = jD AO::get($this->_params['dao']);61 $dao = jDao::get($this->_params['dao']); 62 62 if($pattern == '%' || $pattern == ''){ 63 63 return $dao->findAllOrdered(); … … 68 68 69 69 public function changePassword($login, $newpassword){ 70 $dao = jD AO::get($this->_params['dao']);70 $dao = jDao::get($this->_params['dao']); 71 71 return $dao->updatePassword($login, $newpassword); 72 72 } 73 73 74 74 public function verifyPassword($login, $password){ 75 $daouser = jD AO::get($this->_params['dao']);75 $daouser = jDao::get($this->_params['dao']); 76 76 $user = $daouser->getByLoginPassword($login, $password); 77 77 return ($user?$user:false); trunk/lib/jelix/dao/jDaoConditions.class.php
r174 r179 20 20 * structure stockant les donn� d'une condition 21 21 */ 22 class jD AOCondition {22 class jDaoCondition { 23 23 /** 24 24 * the parent group if any … … 50 50 * conteneur d'un ensemble de conditions 51 51 */ 52 class jD AOConditions {52 class jDaoConditions { 53 53 /** 54 * var jD AOCondition54 * var jDaoCondition 55 55 */ 56 56 public $condition; … … 72 72 73 73 function __construct ($glueOp = 'AND'){ 74 $this->condition = new jD AOCondition ($glueOp);74 $this->condition = new jDaoCondition ($glueOp); 75 75 $this->_currentCondition = $this->condition; 76 76 } … … 93 93 */ 94 94 function startGroup ($glueOp = 'AND'){ 95 $cond= new jD AOCondition ($glueOp, $this->_currentCondition);95 $cond= new jDaoCondition ($glueOp, $this->_currentCondition); 96 96 $this->_currentCondition->group[] = $cond; 97 97 $this->_currentCondition = $cond; trunk/lib/jelix/forms/jFormsBase.class.php
r134 r179 61 61 62 62 public function initFromDao($daoSelector){ 63 $dao = jD AO::create($daoSelector);63 $dao = jDao::create($daoSelector); 64 64 $daorec = $dao->get($this->_container->userId); 65 65 foreach($this->_controls as $name=>$ctrl){ … … 69 69 70 70 public function saveToDao($daoSelector){ 71 $dao = jD AO::create($daoSelector);72 $daorec = jD AO::createRecord($daoSelector);71 $dao = jDao::create($daoSelector); 72 $daorec = jDao::createRecord($daoSelector); 73 73 foreach($this->_controls as $name=>$ctrl){ 74 74 $daorec->$name = $this->_container->datas[$name]; trunk/lib/jelix/forms/jFormsDatasource.class.php
r86 r179 39 39 40 40 public function getDatas(){ 41 $dao = jD AO::get($this->daoselector);41 $dao = jDao::get($this->daoselector); 42 42 $found = $dao->${$this->daomethod}(); 43 43 $result=array();
