--- loncom/interface/lonsupportreq.pm	2019/07/26 18:03:59	1.79.2.4
+++ loncom/interface/lonsupportreq.pm	2017/01/23 19:49:07	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.4 2019/07/26 18:03:59 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.89 2017/01/23 19:49:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,6 @@
 package Apache::lonsupportreq;
 
 use strict;
-use MIME::Types;
-use MIME::Lite;
 use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -69,9 +67,7 @@ sub handler {
         }
     }
     my $origurl = $env{'form.origurl'};
-    if ($origurl =~ m{^https?://[^/]+(.*)$}) {
-        $origurl =~ $1;
-    }
+    $origurl =~ s{^https?://}{};
     $origurl =~ s/(`)//g;
     $origurl =~ s/\$/\(\$\)/g;
     my $command = $env{'form.command'};
@@ -153,6 +149,7 @@ sub print_request_form {
         }
     }
 
+    my %coursecodes;
     my %codes;
     my @codetitles;
     my %cat_titles;
@@ -160,7 +157,9 @@ sub print_request_form {
     my %idlist;
     my %idnums;
     my %idlist_titles;
+    my $caller = 'global';
     my $totcodes = 0;
+    my $format_reply;
     my $jscript = '';
     my $loaditems = qq|
 function initialize_codes() {
@@ -168,17 +167,10 @@ function initialize_codes() {
 }
     |;
     unless ($helpform{'course'} eq 'no') {
-        my $instcats = &Apache::lonnet::get_dom_instcats($codedom);
-        if (ref($instcats) eq 'HASH') {
-            if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') &&
-                (ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) {
-                %codes = %{$instcats->{'codes'}};
-                @codetitles = @{$instcats->{'codetitles'}};
-                %cat_titles = %{$instcats->{'cat_titles'}};
-                %cat_order = %{$instcats->{'cat_order'}};
-                $totcodes = scalar(keys(%codes));
-            }
-            if ($totcodes > 0) {
+        $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
+        if ($totcodes > 0) {
+            $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+            if ($format_reply eq 'ok') {
                 my $numtypes = @codetitles;
                 &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
                 my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
@@ -321,6 +313,7 @@ $jscript
 $loaditems
 // ]]>
 </script>
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 ENDJS
     if ($recaptcha_version >=2) {
         $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
@@ -580,10 +573,11 @@ ENDJS
                     $showmax = $helpform{'maxsize'};
                 }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
-                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]).
-                       ' <input type="file" name="screenshot" size="20" /><br />'.
-                       "\n".$html_lt{'uplf'}.$showmax."\n".
-                       &Apache::lonhtmlcommon::row_closure();
+                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
+                    .' <input type="file" name="screenshot" class="flUpload" size="20" />'
+                    .'<input type="hidden" id="free_space" value="'.$max.'" />'
+                    .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
+                    .&Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
             }
@@ -714,12 +708,8 @@ sub print_request_receipt {
         $coursecode = $env{'form.coursecode'};
         if ($coursecode eq '') {
             my $totcodes = 0;
-            my $instcats = &Apache::lonnet::get_dom_instcats($defdom);
-            if (ref($instcats) eq 'HASH') {
-                if (ref($instcats->{'codes'}) eq 'HASH') {
-                    $totcodes = scalar(keys(%{$instcats->{'codes'}}));
-                }
-            }
+            my %coursecodes;
+            $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom);
             my @standardnames = &Apache::loncommon::get_standard_codeitems();
             if ($totcodes > 0) {
                 my $noregexps = 1;
@@ -1028,20 +1018,22 @@ END
         }
     }
 
-    my $attachment_text = '';
+    my $attachment_text;
     unless ($homeserver && $attachmentpath) {
+        my $envdata = '';
         foreach my $var (@cookievars) {
-            $attachment_text .= "$var: $cookies{$var}\n";
+            $envdata .= "$var: $cookies{$var}\n";
         }
         foreach my $var (@ENVvars) {
-            $attachment_text .= "$var: $ENV{$var}\n";
+            $envdata .= "$var: $ENV{$var}\n";
         }
         foreach my $var (@envvars) {
-            $attachment_text .= "$var: $env{$var}\n";
+            $envdata .= "$var: $env{$var}\n";
         }
         foreach my $var (@loncvars) {
-            $attachment_text .= "$var: $env{$var}\n";
+            $envdata .= "$var: $env{$var}\n";
         }
+        $attachment_text = $envdata;
     }
 
     if ($addtext) {
@@ -1054,39 +1046,9 @@ END
         }
     }
 
-    my $msg = MIME::Lite->new(
-                 From    => $from,
-                 To      => $to,
-                 Subject => $subject,
-                 Type    =>'TEXT',
-                 Data    => $supportmsg,
-                 );
-    if ($homeserver) {
-        if (@ok_ccs > 0) {
-            my $cc_string = join(', ',@ok_ccs);
-            $msg->add("Cc" => $cc_string);
-        }
-    }
-    if ($bcc ne '') {
-        $msg->add("Bcc" => $bcc);
-    }
-    $msg->attr("content-type"         => "text/plain");
-    $msg->attr("content-type.charset" => "UTF-8");
-
-    if ($homeserver && $attachmentpath) {
-        my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
-        $msg->attach(Type     => $type,
-                     Path     => $attachmentpath,
-                     Filename => $fname
-                     );
-
-    } elsif ($attachment_text ne '') {
-        $msg->attach(Type => 'TEXT',
-                     Data => $attachment_text);
-    }
-
-### Send it:
-    $msg->send('sendmail');
+    # Compose and send a MIME email
+    &Apache::loncommon::mime_email($from, $to, $subject, $supportmsg, $cc_string, $bcc, 
+                                    $attachmentpath, $fname, $attachment_text);
 
     if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
         unlink($attachmentpath);