--- loncom/interface/lonaboutme.pm 2010/09/26 02:02:42 1.147 +++ loncom/interface/lonaboutme.pm 2023/12/28 15:57:27 1.168 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.147 2010/09/26 02:02:42 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.168 2023/12/28 15:57:27 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() @@ -80,11 +78,13 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; -use Apache::lonfeedback; +use Apache::lonhtmlgateway; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); use Apache::lontemplate; +use Apache::longroup; +use Apache::lonhtmlcommon(); use HTML::Entities(); use Image::Magick; @@ -109,10 +109,15 @@ sub handler { $is_course = &Apache::lonnet::is_course($cdom,$cnum); } + my $clientip = &Apache::lonnet::get_requestor_ip($r); my $candisplay = 1; if (!$is_course) { if ($action ne 'portfolio') { - $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + if (($env{'user.name'} eq $cnum) && ($env{'user.domain'} eq $cdom)) { + $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + } else { + $candisplay = &Apache::loncommon::aboutme_on($cnum,$cdom); + } if ((!$candisplay) && ($env{'request.course.id'})) { $candisplay = &aboutme_access($cnum,$cdom); } @@ -121,7 +126,7 @@ sub handler { $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\'); } else { $r->print(&Apache::loncommon::start_page("Personal Information Page")); - $r->print('

'.&mt('No user personal information page available') .'

'. + $r->print('

'.&mt('No user personal information page available') .'

'. &mt('This is a result of one of the following:').''); } else { my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('port',$cnum,$cdom); + &Apache::loncommon::blocking_status('port',$clientip,$cnum,$cdom); if (!$blocked) { &display_portfolio_files($r,$is_course); } else { @@ -168,7 +172,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 +196,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 +226,45 @@ 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{'form.only_body'}) && ($env{'request.course.id'})) { + $args->{'only_body'} = 1; + } elsif (($env{'request.course.id'}) && + ($env{'form.folderpath'} =~ /^supplemental/)) { + &Apache::loncommon::validate_folderpath(1,'',$coursenum,$coursedomain); + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Personal Information Page'); + } + $title = &HTML::Entities::encode($title,'\'"<>&'); + my $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; + $args->{'bread_crumbs_nomenu'} = 1; + } + } 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); } + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('about',$clientip,$cnum,$cdom); + if ($blocked) { + if ($target eq 'tex') { + $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\'); + } else { + $r->print($blocktext); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } -#----------------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 +273,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').'}\\\\'); @@ -339,8 +335,9 @@ sub handler { if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,$env{'user.adv'}); + chomp($field); + my $gateway = Apache::lonhtmlgateway->new(); + $field = $gateway->process_incoming_html($field,1); $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -409,12 +406,15 @@ sub handler { } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} } else { - $r->print('

'.&mt('No personal information provided').'.

'); + $r->print('

'.&mt('No personal information provided').'.

'); + if ($target ne 'tex') { + &print_portfiles_link($r,$is_course); + } } 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'); @@ -426,13 +426,13 @@ sub handler { } else { $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom, 'tex'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom,$target); } } if ($target ne 'tex') { $r->print('
'); if ($env{'form.popup'}) { - $r->print('

'.&mt('Close window').''); + $r->print('

'.&mt('Close window').'

'); } $r->print(&Apache::loncommon::end_page()); } else { @@ -444,31 +444,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); @@ -592,7 +567,7 @@ sub display_portfolio_header { title => &mt('Go to personal information page for [_1]',$name), no_mt => 1}, {href => "/adm/$cdom/$cnum/aboutme/portfolio".$query_string, - text => 'Viewable files', + text => &mt('Viewable files'), title => &mt('Viewable portfolio files for [_1]',$name), no_mt => 1} ]; @@ -664,6 +639,10 @@ sub portfolio_files { withoutpass => 0, both => 0, }; + unless (($is_course) || + (&Apache::lonnet::usertools_access($cnum,$cdom,'portaccess',undef,'tools'))) { + return $filecounts; + } my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum); my %access_controls = @@ -681,9 +660,12 @@ sub portfolio_files { my $diroutput; if ($is_course) { my %files_by_group; + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); foreach my $filename (sort(keys(%access_controls))) { my ($group,$path) = split('/',$filename,2); - $files_by_group{$group}{$path} = $access_controls{$filename}; + if (exists($curr_groups{$group})) { + $files_by_group{$group}{$path} = $access_controls{$filename}; + } } foreach my $group (sort(keys(%files_by_group))) { my %fileshash; @@ -718,9 +700,12 @@ sub portfolio_files { sub build_hierarchy { my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info, $allfileshash,$group) = @_; + my $clientip = &Apache::lonnet::get_requestor_ip($r); + my $usercanshare = &Apache::lonnet::usertools_access($cnum,$cdom,'portaccess',undef,'tools'); foreach my $filename (sort(keys(%{$access_info}))) { my $access_status = - &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$$access_info{$filename}); + &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$clientip, + $access_info->{$filename},\$usercanshare); if ($portaccess eq 'both') { if (($access_status ne 'ok') && ($access_status !~ /^[^:]+:guest_/)) { @@ -777,9 +762,12 @@ sub parse_directory { my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, $group); my $getpropath = 1; - my %dirlist = map { - ((split('&',$_,2))[0],1) - } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my ($listref,$listerror) = + &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my %dirlist; + if (ref($listref) eq 'ARRAY') { + %dirlist = map { ((split('&',$_,2))[0],1) } @{$listref}; + } foreach my $item (sort(keys(%{$currhash}))) { $output .= &Apache::loncommon::start_data_table_row(); $output .= ''; @@ -835,10 +823,8 @@ sub parse_directory { sub aboutme_access { my ($uname,$udom) = @_; my $privcheck = $env{'request.course.id'}; - my $sec; if ($env{'request.course.sec'} ne '') { - $sec = $env{'request.course.sec'}; - $privcheck .= '/'.$sec; + $privcheck .= '/'.$env{'request.course.sec'}; } my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; @@ -849,7 +835,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; } }