--- loncom/interface/lonaboutme.pm 2012/10/04 13:41:10 1.149 +++ loncom/interface/lonaboutme.pm 2012/12/07 17:15:56 1.153 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.149 2012/10/04 13:41:10 bisitz Exp $ +# $Id: lonaboutme.pm,v 1.153 2012/12/07 17:15:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,8 +50,6 @@ described at http://www.lon-capa.org. =item handler() -=item in_course() - =item aboutme_info() =item print_portfiles_link() @@ -141,9 +139,8 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['forceedit','forcestudent', - 'register','popup']); - + ['forceedit','forcestudent','todocs', + 'register','popup','folderpath','title']); # ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { &display_portfolio_header($r,$is_course); @@ -168,7 +165,7 @@ sub handler { if ($is_course) { if ($target ne 'tex') { - my $args = {'function' => $env{'forcestudent'}, + my $args = {'function' => undef, 'domain' => $cdom}; if ($env{'form.register'}) { $args->{'force_register'} = $env{'form.register'}; @@ -192,17 +189,24 @@ sub handler { return OK; } -# --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - #------------Get rights my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); - my $allowed=0; - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && - ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } + my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); + my ($allowed,$coursedomain,$coursenum); + if ($env{'request.course.id'}) { + $coursedomain = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $coursenum = $env{'course.'.$env{'request.course.id'}.'.num'}; + } + my ($cfile) = + &Apache::lonnet::can_edit_resource($env{'request.noversionuri'}, + $coursenum,$coursedomain, + $env{'request.noversionuri'}, + $env{'request.symb'}); + if ($cfile ne '') { + $allowed = 1; + } + + if (!$env{'form.forceedit'} or $target eq 'tex') { $allowed=0; } # --------------------------------------- There is such a user, get environment @@ -215,60 +219,29 @@ sub handler { if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window $args->{'no_nav_bar'} = 1; } elsif (!$env{'form.register'}) { #Don't show breadcrumbs twice, when this page is part of course content and you call it - $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme", - text=>"Personal Information Page"}]; + if (($env{'request.course.id'}) && + ($env{'form.folderpath'} =~ /^supplemental/)) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Personal Information Page'); + } + my $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; + } + } else { + $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme", + text=>"Personal Information Page"}]; + } } my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args); $r->print($start_page); } -#----------------Print Functions - if ($target ne 'tex') { - my $functions=&Apache::lonhtmlcommon::start_funclist(); - if ($allowed) { - my $query_string = &build_query_string( - {'forcestudent' => '1', - 'popup' => $env{'form.popup'}}); - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_PublicView')); - } elsif ($privleged) { - my $query_string = &build_query_string( - {'forceedit' => '1', - 'popup' => $env{'form.popup'}}); - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Edit').''); - } - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - &Apache::lontemplate::send_message($r,$cnum,$cdom)); - - if ($env{'request.course.id'} && - &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && - &in_course($cdom,$cnum)) { - if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - &Apache::loncommon::track_student_link( - 'View recent activity by this student',$cnum,$cdom)); - } - if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || - &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - &Apache::loncommon::slot_reservations_link( - 'Slot reservation history',$cnum,$cdom)); - } - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - &Apache::loncommon::noteswrapper( - &mt('Add Records'),$cnum,$cdom)); - } - $functions.=&Apache::lonhtmlcommon::end_funclist(); - $r->print(&Apache::loncommon::head_subbox($functions)); - } +#----------------Print Privacy note (edit mode) or last modified date. -# Print Privacy Note if ($target ne 'tex') { #Print Privacy Note if ($allowed) { @@ -277,36 +250,36 @@ sub handler { .&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.') .'' ); - } - } - -#Print last modified - - if ($target ne 'tex') { - my $lastmod; - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - $lastmod=$syllabus{'uploaded.lastmodified'}; + } elsif ($syllabus{'uploaded.lastmodified'}) { + #Print last modified + my $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); $r->print('
'); - $r->print(&mt('Last updated').': '.$lastmod . ''); + $r->print(&mt('Last updated').': '.$lastmod . ''); $r->print('
'); } } -#Print Help Text - if ($target ne 'tex') { - if($allowed){ - $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); - } - } #------Print Headtitle if ($target ne 'tex') { - $r->print('
'); - $r->print('

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); - if ($courseenv{'nickname'}) { - $r->print('

"'.$courseenv{'nickname'}.'"

'); - } - $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); + $r->print('
'. + '

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); + if ($allowed) { + $r->print('
'); + if ($courseenv{'nickname'}) { + $r->print('

"'.$courseenv{'nickname'}.'"

'); + } + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); + #Print Help Text + $r->print('
'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')). + '

'); + } else { + if ($courseenv{'nickname'}) { + $r->print('

"'.$courseenv{'nickname'}.'"

'); + } + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); + } } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); @@ -414,7 +387,7 @@ sub handler { if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) - && &in_course($cdom,$cnum)) { + && &Apache::lonnet::in_course($cdom,$cnum,$coursedomain,$coursenum,undef,1)) { if ($target ne 'tex') { $r->print(''); &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box'); @@ -444,31 +417,6 @@ sub handler { return OK; } -sub in_course { - my ($udom,$uname,$cdom,$cnum,$type) = @_; - $type ||= 'any'; - if (!defined($cdom) || !defined($cnum)) { - my $cid = $env{'request.course.id'}; - $cdom = $env{'course.'.$cid.'.domain'}; - $cnum = $env{'course.'.$cid.'.num'}; - } - my $typesref; - if ($type eq 'all') { - $typesref = ['active','previous','future']; - } elsif ($type eq 'previous' || $type eq 'future') { - $typesref = [$type]; - } - my %roles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles', - $typesref,undef,[$cdom]); - my ($tmp) = keys(%roles); - return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i); - my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles)); - if (@course_roles > 0) { - return 1; - } - return 0; -} - sub aboutme_info { my ($r,$is_course) = @_; my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); @@ -852,7 +800,7 @@ sub aboutme_access { } if ((&Apache::lonnet::allowed('srm',$privcheck)) || (&Apache::lonnet::allowed('dff',$privcheck))) { - if (&in_course($uname,$udom,$cnum,$cdom)) { + if (&Apache::lonnet::in_course($uname,$udom,$cnum,$cdom,undef,1)) { return 1; } }