version 1.346, 2004/10/21 02:43:34
|
version 1.351, 2005/01/24 22:36:03
|
Line 1157 sub inserteditinfo {
|
Line 1157 sub inserteditinfo {
|
if ($filetype eq 'html') { |
if ($filetype eq 'html') { |
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons(); |
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons(); |
$initialize=&Apache::lonhtmlcommon::htmlareaheaders(). |
$initialize=&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::spellheader().(<<FULLPAGE); |
&Apache::lonhtmlcommon::spellheader(); |
|
if (!&Apache::lonhtmlcommon::htmlareablocked() && |
|
&Apache::lonhtmlcommon::htmlareabrowser()) { |
|
$initialize.=(<<FULLPAGE); |
<script type="text/javascript"> |
<script type="text/javascript"> |
$addbuttons |
$addbuttons |
|
|
Line 1170 $addbuttons
|
Line 1173 $addbuttons
|
} |
} |
</script> |
</script> |
FULLPAGE |
FULLPAGE |
|
} else { |
|
$initialize.=(<<FULLPAGE); |
|
<script type="text/javascript"> |
|
$addbuttons |
|
function initDocument() { |
|
} |
|
</script> |
|
FULLPAGE |
|
} |
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i; |
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i; |
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
} |
} |
Line 1326 ENDNOTFOUND
|
Line 1338 ENDNOTFOUND
|
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
my $displayfile=$request->uri; |
my $displayfile=$request->uri; |
$displayfile=~s/^\/[^\/]*//; |
$displayfile=~s/^\/[^\/]*//; |
$result='<html><body bgcolor="#FFFFFF">'. |
my $bodytag='<body bgcolor="#FFFFFF">'; |
|
if ($ENV{'environment.remote'} eq 'off') { |
|
$bodytag=&Apache::loncommon::bodytag(); |
|
} |
|
$result='<html>'.$bodytag. |
&Apache::lonxml::message_location().'<h3>'. |
&Apache::lonxml::message_location().'<h3>'. |
$displayfile. |
$displayfile. |
'</h3></body></html>'; |
'</h3></body></html>'; |
Line 1365 sub debug {
|
Line 1381 sub debug {
|
} |
} |
} |
} |
|
|
|
sub show_error_warn_msg { |
|
if ($ENV{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' && |
|
&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) { |
|
return 1; |
|
} |
|
return (($Apache::lonxml::debug eq 1) || |
|
($ENV{'request.state'} eq 'construct') || |
|
($Apache::lonhomework::browse eq 'F' |
|
&& |
|
$ENV{'form.show_errors'} eq 'on')); |
|
} |
|
|
sub error { |
sub error { |
$errorcount++; |
$errorcount++; |
if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { |
if ( &show_error_warn_msg() ) { |
# If printing in construction space, put the error inside <pre></pre> |
# If printing in construction space, put the error inside <pre></pre> |
push(@Apache::lonxml::error_messages, |
push(@Apache::lonxml::error_messages, |
$Apache::lonxml::warnings_error_header. |
$Apache::lonxml::warnings_error_header. |
Line 1407 sub warning {
|
Line 1435 sub warning {
|
$warningcount++; |
$warningcount++; |
|
|
if ($ENV{'form.grade_target'} ne 'tex') { |
if ($ENV{'form.grade_target'} ne 'tex') { |
if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) { |
if ( &show_error_warn_msg() ) { |
my $request=$Apache::lonxml::request; |
my $request=$Apache::lonxml::request; |
if (!$request) { $request=Apache->request; } |
if (!$request) { $request=Apache->request; } |
push(@Apache::lonxml::warning_messages, |
push(@Apache::lonxml::warning_messages, |
Line 1572 sub whichuser {
|
Line 1600 sub whichuser {
|
my ($passedsymb)=@_; |
my ($passedsymb)=@_; |
my ($symb,$courseid,$domain,$name,$publicuser); |
my ($symb,$courseid,$domain,$name,$publicuser); |
if (defined($ENV{'form.grade_symb'})) { |
if (defined($ENV{'form.grade_symb'})) { |
my $tmp_courseid=$ENV{'form.grade_courseid'}; |
my ($tmp_courseid)= |
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid); |
&Apache::loncommon::get_env_multiple('form.grade_courseid'); |
if (!$allowed && |
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid); |
exists($ENV{'request.course.sec'}) && |
if (!$allowed && |
$ENV{'request.course.sec'} !~ /^\s*$/) { |
exists($ENV{'request.course.sec'}) && |
$allowed=&Apache::lonnet::allowed('vgr',$ENV{'form.grade_courseid'}. |
$ENV{'request.course.sec'} !~ /^\s*$/) { |
'/'.$ENV{'request.course.sec'}); |
$allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid. |
} |
'/'.$ENV{'request.course.sec'}); |
if ($allowed) { |
|
$symb=$ENV{'form.grade_symb'}; |
|
$courseid=$ENV{'form.grade_courseid'}; |
|
$domain=$ENV{'form.grade_domain'}; |
|
$name=$ENV{'form.grade_username'}; |
|
} |
|
} else { |
|
if (!$passedsymb) { |
|
$symb=&Apache::lonnet::symbread(); |
|
} else { |
|
$symb=$passedsymb; |
|
} |
} |
$courseid=$ENV{'request.course.id'}; |
if ($allowed) { |
$domain=$ENV{'user.domain'}; |
($symb)=&Apache::loncommon::get_env_multiple('form.grade_symb'); |
$name=$ENV{'user.name'}; |
$courseid=$tmp_courseid; |
if ($name eq 'public' && $domain eq 'public') { |
($domain)=&Apache::loncommon::get_env_multiple('form.grade_domain'); |
if (!defined($ENV{'form.username'})) { |
($name)=&Apache::loncommon::get_env_multiple('form.grade_username'); |
$ENV{'form.username'}.=time.rand(10000000); |
return ($symb,$courseid,$domain,$name,$publicuser); |
} |
} |
$name.=$ENV{'form.username'}; |
} |
|
if (!$passedsymb) { |
|
$symb=&Apache::lonnet::symbread(); |
|
} else { |
|
$symb=$passedsymb; |
|
} |
|
$courseid=$ENV{'request.course.id'}; |
|
$domain=$ENV{'user.domain'}; |
|
$name=$ENV{'user.name'}; |
|
if ($name eq 'public' && $domain eq 'public') { |
|
if (!defined($ENV{'form.username'})) { |
|
$ENV{'form.username'}.=time.rand(10000000); |
} |
} |
|
$name.=$ENV{'form.username'}; |
} |
} |
return ($symb,$courseid,$domain,$name,$publicuser); |
return ($symb,$courseid,$domain,$name,$publicuser); |
} |
} |