loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.344.2.8.2.2 and 1.358

version 1.344.2.8.2.2, 2018/01/25 20:15:50	version 1.358, 2015/10/05 02:35:40
Line 49 use Apache::matchresponse();	Line 49 use Apache::matchresponse();
use Apache::chemresponse();	use Apache::chemresponse();
use Apache::functionplotresponse();	use Apache::functionplotresponse();
use Apache::drawimage();	use Apache::drawimage();
	use Apache::loncapamath();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::loncommon();	use Apache::loncommon();
	use Apache::lonparmset();
use Apache::lonlocal;	use Apache::lonlocal;
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
use HTML::Entities();	use HTML::Entities();
Line 208 sub proctor_checked_in {	Line 210 sub proctor_checked_in {
}	}

sub check_slot_access {	sub check_slot_access {
my ($id,$type,$symb,$partlist)=@_;	my ($id,$type,$symb)=@_;

# does it pass normal muster	# does it pass normal muster
my ($status,$datemsg)=&check_access($id,$symb);	my ($status,$datemsg)=&check_access($id,$symb);
Line 219 sub check_slot_access {	Line 221 sub check_slot_access {
return ($status,$datemsg);	return ($status,$datemsg);
}	}

if ($status eq 'SHOW_ANSWER' \|\|	my $checkin = 'resource.0.checkedin';
$status eq 'CLOSED' \|\|	my $version;
	if ($type eq 'Task') {
	$version=$Apache::lonhomework::history{'resource.version'};
	$checkin = "resource.$version.0.checkedin";
	}
	my $checkedin = $Apache::lonhomework::history{$checkin};
	my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip);
	$now = time;
	$ip=$env{'request.host'} \|\| $ENV{'REMOTE_ADDR'};

	if ($checkedin) {
	$checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
	my %slot=&Apache::lonnet::get_slot($checkinslot);
	if ($slot{'iptied'}) {
	$ipused = $Apache::lonhomework::history{"$checkin.ip"};
	unless (($ip ne '') && ($ipused eq $ip)) {
	$blockip = $slot{'iptied'};
	$slot_name = $checkinslot;
	$returned_slot = \%slot;
	}
	}
	}

	if ($status eq 'SHOW_ANSWER') {
	if ($blockip eq 'answer') {
	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ($status,$datemsg);
	}
	}

	if ($status eq 'CLOSED' \|\|
$status eq 'INVALID_ACCESS' \|\|	$status eq 'INVALID_ACCESS' \|\|
$status eq 'UNAVAILABLE') {	$status eq 'UNAVAILABLE') {
return ($status,$datemsg);	return ($status,$datemsg);
Line 230 sub check_slot_access {	Line 263 sub check_slot_access {
}	}

if ($type eq 'Task') {	if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.version'};	if ($checkedin &&
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {	$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
return ('SHOW_ANSWER');	if ($blockip eq 'answer') {
}	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ('SHOW_ANSWER');
	}
	}
}	}

my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);	my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
Line 244 sub check_slot_access {	Line 280 sub check_slot_access {
# if (!@slots) {	# if (!@slots) {
# return ($status,$datemsg);	# return ($status,$datemsg);
# }	# }
	undef($returned_slot);
	undef($slot_name);
my $slotstatus='NOT_IN_A_SLOT';	my $slotstatus='NOT_IN_A_SLOT';
my ($returned_slot,$slot_name);
my $now = time;
my $num_usable_slots = 0;	my $num_usable_slots = 0;
unless ($symb) {	if (!$symb) {
($symb) = &Apache::lonnet::whichuser();	($symb) = &Apache::lonnet::whichuser();
}	}
foreach my $slot (@slots) {	foreach my $slot (@slots) {
Line 261 sub check_slot_access {	Line 297 sub check_slot_access {
if ($slot{'starttime'} < $now &&	if ($slot{'starttime'} < $now &&
$slot{'endtime'} > $now &&	$slot{'endtime'} > $now &&
&Apache::loncommon::check_ip_acc($slot{'ip'})) {	&Apache::loncommon::check_ip_acc($slot{'ip'})) {
&Apache::lonxml::debug("$slot is good");	if ($slot{'iptied'}) {
$slotstatus='NEEDS_CHECKIN';	if ($env{'request.course.id'}) {
$returned_slot=\%slot;	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$slot_name=$slot;	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
last;	if ($slot eq $checkinslot) {
}	if ($ip eq $ipused) {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus ='NEEDS_CHECKIN';
	} else {
	$slotstatus = 'NEED_DIFFERENT_IP';
	$slot_name = $slot;
	$returned_slot = \%slot;
	last;
	}
	} elsif ($ip) {
	my $uniqkey = "$slot\0$symb\0$ip";
	my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum);
	if ($used_ip{$uniqkey}) {
	$slotstatus = 'NEED_DIFFERENT_IP';
	} else {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus ='NEEDS_CHECKIN';
	}
	}
	}
	} else {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus='NEEDS_CHECKIN';
	}
	if ($slotstatus eq 'NEEDS_CHECKIN') {
	$returned_slot=\%slot;
	$slot_name=$slot;
	last;
	}
	}
}	}
if ($slotstatus eq 'NEEDS_CHECKIN' &&	if ($slotstatus eq 'NEEDS_CHECKIN' &&
&proctor_checked_in($slot_name,$returned_slot,$type)) {	&proctor_checked_in($slot_name,$returned_slot,$type)) {
Line 274 sub check_slot_access {	Line 339 sub check_slot_access {
$slotstatus=$status;	$slotstatus=$status;
}	}

my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq);	my ($is_correct,$got_grade);
if ($type eq 'Task') {	if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};	my $version=$Apache::lonhomework::history{'resource.0.version'};
$checkin = "resource.$version.0.checkedin";
$got_grade =	$got_grade =
($Apache::lonhomework::history{"resource.$version.0.status"}	($Apache::lonhomework::history{"resource.$version.0.status"}
=~ /^(?:pass\|fail)$/);	=~ /^(?:pass\|fail)$/);
$is_correct =	$is_correct =
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'	($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
\|\| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );	\|\| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
$checkedin =
$Apache::lonhomework::history{"resource.$version.0.checkedin"};
} elsif ($type eq 'problem') {	} elsif ($type eq 'problem') {
$checkin = 'resource.0.checkedin';	$got_grade = 1;
$checkedin = $Apache::lonhomework::history{$checkin};	$is_correct =
}	($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
if ($checkedin) {
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
my %slot=&Apache::lonnet::get_slot($checkinslot);
$consumed_uniq = $slot{'uniqueperiod'};
}
if ($type eq 'problem') {
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
my ($numcorrect,$numgraded) = (0,0);
foreach my $part (@{$partlist}) {
my $currtries = $Apache::lonhomework::history{"resource.$part.tries"};
my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb);
my $probstatus = &Apache::structuretags::get_problem_status($part);
my $earlyout;
unless (($probstatus eq 'no') \|\|
($probstatus eq 'no_feedback_ever')) {
if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) {
$numcorrect ++;
} else {
$earlyout = 1;
}
}
if (($currtries == $maxtries) \|\| ($is_correct)) {
$earlyout = 1;
} else {
$numgraded ++;
}
last if ($earlyout);
}
my $numparts = scalar(@{$partlist});
if ($numparts == $numcorrect) {
$is_correct = 1;
}
if ($numparts == $numgraded) {
$got_grade = 1;
}
} else {
my $currtries = $Apache::lonhomework::history{"resource.0.tries"};
my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb);
my $probstatus = &Apache::structuretags::get_problem_status('0');
unless (($probstatus eq 'no') \|\|
($probstatus eq 'no_feedback_ever')) {
$is_correct =
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
}
unless (($currtries == $maxtries) \|\| ($is_correct)) {
$got_grade = 1;
}
}
}	}

