version 1.125, 2004/11/11 19:55:44
|
version 1.127, 2004/11/11 22:47:55
|
Line 43 use Apache::lonnet();
|
Line 43 use Apache::lonnet();
|
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::loncommon(); |
use Apache::loncommon(); |
|
use Apache::lonenc(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
|
use vars qw(@desklines $readdesk); |
use vars qw(@desklines $readdesk); |
Line 74 sub menubuttons {
|
Line 75 sub menubuttons {
|
|
|
my $navmaps=''; |
my $navmaps=''; |
my $reloadlink=''; |
my $reloadlink=''; |
my $escurl=&Apache::lonnet::escape(&check_encrypt($ENV{'request.noversionuri'})); |
my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); |
my $escsymb=&Apache::lonnet::escape(&check_encrypt($ENV{'request.symb'})); |
my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); |
if ($ENV{'browser.interface'} eq 'textual') { |
if ($ENV{'browser.interface'} eq 'textual') { |
# Textual display only |
# Textual display only |
my %lt=&initlittle(); |
my %lt=&initlittle(); |
Line 473 ENDREGTEXT
|
Line 474 ENDREGTEXT
|
# Registered, graphical output |
# Registered, graphical output |
} else { |
} else { |
my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; |
my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; |
$requri=&check_encrypt(&Apache::lonnet::unescape($requri)); |
$requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); |
my $cursymb=&check_encrypt($ENV{'request.symb'}); |
my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); |
my $navstatus=&get_nav_status(); |
my $navstatus=&get_nav_status(); |
$result = (<<ENDREGTHIS); |
$result = (<<ENDREGTHIS); |
|
|
Line 978 function gonav(url) {
|
Line 979 function gonav(url) {
|
NAVCONTROL |
NAVCONTROL |
} |
} |
|
|
sub check_encrypt { |
|
my $str=shift; |
|
if ($ENV{'request.enc'}) { return &Apache::lonenc::encrypted($str); } |
|
return $str; |
|
} |
|
|
|
sub utilityfunctions { |
sub utilityfunctions { |
unless (($ENV{'browser.interface'} eq 'textual') || |
unless (($ENV{'browser.interface'} eq 'textual') || |
($ENV{'environment.remote'} eq 'off')) { return ''; } |
($ENV{'environment.remote'} eq 'off')) { return ''; } |
my $currenturl=&check_encrypt($ENV{'request.noversionuri'}); |
my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); |
|
|
my $currentsymb=&check_encrypt($ENV{'request.symb'}); |
my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); |
my $nav_control=&nav_control_js(); |
my $nav_control=&nav_control_js(); |
return (<<ENDUTILITY) |
return (<<ENDUTILITY) |
|
|