--- loncom/interface/lonsimplepage.pm 2005/11/16 12:47:59 1.29 +++ loncom/interface/lonsimplepage.pm 2006/03/16 21:30:00 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.29 2005/11/16 12:47:59 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.33 2006/03/16 21:30:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,15 @@ use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; +sub error { + my ($r,$msg) = @_; + $r->print(&Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag(). + &mt($msg). + &Apache::loncommon::end_page()); + return OK; +} + sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -46,12 +55,8 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT + $r->print(&Apache::lonxml::xmlbegin(). + &Apache::loncommon::headtag()); } else { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } @@ -59,8 +64,7 @@ ENDDOCUMENT # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { - $r->print('Not in a course'); - return OK; + return &error($r,'Not in a course'); } else { $r->print('\textbf{Not in a course}\end{document}'); } @@ -77,20 +81,18 @@ ENDDOCUMENT if ($caller eq 'grppg') { $marker =~ s/\W//g; $namespace = 'grppage_'.$marker; - unless(&Apache::lonnet::get_coursegroups($dom,$crs,\%curr_group, - $marker)) { - $r->print('Invalid group name'); - return OK; + my %curr_groups; + if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { + return &error($r,'Invalid group name'); } - %groupinfo = &Apache::loncommon::get_group_settings($curr_group{$marker}); + %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker}); } else { $marker=~s/\D//g; $namespace = 'smppage_'.$marker; } - unless ($marker) { - $r->print('Invalid call'); - return OK; + if (!$marker) { + return &error($r,'Invalid call'); } # --------------------------------------------------------- The syllabus fields @@ -130,8 +132,9 @@ ENDDOCUMENT $title = 'Group Page'; } $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). - ''.&Apache::loncommon::bodytag - ($title,$forcestudent,$addentries,'',$dom,$env{'form.register'})); + &Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag($title,$forcestudent,$addentries, + '',$dom,$env{'form.register'})); } if ($caller eq 'grppg') { @@ -139,14 +142,15 @@ ENDDOCUMENT (&Apache::loncommon::check_group_access($caller))) { unless(&Apache::lonnet::allowed('vgh', $env{'request.course.id'}.'/'.$marker)) { - &display_group_links($r,$target,$marker,%groupinfo,'view'); + &display_group_links($r,$target,$marker,'view',%groupinfo); return OK; } } else { if ($target ne 'tex') { - $r->print('You do not currently have rights to - view this group. - '); + $r->print(&Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag(). + 'You do not currently have rights to view this group.'. + &Apache::loncommon::end_page()); return OK; } else { $r->print('\textbf{You do not currently have rights to view this group}\end{document}'); @@ -193,7 +197,7 @@ ENDDOCUMENT } } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($caller.'_'.$marker,\%syllabus,$dom,$crs); + &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); } if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { @@ -206,7 +210,7 @@ ENDDOCUMENT $syllabus{$_}=$field; } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($caller.'_'.$marker,\%syllabus,$dom,$crs); + &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); } # ---------------------------------------------------------------- Get syllabus @@ -244,7 +248,7 @@ ENDDOCUMENT if ($_ eq 'abb_links' && $caller eq 'grppg') { $r->print('
'); - &display_group_links($r,$target,$marker,%groupinfo,'edit'); + &display_group_links($r,$target,$marker,'edit',%groupinfo); $r->print('
'); } elsif ($_ eq 'aaa_title') { if ($target ne 'tex') { @@ -302,7 +306,7 @@ ENDDOCUMENT $r->print('

No page information provided.

'); } if ($env{'form.grade_target'} ne 'tex') { - $r->print(''); + $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } @@ -310,9 +314,8 @@ ENDDOCUMENT } sub display_group_links { - my ($r,$target,$marker,%groupinfo,$context) = @_; + my ($r,$target,$marker,$context,%groupinfo) = @_; my @available = (); - my %menu = (); %{$menu{'email'}} = ( text => 'Group e-mail', @@ -360,7 +363,7 @@ sub display_group_links { if ($context eq 'edit') { $output = 'No group functionality'; } else { - $output = 'No group functionality (e.g., e-mail, discussion,chat or file upload) is currently available to you in this group: '.$marker; + $output = 'No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: '.$marker; } if ($target eq 'tex') { $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));