--- loncom/interface/lonsyllabus.pm	2013/05/16 20:03:51	1.127
+++ loncom/interface/lonsyllabus.pm	2013/09/21 23:44:46	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.127 2013/05/16 20:03:51 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.134 2013/09/21 23:44:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonhtmlcommon;
@@ -53,7 +54,7 @@ sub handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['register','forceedit','todocs',
-                                               'folderpath','title']);
+                                               'folderpath','title','only_body']);
 # ----------------------------------------------------- Is this even a course?
     my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($homeserver eq 'no_host') {
@@ -73,12 +74,6 @@ sub handler {
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my $crstype = &Apache::loncommon::course_type();
 
-# ------------------------------------------------------------ Print the screen
-
-    if ($target eq 'tex') {
-        $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
-    }
-
 # --------------------------------------------------------------- Force Student
     my ($forceedit,$forcestudent);
     if ($env{'form.forceedit'}) { $forceedit=1; }
@@ -103,7 +98,7 @@ sub handler {
     my $uploaded=$courseenv{'uploadedsyllabus'};
     my $minimal=$courseenv{'minimalsyllabus'};
 
-    if (($minimal =~/\w/) || ($uploaded =~/\w/)) { 
+    if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
         my $item;
         if ($minimal =~/\w/) {
             if ($external =~ m{\Q$minimal\E$}) {
@@ -124,19 +119,29 @@ sub handler {
                 if ($filecontents eq -1) {
                     $r->print(&mt('Syllabus file unavailable'));
                 } elsif ($filetype eq 'tex') {
-                    my $result = &Apache::lontexconvert::converted(\$filecontents,
-                                                                $env{'form.texengine'});
-                    my %args;
-                    &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
-                    $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
-                              $result.
-                              &Apache::loncommon::end_page());
+                    if ($target eq 'tex') {
+                        $r->print($filecontents);
+                    } else {
+                        my $result = &Apache::lontexconvert::converted(\$filecontents,
+                                                                       $env{'form.texengine'});
+                        my %args;
+                        &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
+                        if ($env{'form.only_body'}) {
+                            $args{'only_body'} = 1;
+                        }
+                        $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
+                                  $result.
+                                  &Apache::loncommon::end_page());
+                    }
                 } else {
                     my %mystyle;
+                    unless ($target eq 'tex') {
+                        $target = 'web';
+                    }
                     &Apache::structuretags::reset_problem_globals();
                     my $oldfile = $env{'request.filename'};
                     $env{'request.filename'} = $item;
-                    my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
+                    my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
                                                            '',%mystyle);
                     &Apache::structuretags::reset_problem_globals();
                     &Apache::lonhomework::finished_parsing();
@@ -145,17 +150,37 @@ sub handler {
                     $r->print($result);
                 }
             } else {
-                $r->print(&Apache::lonwrapper::wrapper($item));
+                if ($target eq 'tex') {
+                    $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+                              ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.
+                              &mt('Unsupported file type.').' \strut \\\\ '.
+                              &mt('Print the syllabus directly from your web browser').
+                              '\end{document}');
+                } else {
+                    $r->print(&Apache::lonwrapper::wrapper($item));
+                }
             }
             return OK;
         }
     } elsif ($external=~/\w/) {
         unless ($allowed && $forceedit) {
-            $r->print(&Apache::lonwrapper::wrapper($external));
+            if ($target eq 'tex') {
+                $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+                         ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
+                         ' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
+                         '\end{document}');
+            } else {
+                $r->print(&Apache::lonwrapper::wrapper($external));
+            }
             return OK;
         }
     }
 
+# ------------------------------------------------------------ Print the screen
+
+    if ($target eq 'tex') {
+        $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+    }
 
 # ------------------------------ The buck stops here: internal syllabus display
 # --------------------------------------------------------- The syllabus fields
@@ -406,10 +431,6 @@ sub handler {
     }
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-        if ($allowed) {
-            $r->print('<form method="post" action="">');
-        }
-
 		my $url_include_handler = sub {
 			my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display) = @_;
 			my %data = %{$data_ref};
@@ -456,7 +477,7 @@ sub handler {
 			$target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash,
                         undef,\%displayfields,\%noshow);
         if ($allowed) {
-            $r->print('</form>'.
+            $r->print('</div></form>'.
             &Apache::lonhtmlcommon::htmlareaselectactive());
         }
     } else {
@@ -675,6 +696,9 @@ ENDSCRIPT
                        );
         $args->{'add_entries'} = \%loaditem;
     }
