--- loncom/interface/lonaboutme.pm 2006/09/21 15:50:10 1.56 +++ loncom/interface/lonaboutme.pm 2007/03/08 01:58:44 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.56 2006/09/21 15:50:10 albertel Exp $ +# $Id: lonaboutme.pm,v 1.61 2007/03/08 01:58:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,7 +57,7 @@ sub handler { 'No user information available'); return OK; } else { - $is_course = &check_for_course($cdom,$cnum); + $is_course = &Apache::lonnet::is_course($cdom,$cnum); } # --------------------------------------------------------- The syllabus fields @@ -74,7 +74,13 @@ sub handler { # ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { &display_portfolio_header($r,$is_course); - &display_portfolio_files($r,$is_course); + 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; } @@ -125,10 +131,10 @@ sub handler { '"'); } if ($target ne 'tex') { - $r->print('

'.$Apache::lonnet::domaindescription{$cdom}.'

'. + $r->print('

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

'. '

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); } else { - $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); + $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); my $allowed=0; @@ -171,12 +177,12 @@ sub handler { } } if (($allowed) && ($env{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$env{'form.'.$_}; + 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'}); - $syllabus{$_}=$field; + $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -209,9 +215,9 @@ sub handler { '
'); } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; + 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; @@ -220,15 +226,15 @@ sub handler { } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'. + $r->print('

'.$syllabusfields{$field}.'

'. $message.'
'); } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } if ($allowed) { - $r->print('
'); } @@ -629,15 +635,5 @@ sub parse_directory { return $output; } -sub check_for_course { - my ($cdom,$cnum) = @_; - my %courses = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef, - undef,'.'); - if (exists($courses{$cdom.'_'.$cnum})) { - return 1; - } - return 0; -} - 1; __END__