--- loncom/interface/lonaboutme.pm 2007/05/23 21:44:11 1.63 +++ loncom/interface/lonaboutme.pm 2008/12/15 16:37:44 1.85 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.63 2007/05/23 21:44:11 albertel Exp $ +# $Id: lonaboutme.pm,v 1.85 2008/12/15 16:37:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,53 @@ # http://www.lon-capa.org/ # +=pod + +=head1 NAME + +pache::lonaboutme + +=head1 SYNOPSIS + +(empty) + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 OVERVIEW + +(empty) + + +=head1 SUBROUTINES + +=over + +=item handler() + +=item in_course() + +=item aboutme_info() + +=item print_portfiles_link() + +=item build_query_string() + +=item display_portfolio_header() + +=item display_portfolio_files() + +=item portfolio_files() + +=item build_hierarchy() + +=item parse_directory() + +=back + +=cut + + package Apache::lonaboutme; use strict; @@ -37,6 +84,7 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); sub handler { @@ -60,6 +108,30 @@ sub handler { $is_course = &Apache::lonnet::is_course($cdom,$cnum); } + my $candisplay = 1; + if (!$is_course) { + if ($action ne 'portfolio') { + $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + if ((!$candisplay) && ($env{'request.course.id'})) { + $candisplay = &aboutme_access($cnum,$cdom); + } + if (!$candisplay) { + if ($target eq 'tex') { + $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\'); + } else { + $r->print(&Apache::loncommon::start_page("Personal Information")); + $r->print('

'.&mt('No user home page available') .'

'. + &mt('This is a result of one of the following:').''); + $r->print(&Apache::loncommon::end_page()); + } + return OK; + } + } + } + # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', @@ -69,17 +141,25 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceedit','forcestudent', - 'register']); + 'register','popup']); # ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { &display_portfolio_header($r,$is_course); - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('port',$cnum,$cdom); - if (!$blocked) { - &display_portfolio_files($r,$is_course); + if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) { + $r->print('

'.&mt('No user portfolio available') .'

'. + &mt('This is a result of one of the following:').''); } else { - $r->print($blocktext); + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('port',$cnum,$cdom); + if (!$blocked) { + &display_portfolio_files($r,$is_course); + } else { + $r->print($blocktext); + } } $r->print(&Apache::loncommon::end_page()); return OK; @@ -87,13 +167,16 @@ sub handler { if ($is_course) { if ($target ne 'tex') { + my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"}, + {href=>"/adm/aboutme",text=>"Course Information"}]; my $start_page = &Apache::loncommon::start_page( "Course Information", undef, {'function' => $env{'forcestudent'}, 'domain' => $cdom, - 'force_register' => $env{'forceregister'},}); + 'force_register' => $env{'forceregister'}, + 'bread_crumbs' => $brcrum}); $r->print($start_page); $r->print('

'.&mt('Group files').'

'); &print_portfiles_link($r,$is_course); @@ -114,14 +197,18 @@ sub handler { # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $args = {'function' => $forcestudent, + 'domain' => $cdom, + 'force_register' => $forceregister}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + } + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information"}]; my $start_page = - &Apache::loncommon::start_page("Personal Information",undef, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $forceregister,}); + &Apache::loncommon::start_page("Personal Information",$rss_link,$args); $r->print($start_page); - $r->print('

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

'); + $r->print('

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

'); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); } @@ -131,8 +218,7 @@ sub handler { '"'); } if ($target ne 'tex') { - $r->print('

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

'. - '

'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('

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

');#OLD SendMessage POS } else { $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } @@ -146,16 +232,16 @@ sub handler { if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1',}); + my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); $r->print('

'.&mt('Privacy Note').': '. &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.'). '

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

Show Public View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'.&mt('Show Public View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } elsif ($privleged && $target ne 'tex') { - my $query_string = &build_query_string({'forceedit' => '1',}); - $r->print('

'. - &mt('Edit').'

'); + my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); + $r->print('

'. + &mt('Edit').'

'); } if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { @@ -164,7 +250,7 @@ sub handler { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme'); + &Apache::lonnet::userphotoupload('uploaddoc','aboutme'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -188,59 +274,61 @@ sub handler { &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } +my $lastmod; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print(&mt('Last updated').': '.$lastmod); + # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - my $image= - qq{}; + $image=qq{}; + if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - $r->print($image); + # $r->print($image); #Print old Image } if ($allowed) { $r->print( - '
- -
'. '
'. '

'.&mt('Upload a Photo').'

'. - ''. - ''. - '
'); + ''. + ''. + ''. + '
+'); } - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed)) { - my $message=$syllabus{$field}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - if ($allowed) { - $r->print('
'); - } - } + &Apache::lontemplate::start_columnSection($r); + &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + if($target ne 'tex') + { + &Apache::lontemplate::start_ContentBox($r); + $r->print($image); + &Apache::lontemplate::send_message($r,$cnum,$cdom); + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); + &Apache::lontemplate::start_columnSection($r); + &Apache::lontemplate::start_ContentBox($r); + &print_portfiles_link($r,$is_course); + if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + $r->print('
'); + $r->print('

'.'RSS Feeds and Blogs'.'

'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('
'); + } + &Apache::lontemplate::end_ContentBox($r); + &Apache::lontemplate::end_columnSection($r); } + if ($allowed) { + if ($env{'form.popup'}) { + $r->print(''); + } $r->print(''); } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} @@ -249,7 +337,8 @@ sub handler { } if ($target ne 'tex') { - &print_portfiles_link($r,$is_course); + # &print_portfiles_link($r,$is_course); #old Print files + } if ($env{'request.course.id'} @@ -280,10 +369,17 @@ sub handler { } } if ($target ne 'tex') { + if ($env{'form.popup'}) { + $r->print('

'.&mt('Close window').''); + } + $r->print('
'.&mt('Last updated').': '.$lastmod); $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } + + + return OK; } @@ -327,7 +423,8 @@ sub aboutme_info { sub print_portfiles_link { my ($r,$is_course) = @_; my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); - my $filecounts = &portfolio_files($r,'showlink',undef,$is_course); + my $filecounts = &portfolio_files($r,'showlink',undef,$is_course, + $cdom,$cnum,$name); my $query_string = &build_query_string(); my $output; my %lt = &Apache::lonlocal::texthash( @@ -336,7 +433,10 @@ sub print_portfiles_link { difl => 'Display file listing', ); if ($filecounts->{'both'} > 0) { - $output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; + $output = '

'; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; + + #$output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; $output .= ''.$lt{'difl'}. '

'; @@ -360,6 +460,8 @@ sub print_portfiles_link { $output .= '
  • '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'
    • '; } $output .= ''; + $output .='

    '; + $output .='
    '; } $r->print($output); return; @@ -459,7 +561,8 @@ sub display_portfolio_files { &mt('Update display').'" />'; $output .= '

    '; $r->print($output); - my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course); + my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, + $cdom,$cnum,$name); if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { my $query_string = &build_query_string(); $r->print('

    '; @@ -662,5 +765,29 @@ sub parse_directory { return $output; } +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; + } + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + if (($cdom eq '') || ($cnum eq '')) { + my %coursehash = &coursedescription($env{'request.course.id'}); + $cdom = $coursehash{'domain'}; + $cnum = $coursehash{'cnum'}; + } + if ((&Apache::lonnet::allowed('srm',$privcheck)) || + (&Apache::lonnet::allowed('dff',$privcheck))) { + if (&in_course($uname,$udom,$cnum,$cdom)) { + return 1; + } + } + return; +} + 1; __END__