--- loncom/xml/lonxml.pm 2009/05/28 11:31:03 1.495 +++ loncom/xml/lonxml.pm 2009/07/08 17:55:16 1.498 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.495 2009/05/28 11:31:03 bisitz Exp $ +# $Id: lonxml.pm,v 1.498 2009/07/08 17:55:16 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -757,6 +757,8 @@ sub init_safespace { '&maxima_cas_formula_fix'); $safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval'); + $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry'); + $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray'); $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check'); $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval, '&r_cas_formula_fix'); @@ -1041,7 +1043,7 @@ sub get_id { my ($parstack,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) { - &error(&mt("ID "[_1]" contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",''.$id.'')); + &error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"'.$id.'"')); } if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } return $id; @@ -1798,7 +1800,7 @@ ENDNOTFOUND if ($env{'environment.remote'} eq 'off') { my $brcrum; if ($env{'request.state'} eq 'construct') { - $brcrum = [{'href' => '', # FIXME Add link to /priv/[user] + $brcrum = [{'href' => &Apache::loncommon::authorspace(), 'text' => 'Construction Space'}, {'href' => '', 'text' => 'Editor'}]; @@ -1837,7 +1839,7 @@ ENDNOTFOUND 'onload' => $add_to_onload, }); $options{'bread_crumbs'} = [{ - 'href' => '', # FIXME Add link to /priv/[user] + 'href' => &Apache::loncommon::authorspace(), 'text' => 'Construction Space'}, {'href' => '', 'text' => 'HTML Editor'}];