--- loncom/interface/lonsimplepage.pm 2006/05/18 01:08:50 1.40 +++ loncom/interface/lonsimplepage.pm 2006/06/30 18:06:47 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.40 2006/05/18 01:08:50 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.42 2006/06/30 18:06:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,7 @@ sub handler { if ($caller eq 'grppg') { $marker =~ s/\W//g; $namespace = 'grppage_'.$marker; - my %curr_groups = &Apache::loncommon::coursegroups($dom,$crs,$marker); + my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$marker); if (!%curr_groups) { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); return OK; @@ -129,8 +129,10 @@ sub handler { if ($caller eq 'grppg') { if (($grp_view_permission) || (&Apache::longroup::check_group_access($caller))) { - unless(&Apache::lonnet::allowed('vgh', - $env{'request.course.id'}.'/'.$marker)) { + if ((!&Apache::lonnet::allowed('vgh', + $env{'request.course.id'}.'/'.$marker)) + && (!&Apache::lonnet::allowed('mdg', + $env{'request.course.id'}.'/'.$marker))) { &display_group_links($r,$target,$marker,'view',%groupinfo); return OK; } @@ -149,8 +151,8 @@ sub handler { my $allowed; if ($caller eq 'grppg') { - $allowed = $grp_view_permission; - unless ($allowed) { + $allowed = &Apache::lonnet::allowed('mdg',$env{'request.course.id'}); + if (!$allowed) { $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}. '/'.$marker); }