+    if ($env{'form.only_body'}) {
+        $args->{'only_body'} = 1;
+    }
     my $start_page =
         &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
     if ($start_page) {
@@ -1011,7 +1035,7 @@ sub get_personnel {
                 }
                 if ($allowed) {
                     my $item = '<span class="LC_nobreak"><label>'.
-                               '<input type="checkbox" name="hideuser" value="'.$element.'&'.$puname.':'.$pudom.'"'.$checked.' />'.
+                               '<input type="checkbox" name="hideuser" value="'.$element.'&amp;'.$puname.':'.$pudom.'"'.$checked.' />'.
                                &Apache::loncommon::aboutmewrapper($courseperson
 ,
                                                $puname,$pudom).
@@ -1040,7 +1064,7 @@ sub get_personnel {
         }
         if ($target ne 'tex') {
             if ($allowed) {
-                $r->print(&Apache::loncommon::end_data_table_row());
+                $r->print('</td>'.&Apache::loncommon::end_data_table_row());
             } else {
                 my $lastclose=$element eq $lastpers?1:0;
                 $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
@@ -1064,13 +1088,18 @@ sub get_personnel {
 sub save_changes {
     my ($cnum,$cdom,$uploaded,$external,$minimal,$syllabus,$syllabusfields,$courseenv) = @_;
     my ($earlyout,$output);
-    unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {
+    unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH') ||
+            (ref($courseenv) eq 'HASH')) {
         return ($earlyout,$uploaded,$external,$minimal,$output);
     }
-    if ($env{'form.deleteuploaded'}) {
+    if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) {
         my %storehash;
         if (($env{'form.choice'} eq 'file') && 
-            ($env{'form.deleteuploaded'} eq 'file') && ($uploaded =~ /\w/)) {
+            ($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {
+            if ($courseenv->{'uploadedsyllabus'} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+                my $filename = $1;
+                &update_access_permissions($cdom,$cnum,$filename);
+            }
             &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
             &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
             $storehash{'uploadedsyllabus'} = '';
@@ -1079,7 +1108,18 @@ sub save_changes {
             undef($uploaded);
             undef($external);
         } elsif (($env{'form.choice'} eq 'minimal') &&
-                 ($env{'form.deleteuploaded'} eq 'minimal') && ($minimal =~ /\w/)) {
+                 ($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {
+            my $minimalurl = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+            if ($courseenv->{'minimalsyllabus'} eq "$minimalurl") {
+                my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$minimalurl));
+                unless ($filecontents eq -1) {
+                    $env{'form.output'} = $filecontents; 
+                    &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+                                                          'portfolio/syllabus/loncapa.html.bak');
+                    $minimalurl = &default_minimal_syllabus($cnum,$cdom);
+                }
+            }
+            &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
             &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
             &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
             $storehash{'externalsyllabus'} = '';
@@ -1135,10 +1175,8 @@ sub save_changes {
         foreach my $syl_field (keys(%{$syllabusfields})) {
             my $field=$env{'form.'.$syl_field};
             chomp($field);
-            $field=~s/\s+$//s;
-            $field=~s/^\s+//s;
-            $field=~s/\<br\s*\/*\>$//s;
-            $field=&Apache::lonfeedback::clear_out_html($field,1);
+            my $gateway = Apache::lonhtmlgateway->new();
+            $field = $gateway->process_incoming_html($field,1);
                             #here it will be stored
             $syllabus->{$syl_field}=$field;
             if ($syl_field eq 'lll_includeurl') { # clean up included URLs
@@ -1233,34 +1271,16 @@ sub save_changes {
                 ($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
                                                    \%allfiles,\%codebase);
             } else {
-                $output = '<div class="LC_info">';
+                $output = '<div class="LC_info">'.
                           &mt('No file uploaded').
                           '</div>';
             }
         } elsif ($env{'form.choice'} eq 'minimal') {
-            my $title = $env{'form.syllabustitle'};
-            $title =~ s{`}{}g;
-            $title=~s/^\s+//;
-            $title=~s/\s+$//;
-            if ($title eq '') {
-                $title = &mt('Syllabus');
+            $url = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+            my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$url));
+            if ($filecontents eq -1) {
+                $url = &default_minimal_syllabus($cnum,$cdom);
             }
-            my $initialtext = &mt('Replace with your own content.');
-            my $newhtml = <<END;
-<html>
-<head>
-<title>$title</title>
-</head>
-<body bgcolor="#ffffff">
-<h2>$title</h2>
-$initialtext
-</body>
-</html>
-END
-            $env{'form.output'}=$newhtml;
-            $url =
-                 &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
-                                                       'portfolio/syllabus/loncapa.html');
         }
         if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
             my $exturl = &home_http_host($cdom,$cnum);
@@ -1349,59 +1369,97 @@ END
     return ($earlyout,$uploaded,$external,$minimal,$output);
 }
 
+sub default_minimal_syllabus {
+    my ($cnum,$cdom) = @_;
+    my $title;
+    if ($env{'form.syllabustitle'}) {
+        $title = $env{'form.syllabustitle'};
+        $title =~ s{`}{}g;
+        $title=~s/^\s+//;
+        $title=~s/\s+$//;
+    }
+    if ($title eq '') {
+        $title = &mt('Syllabus');
+    }
+    my $initialtext = &mt('Replace with your own content.');
+    my $newhtml = <<END;
+<html>
+<head>
+<title>$title</title>
+</head>
+<body bgcolor="#ffffff">
+<h2>$title</h2>
+$initialtext
+</body>
+</html>
+END
+    $env{'form.output'}=$newhtml;
+    return &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+                                                 'portfolio/syllabus/loncapa.html');
+}
+
 sub update_syllabus_env {
     my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_;
     return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH');
     my $now = time;
     my (@envkeys,%storehash);
     if ($saved eq 'template') {
-        if ($uploaded) {
+        if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
             push(@envkeys,'uploaded');
         }
-        if ($minimal) {
+        if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
             push(@envkeys,'minimal');
         }
-        if ($external) {
+        if ($external || $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) {
             push(@envkeys,'external');
         }
         $storehash{'updatedsyllabus'} = $now;
         &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now
 });
-
     } elsif ($saved eq 'url') {
         my $prefix = &home_http_host($cdom,$cnum);
         if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
             my $file = $1;
             if ($file eq 'loncapa.html') {
-                if ($uploaded) {
+                if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
                     push(@envkeys,'uploaded');
                 }
-            } elsif ($minimal) {
+            } elsif ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
                 push(@envkeys,'minimal');
             }
         } else {
-            if ($uploaded) {
+            if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
                 push(@envkeys,'uploaded');
             }
-            if ($minimal) {
+            if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
                 push(@envkeys,'minimal');
             }
         }
     } elsif ($saved eq 'file') {
-        if ($minimal) {
+        if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
             push(@envkeys,'minimal');
         }
     } elsif ($saved eq 'minimal') {
-        if ($uploaded) {
+        if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
             push(@envkeys,'uploaded');
         }
     }
     if (@envkeys > 0) {
         foreach my $item (@envkeys) {
             my $key = $item.'syllabus';
-            if ($courseenv->{$key}) {
+            if ($courseenv->{$key} ne '') {
                 &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
+                if ($item eq 'minimal') {
+                    &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
+                } elsif ($item eq 'uploaded') {
+                    if ($courseenv->{$key} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+                        my $filename = $1;
+                        &update_access_permissions($cdom,$cnum,$filename);
+                    }
+                }
                 $storehash{$key} = '';
+            } elsif ($env{'course.'.$env{'request.course.id'}.'.'.$key} ne '') {
+                &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
             }
             if ($item eq 'uploaded') {
                 undef($uploaded);
@@ -1420,6 +1478,25 @@ sub update_syllabus_env {
     return ($uploaded,$minimal,$external);
 }
 
+sub update_access_permissions {
+    my ($cdom,$cnum,$file_name) = @_;
+    my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
+    my %access_controls =
+        &Apache::lonnet::get_access_controls($current_permissions,'',$file_name);
+    if (keys(%access_controls) > 0) {
+        my %changes;
+        foreach my $key (keys(%{$access_controls{$file_name}})) {
+            $changes{'delete'}{$key} = 1;
+        }
+        if (keys(%changes) > 0) {
+            my ($outcome,$deloutcome,$new_values,$translation) =
+                &Apache::lonnet::modify_access_controls($file_name,\%changes,
+                                                        $cdom,$cnum);
+        }
+    }
+    return; 
+}
+
 sub home_http_host {
     my ($cdom,$cnum) = @_;
     my $home=&Apache::lonnet::homeserver($cnum,$cdom);
@@ -1527,7 +1604,7 @@ sub editfile_button {
     }
     $output .= '
                 <input type="button" value="'.$deltext.'" onclick="javascript:dodelete('."'$context'".');" name="del_'.$context.'" />
-                <input type="hidden" value="" name="deleteuploaded" />
+                <input type="hidden" value="" name="deleteuploaded_'.$context.'" id="deleteuploaded_'.$context.'" />
     ';
     return $output;
 }
@@ -1545,15 +1622,17 @@ sub editbutton_js {
                       document.location.href = url+'?editmode=1&forceedit=1';
                   }
                   function dodelete(caller,url) {
-                      document.syllabus.deleteuploaded.value=caller;
-                      if (caller == 'minimal') {
-                          if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
-                              document.syllabus.submit();
+                      if (document.getElementById('deleteuploaded_'+caller)) {
+                          document.getElementById('deleteuploaded_'+caller).value=1;
+                          if (caller == 'minimal') {
+                              if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
+                                  document.syllabus.submit();
+                              }
                           }
-                      }
-                      if (caller == 'file') {
-                          if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
-                              document.syllabus.submit();
+                          if (caller == 'file') {
+                              if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
+                                  document.syllabus.submit();
+                              }
                           }
                       }
                       return;