';
if ($cols > 80) { $cols = 80; }
if ($cols < 70) { $cols = 70; }
if ($rows < 20) { $rows = 20; }
- $result.='
+ my $bodytag='';
+ if ($ENV{'environment.remote'} eq 'off') {
+ $bodytag=&Apache::loncommon::bodytag();
+ }
+ $result.=''.$bodytag.&Apache::lonxml::message_location().'
';
+ &Apache::lonxml::add_messages(\$result);
$request->print($result);
}
return '';
@@ -500,12 +612,21 @@ sub renderpage {
my ($request,$file) = @_;
my (@targets) = &get_target();
+ &Apache::lonhomework::showhashsubset(\%ENV,'form.');
&Apache::lonxml::debug("Running targets ".join(':',@targets));
+ my $overall_result;
foreach my $target (@targets) {
+ # FIXME need to do something intelligent when a problem goes
+ # from viewable to not viewable due to map conditions
+ #&setuppermissions();
+ #if ( $Apache::lonhomework::browse ne '2'
+ # && $Apache::lonhomework::browse ne 'F' ) {
+ # $request->print(" You most likely shouldn't see me.");
+ #}
#my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
if ($problem eq -1) {
- &Apache::lonxml::error(" Unable to find $file");
+ &Apache::lonxml::error(" ".&mt('Unable to find')." $file");
$problem='';
}
@@ -532,12 +653,16 @@ sub renderpage {
#$result =~ s:::;
#$result.=" Spent $td seconds processing target $target\n";
#}
- $request->print($result);
- $request->rflush();
+# $request->print($result);
+ $overall_result.=$result;
+# $request->rflush();
}
#$request->print(":Result ends");
#my $td=&tv_interval($t0);
}
+ &Apache::lonxml::add_messages(\$overall_result);
+ $request->print($overall_result);
+ $request->rflush();
}
# with no arg it returns a HTML \n\n';
}
return $result;
@@ -586,28 +711,40 @@ sub newproblem {
copy($templatefilename,$dest);
&renderpage($request,$dest);
} else {
- my $url=$request->uri;
+ my $url=&HTML::Entities::encode($request->uri,'<>&"');
+ my $shownurl=$url;
+ $shownurl=~s-^/~-/priv/-;
my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $errormsg;
if ($ENV{'form.newfile'}) {
- $errormsg='
You did not select a template.
'."\n";
+ $errormsg='
'.&mt('You did not select a template.').'
'."\n";
}
my $instructions;
- if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
+ my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+ ($ENV{'environment.remote'} ne 'off'));
+ if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").' '.&mt("Then");}
+ my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
+ 'resource' => 'resource',
+ 'requested' => 'The requested file',
+ 'not exist' => 'currently does not exist',
+ 'createnew' => 'To create a new',
+ 'click' => 'click on the',
+ 'Create' => 'Create',
+ 'button' => 'button');
$request->print(<
-
Creating a new $extension resource
+$bodytag
+
$lt{'create'} $extension $lt{'resource'}
$errormsg
-The requested file $url currently does not exist.
+$lt{'requested'} $shownurl $lt{'not exist'}.
-To create a new $extension$instructions click on the "Create $extension" button.
+$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.
");
}
return '';
@@ -615,12 +752,18 @@ ENDNEWPROBLEM
sub view_or_edit_menu {
my ($request) = @_;
- my $url=$request->uri;
+ my $url=&HTML::Entities::encode($request->uri,'<>&"');
+ my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to',
+ 'view' => 'View',
+ 'Edit' => 'edit',
+ 'or' => 'or',
+ 'the problem' => 'the problem');
$request->print(<
EDITMENU
@@ -631,13 +774,8 @@ sub handler {
my $request=$_[0];
$Apache::lonxml::debug=$ENV{'user.debug'};
-
- if (&setupheader($request)) { return OK; }
$ENV{'request.uri'}=$request->uri;
-
- #setup permissions
- $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
- $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ &setuppermissions();
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
# some times multiple problemmodes are submitted, need to select
# the last one
@@ -655,7 +793,8 @@ sub handler {
#check if we know where we are
if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) {
# 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") {
#should know where we are, so ask
if ( &Apache::lonnet::mod_perl_version() == 2 ) {
&Apache::lonnet::cleanenv();
@@ -663,13 +802,14 @@ sub handler {
$request->internal_redirect('/adm/ambiguous'); return;
}
}
+ if (&setupheader($request)) { return OK; }
my ($symb) = &Apache::lonxml::whichuser();
&Apache::lonxml::debug('symb is '.$symb);
if ($ENV{'request.state'} eq "construct" || $symb eq '') {
- if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
- $ENV{'form.resetdata'} eq 'New Problem Variation' ||
- $ENV{'form.newrandomization'} eq 'New Randomization') {
+ if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') ||
+ $ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+ $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
&Apache::lonnet::tmpreset($symb,'',$domain,$name);
&Apache::lonxml::debug("Attempt reset");
@@ -684,9 +824,9 @@ sub handler {
#&view_or_edit_menu($request);
$ENV{'form.problemmode'}='View';
&renderpage($request,$file);
- } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
+ } elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) {
&editxmlmode($request,$file);
- } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
+ } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
&analyze($request,$file);
} else {
&renderpage($request,$file);