--- loncom/interface/lonmenu.pm 2003/10/24 21:04:21 1.96
+++ loncom/interface/lonmenu.pm 2004/08/10 18:05:12 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.96 2003/10/24 21:04:21 albertel Exp $
+# $Id: lonmenu.pm,v 1.112 2004/08/10 18:05:12 albertel 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);
@@ -66,24 +65,31 @@ sub initlittle {
# ============================= This gets called at the top of the body section
sub menubuttons {
- &Apache::lonlocal::reroutetrans();
my $forcereg=shift;
my $target =shift;
my $registration=shift;
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['inhibitmenu']);
+ if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
+
my $navmaps='';
my $reloadlink='';
- my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
+ my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
if ($ENV{'browser.interface'} eq 'textual') {
# Textual display only
my %lt=&initlittle();
+ $pgbg='#FFFFFF';
+ $tabbg='#FFFFFF';
+ $font='#000000';
if ($ENV{'request.course.id'}) {
$navmaps=(<<ENDNAV);
<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
ENDNAV
- if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
- ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
- ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+ if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
+ ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+ ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
my $escreload=&Apache::lonnet::escape('return:');
$reloadlink=(<<ENDRELOAD);
<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
@@ -114,7 +120,7 @@ ENDMAINMENU
$function='admin';
}
if (($ENV{'request.role'}=~/^(au|ca)/) ||
- ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+ ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
$function='author';
}
my $domain=&Apache::loncommon::determinedomain();
@@ -131,9 +137,9 @@ ENDMAINMENU
<td bgcolor="$tabbg">
<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>
ENDNAVREM
- if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
- ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
- ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+ if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
+ ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+ ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
my $escreload=&Apache::lonnet::escape('return:');
$reloadlink=(<<ENDRELOAD);
<td bgcolor="$tabbg">
@@ -149,7 +155,7 @@ ENDRELOAD
<script>
// BEGIN LON-CAPA Internal
</script>
-<table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
+<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
<tr>
<td bgcolor="$tabbg">
<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
@@ -164,6 +170,7 @@ $navmaps
<b>LON-CAPA</b></td>
</tr>
</table>
+</font>
<script>
// END LON-CAPA Internal
</script>
@@ -177,11 +184,10 @@ ENDINLINEMENU
# ====================================== This gets called in the header section
sub registerurl {
- &Apache::lonlocal::reroutetrans();
my $forcereg=shift;
my $target = shift;
my $result = '';
- if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
my $force_title='';
if ($ENV{'request.state'} eq 'construct') {
$force_title=&Apache::lonxml::display_title();
@@ -196,7 +202,7 @@ sub registerurl {
($ENV{'environment.remote'} eq 'off') ||
((($ENV{'request.publicaccess'}) ||
(!&Apache::lonnet::is_on_map(
- &Apache::lonnet::unescape($ENV{'REQUEST_URI'})))) &&
+ &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) &&
(!$forcereg))) {
return $result.
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
@@ -213,11 +219,10 @@ sub registerurl {
# =========== and in the body of the document
sub innerregister {
- &Apache::lonlocal::reroutetrans();
my $forcereg=shift;
my $target = shift;
my $result = '';
- if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
$Apache::lonxml::registered=1;
@@ -233,7 +238,7 @@ sub innerregister {
my $newmail='';
if ($noremote) {
- $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+ $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
}
if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
@@ -254,39 +259,38 @@ sub innerregister {
'swmenu.setstatus("you have","messages");');
}
if ($noremote) {
- $newmail.='</td></tr></table>';
+ $newmail.='</td></tr></table></font>';
}
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
- my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');
- my $tableend=($noremote?'</table>':'');
+ my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
+ my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
# =============================================================================
# ============================ This is for URLs that actually can be registered
- if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
+ if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
# -- This applies to homework problems for users with grading privileges
- my $hwkadd='';
- if
- ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
- my $crs='/'.$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $crs.='_'.$ENV{'request.course.sec'};
- }
- $crs=~s/\_/\//g;
+ my $crs='/'.$ENV{'request.course.id'};
+ if ($ENV{'request.course.sec'}) {
+ $crs.='_'.$ENV{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+ my $hwkadd='';
+ if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
if (&Apache::lonnet::allowed('vgr',$crs)) {
- $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
+ $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
"gocmd('/adm/grades','submission')",
'View user submissions for this assessment resource');
}
if (&Apache::lonnet::allowed('mgr',$crs)) {
- $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
+ $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
"gocmd('/adm/grades','gradingmenu')",
'Modify user grades for this assessment resource');
}
- if (&Apache::lonnet::allowed('opa',$crs)) {
- $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
- "gocmd('/adm/parmset','set')",
- 'Modify deadlines, etc, for this assessment resource');
- }
+ }
+ if (&Apache::lonnet::allowed('opa',$crs)) {
+ $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
+ "gocmd('/adm/parmset','set')",
+ 'Modify deadlines, etc, for this resource');
}
# -- End Homework
###
@@ -311,9 +315,11 @@ sub innerregister {
}
# Check that we are on the correct machine
my $home = &Apache::lonnet::homeserver($caname,$cadom);
- if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
- $editbutton=&switch
- ('','',6,1,$top,,$bottom,$action,$desc);
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if (!$allowed) {
+ $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
}
}
##
@@ -325,11 +331,14 @@ sub innerregister {
if ($ENV{'request.filename'}) {
my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
$file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
- # Chech that the user has permission to edit this resource
+ # Check that the user has permission to edit this resource
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
if (defined($cfudom)) {
- if (&Apache::lonnet::homeserver($cfuname,$cfudom)
- eq $Apache::lonnet::perlvar{'lonHostID'}) {
+ my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if ($allowed) {
$cfile=$file;
}
}
@@ -337,7 +346,7 @@ sub innerregister {
# Finally, turn the button on or off
if ($cfile) {
$editbutton=&switch
- ('','',6,1,'cstr.gif','edit','resource',
+ ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
"go('".$cfile."');","Edit this resource");
} elsif ($editbutton eq '') {
$editbutton=&clear(6,1);
@@ -348,20 +357,20 @@ sub innerregister {
# Prepare the rest of the buttons
my $menuitems=(<<ENDMENUITEMS);
c&3&1
-s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
-s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
+s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
+s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
c&6&3
c&8&1
c&8&2
-s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
-s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
-s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
+s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
ENDMENUITEMS
- unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+ unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
$menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
-s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
-s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
ENDREALRES
}
my $buttons='';
@@ -377,8 +386,20 @@ ENDREALRES
# Registered, textual output
my $utility=&utilityfunctions();
my $form=&serverform();
- my $inlinebuttons=
+ my $inlinebuttons='';
+
+ if ($ENV{'browser.interface'} eq 'textual') {
+ $inlinebuttons=
join('',map { (defined($_)?$_:'') } @inlineremote);
+ } else {
+ $inlinebuttons=(<<ENDINLINE);
+<tr><td>$inlineremote[21]</td><td> </td><td>$inlineremote[23]</td></tr>
+<tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
+<tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
+<tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
+<tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
+ENDINLINE
+ }
$result =(<<ENDREGTEXT);
<script>
// BEGIN LON-CAPA Internal
@@ -397,7 +418,7 @@ $form
ENDREGTEXT
# Registered, graphical output
} else {
- my $requri=(split(/\?/,$ENV{'REQUEST_URI'}))[0];
+ my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
$requri=&Apache::lonnet::unescape($requri);
$result = (<<ENDREGTHIS);
@@ -432,7 +453,7 @@ var swmenu=null;
swmenu.clearbut(7,3);
swmenu.menucltim=swmenu.setTimeout(
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
2000);
}
@@ -485,12 +506,12 @@ ENDDONOTREGTHIS
}
sub loadevents() {
- if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAreg();';
}
sub unloadevents() {
- if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+ if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
return 'LONCAPAstale();';
}
@@ -588,7 +609,9 @@ sub reopenmenu {
sub open {
my $returnval='';
if (($ENV{'browser.interface'} eq 'textual') ||
- ($ENV{'environment.remote'} eq 'off')) { return ''; }
+ ($ENV{'environment.remote'} eq 'off')) {
+ return '<script type="text/javascript">self.name="loncapaclient";</script>';
+ }
my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
unless (shift eq 'unix') {
# resizing does not work on linux because of virtual desktop sizes
@@ -633,6 +656,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
@@ -648,28 +672,45 @@ sub switch {
'<a href="javascript:'.$act.';">'.$text.'</a>';
} else {
$inlineremote[10*$row+$col]="\n<br />".
- '<a href="javascript:'.$act.';">'.$desc.'</a>';
+ $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
}
} else {
# Inline Remote
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
- if ($nobreak==3) {
- $inlineremote[10*$row+$col]="\n".
- '<td width="50%" colspan="2" align="right" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
- '</font></a></td></tr>';
- } elsif ($nobreak) {
- $inlineremote[10*$row+$col]="\n<tr>".
- '<td width="50%" colspan="2" align="left" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
- '</font></a></td>';
+
+ my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+ if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+ my $pic=
+ '<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
+ if ($nobreak==3) {
+ $inlineremote[10*$row+$col]="\n".
+ '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
+ '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
+ } elsif ($nobreak) {
+ $inlineremote[10*$row+$col]="\n<tr>".
+ '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.
+ '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
+ } else {
+ $inlineremote[10*$row+$col]="\n<tr>".
+ '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.
+ '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
+ '</font></td></tr>';
+ }
} else {
- $inlineremote[10*$row+$col]="\n<tr>".
- '<td width="50%" colspan="4" align="left" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'">'.$desc.
- '</font></a></td></tr>';
+# Inline Menu
+ $inlineremote[10*$row+$col]=
+ '<a href="javascript:'.$act.';">'.$pic.
+ '</a><font color="'.$font.'" size="2">'.$desc.
+ '</font>';
}
}
return '';
@@ -781,7 +822,10 @@ sub rawconfig {
}
$act =~ s/\$caname/$caname/g;
my $home = &Apache::lonnet::homeserver($caname,$cadom);
- if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) {
+ my $allowed=0;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+ if ($allowed) {
$output.=switch($caname,$cadom,
$row,$col,$img,$top,$bot,$act,$desc);
}
@@ -826,7 +870,7 @@ sub footer {
sub utilityfunctions {
unless (($ENV{'browser.interface'} eq 'textual') ||
($ENV{'environment.remote'} eq 'off')) { return ''; }
- my $currenturl=$ENV{'REQUEST_URI'};
+ my $currenturl=$ENV{'request.noversionuri'};
my $currentsymb=$ENV{'request.symb'};
return (<<ENDUTILITY)
@@ -865,11 +909,11 @@ function gocmd(url,cmd) {
}
function catalog_info() {
- loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+ loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
}
function chat_win() {
- lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+ lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
}
ENDUTILITY
}
@@ -894,8 +938,6 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
- &Apache::lonlocal::clearreroutetrans();
-
my $form=&serverform();
my $bodytag=&Apache::loncommon::bodytag('Main Menu');
my $function='student';
@@ -906,7 +948,7 @@ sub handler {
$function='admin';
}
if (($ENV{'request.role'}=~/^(au|ca)/) ||
- ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+ ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
$function='author';
}
my $domain=&Apache::loncommon::determinedomain();
@@ -914,7 +956,8 @@ sub handler {
$tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
$font=&Apache::loncommon::designparm($function.'.font',$domain);
# ---- Print the screen, pretent to be in text mode to generate text-based menu
- unless ($ENV{'brower.interface'} eq 'textual') {
+ unless ($ENV{'browser.interface'} eq 'textual') {
+ $ENV{'browser.interface'}='faketextual';
$ENV{'environment.remote'}='off';
}
my $utility=&utilityfunctions();
@@ -928,7 +971,6 @@ $utility
$bodytag
ENDHEADER
$r->print('<table>'.&inlinemenu().'</table>'.$form);
- $r->print(&Apache::lonlocal::endreroutetrans());
$r->print('</body></html>');
return OK;
}
@@ -938,15 +980,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';