loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

-version 1.130, 2001/09/26 14:43:50
+version 1.132, 2001/10/01 20:06:45
  Line 1098  sub get_param {
    if ( ! $context ) { $context = -1; }
    my $args ='';
    if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-   return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+   if ( $args =~ /my \$$param=\"/ ) {
+     return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+   } else {
+     return undef;
+   }
+ }
+ sub get_param_var {
+   my ($param,$parstack,$safeeval,$context) = @_;
+   if ( ! $context ) { $context = -1; }
+   my $args ='';
+   if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+   if ( $args !~ /my \$$param=\"/ ) { return undef; }
+   my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+   if ($value =~ /^[\$\@\%]/) {
+     return &Apache::run::run("return $value",$safeeval,1);
+   } else {
+     return $value;
+   }
  }
  sub register_insert {