--- loncom/interface/lonaboutme.pm 2008/11/11 10:45:22 1.71 +++ loncom/interface/lonaboutme.pm 2009/02/17 10:24:54 1.96 @@ -1,7 +1,7 @@ # The LearningOnline Network -# "About Me" Personal Information +# Personal Homepage # -# $Id: lonaboutme.pm,v 1.71 2008/11/11 10:45:22 amueller Exp $ +# $Id: lonaboutme.pm,v 1.96 2009/02/17 10:24:54 weissno 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,7 +84,9 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); +use Image::Magick; sub handler { my $r = shift; @@ -60,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 home page available').'}}\\\\\\\\'); + } else { + $r->print(&Apache::loncommon::start_page("Personal Homepage")); + $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', - 'bbb_aboutme' => 'About Me', + 'bbb_aboutme' => 'Personal Homepage', 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String @@ -74,12 +147,20 @@ sub handler { # ----------------------------------------------- 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 +168,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); @@ -121,10 +205,12 @@ sub handler { if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; } + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Homepage"}]; my $start_page = - &Apache::loncommon::start_page("Personal Information",$rss_link,$args); + &Apache::loncommon::start_page("Personal Homepage",$rss_link,$args); $r->print($start_page); - $r->print('

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

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

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

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

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

');#OLD SendMessage POS } else { $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); @@ -146,18 +233,18 @@ sub handler { my $privleged=$allowed=(($env{'user.name'} eq $cnum) && ($env{'user.domain'} eq $cdom)); if ($forcestudent or $target eq 'tex') { $allowed=0; } - + my $query_string; if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); + $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').'

'); + '

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

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

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

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

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

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

'); } if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { @@ -166,7 +253,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); @@ -196,89 +283,70 @@ my $image; 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 + $r->print('
'.&mt('Last updated').': '.$lastmod); if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - $image= - qq{}; + + #This call is to resize all "Personal Info" 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($target ne 'tex') - { - $r->print('

'); - } - - 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') { - - # Start Neu - $r->print('
'.$syllabusfields{$field}.''); - $r->print($message); - $r->print('

'); - #Ende NEU - - # $r->print('

'.$syllabusfields{$field}. 'MESSAGE ____' .'

'. - # $message.'
'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - if ($allowed) { - $r->print('
'); - } - } - } - if($target ne 'tex') - { - - &print_portfiles_link($r,$is_course); - - $r->print('
'); - $r->print('
'); - $r->print($image); - - $r->print('

'); - $r->print('

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + if($allowed) { + $r->print('
'); + } - $r->print('
'); + if($target ne 'tex') #print Image + { + &Apache::lontemplate::start_ContentBox($r); + &Apache::lontemplate::send_message($r,$cnum,$cdom); + &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 ''){ + $r->print('
'); + $r->print('

'.'RSS Feeds and Blogs'.'

'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('
'); + } + + if($allowed){ + $r->print('

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

'); + } + }#End Print RSS and portfiles + $r->print('
'); + $r->print('
'); if ($allowed) { 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}'); @@ -389,10 +452,10 @@ sub print_portfiles_link { 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 = '

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

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

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

    '; + $output .=''; } $r->print($output); return; @@ -475,8 +539,8 @@ 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=>"Personal Homepage - $name", + title=>"Go to personal homepage for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", text=>"Viewable files - $name", title=>"Viewable portfolio files for $name"} ); @@ -710,7 +774,7 @@ sub parse_directory { ' '.$showname.''; $output.=''; if ($have_meta) { - $output.= ''.&mt('Catalog Information').''.&mt('Metadata').''; } @@ -720,5 +784,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__