--- loncom/interface/lonsimplepage.pm 2006/10/23 18:48:47 1.48 +++ loncom/interface/lonsimplepage.pm 2008/01/28 10:32:47 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.48 2006/10/23 18:48:47 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.54 2008/01/28 10:32:47 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,6 +41,26 @@ use Apache::longroup; use HTML::Entities(); use LONCAPA; +sub get_db_name { + my ($url) = @_; + my ($udom,$uname,$marker)=(split(m{/},$url))[2,3,4]; + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + + my $db_name; + + if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { + $marker =~ s/\W//g; + $db_name = 'grppage_'.$marker; + } else { + $marker=~s/\D//g; + $db_name = 'smppage_'.$marker; + } + return if (!defined($marker)); + + return $db_name; +} + sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -51,7 +71,7 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$udom,$uname,$marker)=split(/\//,$r->uri); + # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { @@ -62,15 +82,17 @@ sub handler { return OK; } + my $db_name = &get_db_name($r->uri); + my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit, + my ($group,$group_desc,$group_home_view,$group_home_edit, $group_view_perm,$group_edit_perm); my %curr_group = (); my %groupinfo = (); - if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { - $marker =~ s/\W//g; - $group = $marker; + if ($db_name =~ /^grppage_/) { + $group = (split(m{/},$r->uri))[4]; + $group =~ s/\W//g; my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); if (!%curr_groups) { &Apache::loncommon::simple_error_page($r,'','Invalid group name'); @@ -79,13 +101,9 @@ sub handler { %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); - $namespace = 'grppage_'.$group; - } else { - $marker=~s/\D//g; - $namespace = 'smppage_'.$marker; } - if (!$marker) { + if (!$db_name) { &Apache::loncommon::simple_error_page($r,'','Invalid call'); return OK; } @@ -115,7 +133,7 @@ sub handler { $refarg = '&ref='.$env{'form.ref'}; } - my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs); + my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs); # --------------------------------------- There is such a user, get environment @@ -150,8 +168,13 @@ sub handler { $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc)); } if ((!$group_home_edit) && (!$group_home_view) && - (!$group_view_perm) && (!$group_edit_perm)) { + (!$group_view_perm) && (!$group_edit_perm)) { &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + if ($env{'form.grade_target'} ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; } } else { @@ -165,6 +188,13 @@ sub handler { } return OK; } + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('groups'); + if ($blocked) { + $r->print($blocktext); + $r->print(&Apache::loncommon::end_page()); + return OK; + } } my $allowed; @@ -218,7 +248,7 @@ sub handler { } } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { @@ -231,7 +261,7 @@ sub handler { $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } # ---------------------------------------------------------------- Get syllabus @@ -254,9 +284,10 @@ sub handler { '
'. ''. '

Upload a Photo

'. - ''. - ''. - '
'); + ''. + ''. + '
'. + ''); } foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed) || @@ -268,7 +299,11 @@ sub handler { if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } - $message=&Apache::lontexconvert::msgtexconverted($message); + &Apache::lonnet::logthis("Prior to texconvert: '$message'"); + if ($target ne 'tex') { + $message=&Apache::lontexconvert::msgtexconverted($message); + } + &Apache::lonnet::logthis("After texconvert: '$message'"); if ($field eq 'abb_links' && $group ne '') { $r->print('
'); @@ -287,7 +322,7 @@ sub handler { $r->print( '
Title
'); + ''); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); @@ -296,8 +331,10 @@ sub handler { } else { if (($field ne 'bbb_content') || ($allowed)) { if ($target ne 'tex') { + &Apache::lonnet::logthis("contents in web presentation '$syllabusfields{$field}'"); $r->print('

'.$syllabusfields{$field}.'

'); } else { + &Apache::lonnet::logthis("contents in tex presentation '$syllabusfields{$field}'"); my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); } @@ -313,7 +350,7 @@ sub handler { if ($target ne 'tex') { $r->print('
'); + ''); } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.