--- loncom/interface/lonsimplepage.pm 2009/03/27 15:46:38 1.77 +++ loncom/interface/lonsimplepage.pm 2009/04/15 10:49:30 1.78 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.77 2009/03/27 15:46:38 bisitz Exp $ +# $Id: lonsimplepage.pm,v 1.78 2009/04/15 10:49:30 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,7 @@ sub handler { # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); - } + } # Is this even in a course? unless ($env{'request.course.id'}) { @@ -99,7 +99,7 @@ sub handler { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); return OK; } - %groupinfo = + %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); } @@ -133,9 +133,9 @@ sub handler { if ($env{'form.ref'}) { $refarg = '&ref='.$env{'form.ref'}; } - + my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs); - + # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { @@ -143,7 +143,7 @@ sub handler { if ($group ne '') { $title = 'Simple Group Page'; } - my $start_page = + my $start_page = &Apache::loncommon::start_page($title,undef, {'function' => $forcestudent, 'domain' => $dom, @@ -163,12 +163,12 @@ sub handler { $env{'request.course.id'}.'/'.$group); $group_home_edit = &Apache::lonnet::allowed('mgh', $env{'request.course.id'}.'/'.$group); - if ($group_view_perm || $group_edit_perm || $group_home_view || + if ($group_view_perm || $group_edit_perm || $group_home_view || $group_home_edit || &Apache::longroup::check_group_access($group)) { if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex')) { $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc)); } - if ((!$group_home_edit) && (!$group_home_view) && + if ((!$group_home_edit) && (!$group_home_view) && (!$group_view_perm) && (!$group_edit_perm)) { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); if ($env{'form.grade_target'} ne 'tex') { @@ -179,7 +179,7 @@ sub handler { return OK; } } else { - my $msg = + my $msg = &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { $r->print("

$msg

". @@ -189,7 +189,7 @@ sub handler { } return OK; } - my ($blocked,$blocktext) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); if ($blocked) { $r->print($blocktext); @@ -199,13 +199,13 @@ sub handler { } my $allowed; - + if ($group ne '') { $allowed = $group_edit_perm; if (!$allowed) { - $allowed = $group_home_edit; + $allowed = $group_home_edit; } - } else { + } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); } my $privileged=$allowed; @@ -214,7 +214,7 @@ sub handler { } if ($forcestudent or $target eq 'tex') { $allowed=0; } - + if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -255,8 +255,8 @@ sub handler { #---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'))); + if($allowed){ + $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); } } #---Print Function @@ -285,24 +285,24 @@ if($target ne 'tex'){ } $r->print(&Apache::lontemplate::end_functionslist()); } - } + } # ---------------------------------------------------------------- Get syllabus - if ((($syllabus{'uploaded.lastmodified'}) && - (($group ne '' && ($group_home_view || $group_edit_perm || + if ((($syllabus{'uploaded.lastmodified'}) && + (($group ne '' && ($group_home_view || $group_edit_perm || $group_view_perm)) || ($group eq ''))) || ($allowed)) { my $image; if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/smppg', $syllabus{'uploaded.photourl'}); - + $image=''; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } } - + if ($allowed) { $r->print( '
'. @@ -313,13 +313,13 @@ if($target ne 'tex'){ '
'. ''. '' ); - } + } if($allowed){ $r->print($image.'
 
'); } - + foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed) || + if (($syllabus{$field}) || ($allowed) || ($field eq 'abb_links' && $group ne '')) { my $message=$syllabus{$field}; &Apache::lonfeedback::newline_to_br(\$message); @@ -348,21 +348,21 @@ if($target ne 'tex'){ $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); } if ($allowed) { - if ($env{'form.grade_target'} ne 'tex') { - &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); + if ($env{'form.grade_target'} ne 'tex') { + &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); + &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); $r->print('

'); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } - } - if(!$allowed) {$r->print($image); } + } + if(!$allowed) {$r->print($image); } } else { if ($target ne 'tex') { if($allowed){ $r->print('

'); - } + } &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); } else { my $safeinit; @@ -463,7 +463,7 @@ sub display_group_links { my $output; if ($context eq 'edit') { $output = &mt('No group functionality.'); - } else { + } else { $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].',''.&unescape($groupinfo{'description'}).''); } if ($target eq 'tex') {