version 1.254, 2009/03/02 11:51:25
|
version 1.258, 2009/04/14 23:52:11
|
Line 174 sub initlittle {
|
Line 174 sub initlittle {
|
'Courses':'Roles'), |
'Courses':'Roles'), |
'other' => 'Other Roles', |
'other' => 'Other Roles', |
'docs' => 'Edit Course', |
'docs' => 'Edit Course', |
'exit' => 'Exit', |
'exit' => 'Logout', |
'login' => 'Log In', |
'login' => 'Log In', |
'launch' => 'Launch Remote Control', |
'launch' => 'Launch Remote Control', |
'groups' => 'Groups', |
'groups' => 'Groups', |
Line 348 ENDCRELOAD
|
Line 348 ENDCRELOAD
|
my $form=&serverform(); |
my $form=&serverform(); |
my $utility=&utilityfunctions(); |
my $utility=&utilityfunctions(); |
|
|
|
my $messagelink = ""; |
|
if(&Apache::lonmsg::mynewmail()){ |
|
$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>' |
|
}else{ |
|
$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>' |
|
} |
my $helplink=&Apache::loncommon::top_nav_help('Help'); |
my $helplink=&Apache::loncommon::top_nav_help('Help'); |
return (<<ENDINLINEMENU); |
return (<<ENDINLINEMENU); |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 358 $utility
|
Line 364 $utility
|
</script> |
</script> |
<ol class="LC_smallMenu LC_right"> |
<ol class="LC_smallMenu LC_right"> |
<li>$logo</li> |
<li>$logo</li> |
<li><a href="javascript:go('/adm/communicate');">Message</a></li> |
<li>$messagelink</li> |
<li>$roles</li> |
<li>$roles</li> |
<li>$helplink</li> |
<li>$helplink</li> |
<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li> |
<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li> |
Line 517 sub innerregister {
|
Line 523 sub innerregister {
|
### resource |
### resource |
### |
### |
my $editbutton = ''; |
my $editbutton = ''; |
|
my $noeditbutton = 1; |
|
my ($cnum,$cdom); |
|
if ($env{'request.course.id'}) { |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
} |
if ($env{'user.author'}) { |
if ($env{'user.author'}) { |
if ($env{'request.role'}=~/^(aa|ca|au)/) { |
if ($env{'request.role'}=~/^(aa|ca|au)/) { |
# Set defaults for authors |
# Set defaults for authors |
Line 544 sub innerregister {
|
Line 556 sub innerregister {
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); |
$editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); |
|
$noeditbutton = 0; |
} |
} |
} |
} |
## |
## |
Line 552 sub innerregister {
|
Line 565 sub innerregister {
|
my $cfile=''; |
my $cfile=''; |
my $cfuname=''; |
my $cfuname=''; |
my $cfudom=''; |
my $cfudom=''; |
|
my $uploaded; |
if ($env{'request.filename'}) { |
if ($env{'request.filename'}) { |
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
if (defined($cnum) && defined($cdom)) { |
# Check that the user has permission to edit this resource |
$uploaded = &is_course_upload($file,$cnum,$cdom); |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
} |
if (defined($cfudom)) { |
if (!$uploaded) { |
my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$2/; |
my $allowed=0; |
# Check that the user has permission to edit this resource |
my @ids=&Apache::lonnet::current_machine_ids(); |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (defined($cfudom)) { |
if ($allowed) { |
my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$cfile=$file; |
my $allowed=0; |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
|
if ($allowed) { |
|
$cfile=$file; |
|
} |
} |
} |
} |
} |
} |
} |
# Finally, turn the button on or off |
# Finally, turn the button on or off |
if ($cfile && !$const_space) { |
if ($cfile && !$const_space) { |
$editbutton=&switch |
$editbutton=&switch |
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]', |
"go('".$cfile."');","Edit this resource"); |
"go('".$cfile."');","Edit this resource"); |
|
$noeditbutton = 0; |
} elsif ($editbutton eq '') { |
} elsif ($editbutton eq '') { |
$editbutton=&clear(6,1); |
$editbutton=&clear(6,1); |
} |
} |
} |
} |
|
if (($noeditbutton) && ($env{'request.filename'})) { |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
my $file=&Apache::lonnet::declutter($env{'request.filename'}); |
|
if (defined($cnum) && defined($cdom)) { |
|
if (&is_course_upload($file,$cnum,$cdom)) { |
|
my $cfile = &edit_course_upload($file,$cnum,$cdom); |
|
if ($cfile) { |
|
$editbutton=&switch |
|
('','',6,1,'pcstr.gif','edit[_1]', |
|
'resource[_2]',"go('".$cfile."');", |
|
'Edit this resource'); |
|
} |
|
} |
|
} |
|
} |
|
} |
### |
### |
### |
### |
# Prepare the rest of the buttons |
# Prepare the rest of the buttons |
Line 626 $menuitems.="Make notes and annotations
|
Line 662 $menuitems.="Make notes and annotations
|
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
if (!$env{'request.enc'}) { |
if (!$env{'request.enc'}) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information |
s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show Metadata |
ENDREALRES |
ENDREALRES |
} |
} |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
Line 810 ENDDONOTREGTHIS
|
Line 846 ENDDONOTREGTHIS
|
return $result; |
return $result; |
} |
} |
|
|
|
sub is_course_upload { |
|
my ($file,$cnum,$cdom) = @_; |
|
my $uploadpath = &LONCAPA::propath($cdom,$cnum); |
|
$uploadpath =~ s{^\/}{}; |
|
if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) || |
|
($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) { |
|
return 1; |
|
} |
|
return; |
|
} |
|
|
|
sub edit_course_upload { |
|
my ($file,$cnum,$cdom) = @_; |
|
my $cfile; |
|
if ($file =~/\.(htm|html|css|js|txt)$/) { |
|
my $ext = $1; |
|
my $url = &Apache::lonnet::hreflocation('',$file); |
|
my $home = &Apache::lonnet::homeserver($cnum,$cdom); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my $dest; |
|
if ($home && grep(/^\Q$home\E$/,@ids)) { |
|
$dest = $url.'?forceedit=1'; |
|
} else { |
|
unless (&Apache::lonnet::get_locks()) { |
|
$dest = '/adm/switchserver?otherserver='. |
|
$home.'&role='.$env{'request.role'}. |
|
'&url='.$url.'&forceedit=1'; |
|
} |
|
} |
|
if ($dest) { |
|
$cfile = &HTML::Entities::encode($dest,'"<>&'); |
|
} |
|
} |
|
return $cfile; |
|
} |
|
|
sub loadevents() { |
sub loadevents() { |
if ($env{'request.state'} eq 'construct' || |
if ($env{'request.state'} eq 'construct' || |
$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } |
$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } |