version 1.425, 2006/11/10 19:41:34
|
version 1.437, 2007/01/29 23:51:04
|
Line 88 use Apache::loncommon();
|
Line 88 use Apache::loncommon();
|
use Apache::lonfeedback(); |
use Apache::lonfeedback(); |
use Apache::lonmsg(); |
use Apache::lonmsg(); |
use Apache::loncacc(); |
use Apache::loncacc(); |
|
use Apache::lonmaxima(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
|
#================================================== Main subroutine: xmlparse |
#================================================== Main subroutine: xmlparse |
Line 674 sub init_safespace {
|
Line 675 sub init_safespace {
|
'&chem_standard_order'); |
'&chem_standard_order'); |
$safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status'); |
$safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status'); |
|
|
|
$safehole->wrap(\&Apache::lonmaxima::maxima_eval,$safeeval,'&maxima_eval'); |
|
$safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check'); |
|
$safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval, |
|
'&maxima_cas_formula_fix'); |
|
|
|
$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval, |
|
'&capa_formula_fix'); |
|
|
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); |
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); |
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); |
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); |
Line 780 sub init_safespace {
|
Line 789 sub init_safespace {
|
$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS'); |
$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS'); |
$safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS'); |
$safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS'); |
$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange'); |
$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange'); |
use Data::Dumper; |
# use Data::Dumper; |
$safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper'); |
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper'); |
#need to inspect this class of ops |
#need to inspect this class of ops |
# $safeeval->deny(":base_orig"); |
# $safeeval->deny(":base_orig"); |
$safeeval->permit("require"); |
$safeeval->permit("require"); |
Line 1332 FULLPAGE
|
Line 1341 FULLPAGE
|
my $cleanbut = ''; |
my $cleanbut = ''; |
|
|
my $titledisplay=&display_title(); |
my $titledisplay=&display_title(); |
my %lt=&Apache::lonlocal::texthash('st' => 'Save this', |
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', |
'vi' => 'View', |
'vi' => 'Save and View', |
|
'dv' => 'Discard Edits and View', |
|
'un' => 'undo', |
'ed' => 'Edit'); |
'ed' => 'Edit'); |
my $buttons=(<<BUTTONS); |
my $buttons=(<<BUTTONS); |
$cleanbut |
$cleanbut |
|
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" /> |
|
<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" /><hr> |
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" /> |
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" /> |
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" /> |
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" /> |
BUTTONS |
BUTTONS |
Line 1416 sub handler {
|
Line 1429 sub handler {
|
# |
# |
# Edit action? Save file. |
# Edit action? Save file. |
# |
# |
unless ($env{'request.state'} eq 'published') { |
if (!($env{'request.state'} eq 'published')) { |
if ($env{'form.savethisfile'}) { |
if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) { |
if (&storefile($file,$env{'form.filecont'})) { |
my $html_file=&Apache::lonnet::getfile($file); |
&Apache::lonxml::info("<font COLOR=\"#0000FF\">". |
my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'}); |
&mt('Updated').": ". |
|
&Apache::lonlocal::locallocaltime(time). |
|
" </font>"); |
|
} |
|
} |
} |
} |
} |
my %mystyle; |
my %mystyle; |
Line 1457 ENDNOTFOUND
|
Line 1466 ENDNOTFOUND
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['editmode']); |
['editmode']); |
} |
} |
if (!$env{'form.editmode'} || $env{'form.viewmode'}) { |
if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) { |
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents, |
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents, |
'',%mystyle); |
'',%mystyle); |
undef($Apache::lonhomework::parsing_a_task); |
undef($Apache::lonhomework::parsing_a_task); |
Line 1471 ENDNOTFOUND
|
Line 1480 ENDNOTFOUND
|
# Edit action? Insert editing commands |
# Edit action? Insert editing commands |
# |
# |
unless ($env{'request.state'} eq 'published') { |
unless ($env{'request.state'} eq 'published') { |
if ($env{'form.editmode'} && (!($env{'form.viewmode'}))) { |
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) |
|
{ |
my $displayfile=$request->uri; |
my $displayfile=$request->uri; |
$displayfile=~s/^\/[^\/]*//; |
$displayfile=~s/^\/[^\/]*//; |
my %options = (); |
my %options = (); |
Line 1561 sub error {
|
Line 1571 sub error {
|
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1); |
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1); |
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
|
my $baseurl = &Apache::lonnet::clutter($declutter); |
my @userlist; |
my @userlist; |
foreach (keys %users) { |
foreach (keys %users) { |
my ($user,$domain) = split(/:/, $_); |
my ($user,$domain) = split(/:/, $_); |
Line 1571 sub error {
|
Line 1582 sub error {
|
$cdom,$cnum); |
$cdom,$cnum); |
my $now=time; |
my $now=time; |
if ($now-$lastnotified{$key}>86400) { |
if ($now-$lastnotified{$key}>86400) { |
|
my $title = &Apache::lonnet::gettitle($symb); |
|
my $sentmessage; |
&Apache::lonmsg::user_normal_msg($user,$domain, |
&Apache::lonmsg::user_normal_msg($user,$domain, |
"Error [$declutter]",$msg); |
"Error [$title]",$msg,'',$baseurl,'','', |
|
\$sentmessage,$symb,$title,1); |
&Apache::lonnet::put('nohist_xmlerrornotifications', |
&Apache::lonnet::put('nohist_xmlerrornotifications', |
{$key => $now}, |
{$key => $now}, |
$cdom,$cnum); |
$cdom,$cnum); |
Line 1692 sub register_insert {
|
Line 1706 sub register_insert {
|
my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line); |
my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line); |
if ($tag) { |
if ($tag) { |
$insertlist{"$tagnum.tag"} = $tag; |
$insertlist{"$tagnum.tag"} = $tag; |
$insertlist{"$tagnum.description"} = $descrip; |
$insertlist{"$tag.description"} = $descrip; |
$insertlist{"$tagnum.color"} = $color; |
$insertlist{"$tag.color"} = $color; |
$insertlist{"$tagnum.function"} = $function; |
$insertlist{"$tag.function"} = $function; |
if (!defined($show)) { $show='yes'; } |
if (!defined($show)) { $show='yes'; } |
$insertlist{"$tagnum.show"}= $show; |
$insertlist{"$tag.show"}= $show; |
$insertlist{"$tagnum.helpfile"} = $helpfile; |
$insertlist{"$tag.helpfile"} = $helpfile; |
$insertlist{"$tagnum.helpdesc"} = $helpdesc; |
$insertlist{"$tag.helpdesc"} = $helpdesc; |
$insertlist{"$tag.num"}=$tagnum; |
$insertlist{"$tag.num"}=$tagnum; |
$tagnum++; |
$tagnum++; |
} |
} |
Line 1712 sub register_insert {
|
Line 1726 sub register_insert {
|
for (my $j=0;$j <=$#which;$j++) { |
for (my $j=0;$j <=$#which;$j++) { |
if ( $which[$j] eq 'Y' ) { |
if ( $which[$j] eq 'Y' ) { |
if ($insertlist{"$j.show"} ne 'no') { |
if ($insertlist{"$j.show"} ne 'no') { |
push(@{ $insertlist{"$tag.which"} },$j); |
push(@{ $insertlist{"$tag.which"} },$insertlist{"$j.tag"}); |
} |
} |
} |
} |
} |
} |
Line 1721 sub register_insert {
|
Line 1735 sub register_insert {
|
} |
} |
|
|
sub description { |
sub description { |
my ($token)=@_; |
my ($token)=@_; |
my $tagnum; |
my $tag = &get_tag($token); |
my $tag=$token->[1]; |
return $insertlist{$tag.'.description'}; |
foreach my $namespace (reverse @Apache::lonxml::namespace) { |
|
my $testtag=$namespace.'::'.$tag; |
|
$tagnum=$insertlist{"$testtag.num"}; |
|
if (defined($tagnum)) { last; } |
|
} |
|
if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; } |
|
return $insertlist{$tagnum.'.description'}; |
|
} |
} |
|
|
# Returns a list containing the help file, and the description |
# Returns a list containing the help file, and the description |
sub helpinfo { |
sub helpinfo { |
my ($token)=@_; |
my ($token)=@_; |
my $tagnum; |
my $tag = &get_tag($token); |
my $tag=$token->[1]; |
return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'}); |
foreach my $namespace (reverse @Apache::lonxml::namespace) { |
} |
my $testtag=$namespace.'::'.$tag; |
|
$tagnum=$insertlist{"$testtag.num"}; |
sub get_tag { |
if (defined($tagnum)) { last; } |
my ($token)=@_; |
} |
my $tagnum; |
if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; } |
my $tag=$token->[1]; |
return ($insertlist{$tagnum.'.helpfile'}, $insertlist{$tagnum.'.helpdesc'}); |
foreach my $namespace (reverse(@Apache::lonxml::namespace)) { |
|
my $testtag = $namespace.'::'.$tag; |
|
$tagnum = $insertlist{"$testtag.num"}; |
|
last if (defined($tagnum)); |
|
} |
|
if (!defined($tagnum)) { |
|
$tagnum = $Apache::lonxml::insertlist{"$tag.num"}; |
|
} |
|
return $insertlist{"$tagnum.tag"}; |
} |
} |
|
|
1; |
1; |