--- loncom/interface/lonsimplepage.pm 2006/07/20 15:03:01 1.46 +++ loncom/interface/lonsimplepage.pm 2008/03/20 12:06:51 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.46 2006/07/20 15:03:01 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.56 2008/03/20 12:06:51 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,8 +38,29 @@ use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; 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'); @@ -50,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') { @@ -61,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'); @@ -78,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; } @@ -114,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 @@ -149,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 { @@ -164,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; @@ -185,7 +216,9 @@ sub handler { if ($allowed) { $r->print('

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')) + .'
' + .''.&mt('Show Student View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } elsif ($privileged and $target ne 'tex') { my $edittext = &mt('Edit'); @@ -217,20 +250,20 @@ 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 (keys %syllabusfields) { - my $field=$env{'form.'.$_}; + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; chomp($field); $field=~s/\s+$//s; $field=~s/^\s+//s; $field=~s/\$//s; $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; + $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 @@ -252,29 +285,32 @@ sub handler { $r->print( '
'. ''. - '

Upload a Photo

'. - ''. - ''. - '
'); + '

'.&mt('Upload a Photo').'

'. + ''. + ''. + '
'. + ''); } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed) || - ($_ eq 'abb_links' && $group ne '')) { - my $message=$syllabus{$_}; + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed) || + ($field eq 'abb_links' && $group ne '')) { + my $message=$syllabus{$field}; &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; if ($allowed) { $message=&Apache::lonspeller::markeduptext($message); } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($_ eq 'abb_links' && $group ne '') { - $r->print('
'); + if ($target ne 'tex') { + $message=&Apache::lontexconvert::msgtexconverted($message); + } + if ($field eq 'abb_links' && $group ne '') { + $r->print('
'); &display_group_links($r,$target,$group,'edit',$refarg, %groupinfo); $r->print('
'); - } elsif ($_ eq 'aaa_title') { + } elsif ($field eq 'aaa_title') { if ($target ne 'tex') { $r->print('

'.$message.'

'); } else { @@ -284,21 +320,21 @@ sub handler { if ($allowed) { if ($env{'form.grade_target'} ne 'tex') { $r->print( - '
Title
'); + '

'.&mt('Title').'

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

'.$syllabusfields{$_}.'

'); + $r->print('

'.$syllabusfields{$field}.'

'); } else { my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$_}.'

')); + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); } } if ($target ne 'tex') { @@ -310,12 +346,12 @@ sub handler { } if ($allowed) { if ($target ne 'tex') { - $r->print('
'); + $r->print('
'); } else { my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); } } }