--- loncom/interface/lonsupportreq.pm	2010/04/14 07:31:21	1.55.4.3
+++ loncom/interface/lonsupportreq.pm	2012/02/10 19:22:19	1.66.6.2
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.55.4.3 2010/04/14 07:31:21 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.66.6.2 2012/02/10 19:22:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,8 +36,7 @@ use Apache::lonhtmlcommon;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
-use Apache::courseclassifier;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
  
 
 sub handler {
@@ -57,7 +56,7 @@ sub handler {
         &Apache::lonacc::get_posted_cgi($r);
     }
     my $function = $env{'form.function'};
-    my $origurl = &unescape($env{'form.origurl'});
+    my $origurl = $env{'form.origurl'};
     my $command = $env{'form.command'};
 
     if ($command eq 'process') {
@@ -70,22 +69,20 @@ sub handler {
     
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
-    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname);
+    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$email,
+        $lastname,$firstname,$server,$formname,$public);
     $function = &Apache::loncommon::get_users_function() if (!$function);
-    $ccode = '';
     $os = $env{'browser.os'};
     $browser = $env{'browser.type'};
     $bversion = $env{'browser.version'};
     $uhost = $env{'request.host'};
-    my ($uname,$udom);
-    if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) {
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $public = 1;
+    } else {
         $uname = $env{'user.name'};
         $udom = $env{'user.domain'};
     }
     $uhome = $env{'user.home'};
-    $urole = $env{'request.role'};
-    $usec = $env{'request.course.sec'};
-    $cid = $env{'request.course.id'};
     $formname = 'logproblem';
     my $machine = &Apache::lonnet::absolute_url();
     if ($origurl =~ m-^https?://-) {
@@ -111,14 +108,7 @@ sub print_request_form {
                   entr => 'Enter the username you use to log-in to LON-CAPA, and your domain.',
                   urlp => 'URL of page',
                   phon => 'Phone',
-                  crsd => 'Course Details',
-                  enin => 'Enter institutional course code',
                   pick => 'Pick',
-                  enct => 'Enter course title',
-                  secn => 'Section Number',
-                  sele => 'Select',
-                  titl => 'Title',
-                  lsec => 'LON-CAPA sec',
                   subj => 'Subject',
                   detd => 'Detailed Description',
                   opfi => 'Optional file upload',
@@ -145,16 +135,6 @@ function validate() {
 
 END
     $scripttag .= &Apache::lonhtmlcommon::javascript_valid_email();
-    if ($cid) {
-        $cdom = $env{'course.'.$cid.'.domain'};
-        $cnum = $env{'course.'.$cid.'.num'};
-    }
-    if ($cdom && $cnum) {
-        my %csettings = &Apache::lonnet::get('environment',['description','internal.coursecode','internal.sectionnums'],$cdom,$cnum);
-        $ctitle = $csettings{'description'};
-        $ccode = $csettings{'internal.coursecode'};
-        $sectionlist = $csettings{'internal.sectionnums'};
-    }
 
     if ($env{'environment.permanentemail'}) {
         $email = $env{'environment.permanentemail'};
@@ -169,70 +149,30 @@ END
     if ($env{'environment.firstname'}) {
         $firstname = $env{'environment.firstname'};
     }
-    my @sections = split(/,/,$sectionlist);
-    my %groupid;
-    foreach my $section (@sections) {
-        my ($sec,$grp) = split(/:/,$section);
-        $groupid{$sec} = $grp;
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom',
+                                                 'useremail','useraccount']);
+    if ($env{'form.origurl'} eq '/adm/createaccount') {
+        if ($email eq '') {
+            if ($env{'form.useremail'} =~ /^[^\@]+\@[^\@]+$/) {
+                $email = &HTML::Entities::encode($env{'form.useremail'},'"<>&');
+            }
+        }
+        if ($uname eq '') {
+            if ($env{'form.useraccount'} =~ /^$match_username$/) {
+                $uname = &HTML::Entities::encode($env{'form.useraccount'},'"<>&');
+            }
+        }
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']);
     my $codedom = &get_domain();
-    my $details_title;
-    if ($codedom) {
-        $details_title = '<br />('.$codedom.')';
-    }
-    my %coursecodes;
-    my %codes;
-    my @codetitles;
-    my %cat_titles;
-    my %cat_order;
-    my %idlist;
-    my %idnums;
-    my %idlist_titles;
     my $caller = 'global';
-    my $totcodes = 0;
     my $format_reply;
     my $jscript = '';
-    my $loaditems = qq|
-function initialize_codes() {
-    return;
-}
-    |;
-    if ($cnum) {
-        $coursecodes{$cnum} = $ccode;
-        if ($ccode eq '') {
-            $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
-        } else {
-            $coursecodes{$cnum} = $ccode;
-            $caller = $cnum;
-            $totcodes ++;
-        }
-    } else { 
-        $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
-    }
-    if ($totcodes > 0) {
-        if ($ccode eq '') {
-            $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);
-                my $longtitles_str = join('","',@{$longtitles});
-                my $allidlist = $idlist{$codetitles[0]};
-                $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
-                $jscript .= $scripttext;
-                $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
-                $loaditems = '';
-            }
-        }
-    }
-	
     my $js = '<script type="text/javascript">'."\n$scripttag\n$jscript\n".
-	'</script>';
+	     '</script>';
     my %add_entries = (topmargin    => "0",
 		       marginheight => "0",
-		       onLoad       =>"initialize_codes()",);
-
+		      );
     
     $r->print(&Apache::loncommon::start_page('Support Request',$js,
 				       { 'function'    => $function,
@@ -269,7 +209,7 @@ function initialize_codes() {
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
-    if (defined($uname)) {
+    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
                    '<input type="text" size="50" name="cc" value="" /><br />'."\n".
                    &Apache::lonhtmlcommon::row_closure();
@@ -281,30 +221,33 @@ function initialize_codes() {
                      &HTML::Entities::encode($udom,'"<>&').'" />';
     my $uname_input = '<input type="hidden" name="uname" value="'.
                       &HTML::Entities::encode($uname,'"<>&').'" />'; 
-    if (defined($uname) && defined($udom)) {
+    if (($env{'user.name'} =~ /^$match_username$/) && 
+        ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
         $output .= '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
     } else {
         my $udomform = '';
         my $unameform = '';
-        if (defined($udom)) {
+        if (($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
             $output .= $lt{'entu'};
-        } elsif (defined($uname)) {
+        } elsif (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { 
             $output .= $lt{'chdo'};
         } else {
             $output .= $lt{'entr'};
         }
         $output .= '<br />';
-        if (defined($udom)) {
-            $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
-        } elsif (defined($uname)) {
-            $unameform = '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+        if (!$public) {
+            if ($env{'user.domain'} =~ /^$match_domain$/) {
+                $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
+            } elsif ($env{'user.name'} =~ /^$match_username$/) {
+                $unameform = '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+            }
         }
         if ($udomform eq '') {
             $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;';
             $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom');
         }
         if ($unameform eq '') {
-            $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="12" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
+            $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
         }
         $output .= $unameform.$udomform;
     }
@@ -314,115 +257,15 @@ function initialize_codes() {
     $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]).
                $showserver.'<input type="hidden" name="sourceurl" value="'.
                &HTML::Entities::encode($server,'"<>&').'" />'.
-               &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
-               '<input type="text" size="15" name="phone" /><br />'.
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
-    $i = $num%2; 
-    $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]);
-    if ($cnum) {
-        if ($coursecodes{$cnum}) {
-            foreach my $item (@codetitles) {
-                $output .= '<i>'.$item.'</i>:&nbsp;'.$codes{$cnum}{$item}.';&nbsp;';
-            }
-            $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />';
-        } else {
-            $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
-        }
-    } else {
-        if ($totcodes > 0) {
-            my $numtitles = @codetitles;
-            if ($numtitles == 0) {
-                $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
-            } else {
-                my $lasttitle = $numtitles;
-                if ($numtitles > 4) {
-                    $lasttitle = 4;
-                } 
-                $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
-                      '<select name="'.$codetitles[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
-                      ' <option value="-1" />'.$lt{'sele'}."\n";
-                my @items = ();
-                my @longitems = ();
-                if ($idlist{$codetitles[0]} =~ /","/) {
-                    @items = split(/","/,$idlist{$codetitles[0]});
-                } else {
-                    $items[0] = $idlist{$codetitles[0]};
-                }
-                if (defined($idlist_titles{$codetitles[0]})) {
-                    if ($idlist_titles{$codetitles[0]} =~ /","/) {
-                        @longitems = split(/","/,$idlist_titles{$codetitles[0]});
-                    } else {
-                        $longitems[0] = $idlist_titles{$codetitles[0]};
-                    }
-                    for (my $i=0; $i<@longitems; $i++) {
-                        if ($longitems[$i] eq '') {
-                            $longitems[$i] = $items[$i];
-                        }
-                    }
-                } else {
-                    @longitems = @items;
-                }
-                for (my $i=0; $i<@items; $i++) {
-                    $output .= ' <option value="'.$items[$i].'">'.$longitems[$i].'</option>'."\n";
-                }
-                $output .= '</select></td>';
-                for (my $i=1; $i<$numtitles; $i++) {
-                    $output .= '<td>'.$codetitles[$i].'<br />'."\n".
-                     '<select name="'.$codetitles[$i].'" onchange="courseSet('."'$codetitles[$i]'".')">'."\n".
-                     '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
-                     '</select>'."\n".
-                     '</td>'."\n";
-                }
-                $output .= '</tr></table>';
-                if ($numtitles > 4) {
-                    $output .= '<br /><br />'.$codetitles[$numtitles].'<br />'."\n".
-                          '<select name="'.$codetitles[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".')">'."\n".
-                          '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
-                          '</select>'."\n";
-                }
-            }
-        } else {
-            $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
-        }
-    }
-    if ($ctitle) {
-        $output .= '<br /><i>'.$lt{'titl'}.'</i>:&nbsp;'.$ctitle.
-                   '<input type="hidden" name="title" value="'.
-                   &HTML::Entities::encode($ctitle,'"<>&').'" />'."\n";
-    } else {
-        $output .= '<br />'.$lt{'enct'}.':&nbsp;
-                 <input type="text" name="title" size="25" value="" />'."\n";
-    }
-    $output .= &Apache::lonhtmlcommon::row_closure();
-    $num ++;
     $i = $num%2;
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]);
-    if ($sectionlist) {
-        $output .= "<select name=\"section\"\n>".
-                   "  <option value=\"\" selected=\"selected\">$lt{'sele'}</option>\n";
-        foreach my $id (sort(keys(%groupid))) {
-            if ($id eq $groupid{$id} || $groupid{$id} eq '') {
-                $output .= "  <option value=".
-                           &HTML::Entities::encode($id,'"<>&').
-                           " >$id</option>\n";
-            } else {
-                $output .= "  <option value=".
-                           &HTML::Entities::encode($id,'"<>&').
-                           " >$id - ($lt{'lsec'}: $groupid{$id})</option>\n";
-            }
-        }
-        $output .= "</select>";
-    } else {
-        $output .= '<input type="text" name="section" size="10" />';
-    }
-    $output .= &Apache::lonhtmlcommon::row_closure();
+    $output .= &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,
+                                                 'LC_evenrow_value').
+               '<input type="text" size="15" name="phone" /><br />'.
+               &Apache::lonhtmlcommon::row_closure();
     $num ++;
-    $i = $num%2; 
+    $i = $num%2;
     $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value').
                '  <input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
@@ -431,7 +274,7 @@ function initialize_codes() {
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    if (defined($uname)) {
+    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
                    ' <input type="file" name="screenshot" size="20" /><br />'.$lt{'uplf'}."\n".
         &Apache::lonhtmlcommon::row_closure();
@@ -504,40 +347,21 @@ sub print_request_receipt {
         }
     }
     my $reporttime = &Apache::lonlocal::locallocaltime(time);
-    my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot');
-
+    my @formvars = ('username','email','uname','udom','sourceurl','phone',
+                    'subject','description','screenshot');
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
-    my $coursecode = $env{'form.coursecode'};
-    if ($coursecode eq '') {
-        if (defined($env{'form.Year'})) {
-            $coursecode .= $env{'form.Year'};
-        }
-        if (defined($env{'form.Semester'})) {
-            $coursecode .= $env{'form.Semester'};
-        }
-        if (defined($env{'form.Department'})) {
-            $coursecode .= $env{'form.Department'};
-        }
-        if (defined($env{'form.Number'})) {
-            $coursecode .= $env{'form.Number'};
-        }
-    }
     my %lt = &Apache::lonlocal::texthash (
                  username    => 'Name',
                  email       => 'E-mail',
                  cc          => 'Cc',
                  user        => 'Username/domain',
                  phone       => 'Phone',
-                 crsi        => 'Course Information',
                  subject     => 'Subject',
                  description => 'Description',
                  sourceurl   => 'URL',
                  date        => 'Date/Time',
-                 secn        => 'Section',
-                 asup        => 'A support request has been sent to',
                  warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',
-                 sect        => 'section',
                  info        => 'Information supplied',
                  adin        => 'Additional information recorded',
     );
@@ -559,7 +383,7 @@ sub print_request_receipt {
                 if (!(grep(/^\Q$cc\E$/,@ok_ccs))) {
                     push(@ok_ccs,$cc);
                 }
-            } else {
+            } elsif ($cc ne '') {
                 if (!(grep(/^\Q$cc\E$/,@bad_ccs))) {
                     push(@bad_ccs,$cc);
                 }
@@ -576,14 +400,12 @@ sub print_request_receipt {
         }
     }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
-    $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'};
     my $supportmsg = <<END;
 $lt{'username'}: $env{'form.username'}
 $lt{'email'}: $env{'form.email'}
 $lt{'cc'}: $okcclist
 $lt{'user'}: $env{'form.user'}
 $lt{'phone'}: $env{'form.phone'}
-$lt{'crsi'}: $env{'form.csri'}
 $lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
 $lt{'sourceurl'}: $env{'form.sourceurl'}
@@ -591,7 +413,8 @@ $lt{'date'}: $reporttime
 
 END
     my $displaymsg;
-    foreach my $item ('username','email','cc','user','phone','crsi','subject','description','sourceurl') {
+    foreach my $item ('username','email','cc','user','phone','subject',
+                      'description','sourceurl') {
         if ($env{'form.'.$item} ne '') {
             if ($item eq 'description') {
                 my $descrip = $env{'form.description'};
@@ -665,14 +488,20 @@ END
             $bad_email = 1;
         }
     }
-    if ($bad_email) {
-        $r->print('
- <h3>'.$lt{'warn'}.'</h3>'.
-&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.')); 
-            $to = 'helpdesk@lon-capa.org';
+
+    my $message;
+    if (!$bad_email) {
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));
     } else {
-        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            $lt{'warn'}.'<br />'
+           .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>')
+           .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1); 
+        $to = 'helpdesk@lon-capa.org';
     }
+    $r->print(&Apache::loncommon::confirmwrapper($message));
+
     if (defined($env{'form.email'})) {
         $env{'form.email'} =~ s/^\s+//;
         $env{'form.email'} =~ s/\s+$//;
@@ -720,7 +549,7 @@ END
         $fname = $1;
         $displaymsg .= '<br />'
                       .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
-                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,'<span class="LC_filename">'.$fname.'</span>'
                           ,$attachmentsize
                           ,$env{'user.name'}.':'.$env{'user.domain'}
                        );
@@ -750,6 +579,8 @@ END
     if ($bcc ne '') {
         $msg->add("Bcc" => $bcc);
     }
+    $msg->attr("content-type"         => "text/plain");
+    $msg->attr("content-type.charset" => "UTF-8");
 
     if ($attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
@@ -837,13 +668,16 @@ sub print_header {
     } else {
         $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
     }
+    if ($origurl eq '') {
+        $origurl = 'javascript:history.go(-1)';
+    }
     $r->print(<<END);
 <table width="620" border="0" cellspacing="0" cellpadding="0" height="55">   <tr height="50">    <td width='5'>&nbsp;</td>
    <td>
     <fieldset>
       <legend>
-        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />&nbsp;&nbsp;
-       <b>LON-CAPA $lt{'headline'}</b>
+        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />
+        LON-CAPA $lt{'headline'}
       </legend>
  <table id="LC_helpmenu_links">
    <tr>