--- loncom/interface/lonmenu.pm	2003/11/21 21:38:50	1.103
+++ loncom/interface/lonmenu.pm	2003/12/08 20:21:23	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.103 2003/11/21 21:38:50 www Exp $
+# $Id: lonmenu.pm,v 1.105 2003/12/08 20:21:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@ use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon;
-use Apache::File;
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -646,6 +645,7 @@ sub switch {
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
+    $img=&mt($img);
     unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {
 # Remote
@@ -668,8 +668,12 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\s*\-\s*//gs;
+
+       my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+       if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" align="'.
+	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
+	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
 	   ($nobreak==3?'right':'left').'" />';
        if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) {
 # Accessibility
@@ -962,15 +966,17 @@ ENDHEADER
 BEGIN {
   if (! defined($readdesk)) {
    {
-    my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-				  '/mydesk.tab');
-    while (my $configline=<$config>) {
-       $configline=(split(/\#/,$configline))[0];
-       $configline=~s/^\s+//;
-       chomp($configline);
-       if ($configline) {
-          $desklines[$#desklines+1]=$configline;
-       }
+    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+    if ( CORE::open( my $config,"<$tabfile") ) {
+        while (my $configline=<$config>) {
+            $configline=(split(/\#/,$configline))[0];
+            $configline=~s/^\s+//;
+            chomp($configline);
+            if ($configline) {
+                $desklines[$#desklines+1]=$configline;
+            }
+        }
+        CORE::close($config);
     }
    }
    $readdesk='done';