--- loncom/homework/bridgetask.pm 2006/03/28 21:06:00 1.124 +++ loncom/homework/bridgetask.pm 2006/04/14 21:42:05 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.124 2006/03/28 21:06:00 albertel Exp $ +# $Id: bridgetask.pm,v 1.141 2006/04/14 21:42:05 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,7 +66,7 @@ sub proctor_check_auth { my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { - my ($puser,$pdom)=(split('@',$possible)); + my ($puser,$pdom)=(split(':',$possible)); if ($puser eq $user && $pdom eq $domain) { my $authenticated=0; if ( $slot->{'secret'} =~ /\S/ && @@ -95,7 +95,7 @@ sub proctor_check_auth { #setup new version and who did it $Apache::lonhomework::results{'resource.0.version'}=$version; $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= $slot_name; @@ -103,7 +103,7 @@ sub proctor_check_auth { } elsif ($authenticated && $type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.0.checkedin.slot"}= $slot_name; } @@ -259,64 +259,14 @@ sub preserve_grade_info { } sub style { - return (< + my ($target) = @_; + if ($target eq 'web' + || $target eq 'webgrade') { + return (< STYLE - + } + return; } sub show_task { @@ -425,27 +375,29 @@ sub start_Task { } $Apache::lonhomework::parsing_a_task=1; - #should get back a or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - - $body_tag_start .= '