--- loncom/xml/lonxml.pm 2008/05/28 01:32:59 1.478
+++ loncom/xml/lonxml.pm 2008/06/10 16:20:39 1.480
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.478 2008/05/28 01:32:59 www Exp $
+# $Id: lonxml.pm,v 1.480 2008/06/10 16:20:39 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -718,6 +718,7 @@ sub init_safespace {
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->permit("time");
+ $safeeval->permit("caller");
$safeeval->deny("rand");
$safeeval->deny("srand");
$safeeval->deny(":base_io");
@@ -737,6 +738,9 @@ sub init_safespace {
$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
'&capa_formula_fix');
+ $safehole->wrap(\&Apache::lonlocal::locallocaltime,$safeeval,
+ '&locallocaltime');
+
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
@@ -1507,17 +1511,17 @@ sub renderingoptions {
}
return
''.
- &mt('Language: ').
+ &mt('Language:').' '.
&Apache::loncommon::select_form($env{'form.languages'},'languages',
%langchoices).'
'.
- &mt('Math Rendering: ').
+ &mt('Math Rendering:').' '.
&Apache::loncommon::select_form($env{'form.texengine'},'texengine',
('' => '',
- 'tth' => 'tth',
+ 'tth' => 'tth (Tex-to-HTML)',
'jsMath' => 'jsMath',
- 'mimetex' => 'mimetex')).'
+ 'mimetex' => 'mimetex (Convert to Images)')).'
';
}