--- loncom/homework/structuretags.pm	2010/08/09 23:39:50	1.461.2.1
+++ loncom/homework/structuretags.pm	2010/02/10 20:17:44	1.464
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.461.2.1 2010/08/09 23:39:50 raeburn Exp $
+# $Id: structuretags.pm,v 1.464 2010/02/10 20:17:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -254,18 +254,15 @@ sub page_start {
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
     $page_start .= $pageheader;
-
-    unless ($env{'request.gcicontext'} eq 'buildtest') {
-        if (!defined($found{'body'})
-            && $env{'request.state'} ne 'construct'
-            && ($target eq 'web' || $target eq 'webgrade')) {
-
-            my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
-            if ($symb eq '' && !$publicuser) {
-                $page_start .= '<p class="LC_info">'
-                              .&mt('Browsing resource, all submissions are temporary.')
-                              .'</p>';
-            }
+    if (!defined($found{'body'}) 
+	&& $env{'request.state'} ne 'construct'
+	&& ($target eq 'web' || $target eq 'webgrade')) {
+
+	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
+        if ($symb eq '' && !$publicuser) {
+            $page_start .= '<p class="LC_info">'
+                          .&mt('Browsing resource, all submissions are temporary.')
+                          .'</p>';
         }
     }
 
@@ -278,6 +275,7 @@ sub page_start {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
 	my $uri = Apache::loncommon::inhibit_menu_check(
                 &Apache::lonenc::check_encrypt($env{'request.uri'}));
+        $uri = &HTML::Entities::encode($uri,'<>&"');
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -654,11 +652,7 @@ item store_aggregates()
 
 sub store_aggregates {
     my ($symb,$courseid) = @_;
-    my (%aggregate,%subtracker);
-    my $tracksub;
-    if ($symb =~ m{^uploaded/gcitest/$LONCAPA::match_courseid/default_1261144274.sequence___\d+___gci/gci/}) {
-        $tracksub = 1;
-    }
+    my %aggregate;
     my @parts;
     my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -673,9 +667,6 @@ sub store_aggregates {
 	    $Apache::lonhomework::results{'resource.'.$part.'.award'}
 	    eq 'EXACT_ANS') {
             $aggregate{$symb."\0".$part."\0correct"} = 1;
-            if ($tracksub) {
-                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0correct"} ++;
-            }
         }
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
             $aggregate{$symb."\0".$part."\0users"} = 1;
@@ -688,22 +679,11 @@ sub store_aggregates {
             }
         }
         $aggregate{$symb."\0".$part."\0attempts"} = 1;
-        if ($tracksub) {
-            if ($Apache::lonhomework::type eq 'survey') {
-                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0surveysubs"} ++;
-            } else {
-                $subtracker{$env{'user.name'}.':'.$env{'user.domain'}."\0attempts"} ++;
-            }
-        }
     }
     if (keys (%aggregate) > 0) {
 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                             $cdomain,$cname);
     }
-    if (keys(%subtracker) > 0) {
-        &Apache::lonnet::cinc('nohist_submissiontracker',\%subtracker,
-                            $cdomain,$cname);
-    }
 }
 
 sub checkout_msg {
@@ -935,34 +915,28 @@ sub start_problem {
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseed.'" />';
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-                $form_tag_start .= '<input type="submit" name="resetdata"'.
-                            ' value="'.&mt('New Problem Variation').'" />';
-            }
+		$rndseed.'" />'.
+		    '<input type="submit" name="resetdata"
+                             value="'.&mt('New Problem Variation').'" />';
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
 	    }
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-	        if ($env{'request.role.adv'}) {
-		    $form_tag_start.= ' <label class="LC_nobreak">'
-                              .'<input type="checkbox" name="showallfoils"';
-		    if (defined($env{'form.showallfoils'})) {
-		        $form_tag_start.=' checked="checked"';
-		    }
-                    $form_tag_start.= ' /> '
-                                     .&mt('Show All Foils')
-                                     .'</label>';
-	        }
-            }
+	    if ($env{'request.role.adv'}) {
+		$form_tag_start.= ' <label class="LC_nobreak">'
+                         .'<input type="checkbox" name="showallfoils"';
+		if (defined($env{'form.showallfoils'})) {
+		    $form_tag_start.=' checked="checked"';
+		}
+                $form_tag_start.= ' /> '
+                                 .&mt('Show All Foils')
+                                 .'</label>';
+	    }
             if ($Apache::lonhomework::type eq 'practice') {
                 $form_tag_start.=&practice_problem_header();
             }
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-	        $form_tag_start.='<hr />';
-            }
+	    $form_tag_start.='<hr />';
 	}
 
 	($status,$accessmsg,my $slot_name,my $slot) = 
@@ -1152,7 +1126,9 @@ sub end_problem {
 			'\textit{'.$duedate_text.'} '.$toc_line;
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
-		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { 
+			$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+		    }
 		}
 	    } else {
 		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
@@ -1160,7 +1136,9 @@ sub end_problem {
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
-		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { 
+		    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+		}
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
 	    }
@@ -1802,7 +1780,10 @@ sub start_part {
 				    '.disableexampointprint'}) eq 'yes') {
 			$allow_print_points=0;
 		    }
-		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
+			$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
+
+		    }
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}