version 1.267, 2007/04/07 00:12:42
|
version 1.268.2.2, 2007/09/21 17:25:58
|
Line 196 sub check_ip_acc {
|
Line 196 sub check_ip_acc {
|
return 1; |
return 1; |
} |
} |
my $allowed=0; |
my $allowed=0; |
my $ip=$ENV{'REMOTE_ADDR'}; |
my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'}; |
|
|
my $name; |
my $name; |
foreach my $pattern (split(',',$acc)) { |
foreach my $pattern (split(',',$acc)) { |
$pattern =~ s/^\s*//; |
$pattern =~ s/^\s*//; |
Line 901 sub renderpage {
|
Line 902 sub renderpage {
|
my @targets = @{$targets || [&get_target()]}; |
my @targets = @{$targets || [&get_target()]}; |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
|
|
my $overall_result; |
my $overall_result; |
foreach my $target (@targets) { |
foreach my $target (@targets) { |
# FIXME need to do something intelligent when a problem goes |
# FIXME need to do something intelligent when a problem goes |
Line 938 sub renderpage {
|
Line 940 sub renderpage {
|
&Apache::lonxml::debug("Should be parsing now"); |
&Apache::lonxml::debug("Should be parsing now"); |
$result .= &Apache::lonxml::xmlparse($request, $target, $problem, |
$result .= &Apache::lonxml::xmlparse($request, $target, $problem, |
&setup_vars($target),%mystyle); |
&setup_vars($target),%mystyle); |
undef($Apache::lonhomework::parsing_a_problem); |
&finished_parsing(); |
if (!$output) { $result = ''; } |
if (!$output) { $result = ''; } |
#$request->print("Result follows:"); |
#$request->print("Result follows:"); |
if ($target eq 'modified') { |
if ($target eq 'modified') { |
Line 969 sub renderpage {
|
Line 971 sub renderpage {
|
} |
} |
} |
} |
|
|
|
sub finished_parsing { |
|
undef($Apache::lonhomework::parsing_a_problem); |
|
undef($Apache::lonhomework::parsing_a_task); |
|
} |
|
|
# with no arg it returns a HTML <option> list of the template titles |
# with no arg it returns a HTML <option> list of the template titles |
# with one arg it returns the filename associated with the arg passed |
# with one arg it returns the filename associated with the arg passed |
sub get_template_list { |
sub get_template_list { |
Line 977 sub get_template_list {
|
Line 984 sub get_template_list {
|
my @allnames; |
my @allnames; |
&Apache::lonxml::debug("Looking for :$extension:"); |
&Apache::lonxml::debug("Looking for :$extension:"); |
foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) { |
foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) { |
|
&Apache::lonxml::debug("Looking at $file"); |
my $name=&Apache::lonnet::metadata($file,'title'); |
my $name=&Apache::lonnet::metadata($file,'title'); |
|
&Apache::lonxml::debug("Got a name $name"); |
if ($namewanted && ($name eq $namewanted)) { |
if ($namewanted && ($name eq $namewanted)) { |
$result=$file; |
$result=$file; |
last; |
last; |
Line 1047 $errormsg
|
Line 1056 $errormsg
|
return ''; |
return ''; |
} |
} |
|
|
|
sub update_construct_style { |
|
if ($env{'request.state'} eq "construct" |
|
&& $env{'form.problemmode'} eq &mt('View') |
|
&& defined($env{'form.submitted'}) |
|
&& !defined($env{'form.resetdata'}) |
|
&& !defined($env{'form.newrandomization'})) { |
|
if ((!$env{'form.style_file'} && $env{'construct.style'}) |
|
||$env{'form.clear_style_file'}) { |
|
&Apache::lonnet::delenv('construct\\.style'); |
|
} elsif ($env{'form.style_file'} |
|
&& $env{'construct.style'} ne $env{'form.style_file'}) { |
|
&Apache::lonnet::appenv('construct.style' => |
|
$env{'form.style_file'}); |
|
} |
|
} |
|
} |
|
|
|
|
sub handler { |
sub handler { |
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
my $request=$_[0]; |
my $request=$_[0]; |
Line 1097 sub handler {
|
Line 1124 sub handler {
|
} elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { |
} elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { |
&analyze($request,$file); |
&analyze($request,$file); |
} else { |
} else { |
|
&update_construct_style(); |
&renderpage($request,$file); |
&renderpage($request,$file); |
} |
} |
} else { |
} else { |