--- loncom/interface/lonsimplepage.pm 2005/11/16 13:17:30 1.30
+++ loncom/interface/lonsimplepage.pm 2005/11/22 00:01:41 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.30 2005/11/16 13:17:30 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.31 2005/11/22 00:01:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -77,12 +77,12 @@ ENDDOCUMENT
if ($caller eq 'grppg') {
$marker =~ s/\W//g;
$namespace = 'grppage_'.$marker;
- unless(&Apache::lonnet::get_coursegroups($dom,$crs,\%curr_group,
- $marker)) {
+ my %curr_groups;
+ if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {
$r->print('Invalid group name');
return OK;
}
- %groupinfo = &Apache::loncommon::get_group_settings($curr_group{$marker});
+ %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker});
} else {
$marker=~s/\D//g;
$namespace = 'smppage_'.$marker;
@@ -139,7 +139,7 @@ ENDDOCUMENT
(&Apache::loncommon::check_group_access($caller))) {
unless(&Apache::lonnet::allowed('vgh',
$env{'request.course.id'}.'/'.$marker)) {
- &display_group_links($r,$target,$marker,%groupinfo,'view');
+ &display_group_links($r,$target,$marker,'view',%groupinfo);
return OK;
}
} else {
@@ -244,7 +244,7 @@ ENDDOCUMENT
if ($_ eq 'abb_links' && $caller eq 'grppg') {
$r->print('
');
- &display_group_links($r,$target,$marker,%groupinfo,'edit');
+ &display_group_links($r,$target,$marker,'edit',%groupinfo);
$r->print('
');
} elsif ($_ eq 'aaa_title') {
if ($target ne 'tex') {
@@ -310,9 +310,8 @@ ENDDOCUMENT
}
sub display_group_links {
- my ($r,$target,$marker,%groupinfo,$context) = @_;
+ my ($r,$target,$marker,$context,%groupinfo) = @_;
my @available = ();
-
my %menu = ();
%{$menu{'email'}} = (
text => 'Group e-mail',
@@ -360,7 +359,7 @@ sub display_group_links {
if ($context eq 'edit') {
$output = 'No group functionality';
} else {
- $output = 'No group functionality (e.g., e-mail, discussion,chat or file upload) is currently available to you in this group: '.$marker;
+ $output = 'No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: '.$marker;
}
if ($target eq 'tex') {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$output));