version 1.181, 2006/05/15 16:23:58
|
version 1.183, 2006/05/30 12:46:09
|
Line 44 use Apache::lonhtmlcommon();
|
Line 44 use Apache::lonhtmlcommon();
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonenc(); |
use Apache::lonenc(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
use vars qw(@desklines $readdesk); |
use vars qw(@desklines $readdesk); |
|
|
Line 83 sub menubuttons {
|
Line 85 sub menubuttons {
|
my $docs=''; |
my $docs=''; |
my $groups=''; |
my $groups=''; |
my $showgroups=0; |
my $showgroups=0; |
my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); |
my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); |
my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); |
my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); |
|
|
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { |
if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { |
my $returnurl = $env{'request.filename'}; |
my $returnurl = $env{'request.filename'}; |
$returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; |
$returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; |
$escurl = &Apache::lonnet::escape($returnurl); |
$escurl = &escape($returnurl); |
} |
} |
} |
} |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
Line 114 ENDNAV
|
Line 116 ENDNAV
|
if (($env{'request.noversionuri'}=~/^\/adm\//) && |
if (($env{'request.noversionuri'}=~/^\/adm\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { |
($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { |
my $escreload=&Apache::lonnet::escape('return:'); |
my $escreload=&escape('return:'); |
$reloadlink=(<<ENDRELOAD); |
$reloadlink=(<<ENDRELOAD); |
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a> |
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a> |
ENDRELOAD |
ENDRELOAD |
Line 209 ENDGROUPS
|
Line 211 ENDGROUPS
|
m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) |
m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) |
) |
) |
) { |
) { |
my $escreload=&Apache::lonnet::escape('return:'); |
my $escreload=&escape('return:'); |
$reloadlink=(<<ENDRELOAD); |
$reloadlink=(<<ENDRELOAD); |
<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> |
<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> |
ENDRELOAD |
ENDRELOAD |
} |
} |
} |
} |
if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { |
if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { |
my $escreload=&Apache::lonnet::escape('return:'); |
my $escreload=&escape('return:'); |
$reloadlink=(<<ENDCRELOAD); |
$reloadlink=(<<ENDCRELOAD); |
<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> |
<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td> |
ENDCRELOAD |
ENDCRELOAD |
Line 277 sub registerurl {
|
Line 279 sub registerurl {
|
($env{'environment.remote'} eq 'off') || |
($env{'environment.remote'} eq 'off') || |
((($env{'request.publicaccess'}) || |
((($env{'request.publicaccess'}) || |
(!&Apache::lonnet::is_on_map( |
(!&Apache::lonnet::is_on_map( |
&Apache::lonnet::unescape($env{'request.noversionuri'})))) && |
&unescape($env{'request.noversionuri'})))) && |
(!$forcereg))) { |
(!$forcereg))) { |
return $result. |
return $result. |
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; |
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title; |
Line 531 ENDREGTEXT
|
Line 533 ENDREGTEXT
|
# Registered, graphical output |
# Registered, graphical output |
} else { |
} else { |
my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
$requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); |
$requri=&Apache::lonenc::check_encrypt(&unescape($requri)); |
my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); |
my $navstatus=&get_nav_status(); |
my $navstatus=&get_nav_status(); |
my $clearcstr; |
my $clearcstr; |
Line 646 sub startupremote {
|
Line 648 sub startupremote {
|
# The Remote actually gets launched! |
# The Remote actually gets launched! |
# |
# |
my $configmenu=&rawconfig(); |
my $configmenu=&rawconfig(); |
my $esclowerurl=&Apache::lonnet::escape($lowerurl); |
my $esclowerurl=&escape($lowerurl); |
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); |
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); |
return(<<ENDREMOTESTARTUP); |
return(<<ENDREMOTESTARTUP); |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 729 sub load_remote_msg {
|
Line 731 sub load_remote_msg {
|
if (($env{'browser.interface'} eq 'textual') || |
if (($env{'browser.interface'} eq 'textual') || |
($env{'environment.remote'} eq 'off')) { return ''; } |
($env{'environment.remote'} eq 'off')) { return ''; } |
|
|
my $esclowerurl=&Apache::lonnet::escape($lowerurl); |
my $esclowerurl=&escape($lowerurl); |
my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode', |
my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode', |
"/adm/remote?action=collapse?url=$esclowerurl"); |
"/adm/remote?action=collapse&url=$esclowerurl"); |
return(<<ENDREMOTEFORM); |
return(<<ENDREMOTEFORM); |
<p> |
<p> |
<form name="wheel"> |
<form name="wheel"> |
Line 1045 sub utilityfunctions {
|
Line 1047 sub utilityfunctions {
|
unless (($env{'browser.interface'} eq 'textual') || |
unless (($env{'browser.interface'} eq 'textual') || |
($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } |
($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; } |
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); |
$currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl)); |
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl)); |
|
|
my $currentsymb=&Apache::lonenc::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(); |