--- loncom/interface/lonsyllabus.pm 2010/01/31 06:03:55 1.106 +++ loncom/interface/lonsyllabus.pm 2013/05/09 05:43:30 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.106 2010/01/31 06:03:55 faziophi Exp $ +# $Id: lonsyllabus.pm,v 1.121 2013/05/09 05:43:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,8 @@ 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') { @@ -61,6 +62,12 @@ sub handler { &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,20 +77,74 @@ 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; + } - 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; +# --------------------------------------------------------------- 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 ($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; + } } + my $crstype = &Apache::loncommon::course_type(); + # ------------------------------ The buck stops here: internal syllabus display # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( @@ -102,289 +163,235 @@ 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); - my $js; - if ($env{'form.backto'} eq 'coursecatalog') { - $js .= <<"ENDSCRIPT"; +# ---------------------------------------------------------- Load syllabus info + my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); + my ($output,%displayfields,%noshow); - +# -------------------------------------------- Determine which fields are shown -ENDSCRIPT + if ($syllabus{'uploaded.fields'}) { + if ($syllabus{'uploaded.fields'} eq 'none') { + foreach my $field (keys(%syllabusfields)) { + $displayfields{$field} = ' style="display:none;"'; + $noshow{$field} = 1; + } + } else { + my %included; + map { $included{$_} = 1; } split(/,/,$syllabus{'uploaded.fields'}); + foreach my $field (keys(%syllabusfields)) { + my ($prefix) = split(/_/,$field); + if ($included{$prefix}) { + $displayfields{$field} = ' style="display:block;"'; + } else { + $displayfields{$field} = ' style="display:none;"'; + $noshow{$field} = 1; + } + } } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js, - {'function' => undef, - 'domain' => $cdom, - 'force_register' => - $env{'form.register'},}); - - $r->print($start_page); - if ($env{'form.backto'} eq 'coursecatalog') { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:ToCatalog()", - text=>"Course/Community Catalog"}); - 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()); + } else { + foreach my $field (keys(%syllabusfields)) { + if ($syllabus{$field} ne '') { + $displayfields{$field} = ' style="display:block;"'; + } else { + $displayfields{$field} = ' style="display:none;"'; + } } } -# ---------------------------------------------------------- Load syllabus info - my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); - my $allowed=0; - my $privileged=0; -# 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; } + 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('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'}); +#-------------------------------------------------------------- Print Headtitle if ($target ne 'tex') { - $r->print(''. + &mt('All feeds currently hidden'). + $msg. + '
'); + } else { + $r->print(''. + &mt('No current feeds'). + $msg. + '
'); + } + $rsslinktext = &mt('Manage Course RSS Feeds/Blogs'); + if ($crstype eq 'Community') { + $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs'); + } + } 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)); + $r->print( ''.$rsslinktext.''); &Apache::lontemplate::print_end_template($r); + } else { + unless ($hidefeeds) { + my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit); + if ($feeds ne '') { + &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box'); + $r->print($feeds); + &Apache::lontemplate::print_end_template($r); + } + } } - } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { - $r->print('