From: Sylvie G. <sgr...@gm...> - 2008-11-21 19:07:35
|
Sept7, Anonymous with tiki_p_view can not see wiki pages after this commit. On Fri, 2008-11-21 at 16:54 +0000, se...@us... wrote: > Revision: 15716 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15716&view=rev > Author: sept_7 > Date: 2008-11-21 16:54:58 +0000 (Fri, 21 Nov 2008) > > Log Message: > ----------- > [BPB] BPB for Nyloth :D > [FIX] filegals and others : fix permissions setting ... > > Modified Paths: > -------------- > trunk/lib/userslib.php > trunk/tiki-list_file_gallery.php > trunk/tiki-setup_base.php > > Modified: trunk/lib/userslib.php > =================================================================== > --- trunk/lib/userslib.php 2008-11-21 16:51:55 UTC (rev 15715) > +++ trunk/lib/userslib.php 2008-11-21 16:54:58 UTC (rev 15716) > @@ -1768,11 +1768,11 @@ > if ( count($groups) == 1 ) return $this->get_group_permissions($groups[0]); > > $ret = array(); > - $query = 'select distinct up.`permName` from `users_permissions` as up, `users_grouppermissions` as ug where ug.`groupName` in ('.implode(',',array_fill(0,count($groups),'?')).') and up.`permName`=ug.`permName`'; > + $query = 'select distinct up.* from `users_permissions` as up, `users_grouppermissions` as ug where ug.`groupName` in ('.implode(',',array_fill(0,count($groups),'?')).') and up.`permName`=ug.`permName`'; > $result = $this->query($query, $groups); > > while ( $res = $result->fetchRow() ) { > - $ret[] = $res['permName']; > + $ret[] = $res; > } > > return $ret; > > Modified: trunk/tiki-list_file_gallery.php > =================================================================== > --- trunk/tiki-list_file_gallery.php 2008-11-21 16:51:55 UTC (rev 15715) > +++ trunk/tiki-list_file_gallery.php 2008-11-21 16:54:58 UTC (rev 15716) > @@ -74,7 +74,7 @@ > > $galleryId = $_REQUEST['galleryId']; > > -if ( ( $galleryId != 0 || $tiki_p_list_file_galleries != 'y' ) && ($galleryId == 0 || $tiki_p_view_file_gallery != 'y')) { > +if ( $tiki_p_admin_file_galleries != 'y' && (( $galleryId != 0 || $tiki_p_list_file_galleries != 'y' ) && ($galleryId == 0 || $tiki_p_view_file_gallery != 'y'))) { > $smarty->assign('errortype', 401); > $smarty->assign('msg', tra('Permission denied you cannot view this section')); > $smarty->display('error.tpl'); > > Modified: trunk/tiki-setup_base.php > =================================================================== > --- trunk/tiki-setup_base.php 2008-11-21 16:51:55 UTC (rev 15715) > +++ trunk/tiki-setup_base.php 2008-11-21 16:54:58 UTC (rev 15716) > @@ -406,12 +406,12 @@ > $perms = $userlib->get_user_detailled_permissions($user); > foreach ($perms as $perm) { > $smarty->assign($perm, 'y'); > - $$perm = 'y'; > - if ( in_array($perm, $admin_perms) ) { // assign all perms of the perm type > + $$perm['permName'] = 'y'; > + if ( in_array($perm['permName'], $admin_perms) ) { // assign all perms of the perm type > $ps = $userlib->get_permissions(0, -1, 'permName_desc', '', $perm['type']); > - foreach ($ps['data'] as $perm) { > - $$perm['permName'] = 'y'; > - $smarty->assign($perm['permName'], 'y'); > + foreach ($ps['data'] as $p) { > + $$p['permName'] = 'y'; > + $smarty->assign($p['permName'], 'y'); > } > } > } > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |