--- loncom/interface/lonsimplepage.pm 2006/03/23 22:32:11 1.35 +++ loncom/interface/lonsimplepage.pm 2010/03/29 00:37:36 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.35 2006/03/23 22:32:11 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.95 2010/03/29 00:37:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,12 +31,37 @@ 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; use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; +use Apache::longroup; +use Apache::lonnavmaps(); +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; @@ -46,44 +71,43 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { - $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); - } - my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); + } + # Is this even in a course? unless ($env{'request.course.id'}) { - if ($target ne 'tex') { - return &Apache::loncommon::simple_error_page($r,'', - 'Not in a course'); - } else { - $r->print('\textbf{Not in a course}\end{document}'); - } + if ($target ne 'tex') { + &Apache::loncommon::simple_error_page($r,'','Not in a course'); + } else { + $r->print('\textbf{Not in a course}\end{document}'); + } + 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; - + my ($group,$group_desc,$group_home_view,$group_home_edit, + $group_view_perm,$group_edit_perm); my %curr_group = (); my %groupinfo = (); - if ($caller eq 'grppg') { - $marker =~ s/\W//g; - $namespace = 'grppage_'.$marker; - my %curr_groups; - if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { - return &Apache::loncommon::simple_error_page($r,'', - 'Invalid group name'); - } - %groupinfo = - &Apache::loncommon::get_group_settings($curr_groups{$marker}); - } else { - $marker=~s/\D//g; - $namespace = 'smppage_'.$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'); + return OK; + } + %groupinfo = + &Apache::longroup::get_group_settings($curr_groups{$group}); + $group_desc = &unescape($groupinfo{'description'}); } - if (!$marker) { - return &Apache::loncommon::simple_error_page($r,'','Invalid call'); + if (!$db_name) { + &Apache::loncommon::simple_error_page($r,'','Invalid call'); + return OK; } # --------------------------------------------------------- The syllabus fields @@ -91,245 +115,333 @@ sub handler { 'aaa_title' => 'Page Title', 'bbb_content' => 'Content', 'ccc_webreferences' => 'Web References'); - if ($caller eq 'grppg') { - $syllabusfields{'abb_links'} = &mt('Functionality'); + if ($group ne '') { + $syllabusfields{'abb_links'} = &mt('Available Group Tools'); } # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - } + ($ENV{'QUERY_STRING'},['forcestudent','forceedit', + 'register','ref']); # --------------------------------------------------------------- Force Student my $forcestudent=''; if ($env{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; }; - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } + my $forceedit=''; + if ($env{'form.forceedit'}) { $forceedit='edit'; } + + my $refarg; + if ($env{'form.ref'}) { + $refarg = '&ref='.$env{'form.ref'}; + } + + my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs); - - my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs); - # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { - my $title = 'Course Page'; - if ($caller eq 'grppg') { - $title = 'Group Page'; - } - my $start_page = - &Apache::loncommon::start_page($title,undef, - {'function' => $forcestudent, - 'add_entries' => $addentries, - 'domain' => $dom, - 'force_register' => - $env{'form.register'},}); - $r->print($start_page); - } - - if ($caller eq 'grppg') { - if (($grp_view_permission) || - (&Apache::loncommon::check_group_access($caller))) { - unless(&Apache::lonnet::allowed('vgh', - $env{'request.course.id'}.'/'.$marker)) { - &display_group_links($r,$target,$marker,'view',%groupinfo); + my $title = 'Simple Course Page'; + if ($group ne '') { + $title = 'Simple Group Page'; + } + my $start_page = + &Apache::loncommon::start_page($title,undef, + {'function' => $forcestudent, + 'domain' => $dom, + 'force_register' => + $env{'form.register'},}); + $r->print($start_page); + } + + if ($group ne '') { + 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') && + (!$env{'form.register'})) { + $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}'); + } return OK; } } else { - my $msg = - &mt('You do not currently have rights to view this group.'); + my $msg = + &mt('You do not currently have rights to view this group.'); if ($target ne 'tex') { - $r->print("

$msg

". - &Apache::loncommon::end_page()); + $r->print('

'.$msg.'

'. + &Apache::loncommon::end_page()); } else { $r->print('\textbf{'.$msg.'}\end{document}'); } - return OK; + 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 ($caller eq 'grppg') { - $allowed = $grp_view_permission; - unless ($allowed) { - $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}. - '/'.$marker); + + if ($group ne '') { + $allowed = $group_edit_perm; + if (!$allowed) { + $allowed = $group_home_edit; } - } else { + } else { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); } my $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; + $forcestudent='student'; } 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').'

'); - } elsif ($privileged and $target ne 'tex') { - $r->print(''.&mt('Edit').''); - } + if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && - ($env{'form.storeupl'}) && ($allowed)) { - if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - } - if ($caller eq 'grppage') { + ($env{'form.storeupl'}) && ($allowed)) { + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + if ($group ne '') { $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( - 'uploaddoc',1,"grouppage/$marker"); + 'uploaddoc',1,"grouppage/$group"); } else { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); } - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } +# if ($allowed && $env{'form.delupl'}) { +# if ($syllabus{'uploaded.photourl'}) { +# &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); +# delete($syllabus{'uploaded.photourl'}); +# &Apache::lonnet::del('simplepage',['uploaded.photourl']); +# } +# } if (($allowed) && ($env{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$env{'form.'.$_}; - chomp($field); - $field=~s/\s+$//s; - $field=~s/^\s+//s; - $field=~s/\$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs); + 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{$syl_field}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); } -# ---------------------------------------------------------------- Get syllabus - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/'.$caller, - $syllabus{'uploaded.photourl'}); - - my $image=''; - if ($target eq 'tex') { - $image=&Apache::lonxml::xmlparse($r,'tex',$image); - } - $r->print($image); - } - if ($allowed) { - $r->print( - '
'. - ''. - '

Upload a Photo

'. - ''. - ''. - '
'); - } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; - &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' && $caller eq 'grppg') { - $r->print('
'); - &display_group_links($r,$target,$marker,'edit',%groupinfo); - $r->print('
'); - } elsif ($_ eq 'aaa_title') { - if ($target ne 'tex') { - $r->print('

'.$message.'

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

'.$message.'

')); - } - if ($allowed) { - if ($env{'form.grade_target'} ne 'tex') { - $r->print( - '
Title
'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); - } +#---Print Function + if ($target ne 'tex') { + if ($allowed || $privileged) { + my $functions=&Apache::lonhtmlcommon::start_funclist(); + my $url = $r->uri; + if ($group ne '') { + my $navmap=Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + $url = &Apache::longroup::get_group_link($dom,$crs,$group,$navmap); + } + } + if ($allowed) { + $url .= (($url=~/\?/)?'&':'?').'forcestudent=1'; + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '
' + .&mt('Show Student View').'' + .&Apache::loncommon::help_open_topic( + 'Uploaded_Templates_PublicView')); + } elsif ($privileged) { + my $edittext = &mt('Edit'); + $url .= (($url=~/\?/)?'&':'?').'forceedit=edit'.$refarg; + if ($group ne '') { + $edittext = &mt('Edit Group Homepage'); + } + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .$edittext.''); + if ($group ne '') { + if ($group_edit_perm) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Edit Group Settings') + .''); + } } - } else { - if (($_ ne 'bbb_content') || ($allowed)) { - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

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

'.$syllabusfields{$_}.'

')); - } - } - if ($target ne 'tex') { - $r->print('
'. - $message.'
'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); - } - if ($allowed) { - if ($target ne 'tex') { - $r->print('
'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + } + $functions.=&Apache::lonhtmlcommon::end_funclist(); + $r->print(&Apache::loncommon::head_subbox($functions)); + } + } + +#---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'))); + } + } + +# ---------------------------------------------------------------- Get syllabus + if ((($syllabus{'uploaded.lastmodified'}) && + (($group ne '' && ($group_home_view || $group_edit_perm || + $group_view_perm)) || ($group eq ''))) || ($allowed)) { + #Print the title + my $titletext=&HTML::Entities::encode($syllabus{'aaa_title'},'<>&"'); + if ($target ne 'tex') { + if ($allowed) { + } + $r->print('

'.$titletext.'

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

'.$titletext.'

')); + } + if ($allowed) { + if ($env{'form.grade_target'} ne 'tex') { + #editbox for title + $r->print(''); + &Apache::lontemplate::print_start_template($r,&mt('Title'),'LC_Box'); + $r->print($titletext); + $r->print("
"); + &Apache::lontemplate::print_textarea_template($r, $syllabus{'aaa_title'}, + 'aaa_title', Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); + &Apache::lontemplate::print_saveall_template($r); + $r->print("
"); + &Apache::lontemplate::print_end_template($r); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{'aaa_title'},$safeinit)); + } + } + + #print the image + my $image=''; + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + + $image=''.&mt('Image').''; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + } + + if ($allowed) { + &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box'); + $r->print($image); + $r->print("

