--- loncom/interface/lonaboutme.pm 2008/12/02 23:35:21 1.76 +++ loncom/interface/lonaboutme.pm 2009/04/17 17:54:59 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network -# "About Me" Personal Information +# Personal Information Page # -# $Id: lonaboutme.pm,v 1.76 2008/12/02 23:35:21 harmsja Exp $ +# $Id: lonaboutme.pm,v 1.126 2009/04/17 17:54:59 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,6 +86,7 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use Apache::lontemplate; use HTML::Entities(); +use Image::Magick; sub handler { my $r = shift; @@ -94,7 +95,7 @@ sub handler { return OK if $r->header_only; my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target eq 'tex') { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri); @@ -108,10 +109,34 @@ 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 personal information page available').'}}\\\\\\\\'); + } else { + $r->print(&Apache::loncommon::start_page("Personal Information Page")); + $r->print('

'.&mt('No user personal information 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', - 'bbb_aboutme' => 'About Me', + 'bbb_aboutme' => 'Personal Information', 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String @@ -119,15 +144,23 @@ sub handler { ['forceedit','forcestudent', 'register','popup']); -# ----------------------------------------------- Available Portfolio file display +# ----------------------------------------------- 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; @@ -135,15 +168,18 @@ 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').'

'); + $r->print('

'.&mt('Group Portfolio').'

'); &print_portfiles_link($r,$is_course); $r->print(&Apache::loncommon::end_page()); } @@ -158,9 +194,18 @@ sub handler { if ($forcestudent eq '') { $forceregister = $env{'form.register'}; } - + +#------------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; } + + # --------------------------------------- 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, @@ -169,44 +214,89 @@ sub handler { if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; } - my $start_page = - &Apache::loncommon::start_page("Personal Information",$rss_link,$args); + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}]; + my $start_page = &Apache::loncommon::start_page("Personal Data",$rss_link,$args); $r->print($start_page); - $r->print('

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

'); - } else { - $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); - } - if ($courseenv{'nickname'}) { - $r->print( - '

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

'); - } - if ($target ne 'tex') { - $r->print('

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

');#OLD SendMessage POS - } else { - $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); + + #Print Privacy Note + if ($allowed) { + $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.') + .'
' + ); + } + +#Print last modified + + my $lastmod; + if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { + $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); + $r->print('
'); + $r->print(&mt('Last updated').': '.$lastmod . ''); + $r->print('
'); } - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); - my $allowed=0; +} +#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 Functions + if ($target ne 'tex'){ + $r->print(&Apache::lontemplate::start_functionslist()); + if($allowed){ + my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); + $r->print(&Apache::lontemplate::item_functionslist( + ''.&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'}}); + $r->print(&Apache::lontemplate::item_functionslist( + ''. &mt('Edit').'')); + } + $r->print(&Apache::lontemplate::item_functionslist( + &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'})) { + $r->print(&Apache::lontemplate::item_functionslist( + &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'})) { + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom))); + } + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom))); + } + $r->print(&Apache::lontemplate::end_functionslist()); + } +#------Print Headtitle + if ($target ne 'tex') { + $r->print('
'); + $r->print('

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

'); + $r->print('
' ); + 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').'}\\\\'); + } # does this user have privileges to post, etc? - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && - ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } - - if ($allowed) { - 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',&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','popup' => $env{'form.popup'}}); - $r->print('

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

'); - } + + my $query_string; + if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -214,7 +304,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); @@ -238,54 +328,66 @@ sub handler { &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } -my $lastmod; -my $image; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - $image= - qq{}; + + #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line. + &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'})); + #---End Resize--- + + $image=qq{}; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - # $r->print($image); #Print old Image + } + if ($allowed) { $r->print( - '
- -
'. '
'. '

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

'. ''. ''. ''. - '
'); - + '
'); + if ($syllabus{'uploaded.photourl'}) { + $r->print('
') + } + $r->print('

'); } - &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); - if($target ne 'tex') - { - - &print_portfiles_link($r,$is_course); - $r->print('

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

'); - - $r->print('Kontakt'); - $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + if($allowed) { + $r->print('
'); + } + if($target ne 'tex') #print Image + { + &Apache::lontemplate::start_ContentBox($r); + &Apache::lontemplate::end_ContentBox($r); + $r->print($image); + + }#End Print Image + + #Print Content eg. Contactinfo aboutme,... + &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + #End Print Content + + if($target ne 'tex')#Begin Print RSS and portfiles + { + &print_portfiles_link($r,$is_course); + if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + &Apache::lontemplate::print_end_template($r); + } + + } #End Print RSS and portfiles - } if ($allowed) { if ($env{'form.popup'}) { @@ -295,55 +397,41 @@ my $image; $r->print('
'); } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} - } else { + } else { $r->print('

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

