Changeset 194
- Timestamp:
- 06/10/06 22:55:56 (3 years ago)
- Files:
-
- trunk/lib/jelix/acl/jAclManager.class.php (modified) (1 diff)
- trunk/lib/jelix/acl/jAclUserGroup.class.php (modified) (3 diffs)
- trunk/lib/jelix/auth/jAuth.class.php (modified) (1 diff)
- trunk/lib/jelix/auth/jAuthDriverDb.class.php (modified) (1 diff)
- trunk/lib/jelix/db/jDbWidget.class.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix/acl/jAclManager.class.php
r136 r194 76 76 $daoright->deleteBySubject($subject); 77 77 $daosbj = jDao::get('acl~jaclsubject'); 78 $daosbj->del ($subject);78 $daosbj->delete($subject); 79 79 } 80 80 trunk/lib/jelix/acl/jAclUserGroup.class.php
r136 r194 59 59 function removeUserFromGroup($login,$groupid){ 60 60 $daousergroup = jDao::get('acl~jaclusergroup'); 61 $daousergroup->del ($login,$groupid);61 $daousergroup->delete($login,$groupid); 62 62 } 63 63 … … 74 74 75 75 // supprime le groupe personnel du user (jacl_group) 76 $daogroup->del ($privategrp->id_aclgrp);76 $daogroup->delete($privategrp->id_aclgrp); 77 77 78 78 // l'enleve de tous les groupes (jacl_users_group) … … 112 112 $daousergroup->deleteByGroup($groupid); 113 113 // suppression du groupe 114 $daogroup->del ($groupid);114 $daogroup->delete($groupid); 115 115 } 116 116 trunk/lib/jelix/auth/jAuth.class.php
r180 r194 72 72 $dr = self::_getDriver(); 73 73 if($dr->saveNewUser($user)){ 74 jEvent::notify ('AuthNewUser', array(' login'=>$login));74 jEvent::notify ('AuthNewUser', array('user'=>$user)); 75 75 } 76 76 return $user; trunk/lib/jelix/auth/jAuthDriverDb.class.php
r179 r194 61 61 $dao = jDao::get($this->_params['dao']); 62 62 if($pattern == '%' || $pattern == ''){ 63 return $dao->findAll Ordered();63 return $dao->findAll(); 64 64 }else{ 65 65 return $dao->findByLogin($pattern); trunk/lib/jelix/db/jDbWidget.class.php
r151 r194 34 34 * @return object objet contenant les champs sous forme de propri�s, de la ligne s�ctionn� */ 35 35 public function fetchFirst($query){ 36 $rs = $this->_conn->query ($query);37 $result = $rs->fetch ();36 $rs = $this->_conn->query ($query); 37 $result = $rs->fetch (); 38 38 return $result; 39 39 } … … 41 41 /** 42 42 * Effectue une requ�, et met �our les propri�s de l'objet pass�n param�e 43 * @param string $queryrequ� SQL44 * @param object ou string object �emplir ounom de la classe de l'objet �emplir43 * @param string $query requ� SQL 44 * @param string $classname nom de la classe de l'objet �emplir 45 45 * @return object objet initialis�empli 46 46 */ 47 public function fetchFirstInto ($query, $object){ 48 $rs = $this->_conn->query ($query); 49 $result = $rs->fetchInto ($object); 47 public function fetchFirstInto ($query, $classname){ 48 $rs = $this->_conn->query ($query); 49 $rs->setFetchMode(8, $classname); 50 $result = $rs->fetch (); 50 51 return $result; 51 52 } … … 58 59 public function fetchAll($query, $limitOffset=null, $limitCount=null){ 59 60 if($limitOffset===null || $limitCount===null){ 60 $rs = $this->_conn->query ($query);61 $rs = $this->_conn->query ($query); 61 62 }else{ 62 $rs = $this->_conn->limitQuery ($query, $limitOffset, $limitCount);63 $rs = $this->_conn->limitQuery ($query, $limitOffset, $limitCount); 63 64 } 64 65 return $rs->fetchAll (); … … 68 69 * R�p� tout les enregistrements d'un select dans un tableau (d'objets) 69 70 * @param string $query requ� SQL 70 * @param object ou string $className object �emplir ounom de la classe de l'objet �emplir71 * @param string $className nom de la classe de l'objet �emplir 71 72 * @return array tableau d'objets 72 73 */ 73 74 public function fetchAllInto($query, $className, $limitOffset=null, $limitCount=null){ 74 75 if($limitOffset===null || $limitCount===null){ 75 $rs = $this->_conn->query ($query);76 $rs = $this->_conn->query ($query); 76 77 }else{ 77 $rs = $this->_conn->limitQuery ($query, $limitOffset, $limitCount);78 $rs = $this->_conn->limitQuery ($query, $limitOffset, $limitCount); 78 79 } 79 80 $result = array(); 80 81 if ($rs){ 81 while($res = $rs->fetchInto ($className)){ 82 $result[] = $res; 82 $rs->setFetchMode(8, $classname); 83 while($res = $rs->fetch()){ 84 $result[] = $res; 83 85 } 84 86 }
