--- loncom/interface/lonsimplepage.pm 2009/02/13 17:26:56 1.65 +++ loncom/interface/lonsimplepage.pm 2020/09/08 23:54:40 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.65 2009/02/13 17:26:56 neumanie Exp $ +# $Id: lonsimplepage.pm,v 1.105 2020/09/08 23:54:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,32 +33,35 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lontemplate; use Apache::lonnet; -use Apache::lontexconvert; -use Apache::lonfeedback; +use Apache::lonhtmlgateway; 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 ($url,$marker,$cdom,$cnum) = @_; + my ($udom,$uname,$timemark)=(split(m{/},$url))[2,3,4]; + if ($marker eq '') { + $marker = $timemark; + } + if (($cdom eq '') || ($cnum eq '')) { + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $cnum = $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; + if ($cdom && $cnum && ($udom eq $cdom) && ($uname eq $cnum)) { + $marker =~ s/\W//g; + $db_name = 'grppage_'.$marker; } else { - $marker=~s/\D//g; + $marker=~s/\D//g; $db_name = 'smppage_'.$marker; } return if (!defined($marker)); - return $db_name; } @@ -70,49 +73,50 @@ 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'})); - } + $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') { - &Apache::loncommon::simple_error_page($r,'','Not in a course'); - } else { - $r->print('\textbf{Not in a course}\end{document}'); - } - return OK; + 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 $marker = (split(m{/},$r->uri))[4]; + my $db_name = &get_db_name($r->uri,$marker); my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - my ($group,$group_desc,$group_home_view,$group_home_edit, - $group_view_perm,$group_edit_perm); + my ($group,$group_desc); + my %curr_group = (); my %groupinfo = (); if ($db_name =~ /^grppage_/) { - $group = (split(m{/},$r->uri))[4]; - $group =~ s/\W//g; + $group = $marker; + $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; + &Apache::loncommon::simple_error_page($r,'','Invalid group name'); + return OK; } - %groupinfo = - &Apache::longroup::get_group_settings($curr_groups{$group}); + %groupinfo = + &Apache::longroup::get_group_settings($curr_groups{$group}); $group_desc = &unescape($groupinfo{'description'}); } if (!$db_name) { - &Apache::loncommon::simple_error_page($r,'','Invalid call'); - return OK; + &Apache::loncommon::simple_error_page($r,'','Invalid call'); + return OK; } # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_title' => 'Page Title', - 'bbb_content' => 'Content', + 'bbb_content' => ($target eq 'tex'?'':'Content'), 'ccc_webreferences' => 'Web References'); if ($group ne '') { $syllabusfields{'abb_links'} = &mt('Available Group Tools'); @@ -121,39 +125,33 @@ sub handler { # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','forceedit', + ($ENV{'QUERY_STRING'},['forceedit','todocs', '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,$forcestudent); + $forceedit = $env{'form.forceedit'}; + if (!$forceedit) { + $forcestudent=1; + } my $refarg; if ($env{'form.ref'}) { $refarg = '&ref='.$env{'form.ref'}; } - + my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs); - -# --------------------------------------- There is such a user, get environment - if ($target ne 'tex') { - my $title = 'Course Page'; - if ($group ne '') { - $title = 'Group Page'; +# --------------------------------------- There is such a user, get environment + my ($registered,$group_view_perm,$group_edit_perm,$group_home_view, + $group_home_edit,$has_group_access); + my $brcrum = []; + if ($group eq '') { + $registered = $env{'form.register'}; + } else { + unless ($env{'form.ref'} eq 'grouplist') { + $registered = $env{'form.register'}; } - 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 = + $group_view_perm = &Apache::lonnet::allowed('vcg',$env{'request.course.id'}. ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); $group_edit_perm = @@ -163,14 +161,34 @@ sub handler { $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 || + 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)); + $has_group_access = 1; + if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex') && + (!$registered)) { + $brcrum = &grouppage_breadcrumbs($dom,$crs,$group,$group_desc); } - if ((!$group_home_edit) && (!$group_home_view) && + } + } + + if ($target ne 'tex') { + my $title = ($group eq '')? 'Simple Course Page':'Simple Group Page'; + my $start_page = + &Apache::loncommon::start_page($title,undef, + {'domain' => $dom, + 'group' => $group, + 'bread_crumbs' => $brcrum, + 'force_register' => $registered, + }); + $r->print($start_page); + } + + if ($group ne '') { + if ($has_group_access) { + if ((!$group_home_edit) && (!$group_home_view) && (!$group_view_perm) && (!$group_edit_perm)) { - &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + $r->print(&Apache::longroup::display_group_links($r,$env{'form.grade_target'},$group, + 'view',$refarg,undef,undef,%groupinfo)); if ($env{'form.grade_target'} ne 'tex') { $r->print(&Apache::loncommon::end_page()); } else { @@ -179,17 +197,17 @@ sub handler { 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) = + my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('groups'); if ($blocked) { $r->print($blocktext); @@ -199,290 +217,187 @@ sub handler { } my $allowed; - + if ($group ne '') { $allowed = $group_edit_perm; if (!$allowed) { - $allowed = $group_home_edit; + $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'; - } if ($forcestudent or $target eq 'tex') { $allowed=0; } - if ($allowed) { - $r->print('

