--- loncom/interface/lonsyllabus.pm 2009/09/26 20:07:58 1.98 +++ loncom/interface/lonsyllabus.pm 2013/05/05 02:21:20 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.98 2009/09/26 20:07:58 amueller Exp $ +# $Id: lonsyllabus.pm,v 1.119 2013/05/05 02:21:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,15 +52,22 @@ sub handler { my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']); + ($ENV{'QUERY_STRING'},['register','forceedit','todocs', + 'folderpath','title']); # ----------------------------------------------------- Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - &Apache::loncommon::simple_error_page($r,'No syllabus available', + &Apache::loncommon::simple_error_page($r,'No syllabus available', 'No syllabus available'); return OK; + } elsif (!&Apache::lonnet::is_course($cdom,$cnum)) { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::loncommon::simple_error_page($r,'No syllabus available', + 'The course/community for which the syllabus was requested does not exist.'); + return OK; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); @@ -70,18 +77,70 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } -# -------------------------------------------------- Let's see who handles this - my $externalsyllabus=$courseenv{'externalsyllabus'}; - if ($externalsyllabus=~/\w/) { +# --------------------------------------------------------------- Force Student + my ($forceedit,$forcestudent); + if ($env{'form.forceedit'}) { $forceedit=1; } + if (!$forceedit) { + $forcestudent=1; + } + +# --------------------------------------------------------------- Check Privileges + my $allowed = 0; + if ($env{'user.environment'}) { +# does this user have privileges to post, etc? + if ($env{'request.course.id'} + && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} + && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); + if ($forcestudent or $target eq 'tex') { $allowed=0; } + } + } + +# -------------------------------------------------- Let's see who handles this + my $external=$courseenv{'externalsyllabus'}; + my $uploaded=$courseenv{'uploadedsyllabus'}; - if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&Apache::lonwrapper::simple_menu()); - } else { - $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", - $externalsyllabus)); - } - return OK; + if ($uploaded =~/\w/) { + if ($external =~ m{\Q$uploaded\E$}) { + undef($external); + } + unless ($allowed && $forceedit) { + my $file=&Apache::lonnet::filelocation("",$uploaded); + if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) { + my $filetype; + if ($file =~ /\.(sty|css|js|txt|tex)$/) { + $filetype=$1; + } else { + $filetype='html'; + } + my $result = ''; + my $filecontents=&Apache::lonnet::getfile($file); + if ($filecontents eq -1) { + $r->print(&mt('Syllabus file unavailable')); + } elsif ($filetype eq 'html') { + my %mystyle; + &Apache::structuretags::reset_problem_globals(); + my $oldfile = $env{'request.filename'}; + $env{'request.filename'} = $uploaded; + $result = &Apache::lonxml::xmlparse($r,'web',$filecontents, + '',%mystyle); + &Apache::structuretags::reset_problem_globals(); + &Apache::lonhomework::finished_parsing(); + $env{'request.filename'} = $oldfile; + &Apache::lonxml::add_messages(\$result); + $r->print($result); + } + } else { + $r->print(&Apache::lonwrapper::wrapper($uploaded)); + } + return OK; + } + } elsif ($external=~/\w/) { + unless ($allowed && $forceedit) { + $r->print(&Apache::lonwrapper::wrapper($external)); + return OK; + } } # ------------------------------ The buck stops here: internal syllabus display @@ -102,12 +161,6 @@ sub handler { 'jjj_weblinks' => 'Web Links', 'kkk_textbook' => 'Textbook', 'lll_includeurl' => 'URLs To Include in Syllabus'); -# --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - my $forceedit=''; - if ($env{'form.forceedit'}) { $forceedit='edit'; } - # ----------------------------------------------------------------- Make header if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); @@ -116,6 +169,8 @@ sub handler { $js .= <<"ENDSCRIPT"; ENDSCRIPT } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => undef, - 'domain' => $cdom, - 'force_register' => - $env{'form.register'},}); + if ($allowed && $forceedit) { + my $check_uncheck = &Apache::loncommon::check_uncheck_jscript(); + my $invurl = &mt('Invalid URL'); + my $urlregexp = <<'ENDREGEXP'; +/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i +ENDREGEXP - $r->print($start_page); + $js .= <<"ENDSCRIPT"; + + + +ENDSCRIPT + } + my $args = {'function' => undef, + 'domain' => $cdom}; + my $forcereg; + if ($env{'form.register'}) { + $forcereg = 1; + $args->{'force_register'} = $forcereg; + } if ($env{'form.backto'} eq 'coursecatalog') { &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog()", - text=>"Course Catalog"}); + my $brcrum = [{href=>"javascript:ToCatalog();", + text=>&mt('Course/Community Catalog'), + no_mt=>1} + ]; if ($env{'form.coursenum'} ne '') { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog('details')", - text=>"Course details"}); - } - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>$r->uri, - text=>"Course syllabus"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs()); + push(@{$brcrum}, + {href=>"javascript:ToCatalog('details')", + text=>"Course details"}); + } + push(@{$brcrum}, + {href=>$r->uri, + text=>"Course syllabus"}); + $args->{'bread_crumbs'} = $brcrum; + } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Syllabus'); + } + my $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; + } } + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); + $r->print($start_page); } # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); - my $allowed=0; - my $privileged=0; + my %displayfields; # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call - if ($env{'user.environment'}) { -# does this user have privileges to post, etc? - if ($env{'request.course.id'} - && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} - && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { - $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); - $privileged=$allowed; - if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { - $forcestudent='student'; - } - if ($forcestudent or $target eq 'tex') { $allowed=0; } - } - #store what the user typed in - if (($allowed) && ($env{'form.storesyl'})) { + if ($allowed) { +#store what the user typed in to the template + if ($env{'form.storesyl'}) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; chomp($field); @@ -228,88 +360,232 @@ ENDSCRIPT $syllabus{'uploaded.name'}=$env{'user.name'}; $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); + my %storehash; + if ($courseenv{'uploadedsyllabus'}) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); + $storehash{'uploadedsyllabus'} = ''; + } + if ($courseenv{'externalsyllabus'}) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); + $storehash{'externalsyllabus'} = ''; + } + if ($courseenv{'externalsyllabus'} || $courseenv{'uploadedsyllabus'}) { + &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); + undef($uploaded); + undef($external); + } + } elsif ($env{'form.storeurl'}) { + if ($env{'form.externalsyllabus'} =~ m{^https?://}) { + if ($env{'form.externalsyllabus'} eq $external) { + $r->print('
'. + &mt('External URL unchanged.'). + '
'); + if ($uploaded) { + my $prefix; + my $home=&Apache::lonnet::homeserver($cnum,$cdom); + if ($home ne 'no_host') { + my $protocol = $Apache::lonnet::protocol{$home}; + $protocol = 'http' if ($protocol ne 'https'); + $prefix = $protocol.'://'.&Apache::lonnet::hostname($home); + } + unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); + &Apache::lonnet::put('environment',{uploadedsyllabus => ''}, + $cdom,$cnum); + undef($uploaded); + } + } + } else { + $external=$env{'form.externalsyllabus'}; + $external =~ s/(`)//g; + my $putres = + &Apache::lonnet::put('environment',{externalsyllabus=>$external}, + $cdom,$cnum); + if ($putres eq 'ok') { + &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.externalsyllabus' => $external}); + $r->print('
'. + &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')). + '
'); + if ($uploaded) { + my $prefix; + my $home=&Apache::lonnet::homeserver($cnum,$cdom); + if ($home ne 'no_host') { + my $protocol = $Apache::lonnet::protocol{$home}; + $protocol = 'http' if ($protocol ne 'https'); + $prefix = $protocol.'://'.&Apache::lonnet::hostname($home); + } + unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); + &Apache::lonnet::put('environment',{uploadedsyllabus => ''}, + $cdom,$cnum); + undef($uploaded); + } + } + } else { + $r->print('
'. + &mt('An error occurred storing the external URL: [_1]',$putres). + '
'); + } + } + } else { + $r->print('
'. + &mt('External URL not saved -- invalid URL.'). + '
'); + } + } elsif ($env{'form.storefile'}) { + # Process file upload - phase one - upload and parse primary file. + my %allfiles = (); + my %codebase = (); + my ($upload_result,$upload_output,$uploadphase); + if ($env{'form.syllabusfile.filename'}) { + my ($url,$needlink) = &process_upload(\$upload_output,$cnum,$cdom, + \%allfiles,\%codebase); + $r->print($upload_output); + if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) { + my $exturl; + my $home=&Apache::lonnet::homeserver($cnum,$cdom); + if ($home ne 'no_host') { + my $protocol = $Apache::lonnet::protocol{$home}; + $protocol = 'http' if ($protocol ne 'https'); + $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url; + } + my %storehash = ( + uploadedsyllabus => $url, + ); + if ($exturl) { + $storehash{'externalsyllabus'} = $exturl; + if ($exturl =~ /\.(html?|txt|js|css)$/) { + $exturl .= '?inhibitmenu=yes'; + } + } else { + $storehash{'externalsyllabus'} = '', + } + my $putres = + &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); + if ($putres eq 'ok') { + &Apache::lonnet::make_public_indefinitely($url); + foreach my $key (keys(%storehash)) { + &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}}); + } + $uploaded = $url; + if ($needlink) { + $r->print(&return_to_editor($cdom,$cnum). + &Apache::loncommon::end_page()); + return OK; + } + } + } + } + } elsif ($env{'form.phase'} eq 'upload_embedded') { + # Process file upload - phase two - upload embedded objects + my $uploadphase = 'check_embedded'; + my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"'); + my $state = &embedded_form_elems($uploadphase,$primaryurl); + my $url_root = '/uploaded/'.$cdom.'/'.$cnum; + my $actionurl = "/public/$cdom/$cnum/syllabus"; + my ($result,$flag,$numpathchgs) = + &Apache::loncommon::upload_embedded('syllabus','portfolio/syllabus', + $cnum,$cdom,'/userfiles',$url_root,undef,undef,undef,$state, + $actionurl); + unless ($numpathchgs) { + my $modres = + &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus', + $cnum,$cdom, + '/userfiles',$env{'form.primaryurl'}); + $result .= $modres; + } + $r->print($result.&return_to_editor($cdom,$cnum). + &Apache::loncommon::end_page()); + return OK; + } elsif ($env{'form.phase'} eq 'check_embedded') { + # Process file upload - phase three - modify references in HTML file + my $uploadphase = 'modified_orightml'; + my $result = + &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus', + $cnum,$cdom, + '/userfiles',$env{'form.primaryurl'}); + $r->print($result.&return_to_editor($cdom,$cnum). + &Apache::loncommon::end_page()); + return OK; + } + foreach my $field (keys(%syllabusfields)) { + if ($syllabus{$field} ne '') { + $displayfields{$field} = ' style="display:block;"'; + } else { + $displayfields{$field} = ' style="display:none;"'; + } } } -#--------Functions - if( ($allowed || $privileged) && $target ne 'tex') { - my $functions=&Apache::lonhtmlcommon::start_funclist(); - if ($allowed) { - #if you have the register flag, keep it - if($env{'form.register'} == 1) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_PublicView')); - } else { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_PublicView')); - } - } elsif ($privileged) { - if($env{'form.register'} == 1) { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Edit').''); - } else { - $functions.=&Apache::lonhtmlcommon::add_item_funclist( - '' - .&mt('Edit').''); - } + if ($allowed) { +#---------------------------------- Print External URL Syllabus Info if editing + if ($target ne 'tex') { + my $protocol = $Apache::lonnet::protocol{$homeserver}; + $protocol = 'http' if ($protocol ne 'https'); + my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri; + $r->print('
' + .'' + .'' + .&mt('Public link (no log-in): [_1]',''.$link.'') + .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') + .'' + .'
'); + my $lonhost = $r->dir_config('lonHostID'); + $r->print(&chooser($external,$uploaded,$cdom,$cnum,$lonhost,\%syllabusfields,\%syllabus)); } - - $functions.=&Apache::lonhtmlcommon::end_funclist(); - $r->print(&Apache::loncommon::head_subbox($functions)); - } - -#---------------------Print External URL Syllabus Info and Help Text - if( ($allowed) && ($target ne 'tex') ) { - my $protocol = $Apache::lonnet::protocol{$homeserver}; - $protocol = 'http' if ($protocol ne 'https'); - $r->print('

