--- loncom/interface/lonsimplepage.pm	2006/07/20 15:03:01	1.46
+++ loncom/interface/lonsimplepage.pm	2010/02/13 00:51:06	1.59.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.46 2006/07/20 15:03:01 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.59.2.2 2010/02/13 00:51:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,8 +38,29 @@ use Apache::lonlocal;
 use Apache::lonprintout;
 use Apache::lonxml;
 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');
@@ -50,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') {
@@ -61,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_/) {
+        $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');
@@ -78,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;
     }
@@ -114,12 +133,12 @@ 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
 
     if ($target ne 'tex') {
-        my $title = 'Course Page';
+        my $title = 'Simple Course Page';
         if ($group ne '') {
             $title = 'Group Page';
         }
@@ -149,8 +168,13 @@ sub handler {
                 $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc));
             }
             if ((!$group_home_edit) && (!$group_home_view) && 
-                (!$group_view_perm) && (!$group_edit_perm)) {  
+                (!$group_view_perm) && (!$group_edit_perm)) {
                 &display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
+                if ($env{'form.grade_target'} ne 'tex') {
+                    $r->print(&Apache::loncommon::end_page());
+                } else {
+                    $r->print('\end{document}');
+                }
                 return OK;
             }
         } else {
@@ -164,6 +188,13 @@ sub handler {
             }
 	    return OK;
         }
+        my ($blocked,$blocktext) = 
+             &Apache::loncommon::blocking_status('groups');
+        if ($blocked) {
+            $r->print($blocktext);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
     }
 
     my $allowed;