&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");	&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
Line 354 sub check_slot_access {	Line 368 sub check_slot_access {
# However, the problem is not closed, and potentially, another slot might be	# However, the problem is not closed, and potentially, another slot might be
# used to gain access to it to work on it, until the due date is reached, and the	# used to gain access to it to work on it, until the due date is reached, and the
# problem then becomes CLOSED. Therefore return the slotstatus -	# problem then becomes CLOSED. Therefore return the slotstatus -
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE.	# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
if (!defined($slot_name) && $type eq 'problem') {	if (!defined($slot_name) && $type eq 'problem') {
if ($slotstatus eq 'NOT_IN_A_SLOT') {	if ($slotstatus eq 'NOT_IN_A_SLOT') {
if (!$num_usable_slots) {	if (!$num_usable_slots) {
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	unless ($symb) {
	($symb)=&Apache::lonnet::whichuser();
	}
$slotstatus = 'NOTRESERVABLE';	$slotstatus = 'NOTRESERVABLE';
my ($reservable_now_order,$reservable_now,$reservable_future_order,	my ($reservable_now_order,$reservable_now,$reservable_future_order,
$reservable_future) =	$reservable_future) =
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);	&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {	if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
if (@{$reservable_now_order} > 0) {	if (@{$reservable_now_order} > 0) {
if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {	$slotstatus = 'RESERVABLE';
$slotstatus = 'RESERVABLE';	$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
} else {
my ($uniqstart,$uniqend,$useslot);
if (ref($consumed_uniq) eq 'ARRAY') {
($uniqstart,$uniqend)=@{$consumed_uniq};
}
foreach my $slot (reverse(@{$reservable_now_order})) {
if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
my ($new_uniq_start,$new_uniq_end) = ($1,$2);
next if (!
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
}
$useslot = $slot;
last;
}
if ($useslot) {
$slotstatus = 'RESERVABLE';
$datemsg = $reservable_now->{$useslot}{'endreserve'};
}
}
}	}
}	}
unless ($slotstatus eq 'RESERVABLE') {	unless ($slotstatus eq 'RESERVABLE') {
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {	if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
if (@{$reservable_future_order} > 0) {	if (@{$reservable_future_order} > 0) {
if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {	$slotstatus = 'RESERVABLE_LATER';
$slotstatus = 'RESERVABLE_LATER';	$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
} else {
my ($uniqstart,$uniqend,$useslot);
if (ref($consumed_uniq) eq 'ARRAY') {
($uniqstart,$uniqend)=@{$consumed_uniq};
}
foreach my $slot (@{$reservable_future_order}) {
if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
my ($new_uniq_start,$new_uniq_end) = ($1,$2);
next if (!
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
}
$useslot = $slot;
last;
}
if ($useslot) {
$slotstatus = 'RESERVABLE_LATER';
$datemsg = $reservable_future->{$useslot}{'startreserve'};
}
}
}	}
}	}
}	}
Line 431 sub check_slot_access {	Line 406 sub check_slot_access {
&& $checkedin ) {	&& $checkedin ) {

if ($got_grade) {	if ($got_grade) {
return ('SHOW_ANSWER');	if ($blockip eq 'answer') {
	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ('SHOW_ANSWER');
	}
} else {	} else {
return ('WAITING_FOR_GRADE');	return ('WAITING_FOR_GRADE');
}	}

}	}

if ( $is_correct) {	if (($is_correct) && ($blockip ne 'answer')) {
if ($type eq 'problem') {	if ($type eq 'problem') {
return ($status);	return ($status);
}	}
Line 446 sub check_slot_access {	Line 425 sub check_slot_access {
}	}

if ( $status eq 'CANNOT_ANSWER' &&	if ( $status eq 'CANNOT_ANSWER' &&
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {	($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' &&
	$slotstatus ne 'NEED_DIFFERENT_IP') ) {
return ($status,$datemsg);	return ($status,$datemsg);
}	}
	return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
return ($slotstatus,$datemsg,$slot_name,$returned_slot);
}	}

# JB, 9/24/2002: Any changes in this function may require a change	# JB, 9/24/2002: Any changes in this function may require a change
Line 861 sub analyze_header {	Line 840 sub analyze_header {
.&Apache::loncommon::head_subbox(	.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());	&Apache::loncommon::CSTR_pageheader());
$result .=	$result .=
'<form name="lonhomework" method="post" action="'.	'<form name="lonhomework" method="post" action="'.
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.	&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
'<input type="hidden" name="problemmode" value="'.	'<input type="hidden" name="problemmode" value="'.
$env{'form.problemmode'}.'" />'.	$env{'form.problemmode'}.'" />'.
Line 876 sub analyze_header {	Line 855 sub analyze_header {
'onclick="javascript:setmode(this.form,'."'view'".')" />	'onclick="javascript:setmode(this.form,'."'view'".')" />
<hr />	<hr />
</div>'	</div>'
.&Apache::lonxml::message_location().'	.&Apache::lonxml::message_location().
</form>';	'</form>';
&Apache::lonxml::add_messages(\$result);	&Apache::lonxml::add_messages(\$result);
$request->print($result);	$request->print($result);
$request->rflush();	$request->rflush();
Line 1056 sub editxmlmode {	Line 1035 sub editxmlmode {

$problem='';	$problem='';
}	}

if (($env{'form.problemmode'} eq 'saveeditxml') \|\|	if (($env{'form.problemmode'} eq 'saveeditxml') \|\|
($env{'form.problemmode'} eq 'saveviewxml') \|\|	($env{'form.problemmode'} eq 'saveviewxml') \|\|
($env{'form.problemmode'} eq 'undoxml')) {	($env{'form.problemmode'} eq 'undoxml')) {
my $error=&handle_save_or_undo($request,\$problem,	my $error=&handle_save_or_undo($request,\$problem,
\$env{'form.editxmltext'});	\$env{'form.editxmltext'});
Line 1107 sub editxmlmode {	Line 1085 sub editxmlmode {
<div class="LC_edit_problem_header">	<div class="LC_edit_problem_header">
<div class="LC_edit_problem_header_title">'.	<div class="LC_edit_problem_header_title">'.
&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').	&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
'</div><div class="LC_edit_actionbar" id="actionbar">';	'</div><div class="LC_edit_actionbar" id="actionbar">';

$result.='<input type="hidden" name="problemmode" value="saveedit" />'.	$result.='<input type="hidden" name="problemmode" value="saveedit" />'.
&Apache::structuretags::problem_edit_buttons('editxml');	&Apache::structuretags::problem_edit_buttons('editxml');
Line 1117 sub editxmlmode {	Line 1095 sub editxmlmode {

unless ($env{'environment.nocodemirror'}) {	unless ($env{'environment.nocodemirror'}) {
# dropdown menus	# dropdown menus
$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Problem Templates"), template_dropdown_datastructure());	&mt("Problem Templates"), template_dropdown_datastructure());

$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Response Types"), responseblock_dropdown_datastructure());	&mt("Response Types"), responseblock_dropdown_datastructure());

$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Conditional Blocks"), conditional_scripting_datastructure());	&mt("Conditional Blocks"), conditional_scripting_datastructure());

$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Miscellaneous"), misc_datastructure());	&mt("Miscellaneous"), misc_datastructure());
}	}

$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") .	&mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") .
'" style="vertical-align:text-bottom; height: auto; margin:0; "/>',	'" style="vertical-align:text-bottom; height: auto; margin:0; "/>',
helpmenu_datastructure(),"");	helpmenu_datastructure(),"");

$result.="</ol></div>";	$result.="</ol></div>";

$result .= '</div></div>' .	$result .= '</div></div>' .
&Apache::lonxml::message_location() .	&Apache::lonxml::message_location() .
&Apache::loncommon::xmleditor_js() .	&Apache::loncommon::xmleditor_js() .
'<textarea ' . &Apache::edit::element_change_detection() .	'<textarea ' . &Apache::edit::element_change_detection() .
Line 1173 sub editxmlmode {	Line 1151 sub editxmlmode {
autoCloseBrackets: true,	autoCloseBrackets: true,
height: "auto",	height: "auto",
styleActiveLine: true,	styleActiveLine: true,

extraKeys: {	extraKeys: {
"Tab": "indentMore",	"Tab": "indentMore",
"Shift-Tab": "indentLess",	"Shift-Tab": "indentLess",
Line 1220 sub renderpage {	Line 1198 sub renderpage {
$problem='';	$problem='';
my $filename=(split('/',$file))[-1];	my $filename=(split('/',$file))[-1];
my $error =	my $error =
&mt('Unable to find [_1]',	'<p class="LC_error">'
'<span class="LC_filename">'.$filename.'</span>');	.&mt('Unable to find [_1]',
	'<span class="LC_filename">'.$filename.'</span>')
	."</p>";
$result.=	$result.=
&Apache::loncommon::simple_error_page($request,'Not available',	&Apache::loncommon::simple_error_page($request,'Not available',
$error,{'no_auto_mt_msg' => 1});	$error,{'no_auto_mt_msg' => 1});
Line 1272 sub finished_parsing {	Line 1252 sub finished_parsing {
undef($Apache::lonhomework::parsing_a_task);	undef($Apache::lonhomework::parsing_a_task);
}	}


# function extracted from get_template_html	# function extracted from get_template_html
# returns "key" -> list	# returns "key" -> list
# key: path of template	# key: path of template
# value 1: title	# value 1: title
# value 2: category	# value 2: category
# value 3: name of help topic ???	# value 3: name of help topic ???
sub get_template_list {	sub get_template_list{
my ($extension) = @_;	my ($extension) = @_;

my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.	my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
'/templates/*.'.$extension);	'/templates/*.'.$extension);
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),	@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),	(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);	&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);	@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
return @files;	return @files;
}	}
Line 1298 sub get_template_html {	Line 1277 sub get_template_html {
&Apache::lonxml::debug("Looking for :$extension:");	&Apache::lonxml::debug("Looking for :$extension:");
my $glob_extension = $extension;	my $glob_extension = $extension;
if ($extension eq 'survey' \|\| $extension eq 'exam') {	if ($extension eq 'survey' \|\| $extension eq 'exam') {
$glob_extension = 'problem';	$glob_extension = 'problem';
}	}
my @files = &get_template_list($extension);	my @files = &get_template_list($extension);
my ($midpoint,$seconddiv,$numfiles);	my ($midpoint,$seconddiv,$numfiles);
Line 1362 sub get_template_html {	Line 1341 sub get_template_html {
sub newproblem {	sub newproblem {
my ($request) = @_;	my ($request) = @_;

if ($env{'form.mode'} eq 'blank'){	if ($env{'form.mode'} eq 'blank'){
my $dest = &Apache::lonnet::filelocation("",$request->uri);	my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $templatefilename =	&File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
$request->dir_config('lonIncludes').'/templates/blank.problem';
&File::Copy::copy($templatefilename,$dest);
&renderpage($request,$dest);	&renderpage($request,$dest);
return;	return;
}	}
my $errormsg;
if ($env{'form.template'}) {	if ($env{'form.template'}) {
my $file;	my $file = $env{'form.template'};
my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/);	my $dest = &Apache::lonnet::filelocation("",$request->uri);
if ($extension) {	&File::Copy::copy($file,$dest);
my @files = &get_template_list($extension);	&renderpage($request,$dest);
foreach my $poss (@files) {	return;
if (ref($poss) eq 'ARRAY') {
if ($env{'form.template'} eq $poss->[0]) {
$file = $env{'form.template'};
last;
}
}
}
if ($file) {
my $dest = &Apache::lonnet::filelocation("",$request->uri);
&File::Copy::copy($file,$dest);
&renderpage($request,$dest);
return;
} else {
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>';
}
} else {
$errormsg = '<p class="LC_error">'.&mt('Invalid template file; template needs to be a .problem, .library, or .task file.').'</p>';
}
}	}

my ($extension) = ($request->uri =~ m/\.(\w+)$/);	my ($extension) = ($request->uri =~ m/\.(\w+)$/);
Line 1411 sub newproblem {	Line 1369 sub newproblem {
} else {	} else {
my $url=&HTML::Entities::encode($request->uri,'<>&"');	my $url=&HTML::Entities::encode($request->uri,'<>&"');
my $dest = &Apache::lonnet::filelocation("",$request->uri);	my $dest = &Apache::lonnet::filelocation("",$request->uri);
	my $errormsg;
my $instructions;	my $instructions;
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),	my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
'text' => 'Authoring Space'},	'text' => 'Authoring Space'},
Line 1461 sub update_construct_style {	Line 1420 sub update_construct_style {
}	}

#	#
# Sets interval for current user so time left will be zero, either for the entire folder	# Sets interval for current user so time left will be zero, either for the entire folder
# containing the current resource, or just the resource, depending on value of first item	# containing the current resource, or just the resource, depending on value of first item
# in interval array retrieved from EXT("resource.0.interval");	# in interval array retrieved from EXT("resource.0.interval");
#	#
sub zero_timer {	sub zero_timer {
my ($symb) = @_;	my ($symb) = @_;
my ($hastimeleft,$first_access,$now);	my ($hastimeleft,$first_access,$now);
my @interval=&Apache::lonnet::EXT("resource.0.interval");	my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
if (@interval > 1) {	if (@interval > 1) {
if ($interval[1] eq 'course') {	if ($interval[1] eq 'course') {
return;	return;
Line 1476 sub zero_timer {	Line 1435 sub zero_timer {
my $now = time;	my $now = time;
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);	my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
if ($first_access > 0) {	if ($first_access > 0) {
if ($first_access+$interval[0] > $now) {	my ($timelimit) = split(/_/,$interval[0]);
	if ($first_access+$timelimit > $now) {
my $done_time = $now - $first_access;	my $done_time = $now - $first_access;
my $snum = 1;	my $snum = 1;
if ($interval[1] eq 'map') {	if ($interval[1] eq 'map') {
$snum = 2;	$snum = 2;
}	}
my $result =	my $result =
&Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval',	&Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval',
$snum,$done_time,	$snum,$done_time,
'date_interval',	'date_interval',
Line 1499 sub zero_timer {	Line 1459 sub zero_timer {
sub handler {	sub handler {
#my $t0 = [&gettimeofday()];	#my $t0 = [&gettimeofday()];
my $request=$_[0];	my $request=$_[0];

$Apache::lonxml::request=$request;	$Apache::lonxml::request=$request;
$Apache::lonxml::debug=$env{'user.debug'};	$Apache::lonxml::debug=$env{'user.debug'};
$env{'request.uri'}=$request->uri;	$env{'request.uri'}=$request->uri;
Line 1507 sub handler {	Line 1468 sub handler {
my $file=&Apache::lonnet::filelocation("",$request->uri);	my $file=&Apache::lonnet::filelocation("",$request->uri);

#check if we know where we are	#check if we know where we are
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) {	if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) {
# if we are browsing we might not be able to know where we are	# if we are browsing we might not be able to know where we are
if ($Apache::lonhomework::browse ne 'F' &&	if ($Apache::lonhomework::browse ne 'F' &&
$env{'request.state'} ne "construct") {	$env{'request.state'} ne "construct") {
Line 1521 sub handler {	Line 1482 sub handler {
&unset_permissions();	&unset_permissions();
return OK;	return OK;
}	}

&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");	&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");
&Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});	&Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
my ($symb) = &Apache::lonnet::whichuser();	my ($symb) = &Apache::lonnet::whichuser();
Line 1545 sub handler {	Line 1507 sub handler {
&renderpage($request,$file);	&renderpage($request,$file);
}	}
} else {	} else {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['mode']);	['mode']);
# requested file doesn't exist in contruction space	# requested file doesn't exist in contruction space
&newproblem($request);	&newproblem($request);
}	}
} else {	} else {
# Set the event timer to zero if the "done button" was clicked. The button is	# Set the event timer to zero if the "done button" was clicked. The button is
# part of the LCdoneButton form created in lonmenu.pm	# part of the doneButton form created in lonmenu.pm
if ($symb && $env{'form.LC_interval_done'} eq 'true') {	if ($symb && $env{'form.LC_interval_done'} eq 'true') {
&zero_timer($symb);	&zero_timer($symb);
undef($env{'form.LC_interval_done'});	undef($env{'form.LC_interval_done'});
}	}
Line 1577 sub template_dropdown_datastructure {	Line 1539 sub template_dropdown_datastructure {
my %tmplthash = ();	my %tmplthash = ();
# template title => path	# template title => path
my %tmpltcontent = ();	my %tmpltcontent = ();

foreach my $template (@templates){	foreach my $template (@templates){
# put in hash if the template is not empty	# put in hash if the template is not empty
unless ($template->[1] eq ''){	unless ($template->[1] eq ''){
Line 1586 sub template_dropdown_datastructure {	Line 1548 sub template_dropdown_datastructure {
}	}
}	}

my $catList = [];	my $catList = [];
foreach my $cat (sort keys %tmplthash) {	foreach my $cat (sort keys %tmplthash) {
my $catItems = [];	my $catItems = [];
foreach my $title (sort @{$tmplthash{$cat}}) {	foreach my $title (sort @{$tmplthash{$cat}}) {
my $path = $tmpltcontent{$title}->[0];	my $path = $tmpltcontent{$title}->[0];
my $code;	my $code;
Line 1598 sub template_dropdown_datastructure {	Line 1560 sub template_dropdown_datastructure {
}	}
close(FH);	close(FH);

if ($code ne '') {	if ($code ne '') {
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';	my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
my $currItem = [$href, $title, undef];	my $currItem = [$href, $title, undef];
push @{$catItems}, $currItem;	push @{$catItems}, $currItem;
}	}
}	}
push @{$catList}, [$catItems, $cat, undef];	push @{$catList}, [$catItems, $cat, undef];
}	}

return $catList;	return $catList;
}	}

sub responseblock_dropdown_datastructure {	sub responseblock_dropdown_datastructure {

	my $mathCat = [
	[
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
	],
	&mt("Math"),
	undef
	];

my $mathCat = [	my $miscCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
],
&mt("Math"),
undef
];

my $miscCat = [
[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
],	],
&mt("Miscellaneous"),	&mt("Miscellaneous"),
undef	undef
];	];

my $chemCat = [	my $chemCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
],	],
&mt("Chemistry"),	&mt("Chemistry"),
undef	undef
];	];

my $textCat = [	my $textCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
],	],
&mt("Text"),	&mt("Text"),
undef	undef
];	];

return [$mathCat, $miscCat, $chemCat, $textCat];	return [$mathCat, $miscCat, $chemCat, $textCat];
}	}
Line 1668 sub conditional_scripting_datastructure	Line 1630 sub conditional_scripting_datastructure
#TODO translated is currently temporarily here, another solution should be found where the	#TODO translated is currently temporarily here, another solution should be found where the
# needed string can be retrieved	# needed string can be retrieved

my $translatedTag = '	my $translatedTag = '
<translated>	<translated>
<lang which="en"></lang>	<lang which="en"></lang>
<lang which="default"></lang>	<lang which="default"></lang>
</translated>';	</translated>';
return [	return [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
];	];
}	}

Line 1698 sub misc_datastructure {	Line 1660 sub misc_datastructure {

# helper routine for the datastructure building subroutines	# helper routine for the datastructure building subroutines
sub default_xml_tag {	sub default_xml_tag {
my ($tag) = @_;	my ($tag) = @_;
return "\n<$tag></$tag>";	return "\n<$tag></$tag>";
}	}


sub helpmenu_datastructure {	sub helpmenu_datastructure {

# filename, title, width, height	my $width = 500;
my $helpers = [	my $height = 600;
['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],	my $helpers = [
['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],	['Problem_LON-CAPA_Functions', &mt('Script Functions')],
['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],	['Greek_Symbols', &mt('Greek Symbols')],
['Authoring_Multilingual_Problems.hlp', &mt('Languages'), 800, 600],	['Other_Symbols', &mt('Other Symbols')],
];	['Authoring_Output_Tags', &mt('Output Tags')],
	['Authoring_Multilingual_Problems',
my $help_structure = [];	&mt('How to create problems in different languages')]
	];
foreach my $count (0..(scalar(@{$helpers})-1)) {
my $filename = $helpers->[$count]->[0];	my $help_structure = [];
my $title = $helpers->[$count]->[1];
my $width = $helpers->[$count]->[2];	foreach my $count (0..(scalar(@{$helpers})-1)) {
my $height = $helpers->[$count]->[3];	my $filename = $helpers->[$count]->[0];
if ($width eq '') {	my $title = $helpers->[$count]->[1];
$width = 500;	my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
}	push @{$help_structure}, [$href, $title, undef];
if ($height eq '') {	}
$height = 600;
}
my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
push @{$help_structure}, [$href, $title, undef];
}

return $help_structure;	return $help_structure;
}	}

# we need substitution to not break javascript code	# we need substitution to not break javascript code
sub convert_for_js {	sub convert_for_js {
my $return = shift;	my $return = shift;
$return =~ s\|script\|ESCAPEDSCRIPT\|g;	$return =~ s\|script\|ESCAPEDSCRIPT\|g;
$return =~ s\|\\\|\\\\\|g;	$return =~ s\|\\\|\\\\\|g;
$return =~ s\|\n\|\\r\\n\|g;	$return =~ s\|\n\|\\r\\n\|g;
$return =~ s\|'\|\\'\|g;	$return =~ s\|'\|\\'\|g;
$return =~ s\|'\|\\'\|g;	$return =~ s\|'\|\\'\|g;
return $return;	return $return;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.344.2.8.2.2
changed lines
	Added in v.1.358