--- loncom/xml/lonxml.pm 2012/04/16 19:46:14 1.530
+++ loncom/xml/lonxml.pm 2012/11/21 23:13:30 1.533
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.530 2012/04/16 19:46:14 raeburn Exp $
+# $Id: lonxml.pm,v 1.533 2012/11/21 23:13:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -649,9 +649,9 @@ sub setup_globals {
sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;
- $safeeval->reval('use Math::Complex;');
$safeeval->reval('use LaTeX::Table;');
$safeeval->deny_only(':dangerous');
+ $safeeval->reval('use Math::Complex;');
$safeeval->permit_only(":default");
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
@@ -1858,7 +1858,7 @@ sub get_courseupload_hierarchy {
my ($url) = @_;
my ($symb,$itemtitle,$displaypath);
if ($env{'request.course.id'}) {
- $symb = &Apache::lonnet::symbread();
+ $symb = &Apache::lonnet::symbread($url);
my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
my $navmap=Apache::lonnavmaps::navmap->new;
if (ref($navmap)) {
@@ -1957,7 +1957,7 @@ sub error {
my @userlist;
foreach (keys %users) {
my ($user,$domain) = split(/:/, $_);
- push(@userlist,"$user\@$domain");
+ push(@userlist,"$user:$domain");
my $key=$declutter.'_'.$user.'_'.$domain;
my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
[$key],
@@ -1980,7 +1980,7 @@ sub error {
$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
}
}
- push(@Apache::lonxml::error_messages,"$errormsg
");
+ push(@Apache::lonxml::error_messages,"$errormsg
");
}
}