'.'
' - .''.&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')) - .'

'); - } elsif ($privileged and $target ne 'tex') { - my $edittext = &mt('Edit'); - if ($group ne '') { - $edittext = &mt('Edit Group Homepage'); - } - $r->print(''.$edittext.''); - if ($group ne '') { - if ($group_edit_perm) { - $r->print('   '. - ''. - &mt('Edit Group Settings').''); - } - } - } 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'}); - } + ($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/$group"); + 'uploaddoc','coursedoc', + "grouppage/$group"); } else { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc','coursedoc', + "simplepage/$marker"); } - } - $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']); } + $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 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); + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; + chomp($field); + my $gateway = Apache::lonhtmlgateway->new(); + $field = $gateway->process_incoming_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'}) && - (($group ne '' && ($group_home_view || $group_edit_perm || - $group_view_perm)) || ($group eq ''))) || ($allowed)) { - my $image; - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/smppg', - $syllabus{'uploaded.photourl'}); - - $image=''; - if ($target eq 'tex') { - $image=&Apache::lonxml::xmlparse($r,'tex',$image); - } - } - if ($allowed) { - $r->print( - '
'. - ''. - '

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

'. - ''. - ''. - '
'. - ''. - '' ); - } - if($allowed){ - $r->print($image.'
 
'); - } - - 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); - } - 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 ($field eq 'aaa_title') { - if ($target ne 'tex') { - if($allowed){ - $r->print('

'); - } - $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('

'.&mt('Title').'

'); - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

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

'); - } - &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$field}.'

')); - $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); - } - if ($allowed) { - if ($target ne 'tex') { - &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); - $r->print('

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); - } - } - } - } - } - - if(!$allowed){ - $r->print($image); - } - - if ($allowed) { - $r->print('

'.'
' - .''.&mt('Show Student View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } - if ($allowed && ($env{'form.grade_target'} ne 'tex')) { - $r->print(&Apache::lonhtmlcommon::htmlareaselectactive - ('bbb_content').'
'); - } - if ($env{'form.grade_target'} ne 'tex') {$r->print('

');} - } else { - if ($group ne '') { - &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); - } else { - $r->print('

'.&mt('No page information provided.').'

'); +#---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'))); } } - if ($env{'form.grade_target'} ne 'tex') { - $r->print(&Apache::loncommon::end_page()); - } else { - $r->print('\end{document}'); - } - return OK; -} -sub display_group_links { - my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; - my @available = (); - my %menu = (); - %{$menu{'email'}} = ( - text => 'Group Message', - href => '/adm/email?compose=group&group='.$group. - $refarg, - ); - %{$menu{'discussion'}} = ( - text => 'Discussion Boards', - href => '/adm/groupboards?group='.$group.$refarg, - ); - %{$menu{'chat'}} = ( - text => 'Group Chat', - href => "javascript:group_chat('$group')", - ); - %{$menu{'files'}} = ( - text => 'File Repository', - href => '/adm/coursegrp_portfolio?group='.$group. - $refarg, - ); - %{$menu{'roster'}} = ( - text => 'Membership Roster', - href => '/adm/grouproster?group='.$group.$refarg, - ); - foreach my $tool (sort(keys(%menu))) { - if ($groupinfo{functions}{$tool} eq 'on') { - push(@available,$tool); - } - } - if (@available > 0) { - my $output = ''; - if ($target eq 'tex') { - $output = ''; +# ---------------------------------------------------------------- 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 { - $output = &Apache::loncommon::start_data_table(); + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$titletext.'

')); } - foreach my $tool (@available) { - if ($target eq 'tex') { - $output .= ''; + if ($allowed) { + if ($env{'form.grade_target'} ne 'tex') { + #editbox for title + $r->print(''."\n". + ''); + &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 { - $output .= &Apache::loncommon::start_data_table_row() - .'' - .&Apache::loncommon::end_data_table_row(); + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{'aaa_title'},$safeinit)); } } - if ($target eq 'tex') { - $output .= '
'.&mt($menu{$tool}{text}).'
' - .&mt($menu{$tool}{text}).'
'; - } else { - $output .= &Apache::loncommon::end_data_table(); + + #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 ($target eq 'tex') { - $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'

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

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

'.$output); + + 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('
'); + $r->print(&Apache::longroup::display_group_links($r,$target,$group,'edit', + $refarg,undef,undef,%groupinfo)); + $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(). + ''); } + } else { - my $output; - if ($context eq 'edit') { - $output = &mt('No group functionality.'); - } else { - $output = &mt('No group functionality (e.g., e-mail, discussion, chat 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)); + if ($group ne '') { + $r->print(&Apache::longroup::display_group_links($r,$target,$group,'view',$refarg,undef,undef,%groupinfo)); } else { - $r->print($output); + 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()); + } else { + $r->print('\end{document}'); + } + return OK; } 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; + return [{href=>"/adm/coursegroups", + text=>"Groups", + title=>"Display Groups"}, + {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", + text=>&mt('Group').": $description", + title=>&mt("Go to group's home page"), + no_mt=>1}}, + ]; } 1;