--- loncom/lonnet/perl/lonnet.pm 2001/11/22 20:09:22 1.177 +++ loncom/lonnet/perl/lonnet.pm 2001/12/04 15:19:11 1.180 @@ -1,6 +1,30 @@ # The LearningOnline Network # TCP networking package # +# $Id: lonnet.pm,v 1.180 2001/12/04 15:19:11 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30, # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19, # 11/8,11/16,11/18,11/22,11/23,12/22, @@ -35,9 +59,9 @@ # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26, # 10/2 Gerd Kortemeyer # 10/5,10/10,11/13,11/15 Scott Harrison -# 11/17,11/20,11/22 Gerd Kortemeyer +# 11/17,11/20,11/22,11/29 Gerd Kortemeyer # -# $Id: lonnet.pm,v 1.177 2001/11/22 20:09:22 www Exp $ +# $Id: lonnet.pm,v 1.180 2001/12/04 15:19:11 albertel Exp $ # ### @@ -939,7 +963,7 @@ sub tmpreset { $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', &GDBM_WRCREAT,0640)) { foreach my $key (keys %hash) { - if ($key=~ /:$symb:/) { + if ($key=~ /:$symb/) { delete($hash{$key}); } } @@ -2385,6 +2409,7 @@ sub symblist { sub symbread { my $thisfn=shift; unless ($thisfn) { + if ($ENV{'request.symb'}) { return $ENV{'request.symb'}; } $thisfn=$ENV{'request.filename'}; } $thisfn=declutter($thisfn); @@ -2581,8 +2606,7 @@ sub unescape { # ================================================================ Main Program -sub BEGIN { -unless ($readit) { +BEGIN { # ------------------------------------------------------------ Read access.conf { my $config=Apache::File->new("/etc/httpd/conf/access.conf"); @@ -2682,5 +2706,5 @@ $readit='done'; &logtouch(); &logthis('INFO: Read configuration'); } -} + 1;