"); + $r->print( + ''. + ''. + ''. + ''); + &Apache::lontemplate::print_end_template($r); + + +# if ($syllabus{'uploaded.photourl'}) { +# $r->print(''); +# } + } + #Image in Student view and printout. + else { + $r->print($image); + } + + my $links_handler = sub { + my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed) = @_; + if ($group ne '') { + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + $r->print('
'); + &display_group_links($r, $target, $group, 'edit', $refarg, %groupinfo); + $r->print('
'); } - } - } - } - } - if ($allowed && ($env{'form.grade_target'} ne 'tex')) { - $r->print(&Apache::lonhtmlcommon::htmlareaselectactive - ('bbb_content').'
'); - } - if ($env{'form.grade_target'} ne 'tex') {$r->print('

');} + }; + my $title_handler = sub {}; + my %custom_handlers = ( + 'abb_links' => $links_handler, + 'aaa_title' => $title_handler + ); + &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, + $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_handlers, $group); + + if ($allowed && ($env{'form.grade_target'} ne 'tex')) { + $r->print(&Apache::lonhtmlcommon::htmlareaselectactive + ('bbb_content').''); + } + } else { - $r->print('

No page information provided.

'); + if ($group ne '') { + &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + } else { + my $text=&mt('No page information provided.'); + if ($target ne 'tex') { + $r->print('

'.$text.'

'); + } else { + $r->print($text) + } + } } if ($env{'form.grade_target'} ne 'tex') { - $r->print(&Apache::loncommon::end_page()); + $r->print(&Apache::loncommon::end_page()); } else { - $r->print('\end{document}'); + $r->print('\end{document}'); } return OK; } sub display_group_links { - my ($r,$target,$marker,$context,%groupinfo) = @_; + my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; my @available = (); my %menu = (); %{$menu{'email'}} = ( - text => 'Group e-mail', - href => '/adm/email?group='.$marker, + text => 'Group Message', + href => '/adm/email?compose=group&group='.$group. + $refarg, ); %{$menu{'discussion'}} = ( text => 'Discussion Boards', - href => '/adm/groupboards?group='.$marker, + href => '/adm/groupboards?group='.$group.$refarg, ); %{$menu{'chat'}} = ( - text => 'Group chat', - href => "javascript:group_chat('$marker')", + text => 'Group Chat Room', + href => "javascript:group_chat('$group')", ); %{$menu{'files'}} = ( - text => 'File repository', - href => '/adm/portfolio?group='.$marker, + text => 'Group Portfolio', + href => '/adm/coursegrp_portfolio?group='.$group. + $refarg, ); %{$menu{'roster'}} = ( - text => 'Membership roster', - href => '/adm/grouproster?group='.$marker, + text => 'Membership Roster', + href => '/adm/grouproster?group='.$group.$refarg, ); foreach my $tool (sort(keys(%menu))) { if ($groupinfo{functions}{$tool} eq 'on') { @@ -337,27 +449,38 @@ sub display_group_links { } } if (@available > 0) { - my $output = ''; + my $output = ''; + if ($target eq 'tex') { + $output = '
'; + } else { + $output = &Apache::loncommon::start_data_table(); + } foreach my $tool (@available) { if ($target eq 'tex') { - $output .= ''; + $output .= ''; } else { - $output .= ''; + $output .= &Apache::loncommon::start_data_table_row() + .'' + .&Apache::loncommon::end_data_table_row(); } } - $output .= '
'.$menu{$tool}{text}.'
'.&mt($menu{$tool}{text}).'
'. - $menu{$tool}{text}.'' + .&mt($menu{$tool}{text}).'
'; if ($target eq 'tex') { - $r->print(&Apache::lonxml::xmlparse($r,'tex','Available functions

'.$output)); + $output .= ''; + } else { + $output .= &Apache::loncommon::end_data_table(); + } + if ($target eq 'tex') { + $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'

'.$output)); } else { - $r->print('

Functions

'.$output); + $r->print('

'.&mt('Available Group Tools').'

'.$output); } } else { my $output; 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 = &mt('No group functionality.'); + } 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') { $r->print(&Apache::lonxml::xmlparse($r,'tex',$output)); @@ -366,7 +489,22 @@ sub display_group_links { } } } - + +sub grouppage_breadcrumbs { + my ($cdom,$cnum,$group,$description) = @_; + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursegroups", + text=>"Groups", + title=>"Display Groups"}, + {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", + text=>&mt('Group:')." $description", + title=>"Go to group's home page"}, + ); + my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]', + $description)); + return $output; +} 1; __END__