Changeset 866
- Timestamp:
- 04/07/08 00:40:05 (8 months ago)
- Files:
-
- trunk/lib/jelix-scripts/commands/acl2group.cmd.php (modified) (2 diffs)
- trunk/lib/jelix-scripts/commands/acl2group.cmd.php (modified) (2 diffs)
- trunk/lib/jelix-scripts/commands/acl2group.cmd.php (modified) (2 diffs)
- trunk/lib/jelix-scripts/commands/acl2right.cmd.php (modified) (3 diffs)
- trunk/lib/jelix-scripts/commands/acl2right.cmd.php (modified) (3 diffs)
- trunk/lib/jelix-scripts/commands/acl2right.cmd.php (modified) (3 diffs)
- trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php (modified) (2 diffs)
- trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php (modified) (2 diffs)
- trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php (modified) (1 diff)
- trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php (modified) (1 diff)
- trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix-scripts/commands/acl2group.cmd.php
r864 r866 188 188 $cnx = jDb::getConnection(jAclDb::getProfil()); 189 189 190 $id = $this->_getGrpId($params[0]); 190 if($params[0] != 0) 191 $id = $this->_getGrpId($params[0]); 191 192 192 193 $sql="DELETE FROM jacl2_rights WHERE id_aclgrp="; … … 325 326 $cnx = jDb::getConnection(jAclDb::getProfil()); 326 327 if(is_numeric($param)){ 328 if(intval($param) >= 0) 329 die('Error: invalid group id'); 327 330 $sql="SELECT id_aclgrp FROM jacl2_group WHERE grouptype <2 AND id_aclgrp = ".$param; 328 331 }else{ trunk/lib/jelix-scripts/commands/acl2group.cmd.php
r864 r866 188 188 $cnx = jDb::getConnection(jAclDb::getProfil()); 189 189 190 $id = $this->_getGrpId($params[0]); 190 if($params[0] != 0) 191 $id = $this->_getGrpId($params[0]); 191 192 192 193 $sql="DELETE FROM jacl2_rights WHERE id_aclgrp="; … … 325 326 $cnx = jDb::getConnection(jAclDb::getProfil()); 326 327 if(is_numeric($param)){ 328 if(intval($param) >= 0) 329 die('Error: invalid group id'); 327 330 $sql="SELECT id_aclgrp FROM jacl2_group WHERE grouptype <2 AND id_aclgrp = ".$param; 328 331 }else{ trunk/lib/jelix-scripts/commands/acl2group.cmd.php
r864 r866 188 188 $cnx = jDb::getConnection(jAclDb::getProfil()); 189 189 190 $id = $this->_getGrpId($params[0]); 190 if($params[0] != 0) 191 $id = $this->_getGrpId($params[0]); 191 192 192 193 $sql="DELETE FROM jacl2_rights WHERE id_aclgrp="; … … 325 326 $cnx = jDb::getConnection(jAclDb::getProfil()); 326 327 if(is_numeric($param)){ 328 if(intval($param) >= 0) 329 die('Error: invalid group id'); 327 330 $sql="SELECT id_aclgrp FROM jacl2_group WHERE grouptype <2 AND id_aclgrp = ".$param; 328 331 }else{ trunk/lib/jelix-scripts/commands/acl2right.cmd.php
r864 r866 75 75 76 76 protected function cmd_list(){ 77 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n"; 78 echo "- anonymous group\n"; 79 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, s.label_key as subject 80 FROM jacl2_rights r, jacl2_subject s 81 WHERE r.id_aclgrp = 0 AND r.id_aclsbj=s.id_aclsbj 82 ORDER BY subject, id_aclres "; 83 $cnx = jDb::getConnection(jAclDb::getProfil()); 84 $rs = $cnx->query($sql); 85 $sbj =-1; 86 foreach($rs as $rec){ 87 if($sbj !=$rec->id_aclsbj){ 88 $sbj = $rec->id_aclsbj; 89 echo "\t",$rec->id_aclsbj,"\n"; 90 } 91 echo "\t\t",$rec->id_aclres,"\n"; 92 } 93 77 94 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, name as grp, s.label_key as subject 78 95 FROM jacl2_rights r, jacl2_group g, jacl2_subject s … … 81 98 $cnx = jDb::getConnection(jAclDb::getProfil()); 82 99 $rs = $cnx->query($sql); 83 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n";84 100 $grp=-1; 85 101 $sbj =-1; … … 237 253 $cnx = jDb::getConnection(jAclDb::getProfil()); 238 254 if(is_numeric($param)){ 255 if($param == '0') 256 return 0; 239 257 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c id_aclgrp = ".$param; 240 258 }else{ 259 if($param =='anonymous') 260 return 0; 241 261 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c name = ".$cnx->quote($param); 242 262 } trunk/lib/jelix-scripts/commands/acl2right.cmd.php
r864 r866 75 75 76 76 protected function cmd_list(){ 77 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n"; 78 echo "- anonymous group\n"; 79 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, s.label_key as subject 80 FROM jacl2_rights r, jacl2_subject s 81 WHERE r.id_aclgrp = 0 AND r.id_aclsbj=s.id_aclsbj 82 ORDER BY subject, id_aclres "; 83 $cnx = jDb::getConnection(jAclDb::getProfil()); 84 $rs = $cnx->query($sql); 85 $sbj =-1; 86 foreach($rs as $rec){ 87 if($sbj !=$rec->id_aclsbj){ 88 $sbj = $rec->id_aclsbj; 89 echo "\t",$rec->id_aclsbj,"\n"; 90 } 91 echo "\t\t",$rec->id_aclres,"\n"; 92 } 93 77 94 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, name as grp, s.label_key as subject 78 95 FROM jacl2_rights r, jacl2_group g, jacl2_subject s … … 81 98 $cnx = jDb::getConnection(jAclDb::getProfil()); 82 99 $rs = $cnx->query($sql); 83 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n";84 100 $grp=-1; 85 101 $sbj =-1; … … 237 253 $cnx = jDb::getConnection(jAclDb::getProfil()); 238 254 if(is_numeric($param)){ 255 if($param == '0') 256 return 0; 239 257 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c id_aclgrp = ".$param; 240 258 }else{ 259 if($param =='anonymous') 260 return 0; 241 261 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c name = ".$cnx->quote($param); 242 262 } trunk/lib/jelix-scripts/commands/acl2right.cmd.php
r864 r866 75 75 76 76 protected function cmd_list(){ 77 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n"; 78 echo "- anonymous group\n"; 79 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, s.label_key as subject 80 FROM jacl2_rights r, jacl2_subject s 81 WHERE r.id_aclgrp = 0 AND r.id_aclsbj=s.id_aclsbj 82 ORDER BY subject, id_aclres "; 83 $cnx = jDb::getConnection(jAclDb::getProfil()); 84 $rs = $cnx->query($sql); 85 $sbj =-1; 86 foreach($rs as $rec){ 87 if($sbj !=$rec->id_aclsbj){ 88 $sbj = $rec->id_aclsbj; 89 echo "\t",$rec->id_aclsbj,"\n"; 90 } 91 echo "\t\t",$rec->id_aclres,"\n"; 92 } 93 77 94 $sql="SELECT r.id_aclgrp, r.id_aclsbj, r.id_aclres, name as grp, s.label_key as subject 78 95 FROM jacl2_rights r, jacl2_group g, jacl2_subject s … … 81 98 $cnx = jDb::getConnection(jAclDb::getProfil()); 82 99 $rs = $cnx->query($sql); 83 echo "group\tsubject\t\tresource\n---------------------------------------------------------------\n";84 100 $grp=-1; 85 101 $sbj =-1; … … 237 253 $cnx = jDb::getConnection(jAclDb::getProfil()); 238 254 if(is_numeric($param)){ 255 if($param == '0') 256 return 0; 239 257 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c id_aclgrp = ".$param; 240 258 }else{ 259 if($param =='anonymous') 260 return 0; 241 261 $sql="SELECT id_aclgrp FROM jacl2_group WHERE $c name = ".$cnx->quote($param); 242 262 } trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php
r864 r866 36 36 37 37 if(isset($params['jacl2.right'])) { 38 $aclok = jAcl ::check($params['jacl2.right']);38 $aclok = jAcl2::check($params['jacl2.right']); 39 39 40 40 }elseif(isset($params['jacl2.rights.and'])) { 41 41 $aclok = true; 42 42 foreach($params['jacl2.rights.and'] as $right) { 43 if(!jAcl ::check($right)) {43 if(!jAcl2::check($right)) { 44 44 $aclok = false; 45 45 break; … … 49 49 $aclok = false; 50 50 foreach($params['jacl2.rights.or'] as $right) { 51 if(jAcl ::check($right)) {51 if(jAcl2::check($right)) { 52 52 $aclok = true; 53 53 break; trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php
r864 r866 36 36 37 37 if(isset($params['jacl2.right'])) { 38 $aclok = jAcl ::check($params['jacl2.right']);38 $aclok = jAcl2::check($params['jacl2.right']); 39 39 40 40 }elseif(isset($params['jacl2.rights.and'])) { 41 41 $aclok = true; 42 42 foreach($params['jacl2.rights.and'] as $right) { 43 if(!jAcl ::check($right)) {43 if(!jAcl2::check($right)) { 44 44 $aclok = false; 45 45 break; … … 49 49 $aclok = false; 50 50 foreach($params['jacl2.rights.or'] as $right) { 51 if(jAcl ::check($right)) {51 if(jAcl2::check($right)) { 52 52 $aclok = true; 53 53 break; trunk/lib/jelix/plugins/coord/jacl2/jacl2.coord.php
r864 r866 36 36 37 37 if(isset($params['jacl2.right'])) { 38 $aclok = jAcl ::check($params['jacl2.right']);38 $aclok = jAcl2::check($params['jacl2.right']); 39 39 40 40 }elseif(isset($params['jacl2.rights.and'])) { 41 41 $aclok = true; 42 42 foreach($params['jacl2.rights.and'] as $right) { 43 if(!jAcl ::check($right)) {43 if(!jAcl2::check($right)) { 44 44 $aclok = false; 45 45 break; … … 49 49 $aclok = false; 50 50 foreach($params['jacl2.rights.or'] as $right) { 51 if(jAcl ::check($right)) {51 if(jAcl2::check($right)) { 52 52 $aclok = true; 53 53 break; trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php
r864 r866 95 95 $this->assertFalse(jAcl2::check('super.cms.list')); 96 96 $this->assertFalse(jAcl2::check('admin.access')); 97 jAcl2::clearCache(); 98 jAcl2DbManager::addRight(0, 'super.cms.list' ); 99 $this->assertTrue(jAcl2::check('super.cms.list')); 100 $this->assertFalse(jAcl2::check('admin.access')); 97 101 jAuth::$connect = true; 98 102 jAcl2::clearCache(); trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php
r864 r866 95 95 $this->assertFalse(jAcl2::check('super.cms.list')); 96 96 $this->assertFalse(jAcl2::check('admin.access')); 97 jAcl2::clearCache(); 98 jAcl2DbManager::addRight(0, 'super.cms.list' ); 99 $this->assertTrue(jAcl2::check('super.cms.list')); 100 $this->assertFalse(jAcl2::check('admin.access')); 97 101 jAuth::$connect = true; 98 102 jAcl2::clearCache(); trunk/testapp/modules/jelix_tests/tests/jacl2.main_api.html_cli.php
r864 r866 95 95 $this->assertFalse(jAcl2::check('super.cms.list')); 96 96 $this->assertFalse(jAcl2::check('admin.access')); 97 jAcl2::clearCache(); 98 jAcl2DbManager::addRight(0, 'super.cms.list' ); 99 $this->assertTrue(jAcl2::check('super.cms.list')); 100 $this->assertFalse(jAcl2::check('admin.access')); 97 101 jAuth::$connect = true; 98 102 jAcl2::clearCache();