' - .&mt('This syllabus can be publicly viewed at [_1]' - ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') - .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') - .'

' - .'

' - .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' - ,'','') - .'

' - ); - #-Print Help Text - $r->print(&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_TextBoxes', - &mt('Help with filling in text boxes'))); - } - -#----------Print last update - my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - my $who = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}); - if ($target ne 'tex') { - $r->print('
'.&mt('Last updated').': '. - $lastmod . ' '. - ($who ? &mt('by').' '.$who - : '' ) . - '
' ); - } else { - $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. - ($who? &mt('by').'\\\\ '. - &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) - :'') - .'\\\\'); +#--------------------------------------------- Print last update unless editing + my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); + my $who; + if ($syllabus{'uploaded.lastmodified'}) { + if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) { + $who = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}); + } else { +# Public user? +# Only display name of user, but no link to personal information page + $who = &Apache::loncommon::plainname( + $syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}); + } + } + if ($target ne 'tex') { + $r->print('
'.&mt('Last updated').': '. + $lastmod . ' '. + ($who ? &mt('by').' '.$who + : '' ) . + '
' ); + } else { + $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. + ($who? &mt('by').'\\\\ '. + &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'}) + :'') + .'\\\\'); + } } -#----------------------------Print Headtitle + +#-------------------------------------------------------------- Print Headtitle if ($target ne 'tex') { - $r->print('

