--- loncom/interface/lonsimplepage.pm	2006/07/20 03:11:52	1.45
+++ loncom/interface/lonsimplepage.pm	2007/05/02 01:33:49	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.45 2006/07/20 03:11:52 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.50 2007/05/02 01:33:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::lonprintout;
 use Apache::lonxml;
 use Apache::longroup;
+use HTML::Entities();
 use LONCAPA;
 
 sub handler {
@@ -149,8 +150,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 +170,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;
@@ -182,7 +195,7 @@ sub handler {
     }
 
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
-    
+
     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>'.
@@ -220,14 +233,14 @@ sub handler {
 	&Apache::lonnet::put($namespace,\%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);
@@ -235,8 +248,8 @@ sub handler {
 
 # ---------------------------------------------------------------- Get syllabus
     if ((($syllabus{'uploaded.lastmodified'}) && 
-         (($group ne '' && ($group_home_view || $group_edit_perm || 
-           $group_view_perm)) || ($group eq ''))) || ($allowed)) { 
+         (($group ne '' && ($group_home_view || $group_edit_perm ||  
+           $group_view_perm)) || ($group eq ''))) || ($allowed)) {
 	if ($syllabus{'uploaded.photourl'}) {
 	    &Apache::lonnet::allowuploaded('/adm/smppg',
 					   $syllabus{'uploaded.photourl'});
@@ -253,13 +266,14 @@ sub handler {
 		      '<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">'.
+		      '<input type="file" name="uploaddoc" size="50" />'.
+		      '<input type="submit" name="storeupl" value="Upload" />'.
 		      '</form><form method="post">');
 	}
-	foreach (sort keys %syllabusfields) {
-	    if (($syllabus{$_}) || ($allowed)) {
-		my $message=$syllabus{$_};
+	foreach my $field (sort(keys(%syllabusfields))) {
+	    if (($syllabus{$field}) || ($allowed) || 
+                ($field eq 'abb_links' && $group ne '')) {
+		my $message=$syllabus{$field};
 		&Apache::lonfeedback::newline_to_br(\$message);
 		$message
 		    =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
@@ -267,13 +281,13 @@ sub handler {
 		    $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 ($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 {
@@ -283,21 +297,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 />Title<br /><textarea cols="80" rows="2" name="'.$field.'">'.
+                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
+                                      '</textarea><input type="submit" name="storesyl" value="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') {
@@ -309,12 +323,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="Save" />');
 			} else {
 			    my $safeinit;
-			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit));
+			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
 			}
 		    }
 		}