'); - } - - if ($target ne 'tex') { - # &print_portfiles_link($r,$is_course); #old Print files - - } + } if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { if ($target ne 'tex') { - $r->print(''); - $r->print('

'. - &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'

'. - &mt('Shared by course faculty and staff'). - &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). - '
'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print(&Apache::loncommon::track_student_link - ('View recent activity by this student', - $cnum,$cdom).(' 'x2)); - } - $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); + $r->print(''); + &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial'); + $r->print(''); + $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message")); + $r->print('

'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + $r->print('

'); + &Apache::lontemplate::print_end_template($r); + } 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); } } + $r->print('
'); + $r->print(''); 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; } @@ -392,14 +480,14 @@ sub print_portfiles_link { my $query_string = &build_query_string(); my $output; my %lt = &Apache::lonlocal::texthash( - vpfi => 'Viewable portfolio files', - vgpf => 'Viewable group portfolio files', - difl => 'Display file listing', - ); + 'vpfi' => 'Viewable portfolio files', + 'vgpf' => 'Viewable group portfolio files', + 'difl' => 'Display file listing', + ); if ($filecounts->{'both'} > 0) { - $output = '

'; - $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'}. @@ -425,6 +513,7 @@ sub print_portfiles_link { } $output .= ''; $output .='

'; + $output .='
'; } $r->print($output); return; @@ -433,11 +522,11 @@ sub print_portfiles_link { sub build_query_string { my ($new_items) = @_; my $query_string; - my @formelements = ('register'); + my @formelements = ('register'); my $new = 0; if (ref($new_items) eq 'HASH') { $new = 1; - if (!defined($new_items->{'forceedit'}) && + if (!defined($new_items->{'forceedit'}) && !defined($new_items->{'forcestudent'})) { push(@formelements,('forceedit','forcestudent')); } @@ -470,7 +559,7 @@ sub display_portfolio_header { my $output; if ($is_course) { - $output = + $output = &Apache::loncommon::start_page('Viewable group portfolio files',undef, {'function' => $forcestudent, 'domain' => $cdom,}); @@ -483,10 +572,11 @@ sub display_portfolio_header { if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, - text=>"Personal information - $name", - title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", - text=>"Viewable files - $name", - title=>"Viewable portfolio files for $name"} + text=>&mt('Personal Information Page - [_1]',$name), + title=>&mt('Go to personal information page for [_1]', $name)}, + {href=>"/adm/$cdom/$cnum/aboutme/portfolio", + text=>&mt('Viewable files - [_1]', $name), + title=>&mt('Viewable portfolio files for [_1]', $name)} ); $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); } @@ -499,10 +589,11 @@ sub display_portfolio_header { sub display_portfolio_files { my ($r,$is_course) = @_; my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); - my %lt = ( withoutpass => 'passphrase not required', - withpass => 'passphrase protected', - both => 'all access types ',); - %lt = &Apache::lonlocal::texthash(%lt); + my %lt = &Apache::lonlocal::texthash( + 'withoutpass' => 'passphrase not required', + 'withpass' => 'passphrase protected', + 'both' => 'all access types ', + ); my $portaccess = 'withoutpass'; if (exists($env{'form.portaccess'})) { @@ -549,7 +640,7 @@ sub portfolio_files { }; my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum); - my %access_controls = + my %access_controls = &Apache::lonnet::get_access_controls($current_permissions); my $portaccess; if ($mode eq 'showlink') { @@ -566,7 +657,7 @@ sub portfolio_files { my %files_by_group; foreach my $filename (sort(keys(%access_controls))) { my ($group,$path) = split('/',$filename,2); - $files_by_group{$group}{$path} = $access_controls{$filename}; + $files_by_group{$group}{$path} = $access_controls{$filename}; } foreach my $group (sort(keys(%files_by_group))) { my %fileshash; @@ -590,7 +681,7 @@ sub portfolio_files { } else { my $access_text; if (ref($lt) eq 'HASH') { - $access_text = $lt->{$portaccess}; + $access_text = $lt->{$portaccess}; } $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text)); } @@ -598,7 +689,7 @@ sub portfolio_files { return $filecounts; } -{ +{ my $count=0; sub portfolio_table_start { $count=0; @@ -687,7 +778,7 @@ sub parse_directory { $output .= &parse_directory($r,$depth,$currhash->{$item}, $path.'/'.$item,$is_course,$group); } else { - my $file_name; + my $file_name; if ($currhash->{$item} =~ m|/([^/]+)$|) { $file_name = $1; } else { @@ -698,7 +789,7 @@ sub parse_directory { if ($is_course) { $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group. '/portfolio/'.$currhash->{$item}; - } else { + } else { $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'. $currhash->{$item}; } @@ -718,7 +809,7 @@ sub parse_directory { ' '.$showname.''; $output.=''; if ($have_meta) { - $output.= ''.&mt('Catalog Information').''.&mt('Metadata').''; } @@ -728,5 +819,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__