--- loncom/interface/lonsimplepage.pm	2007/05/02 01:33:49	1.50
+++ loncom/interface/lonsimplepage.pm	2007/07/13 00:29:21	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.50 2007/05/02 01:33:49 albertel Exp $
+# $Id: lonsimplepage.pm,v 1.51 2007/07/13 00:29:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,26 @@ use Apache::longroup;
 use HTML::Entities();
 use LONCAPA;
 
+sub get_db_name {
+    my ($url) = @_;
+    my ($udom,$uname,$marker)=(split(m{/},$url))[2,3,4];
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my $db_name;
+
+    if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
+	$marker =~ s/\W//g;
+	$db_name = 'grppage_'.$marker;
+    } else {
+	$marker=~s/\D//g;
+        $db_name = 'smppage_'.$marker;
+    }
+    return if (!defined($marker));
+
+    return $db_name;
+}
+
 sub handler {
     my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');
@@ -51,7 +71,7 @@ sub handler {
     if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     } 
-    my (undef,undef,$udom,$uname,$marker)=split(/\//,$r->uri);
+
 # Is this even in a course?
     unless ($env{'request.course.id'}) {
 	if ($target ne 'tex') {
@@ -62,15 +82,17 @@ sub handler {
 	return OK;
     }
 
+    my $db_name = &get_db_name($r->uri);
+
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit,
+    my ($group,$group_desc,$group_home_view,$group_home_edit,
         $group_view_perm,$group_edit_perm);
     my %curr_group = ();
     my %groupinfo = ();
-    if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
-        $marker =~ s/\W//g;
-        $group = $marker;
+    if ($db_name =~ /^grppage_/) {
+        my ($group)=(split(m{/},$r->uri))[4];  
+	$group =~ s/\W//g;
         my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);
         if (!%curr_groups) {
 	    &Apache::loncommon::simple_error_page($r,'','Invalid group name');
@@ -79,13 +101,9 @@ sub handler {
         %groupinfo = 
 	    &Apache::longroup::get_group_settings($curr_groups{$group});
         $group_desc = &unescape($groupinfo{'description'});
-        $namespace = 'grppage_'.$group;
-    } else {
-        $marker=~s/\D//g;
-        $namespace = 'smppage_'.$marker;
     }
 
-    if (!$marker) {
+    if (!$db_name) {
 	&Apache::loncommon::simple_error_page($r,'','Invalid call');
 	return OK;
     }
@@ -115,7 +133,7 @@ sub handler {
         $refarg = '&ref='.$env{'form.ref'};
     }
    
-    my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);
+    my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs);
        
 # --------------------------------------- There is such a user, get environment
 
@@ -230,7 +248,7 @@ sub handler {
             }
 	}
 	$syllabus{'uploaded.lastmodified'}=time;
-	&Apache::lonnet::put($namespace,\%syllabus,$dom,$crs);
+	&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
     if (($allowed) && ($env{'form.storesyl'})) {
 	foreach my $syl_field (keys(%syllabusfields)) {
@@ -243,7 +261,7 @@ sub handler {
 	    $syllabus{$syl_field}=$field;
 	}
 	$syllabus{'uploaded.lastmodified'}=time;
-	&Apache::lonnet::put($namespace,\%syllabus,$dom,$crs);
+	&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
 
 # ---------------------------------------------------------------- Get syllabus