--- loncom/interface/lonfeedback.pm	2004/12/09 21:58:29	1.145
+++ loncom/interface/lonfeedback.pm	2005/02/17 03:42:29	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.145 2004/12/09 21:58:29 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.150 2005/02/17 03:42:29 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);
             }
@@ -496,8 +512,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
         $imsitems{$alldiscussion{$_}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$_}.'">'.
         '<title>'.$imsitems{$alldiscussion{$_}}{'title'}.'</title>';
                         $imsresources .= "\n".
-    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'.
-      '<file href="'.$alldiscussion{$_}.'.html">'."\n".
+    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'."\n".
+      '<file href="'.$postfilename.'">'."\n".
       $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'currversion'}}."\n".
     '</resource>';
                     }
@@ -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>';
 	    }
 	}
@@ -2085,9 +2105,10 @@ 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');
   $r->print (<<ENDFAILREDIR);
 <html>
 <head><title>Feedback not sent</title>
@@ -2095,7 +2116,7 @@ sub fail_redirect {;
 <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,6 +2194,7 @@ sub redirect_back {
       }
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -2181,7 +2203,7 @@ sub redirect_back {
 <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>
@@ -2214,10 +2236,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>
@@ -2264,9 +2287,9 @@ sub screen_header {
 		' <i>('.&mt('name only visible to course faculty').')</i>';
         }
     }
-    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;
 }
 
@@ -3034,6 +3057,7 @@ END
       }
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
+      my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -3042,7 +3066,7 @@ END
 <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>