--- loncom/interface/lonsimplepage.pm	2006/03/23 22:32:11	1.35
+++ 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.35 2006/03/23 22:32:11 albertel Exp $
+# $Id: lonsimplepage.pm,v 1.42 2006/06/30 18:06:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonfeedback;
 use Apache::lonlocal;
 use Apache::lonprintout;
 use Apache::lonxml;
+use Apache::longroup;
 
 sub handler {
     my $r = shift;
@@ -52,11 +53,11 @@ sub handler {
 # Is this even in a course?
     unless ($env{'request.course.id'}) {
 	if ($target ne 'tex') {
-	    return &Apache::loncommon::simple_error_page($r,'',
-							 'Not in a course');
+	    &Apache::loncommon::simple_error_page($r,'','Not in a course');
 	} else {
 	    $r->print('\textbf{Not in a course}\end{document}');
 	}
+	return OK;
     }
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -70,20 +71,21 @@ sub handler {
     if ($caller eq 'grppg') {
         $marker =~ s/\W//g;
         $namespace = 'grppage_'.$marker;
-        my %curr_groups;
-        if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {
-	    return &Apache::loncommon::simple_error_page($r,'',
-							 'Invalid group name');
+        my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$marker);
+        if (!%curr_groups) {
+	    &Apache::loncommon::simple_error_page($r,'','Invalid group name');
+	    return OK;
         }
         %groupinfo = 
-	    &Apache::loncommon::get_group_settings($curr_groups{$marker});
+	    &Apache::longroup::get_group_settings($curr_groups{$marker});
     } else {  
         $marker=~s/\D//g;
         $namespace = 'smppage_'.$marker;
     }
 
     if (!$marker) {
-	return &Apache::loncommon::simple_error_page($r,'','Invalid call');
+	&Apache::loncommon::simple_error_page($r,'','Invalid call');
+	return OK;
     }
 
 # --------------------------------------------------------- The syllabus fields
@@ -99,17 +101,11 @@ sub handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']);
-# ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    if ($env{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-    }
 # --------------------------------------------------------------- Force Student
     my $forcestudent='';
     if ($env{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; };
-     my $forceedit='';
-     if ($env{'form.forceedit'}) { $forceedit='edit'; }
+    my $forceedit='';
+    if ($env{'form.forceedit'}) { $forceedit='edit'; }
 
    
     my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);
@@ -124,7 +120,6 @@ sub handler {
 	my $start_page = 
 	    &Apache::loncommon::start_page($title,undef,
 					   {'function'       => $forcestudent,
-					    'add_entries'    => $addentries,
 					    'domain'         => $dom,
 					    'force_register' =>
 						$env{'form.register'},});
@@ -133,9 +128,11 @@ sub handler {
 
     if ($caller eq 'grppg') {
         if (($grp_view_permission) || 
-                           (&Apache::loncommon::check_group_access($caller))) {
-            unless(&Apache::lonnet::allowed('vgh',
-                                      $env{'request.course.id'}.'/'.$marker)) {
+                           (&Apache::longroup::check_group_access($caller))) {
+            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;
             }
@@ -154,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);
         }
@@ -313,7 +310,7 @@ sub display_group_links {
     my %menu = ();
     %{$menu{'email'}} = (
                         text => 'Group e-mail',
-                        href => '/adm/email?group='.$marker,
+                        href => '/adm/email?compose=group&group='.$marker,
                       );
     %{$menu{'discussion'}} = (
                         text => 'Discussion Boards',
@@ -325,7 +322,7 @@ sub display_group_links {
                       );
     %{$menu{'files'}} = (
                         text => 'File repository',
-                        href => '/adm/portfolio?group='.$marker,
+                        href => '/adm/coursegrp_portfolio?group='.$marker,
                       );
     %{$menu{'roster'}} = (
                         text => 'Membership roster',