--- loncom/interface/lonsimplepage.pm 2006/07/08 01:12:53 1.44 +++ loncom/interface/lonsimplepage.pm 2008/12/16 19:01:45 1.60 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.44 2006/07/08 01:12:53 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.60 2008/12/16 19:01:45 ehlerst Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ package Apache::lonsimplepage; use strict; use Apache::Constants qw(:common); use Apache::loncommon; +use Apache::lontemplate; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; @@ -38,8 +39,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 +72,7 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$udom,$uname,$marker,$caller)=split(/\//,$r->uri); + # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { @@ -61,17 +83,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 $grp_view_permission = &Apache::lonnet::allowed('vcg', - $env{'request.course.id'}); - my ($namespace,$group,$grp_desc); - + 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,14 +101,10 @@ sub handler { } %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); - $grp_desc = &unescape($groupinfo{'description'}); - $namespace = 'grppage_'.$group; - } else { - $marker=~s/\D//g; - $namespace = 'smppage_'.$marker; + $group_desc = &unescape($groupinfo{'description'}); } - if (!$marker) { + if (!$db_name) { &Apache::loncommon::simple_error_page($r,'','Invalid call'); return OK; } @@ -97,7 +115,7 @@ sub handler { 'bbb_content' => 'Content', 'ccc_webreferences' => 'Web References'); if ($group ne '') { - $syllabusfields{'abb_links'} = &mt('Functionality'); + $syllabusfields{'abb_links'} = &mt('Available Group Tools'); } @@ -111,8 +129,12 @@ sub handler { my $forceedit=''; if ($env{'form.forceedit'}) { $forceedit='edit'; } + my $refarg; + if ($env{'form.ref'}) { + $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 @@ -131,20 +153,29 @@ sub handler { } if ($group ne '') { - if (($grp_view_permission) || - (&Apache::longroup::check_group_access($caller))) { - if ((!&Apache::lonnet::allowed('vgh', - $env{'request.course.id'}.'/'.$marker)) - && (!&Apache::lonnet::allowed('mdg', - $env{'request.course.id'}.'/'.$marker))) { - if ($env{'form.ref'} eq 'grouplist') { - my $gpterm = &Apache::loncommon::group_term(); - my $ucgpterm = $gpterm; - $ucgpterm =~ s/^(\w)/uc($1)/e; - $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$gpterm, - $ucgpterm,$grp_desc)); + my $group_view_perm = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + $group_edit_perm = + &Apache::lonnet::allowed('mdg',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + $group_home_view = &Apache::lonnet::allowed('vgh', + $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 || + $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) && + (!$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}'); } - &display_group_links($r,$target,$marker,'view',%groupinfo); return OK; } } else { @@ -158,14 +189,21 @@ 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; + if ($group ne '') { - $allowed = &Apache::lonnet::allowed('mdg',$env{'request.course.id'}); + $allowed = $group_edit_perm; if (!$allowed) { - $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}. - '/'.$marker); + $allowed = $group_home_edit; } } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); @@ -176,13 +214,30 @@ sub handler { } if ($forcestudent or $target eq 'tex') { $allowed=0; } - + 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_PublicView').'
'.'
'
+ .''.&mt('Show Student View').''.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
+ .'
No page information provided.
'); + if ($group ne '') { + &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + } else { + $r->print(&mt('No page information provided.
')); + } } if ($env{'form.grade_target'} ne 'tex') { $r->print(&Apache::loncommon::end_page()); @@ -316,33 +386,30 @@ sub handler { } sub display_group_links { - my ($r,$target,$marker,$context,%groupinfo) = @_; - my $refarg; - if ($env{'form.ref'} eq 'grouplist') { - $refarg = '&ref=grouplist'; - } + my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; my @available = (); my %menu = (); %{$menu{'email'}} = ( - text => 'Group e-mail', - href => '/adm/email?compose=group&group='.$marker. - $refarg, + text => 'Group Message', + href => '/adm/email?compose=group&group='.$group. + $refarg, ); %{$menu{'discussion'}} = ( text => 'Discussion Boards', - href => '/adm/groupboards?group='.$marker.$refarg, + href => '/adm/groupboards?group='.$group.$refarg, ); %{$menu{'chat'}} = ( - text => 'Group chat', - href => "javascript:group_chat('$marker')", + text => 'Group Chat', + href => "javascript:group_chat('$group')", ); %{$menu{'files'}} = ( - text => 'File repository', - href => '/adm/coursegrp_portfolio?group='.$marker.$refarg, + text => 'File Repository', + href => '/adm/coursegrp_portfolio?group='.$group. + $refarg, ); %{$menu{'roster'}} = ( - text => 'Membership roster', - href => '/adm/grouproster?group='.$marker.$refarg, + text => 'Membership Roster', + href => '/adm/grouproster?group='.$group.$refarg, ); foreach my $tool (sort(keys(%menu))) { if ($groupinfo{functions}{$tool} eq 'on') { @@ -353,24 +420,24 @@ sub display_group_links { my $output = ''.$menu{$tool}{text}.' | '; + $output .= ''.&mt($menu{$tool}{text}).' | '; } else { $output .= ''. - $menu{$tool}{text}.' | '; + &mt($menu{$tool}{text}).''; } } $output .= '