--- loncom/interface/lonfeedback.pm	2004/12/23 13:28:50	1.146
+++ loncom/interface/lonfeedback.pm	2005/02/17 04:39:58	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.146 2004/12/23 13:28:50 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.152 2005/02/17 04:39:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,13 +68,18 @@ sub discussion_visible {
 }
 
 sub list_discussion {
-    my ($mode,$status,$ressymb)=@_;
+    my ($mode,$status,$ressymb,$imsextras)=@_;
     my $outputtarget=$ENV{'form.grade_target'};
     if (defined($ENV{'form.export'})) {
 	if($ENV{'form.export'}) {
             $outputtarget = 'export';
         }
     }
+    if (defined($imsextras)) {
+        if ($$imsextras{'caller'} eq 'imsexport') {
+            $outputtarget = 'export';
+        }
+    }
     if (not &discussion_visible($status)) { return ''; }
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
@@ -325,15 +330,26 @@ sub list_discussion {
         } elsif ($outputtarget eq 'export') {
 # Create temporary directory if this is an export
             my $now = time;
-            $tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
-            if (!-e $tempexport) {
-                mkdir($tempexport,0700);
-            }
-            $tempexport .= '/'.$now;
-            if (!-e $tempexport) {
-                mkdir($tempexport,0700);
+            if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+                $tempexport = $$imsextras{'tempexport'};
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$$imsextras{'count'};
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+            } else {
+                $tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$now;
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
             }
-            $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
             if (!-e $tempexport) {
                 mkdir($tempexport,0700);
             }
@@ -634,27 +650,31 @@ END
 </manifest>
                 |;
                 close($manifestfile);
+                if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+                    $discussion = $copyresult;
+                } else {
 
 #Create zip file in prtspool
 
-                my $imszipfile = '/prtspool/'.
-                $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-                     time.'_'.rand(1000000000).'.zip';
+                    my $imszipfile = '/prtspool/'.
+                    $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+                         time.'_'.rand(1000000000).'.zip';
     # zip can cause an sh launch which can pass along all of %ENV
     # which can be too large for /bin/sh to handle
-                my %oldENV=%ENV;
-                undef(%ENV);
-                my $cwd = &getcwd(); 
-                my $imszip = '/home/httpd/'.$imszipfile;
-                chdir $tempexport;
-                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
-                close(OUTPUT);
-                chdir $cwd;
-                %ENV=%oldENV;
-                undef(%oldENV);
-                $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
-                if ($copyresult) {
-                    $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+                    my %oldENV=%ENV;
+                    undef(%ENV);
+                    my $cwd = &getcwd(); 
+                    my $imszip = '/home/httpd/'.$imszipfile;
+                    chdir $tempexport;
+                    open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
+                    close(OUTPUT);
+                    chdir $cwd;
+                    %ENV=%oldENV;
+                    undef(%oldENV);
+                    $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
+                    if ($copyresult) {
+                        $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+                    }
                 }
             } else {
                 $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
@@ -729,7 +749,7 @@ ENDDISCUSS
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
 		    $ressymb.':::" '.$target.'>'.
-		    '<img src="/adm/lonMisc/chat.gif" border="0" />'.
+		    '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
 		    &mt('Post Discussion').'</a></td></tr></table>';
 	    }
 	}
@@ -954,9 +974,9 @@ sub build_posting_display {
                             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		        }
                         if ($$dischash{$readkey}=~/\.$idx\./) { 
-                            $ctlink = '<b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
                         } else {
-                            $ctlink = '<b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
                         }
                     }
 #figure out at what position this needs to print
@@ -1416,9 +1436,12 @@ END
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
   my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
   my $send=&mt('Send');
+  my $html=&Apache::lonxml::xmlbegin();
+  my $encoding=&Apache::lonxml::fontsettings();
   $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>The LearningOnline Network with CAPA</title>
 <meta http-equiv="pragma" content="no-cache"></meta>
 $htmlheader
@@ -1641,9 +1664,12 @@ sub print_display_options {
         $currtogg = $lt{'toggon'};
         $disctogg = 'toggon';
     }
+    my $html=&Apache::lonxml::xmlbegin();
+    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>$lt{'dido'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 <script>
@@ -1733,18 +1759,18 @@ $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l
        <tr bgcolor="#dddddd">
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"
+       <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
            <br />
-           <input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"
+           <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
        </td>
       </tr><tr bgcolor="#eeeeee">
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
-       <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+       <td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
       </tr><tr bgcolor="#dddddd">
        <td>$lt{'dotm'}</td>
        <td>$lt{$disctogg}</td>
-       <td><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</td>
+       <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
       </tr>
      </table>
     </td>
@@ -1823,10 +1849,12 @@ sub print_sortfilter_options {
     my %role_types = ();
     my %status_types = ();
     &sort_filter_names(\%sort_types,\%role_types,\%status_types);
-
+    my $html=&Apache::lonxml::xmlbegin();
+    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>$lt{'diso'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 <script type="text/javascript">
@@ -1909,7 +1937,7 @@ $bodytag
    </select>
   </td>
   <td>&nbsp;</td>
-  <td><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</td>
+  <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
  </tr>
 </table>
 <br />
@@ -1976,9 +2004,12 @@ sub print_showposters {
             }
         }
     }
+    my $html=&Apache::lonxml::xmlbegin();
+    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>$lt{'diso'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 </head>
@@ -2004,7 +2035,7 @@ END
                     next;
                 } else {
                     $count ++;
-                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</td><td>'.$postcounts{$_}.'</td></tr>');
+                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td><td>'.$postcounts{$_}.'</td></tr>');
                 }
             }
         }
@@ -2085,17 +2116,22 @@ sub get_post_attachments {
     return;
 }
 
-sub fail_redirect {;
+sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+  my $html=&Apache::lonxml::xmlbegin();
+  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDFAILREDIR);
-<html>
-<head><title>Feedback not sent</title>
+$html
+<head>
+$encoding
+<title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>Sorry, no recipients  ...</b>
 <br /><a href="$feedurl">Continue</a>
 </body>
@@ -2173,15 +2209,19 @@ sub redirect_back {
       }
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+  my $html=&Apache::lonxml::xmlbegin();
+  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDREDIR);
-<html>
+$html
 <head>
+$encoding
 <title>Feedback sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color="red">$status</font>
@@ -2203,9 +2243,13 @@ sub no_redirect_back {
   my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
   my $continue=&mt('Continue');
+  my $html=&Apache::lonxml::xmlbegin();
+  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDNOREDIR);
-<html>
-<head><title>Feedback not sent</title>
+$html
+<head>
+$encoding
+<title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
 
@@ -2214,10 +2258,11 @@ ENDNOREDIR
 		&Apache::lonenc::check_encrypt($feedurl).'">');
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>$nofeed</b>
 <br /><a href="$feedurl">$continue</a>
 </body>
@@ -2232,23 +2277,25 @@ sub screen_header {
     unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
 	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
 	    $msgoptions= 
-		'<p><input type="checkbox" name="author" /> '.
-		&mt('Feedback to resource author').'</p>';
+		'<p><label><input type="checkbox" name="author" /> '.
+		&mt('Feedback to resource author').'</label></p>';
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="question" /> '.
-		&mt('Question about resource content');
+		'<p><label><input type="checkbox" name="question" /> '.
+		&mt('Question about resource content').'</label></p>';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="course" /> '.
-		&mt('Question/Comment/Feedback about course content');
+		'<p><label><input type="checkbox" name="course" /> '.
+		&mt('Question/Comment/Feedback about course content').
+		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="policy" /> '.
-		&mt('Question/Comment/Feedback about course policy');
+		'<p><label><input type="checkbox" name="policy" /> '.
+		&mt('Question/Comment/Feedback about course policy').
+		'</label></p>';
 	}
     }
     if ($ENV{'request.course.id'}) {
@@ -2256,17 +2303,17 @@ sub screen_header {
 	    &Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+	    $discussoptions='<label><input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
 		($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
 		&mt('Contribution to course discussion of resource');
-	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+	    $discussoptions.='</label><br /><label><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
 		&mt('Anonymous contribution to course discussion of resource').
-		' <i>('.&mt('name only visible to course faculty').')</i>';
+		' <i>('.&mt('name only visible to course faculty').')</i></label>';
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -2581,9 +2628,12 @@ sub modify_attachments {
         &extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
     }
     &Apache::lonenc::check_encrypt(\$symb);
+    my $html=&Apache::lonxml::xmlbegin();
+    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>Managing Attachments</title>
 <script>
  function setAction () {
@@ -2607,7 +2657,7 @@ END
                 foreach my $id (@currold) {
                     my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
                     $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'<br />'."\n");
+                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
                 }
                 $r->print("<br />");
             }
@@ -2617,7 +2667,7 @@ END
         $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
         foreach (@{$currnewattach}) {
             $_ =~ m#/([^/]+)$#;
-            $r->print('<input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'<br />'."\n");
+            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'</label><br />'."\n");
         }
         $r->print("<br />"); 
     }
@@ -2932,10 +2982,13 @@ sub handler {
   if ($ENV{'form.allversions'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
+      my $html=&Apache::lonxml::xmlbegin();
+      my $encoding=&Apache::lonxml::fontsettings();
       my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
       $r->print(<<END);
-<html>
+$html
 <head>
+$encoding
 <title>Post Versions</title>
 <meta http-equiv="pragma" content="no-cache" />
 </head>
@@ -3034,15 +3087,19 @@ END
       }
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
+      my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
+      my $html=&Apache::lonxml::xmlbegin();
+      my $encoding=&Apache::lonxml::fontsettings();
       $r->print (<<ENDREDIR);
-<html>
+$html
 <head>
+$encoding
 <title>New posts marked as read</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 $textline
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>