'.$courseenv{'description'}.'

'); - $r->print('

'. &Apache::lonnet::domain($cdom,'description').'

'); + my $display = 'block'; + if ($external || $uploaded) { + $display = 'none'; + } + $r->print('
'. + '

'.$courseenv{'description'}.'

'); + if ($allowed) { + $r->print('
'. + '

'.&Apache::lonnet::domain($cdom,'description').'

'. + '
'); +# Print Help Text if editing at right side of screen + $r->print('
'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')). + '

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

'.&Apache::lonnet::domain($cdom,'description').'

'); + } } else { $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. &Apache::lonnet::domain($cdom,'description').'}\\\\'); @@ -329,22 +605,24 @@ ENDSCRIPT } else { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } + my @coursepersonlist; foreach (split(/\,/,$coursepersonnel{$element})) { my ($puname,$pudom)=split(/\:/,$_); if ($target ne 'tex') { my $courseperson = &Apache::loncommon::plainname($puname,$pudom); if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') || ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) { - $r->print(' '.$courseperson); + push(@coursepersonlist,$courseperson); } else { - $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson, + push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson, $puname,$pudom)); } } else { - $r->print(' '.&Apache::loncommon::plainname($puname, + push(@coursepersonlist,&Apache::loncommon::plainname($puname, $pudom).' '); } } + $r->print(join(", ",@coursepersonlist)); if ($target ne 'tex') { my $lastclose=$element eq $lastpers?1:0; $r->print(&Apache::lonhtmlcommon::row_closure($lastclose)); @@ -362,17 +640,25 @@ ENDSCRIPT &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { if ($allowed) { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); + my $display = ' style="display:block;"'; + if ($syllabus{'000_showrssfeeds'} eq 'no') { + $display = ' style="display:none;"'; + } + &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box', + 'box_000_showrssfeeds',$display); $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html'; $r->print( ''.&mt('New RSS Feed or Blog').''); &Apache::lontemplate::print_end_template($r); - } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); - &Apache::lontemplate::print_end_template($r); + } else { + unless ($syllabus{'000_showrssfeeds'} eq 'no') { + if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') { + &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + &Apache::lontemplate::print_end_template($r); + } + } } - } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } @@ -380,74 +666,65 @@ ENDSCRIPT if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { $r->print('
'. - ''); + ''); } - my @htmlids=(); - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}=~/\w/) || ($allowed)) { - my $message=$syllabus{$field}; - if ($field eq 'lll_includeurl') { # this is the "included" field - my $urls=$message; - $message=''; - foreach my $filelink (split(/\n/,$urls)) { - my $output=''; - # embed style? - my ($curfext)=($filelink=~/\.([^\.]+)$/); - my $embstyle=&Apache::loncommon::fileembstyle($curfext); - if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents - $output=&Apache::lonnet::ssi_body($filelink); - } elsif ($embstyle eq 'img') {# embed as an image - $output=''; - } - if ($output ne '') { - if ($target ne 'tex') { - $message.='

'.$output.'

'; - } else { - $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; - } - } - } - if ($allowed) { - $r->print('

'.$syllabusfields{$field}. - &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'); - } else { - $r->print($message); - } - } else { - &Apache::lonfeedback::newline_to_br(\$message); - $message =~s|(https?\://[^\s]+)|$1|g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - #output of syllabusfields will be generated here. - &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - push(@htmlids,$field); - } - if ($allowed) { - if ($target ne 'tex') { - &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field); - } - } - } - } + my $url_include_handler = sub { + my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display) = @_; + my %data = %{$data_ref}; + my %fields = %{$fields_ref}; + my $urls=$message; + $message=''; + foreach my $filelink (split(/\n/,$urls)) { + my $output=''; + # embed style? + my ($curfext)=($filelink=~/\.([^\.]+)$/); + my $embstyle=&Apache::loncommon::fileembstyle($curfext); + if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents + $output=&Apache::lonnet::ssi_body($filelink); + } elsif ($embstyle eq 'img') {# embed as an image + $output=''; + } + if ($output ne '') { + if ($target ne 'tex') { + $message.='

'.$output.'

'; + } else { + $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; + } + } + } + if ($allowed) { + &Apache::lonfeedback::newline_to_br(\$urls); + &Apache::lontemplate::print_start_template($r,$fields{$field}. + &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box', + 'box_'.$field,$display); + $r->print($urls); + $r->print("
"); + &Apache::lontemplate::print_textarea_template($r, $data{$field}, + $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); + &Apache::lontemplate::print_saveall_template($r); + $r->print("
"); + &Apache::lontemplate::print_end_template($r); + + } else { + $r->print($message); + } + }; + my %custom_hash = ( 'lll_includeurl' => $url_include_handler ); + &Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields, + $target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash, + undef,\%displayfields); if ($allowed) { $r->print('
'. - &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); + &Apache::lonhtmlcommon::htmlareaselectactive()); } - # if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} } else { - if ($target ne 'tex') {$r->print('

');} else {$r->print('\par ');} + if ($target ne 'tex') {$r->print('

');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('

');} } if ($target ne 'tex') { + $r->print('
'); if ($env{'form.backto'} eq 'coursecatalog') { $r->print('
'. &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']). @@ -460,5 +737,276 @@ ENDSCRIPT return OK; } +sub chooser { + my ($external,$uploaded,$cdom,$cnum,$lonhost,$fields,$values) = @_; + my %lt = &Apache::lonlocal::texthash( + 'type' => 'Syllabus Type', + 'url' => 'External URL', + 'file' => 'Uploaded File', + 'template' => 'Syllabus Template', + 'templateboxes' => 'Choose template items ... ', + 'curr' => 'Current:', + 'rep' => 'Replace:', + 'upl' => 'Upload:', + 'pr' => 'Preview', + 'save' => 'Save', + 'chourl' => 'Choose external URL', + 'chofile' => 'Uploaded syllabus file', + 'parse' => 'Upload embedded images/multimedia files if HTML file', + ); + my %checked = ( + file => '', + url => '', + template => '', + ); + my %display = ( + file => 'none', + url => 'none', + templatebox => 'none', + ); + my $check = ' checked="checked" '; + if ($uploaded) { + $checked{'file'} = $check; + $display{'file'} = 'block'; + } elsif ($external) { + $checked{'url'} = $check; + $display{'url'} = 'block'; + } else { + $checked{'template'} = $check; + $checked{'templatebox'} = $check; + $display{'templatebox'} = 'block'; + } + + my $output = + ''."\n". + ''."\n". + '
'.$lt{'type'}.''; + foreach my $item ('template','url','file') { + $output .= '
'; + } + $output .= '
'."\n". + '
'."\n". + '
'.$lt{'chourl'}.''."\n". + ''.$lt{'pr'}.' '."\n". + ''."\n". + ' '."\n". + '
'."\n". + '
'.$lt{'file'}.''; + if ($uploaded) { + my $protocol = $Apache::lonnet::protocol{$lonhost}; + $protocol = 'http' if ($protocol ne 'https'); + my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$uploaded; + my ($filename) = ($uploaded =~ m{([^/]+)$}); + my $file=&Apache::lonnet::filelocation("",$uploaded); + my $depbutton; + if ($file =~ /\.html?$/) { + my $filecontents=&Apache::lonnet::getfile($file); + unless ($filecontents eq -1) { + my $mm = new File::MMagic; + my $mimetype = $mm->checktype_contents($filecontents); + if ($mimetype eq 'text/html') { + my (%codebase,%allfiles); + my $parse_result = &Apache::lonnet::extract_embedded_items($uploaded,\%allfiles, + \%codebase,\$filecontents); + my $actionurl = "/public/$cdom/$cnum/syllabus"; + my ($ignore,$num,$numpathchanges,$existing,$mapping) = + &Apache::loncommon::ask_for_embedded_content($actionurl,undef,\%allfiles, + \%codebase, + {'context' => 'rewrites', + 'ignore_remote_references' => 1,}); + if (keys(%allfiles)) { + $depbutton = (' ' x 3). + &editfile_button(). + &editbutton_js($uploaded); + } + } + } + } + + $output .= ''.$lt{'curr'}.' '. + ''. + ''.$filename.''.$depbutton. + '

'.$lt{'rep'}; + } else { + $output .= $lt{'upl'}; + } + + $output .= '
'."\n". + ''. + ''."\n". + ' '. + '
'. + ''. + '
'. + '
'.$lt{'templateboxes'}. + ' '. + (' 'x2). + ''. + ''. + &fields_check_uncheck($fields,$values). + '
'. + '
'; + $output .= '
'. + '
'; + return $output; +} + +sub fields_check_uncheck { + my ($fields,$values) = @_; + return unless ((ref($fields) eq 'HASH') && (ref($values) eq 'HASH')); + my $numinrow = 4; + my $table; + my @fieldnames = sort(keys(%{$fields})); + unshift(@fieldnames,'000_showrssfeeds'); + my $numfields = scalar(@fieldnames); + for (my $i=0; $i<$numfields; $i++) { + my $checked; + my $name = $fields->{$fieldnames[$i]}; + if ($fieldnames[$i] eq '000_showrssfeeds') { + $name = &mt('RSS Feeds and Blogs'); + unless ($values->{$fieldnames[$i]} eq 'on') { + $checked = ' checked="checked"'; + } + } elsif ($values->{$fieldnames[$i]} ne '') { + $checked = ' checked="checked"'; + } + my $rem = $i%($numinrow); + if ($rem == 0) { + if (($i > 0) && ($i < $numfields-1)) { + $table .= ''; + } + if ($i < $numfields-1) { + $table .= ''; + } + } + $table .= + ''."\n"; + } + if ($table ne '') { + my $rem = $numfields%($numinrow); + my $colsleft = $numinrow - $rem; + if ($colsleft > 1 ) { + $table .= ' '; + } elsif ($colsleft == 1) { + $table .= ' '; + } + $table = ''.$table.'
'; + } + return $table; +} + +sub process_upload { + my ($upload_output,$cnum,$cdom,$allfiles,$codebase) = @_; + my ($parseaction,$showupload,$mimetype); + my $dest = 'portfolio/syllabus'; + if ($env{'form.parserflag'}) { + $parseaction = 'parse'; + } + my $url=&Apache::lonnet::userfileupload('syllabusfile','syllabus',$dest, + $parseaction,$allfiles, + $codebase,undef,undef,undef,undef, + undef,undef,\$mimetype); + if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/([^/]+)$}) { + my $stored = $1; + $showupload = '

'.&mt('Uploaded [_1]', + ''.$stored.''). + '

'; + } else { + my ($filename) = ($env{'form.syllabusfile.filename'} =~ m{([^/]+)$}); + $$upload_output = '
'. + &mt('Unable to save file [_1].', + ''.$filename.''). + '
'; + return (); + } + my $needlink; + if (($parseaction eq 'parse') && ($mimetype eq 'text/html')) { + $$upload_output = $showupload; + my $total_embedded = scalar(keys(%{$allfiles})); + if ($total_embedded > 0) { + my $uploadphase = 'upload_embedded'; + my $primaryurl = &HTML::Entities::encode($url,'<>&"'); + my $state = &embedded_form_elems($uploadphase,$primaryurl); + my $actionurl = "/public/$cdom/$cnum/syllabus"; + my ($embedded,$num,$numpathchanges,$existing); + ($embedded,$num,$numpathchanges,$existing) = + &Apache::loncommon::ask_for_embedded_content($actionurl,$state, + $allfiles,$codebase, + {'error_on_invalid_names' => 1, + 'ignore_remote_references' => 1,}); + if ($embedded) { + $needlink = 1; + if ($num) { + $$upload_output .= + '

'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'

'.$embedded; + } elsif ($numpathchanges) { + $$upload_output .= $embedded; + } else { + $$upload_output .= $embedded; + &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus', + $cnum,$cdom,'/userfiles',$url); + } + } else { + $$upload_output .= &mt('Embedded item(s) already present, so no additional upload(s) required').'
'; + &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus', + $cnum,$cdom,'/userfiles',$url); + + } + } else { + $$upload_output .= &mt('No embedded items identified').'
'; + } + $$upload_output = '
'.$$upload_output.'
'; + } + return ($url,$needlink); +} + +sub embedded_form_elems { + my ($phase,$primaryurl) = @_; + return < + + + +STATE +} + +sub return_to_editor { + my ($cdom,$cnum) = @_; + my $actionurl = "/public/$cdom/$cnum/syllabus"; + return '

'. + ''."\n". + ''.&mt('Return to Editor'). + '

'; +} + +sub editfile_button { + my $buttontext=&mt('Edit'); + return <<"END"; + +END +} + +sub editbutton_js { + my ($url) = @_; + return < + // + +ENDJS +} + 1; __END__