@@ -185,7 +216,9 @@ sub handler {
 
     if ($allowed) {
 	$r->print('<p>'.
-		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'"><font size="+1">'.&mt('Show Student View').'</font></a>'.
+		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
+                 .'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
+                 .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
 		  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
     } elsif ($privileged and $target ne 'tex') {
         my $edittext = &mt('Edit');
@@ -217,20 +250,20 @@ 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 (keys %syllabusfields) {
-	    my $field=$env{'form.'.$_};
+	foreach my $syl_field (keys(%syllabusfields)) {
+	    my $field=$env{'form.'.$syl_field};
 	    chomp($field);
 	    $field=~s/\s+$//s;
 	    $field=~s/^\s+//s;
 	    $field=~s/\<br\s*\/*\>$//s;
 	    $field=&Apache::lonfeedback::clear_out_html($field,1);
-	    $syllabus{$_}=$field;
+	    $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
@@ -252,29 +285,34 @@ sub handler {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
 		      '<input type="hidden" name="forceedit" value="edit" />'.
-		      '<h3>Upload a Photo</h3>'.
-		      '<input type="file" name="uploaddoc" size="50">'.
-		      '<input type="submit" name="storeupl" value="Upload">'.
-		      '</form><form method="post">');
+		      '<h3>'.&mt('Upload a Photo').'</h3>'.
+		      '<input type="file" name="uploaddoc" size="50" />'.
+		      '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+		      '</form><form method="post">'.
+                      '<input type="hidden" name="forceedit" value="edit" />');
 	}
-	foreach (sort keys %syllabusfields) {
-	    if (($syllabus{$_}) || ($allowed) || 
-                ($_ eq 'abb_links' && $group ne '')) {
-		my $message=$syllabus{$_};
-		&Apache::lonfeedback::newline_to_br(\$message);
+	foreach my $field (sort(keys(%syllabusfields))) {
+	    if (($syllabus{$field}) || ($allowed) || 
+                ($field eq 'abb_links' && $group ne '')) {
+		my $message=$syllabus{$field};
+                if (!&Apache::lonfeedback::contains_block_html($message)) {
+                    &Apache::lonfeedback::newline_to_br(\$message);
+                }
 		$message
 		    =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 		if ($allowed) {
 		    $message=&Apache::lonspeller::markeduptext($message);
 		}
-		$message=&Apache::lontexconvert::msgtexconverted($message);
-                if ($_ eq 'abb_links' && $group ne '') {
-                    $r->print('<br /><input type="hidden" name="'.$_.
-                                          '" value="'.$syllabus{$_}.'" />');
+		if ($target ne 'tex') {
+		    $message=&Apache::lontexconvert::msgtexconverted($message);
+		}
+                if ($field eq 'abb_links' && $group ne '') {
+                    $r->print('<br /><input type="hidden" name="'.$field.
+                                          '" value="'.$syllabus{$field}.'" />');
                     &display_group_links($r,$target,$group,'edit',$refarg,
                                          %groupinfo);
                     $r->print('<br />');
-                } elsif ($_ eq 'aaa_title') {
+                } elsif ($field eq 'aaa_title') {
                     if ($target ne 'tex') {
                         $r->print('<h1>'.$message.'</h1>');
                     } else {
@@ -284,21 +322,21 @@ sub handler {
                     if ($allowed) {
                         if ($env{'form.grade_target'} ne 'tex') {
                             $r->print(
-                                      '<br />Title<br /><textarea cols="80" rows="2" name="'.$_.'">'.
-                                      $syllabus{$_}.
-                                      '</textarea><input type="submit" name="storesyl" value="Store" />');
+                                      '<br /><h3>'.&mt('Title').'</h3><textarea cols="80" rows="2" name="'.$field.'">'.
+                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
+                                      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
                         } else {
                             my $safeinit;
-                            $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit));
+                            $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
                         }
                     }
                 } else {
-		    if (($_ ne 'bbb_content') || ($allowed)) {
+		    if (($field ne 'bbb_content') || ($allowed)) {
 			if ($target ne 'tex') {
-			    $r->print('<h3>'.$syllabusfields{$_}.'</h3>');
+			    $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
 			} else {
 			    my $safeinit;
-			    $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$_}.'</h3>'));
+			    $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
 			}
 		    }
 		    if ($target ne 'tex') {
@@ -310,12 +348,12 @@ sub handler {
 		    }
 		    if ($allowed) {
 			if ($target ne 'tex') {
-			    $r->print('<br /><textarea cols="80" rows="24" name="'.$_.'" id="'.$_.'">'.
-				      $syllabus{$_}.
-				      '</textarea><input type="submit" name="storesyl" value="Store" />');
+			    $r->print('<br /><textarea cols="80" rows="24" name="'.$field.'" id="'.$field.'">'.
+                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
+				      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
 			} else {
 			    my $safeinit;
-			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit));
+			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
 			}
 		    }
 		}
@@ -346,7 +384,7 @@ sub display_group_links {
     my @available = ();
     my %menu = ();
     %{$menu{'email'}} = (
-                        text => 'Group e-mail',
+                        text => 'Group Message',
                         href => '/adm/email?compose=group&amp;group='.$group.
                                 $refarg,
                       );
@@ -355,16 +393,16 @@ sub display_group_links {
                         href => '/adm/groupboards?group='.$group.$refarg,
                       );
     %{$menu{'chat'}} = (
-                        text => 'Group chat',
+                        text => 'Group Chat Room',
                         href => "javascript:group_chat('$group')",
                       );
     %{$menu{'files'}} = (
-                        text => 'File repository',
+                        text => 'Group Portfolio',
                         href => '/adm/coursegrp_portfolio?group='.$group.
                                 $refarg,
                       );
     %{$menu{'roster'}} = (
-                        text => 'Membership roster',
+                        text => 'Membership Roster',
                         href => '/adm/grouproster?group='.$group.$refarg,
                       );
     foreach my $tool (sort(keys(%menu))) {
@@ -373,16 +411,27 @@ sub display_group_links {
         }
     }
     if (@available > 0) {
-        my $output = '<table cellspacing="4" cellpadding="4"><tr>';
+        my $output = '';
+        if ($target eq 'tex') {
+            $output = '<table cellspacing="4" cellpadding="4">';
+        } else {
+            $output = &Apache::loncommon::start_data_table();
+        }
         foreach my $tool (@available) {
             if ($target eq 'tex') {
-                $output .= '<td>'.&mt($menu{$tool}{text}).'</td>';
+                $output .= '<tr><td>'.&mt($menu{$tool}{text}).'</td></tr>';
             } else {
-                $output .= '<td><a href="'.$menu{$tool}{href}.'">'.
-                           $menu{$tool}{text}.'</a></td>';
+                $output .= &Apache::loncommon::start_data_table_row()
+                          .'<td><a href="'.$menu{$tool}{href}.'">'
+                          .&mt($menu{$tool}{text}).'</a></td>'
+                          .&Apache::loncommon::end_data_table_row();
             }
         }
-        $output .= '</tr></table>';
+        if ($target eq 'tex') {
+            $output .= '</table>';
+        } else {
+            $output .= &Apache::loncommon::end_data_table();
+        }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'<br /><br />'.$output));
         } else {
@@ -393,7 +442,7 @@ sub display_group_links {
         if ($context eq 'edit') {
             $output = &mt('No group functionality.');
         } else {  
-            $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: <b>[_1]</b>.',&unescape($groupinfo{'description'}));
+            $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].','<b>'.&unescape($groupinfo{'description'}).'</b>');
         }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));
@@ -411,11 +460,12 @@ sub grouppage_breadcrumbs {
           text=>"Groups",
           title=>"Display Groups"},
         {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
-          text=>"Group: $description",
-          title=>"Go to group's home page"},
+          text=>&mt('Group:')." $description",
+          title=>&mt("Go to group's home page"),
+          no_mt=>1,},
         );
     my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',
-                                                           $description));
+                      $description),undef,undef,undef,undef,1);
     return $output;
 }