--- loncom/interface/lonfeedback.pm	2008/06/05 00:15:24	1.254
+++ loncom/interface/lonfeedback.pm	2009/03/18 02:44:33	1.255.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.254 2008/06/05 00:15:24 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.255.2.4 2009/03/18 02:44:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -625,7 +625,7 @@ END
                             $filterchoice .= ' '.$role_types{$role}.',';
                         }
                         $filterchoice =~ s/,$//;
-                        $filterchoice .= '<br />&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+                        $filterchoice .= '<br />'.('&nbsp;' x8);
                     }
                     if ($statusfilter) {
                         $filterchoice .= '<i>'.&mt('status').'</i>-&nbsp;'.$status_types{$statusfilter};
@@ -794,7 +794,7 @@ sub action_links_bar {
             $discussion .= '&previous='.$prevread;
         }
         $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
+        $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
     } else {
         $discussion .= '<td align="left">';
     }
@@ -1472,7 +1472,7 @@ sub replicate_attachments {
 }
 
 sub mail_screen {
-  my ($r,$feedurl,$options,$caller_symb) = @_;
+  my ($r,$feedurl,$options,$caller_symb,$attachmaxtext) = @_;
   if (exists($env{'form.origpage'})) {
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
   }
@@ -1482,7 +1482,7 @@ sub mail_screen {
             'myqu' => 'My question/comment/feedback:',
             'title' => 'Title',
             'reta' => 'Retained attachments',
-            'atta' => 'Attachment (128 KB max size)',
+            'atta' => 'Attachment',
            );
   my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
@@ -1618,7 +1618,7 @@ END
       $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
   my $js= <<END;
@@ -1721,7 +1721,7 @@ END
         }
     } else {
         $r->print(<<END);
-$lt{'atta'}: <input type="file" name="attachment" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
 </p>
 END
     }
@@ -2152,7 +2152,7 @@ $start_page
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="rolefilter" multiple="true" size="5">
+   <select name="rolefilter" multiple="multiple" size="5">
     <option value="all">$role_types{'all'}</option>
     <option value="st">$role_types{'st'}</option>
     <option value="cc">$role_types{'cc'}</option>
@@ -2164,13 +2164,13 @@ $start_page
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="sectionpick" multiple="true" size="$numvisible">
+   <select name="sectionpick" multiple="multiple" size="$numvisible">
     $section_sel
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="grouppick" multiple="true" size="$numvisible">
+   <select name="grouppick" multiple="multiple" size="$numvisible">
     $group_sel
    </select>
   </td>
@@ -2391,7 +2391,7 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2505,6 +2505,7 @@ $start_page
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 $blog
+$toolarge
 <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 $prevtag
@@ -2932,7 +2933,8 @@ ENDPREVIEW
 }
 
 sub modify_attachments {
-    my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
+    my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls,
+        $attachmaxtext,$toolarge)=@_;
 
     my %lt = &Apache::lonlocal::texthash(
                'subj' => 'Subject',
@@ -2974,10 +2976,12 @@ END
 				       
     $r->print(<<END);
 $start_page
+$toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <table border="2">
+ <br />
+ <table class="LC_data_table">
   <tr>
-   <td>
+   <td colspan="2">
     <b>Subject:</b> $subject</b><br /><br />
 END
     if ($idx) {
@@ -3003,9 +3007,15 @@ END
         $r->print("<br />"); 
     }
     $r->print(<<END);
-   $lt{'adda'}&nbsp;<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />    
+   </td></tr>
+   <tr>
+    <td>
+   $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />    
    </td>
   </tr>
+  <tr>
+   <td colspan="2">$attachmaxtext</td>
+  </tr>
  </table>
 <input type="hidden" name="subject" value="$env{'form.subject'}" />
 <input type="hidden" name="comment" value="$env{'form.comment'}" />
@@ -3237,12 +3247,18 @@ function setblogvalue() {
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources();
-    foreach my $resource (@allres) {
-        if ($resource->hasDiscussion()) {
-            my $ressymb = $resource->wrap_symb();
-            push(@{$resourcesref}, $ressymb);
+    if (defined($navmap)) {
+        my @allres=$navmap->retrieveResources();
+        foreach my $resource (@allres) {
+            if ($resource->hasDiscussion()) {
+                my $ressymb = $resource->wrap_symb();
+                if (ref($resourcesref) eq 'ARRAY') {
+                    push(@{$resourcesref}, $ressymb);
+                }
+            }
         }
+    } else {
+        &Apache::lonnet::logthis('Has discussion check failed - could not create navmap object.');
     }
     return;
 }
@@ -3288,6 +3304,10 @@ sub handler {
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
   my $group = $env{'form.group'};
+  my %attachmax = (
+                    text => '(128 KB max size)',
+                    num  => 131072,
+                  );
   if ($env{'form.editdisc'}) {
       if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
           my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
@@ -3596,13 +3616,15 @@ ENDREDIR
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','discuss','blog']);
-      my (@currnewattach,@currdelold,@keepold);
+      my (@currnewattach,@currdelold,@keepold,$toolarge);
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
       if (exists($env{'form.addnewattach.filename'})) {
-          unless (length($env{'form.addnewattach'})>131072) {
+          if (length($env{'form.addnewattach'})<=$attachmax{'num'}) {
               my $subdir = 'feedback/'.$env{'form.timestamp'};
               my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
 	      push(@currnewattach, $newattachment);
+          } else {
+              $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
           }
       }
       my $attachmenturls;
@@ -3615,7 +3637,7 @@ ENDREDIR
           $attachmenturls = $contrib{$idx.':attachmenturl'};
       }
       &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,
-			  $attachmenturls);
+			  $attachmenturls,$attachmax{'text'},$toolarge);
       return OK;
   } elsif ($env{'form.export'}) {
       &Apache::loncommon::content_type($r,'text/html');
@@ -3638,7 +3660,7 @@ ENDREDIR
   } else {
 # ------------------------------------------------------------- Normal feedback
       my $feedurl=$env{'form.postdata'};
-      $feedurl=~s/^http\:\/\///;
+      $feedurl=~s/^https?\:\/\///;
       $feedurl=~s/^$ENV{'SERVER_NAME'}//;
       $feedurl=~s/^$ENV{'HTTP_HOST'}//;
       $feedurl=~s/\?.+$//;
@@ -3704,7 +3726,7 @@ ENDREDIR
           }
 	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
-	      &mail_screen($r,$feedurl,$options,$symb);
+	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
 	      &fail_redirect($r,$feedurl);
 	  }
@@ -3730,6 +3752,7 @@ ENDREDIR
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
+      my $toolarge='';
       if (($env{'form.origpage'}) || ($env{'form.editdisc'}) ||
 	  ($env{'form.replydisc'})) {
 	  my ($symb,$idx);
@@ -3748,9 +3771,13 @@ ENDREDIR
 	  $symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
 	  $attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
       } elsif ($env{'form.attachment.filename'}) {
-	  unless (length($env{'form.attachment'})>131072) {
-	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
-	  }
+	  if (length($env{'form.attachment'})<=$attachmax{'num'}) {
+              my $now = time;
+              my $subdir = 'feedback/'.$now;
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,$subdir);
+	  } else {
+              $toolarge = '<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>';
+          }
       }
 # Filter HTML out of message (could be nasty)
       my $message=&clear_out_html($env{'form.comment'});
@@ -3793,7 +3820,7 @@ ENDREDIR
       }
 	  
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge);
   }
   return OK;
 }