'
+ '
'
.$content
.'
'
}
@@ -4365,9 +4590,9 @@ Returns: HTML div with CSTR path and rec
sub CSTR_pageheader {
# this is for resources; directories have customtitle, and crumbs
# and select recent are created in lonpubdir.pm
- my ($uname,$thisdisfn)=
- ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
- my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+ my ($udom,$uname,$thisdisfn)=
+ ($env{'request.filename'} =~ m|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$|);
+ my $formaction='/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
$formaction=~s/\/+/\//g;
my $parentpath = '';
@@ -4441,9 +4666,6 @@ Inputs:
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value
-=item * $no_inline_link, if true and in remote mode, don't show the
- 'Switch To Inline Menu' link
-
=item * $args, optional argument valid values are
no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,
@@ -4461,8 +4683,13 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
- $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$args)=@_;
+ my $public;
+ if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+ || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+ $public = 1;
+ }
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
$function = &get_users_function() if (!$function);
@@ -4478,10 +4705,6 @@ sub bodytag {
'link' => &designparm($function.'.link',$domain),);
@design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
- my $custommenu;
- if ($env{'environment.remote'} eq 'off') {
- $custommenu = &needs_gci_custom();
- }
# role and realm
my ($role,$realm) = split(/\./,$env{'request.role'},2);
if ($role eq 'ca') {
@@ -4491,31 +4714,17 @@ sub bodytag {
# realm
if ($env{'request.course.id'}) {
if ($env{'request.role'} !~ /^cr/) {
- if (($custommenu) && (($role eq 'cm') || ($env{'form.context'} eq 'requestcrs'))) {
- undef($role);
- } else {
- $role = &Apache::lonnet::plaintext($role,&course_type());
- }
+ $role = &Apache::lonnet::plaintext($role,&course_type());
}
- if (defined($role) && $env{'request.course.sec'}) {
+ if ($env{'request.course.sec'}) {
$role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
- }
- if ($env{'form.context'} eq 'requestcrs') {
- undef($realm);
- } else {
- $realm = $env{'course.'.$env{'request.course.id'}.'.description'};
- }
+ }
+ $realm = $env{'course.'.$env{'request.course.id'}.'.description'};
} else {
- if (($custommenu) && ($role eq 'cm')) {
- undef($role);
- } else {
- $role = &Apache::lonnet::plaintext($role);
- }
+ $role = &Apache::lonnet::plaintext($role);
}
if (!$realm) { $realm=' '; }
-# Set messages
- my $messages=&domainlogo($domain);
my $extra_body_attr = &make_attr_string($forcereg,\%design);
@@ -4528,7 +4737,7 @@ sub bodytag {
}
my $name = &plainname($env{'user.name'},$env{'user.domain'});
- if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+ if ($public) {
undef($role);
} else {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
@@ -4549,8 +4758,6 @@ sub bodytag {
$role = '
('.$role.')' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- if ($env{'environment.remote'} eq 'off') {
- # No Remote
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
return $bodytag;
}
@@ -4561,69 +4768,7 @@ sub bodytag {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }
- my $role_selector;
- if (($custommenu) && !($env{'form.context'} eq 'requestcrs') &&
- ($env{'request.course.id'}) &&
- ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest')) {
- $role_selector = &Apache::lonmenu::roles_selector(
- $env{'course.' . $env{'request.course.id'} . '.domain'},
- $env{'course.' . $env{'request.course.id'} . '.num'} );
- if ($role_selector) {
- $role_selector = '
'.$role_selector;
- }
- }
- my $cid = $env{'request.course.id'};
- my %gcicourses = (
- gci_9615072b469884921gcil1 => 'review',
- gci_1H96711d710194bfegcil1 => 'submit',
- gci_5422913620b814c90gcil1 => 'tutorial',
- );
- if (($custommenu && $cid && !$gcicourses{$cid}) &&
- !($env{'form.context'} eq 'requestcrs') ||
- ($env{'user.domain'} eq 'gcitest')) {
- my $role = 'st';
- if ($custommenu) {
- $role = 'cc';
- }
- my ($switcher_js,$switcher,$formname);
- $formname = 'pickrole';
- my %courses = &existing_gcitest_courses($role);
- my $numcourses = keys(%courses);
- my $reqdcount = 0;
- if ($cid) {
- if ($courses{$cid}) {
- $reqdcount = 1;
- }
- }
- if ($numcourses > $reqdcount) {
- $switcher = &gcitest_switcher($role,$formname,%courses);
- my $current;
- if ($cid) {
- $current = $role.'./'.$env{'course.'.$cid.'.domain'}.
- '/'.$env{'course.'.$cid.'.num'};
- }
- $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses,$formname);
- if ($switcher_js) {
- $switcher_js= <<"ENDSCRIPT";
-
-ENDSCRIPT
- }
- }
- if ($switcher) {
- $switcher = $switcher_js.$switcher;
- if ($role_selector) {
- $role_selector .= ' '.$switcher;
- } else {
- $role_selector .= '
'.$switcher;
- }
- }
- }
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {
@@ -4633,19 +4778,13 @@ ENDSCRIPT
$realm $dc_info