Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.976.2.6 and 1.976.2.7

version 1.976.2.6, 2009/01/05 16:29:24 version 1.976.2.7, 2009/03/20 21:18:26
Line 522  sub appenv { Line 522  sub appenv {
 # ----------------------------------------------------- Delete from Environment  # ----------------------------------------------------- Delete from Environment
   
 sub delenv {  sub delenv {
     my $delthis=shift;      my ($delthis,$regexp) = @_;
     if (($delthis=~/user\.role/) || ($delthis=~/user\.priv/)) {      if (($delthis=~/user\.role/) || ($delthis=~/user\.priv/)) {
         &logthis("<font color=\"blue\">WARNING: ".          &logthis("<font color=\"blue\">WARNING: ".
                 "Attempt to delete from environment ".$delthis);                  "Attempt to delete from environment ".$delthis);
Line 535  sub delenv { Line 535  sub delenv {
  tie(my %disk_env,'GDBM_File',$env{'user.environment'},   tie(my %disk_env,'GDBM_File',$env{'user.environment'},
     (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {      (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
  foreach my $key (keys(%disk_env)) {   foreach my $key (keys(%disk_env)) {
     if ($key=~/^\Q$delthis\E/) {               if ($regexp) {
  delete($env{$key});                  if ($key=~/^$delthis/) {
  delete($disk_env{$key});                      delete($env{$key});
     }                      delete($disk_env{$key});
                   }
               } else {
                   if ($key=~/^\Q$delthis\E/) {
                       delete($env{$key});
                       delete($disk_env{$key});
                   }
               }
  }   }
  untie(%disk_env);   untie(%disk_env);
     }      }
Line 9228  in the user's environment.db and in %env Line 9235  in the user's environment.db and in %env
   
 =item *  =item *
 X<delenv()>  X<delenv()>
 B<delenv($regexp)>: removes all items from the session  B<delenv($delthis,$regexp)>: removes all items from the session
 environment file that matches the regular expression in $regexp. The  environment file that begin with $delthis. If the
 values are also delted from the current processes %env.  optional second arg - $regexp - is true, $delthis is treated as a
   regular expression, otherwise \Q$delthis\E is used.
   The values are also deleted from the current processes %env.
   
 =item * get_env_multiple($name)   =item * get_env_multiple($name) 
   

Removed from v.1.976.2.6  
changed lines
  Added in v.1.976.2.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>