--- loncom/interface/lonmenu.pm	2001/08/07 21:47:34	1.8
+++ loncom/interface/lonmenu.pm	2002/02/08 23:52:37	1.13
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
+# $Id: lonmenu.pm,v 1.13 2002/02/08 23:52:37 harris41 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/
+#
 # (TeX Conversion Module
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
@@ -84,7 +108,7 @@ sub rawconfig {
     my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};
-    map {
+    foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
@@ -121,7 +145,7 @@ sub rawconfig {
                 }
             }
         }
-    } @desklines;
+    }
     return $output;
 }
 
@@ -146,11 +170,11 @@ sub footer {
 
 # ================================================================ Main Program
 
-sub BEGIN {
-if ($readdesk ne 'done') {
+BEGIN {
+  unless ($readdesk) {
   {
     my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-                                 '/mydesk.tab');
+				  '/mydesk.tab');
     while (my $configline=<$config>) {
        chomp($configline);
        $desklines[$#desklines+1]=$configline;