Diff for /loncom/interface/lonsupportreq.pm between versions 1.26 and 1.34

version 1.26, 2005/04/10 23:37:21 version 1.34, 2006/04/13 19:07:11
Line 30  use strict; Line 30  use strict;
 use lib qw(/home/httpd/lib/perl);  use lib qw(/home/httpd/lib/perl);
 use MIME::Types;  use MIME::Types;
 use MIME::Lite;  use MIME::Lite;
   use CGI::Cookie();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonacc();
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 45  sub handler { Line 47  sub handler {
     }      }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']);
     if ($r->uri eq '/adm/helpdesk') {      if ($r->uri eq '/adm/helpdesk') {
         &Apache::loncommon::get_posted_cgi($r);          &Apache::lonacc::get_posted_cgi($r);
     }      }
     my $function = $env{'form.function'};      my $function = $env{'form.function'};
     my $origurl = &Apache::lonnet::unescape($env{'form.origurl'});      my $origurl = &Apache::lonnet::unescape($env{'form.origurl'});
Line 61  sub handler { Line 63  sub handler {
           
 sub print_request_form {  sub print_request_form {
     my ($r,$origurl,$function) = @_;      my ($r,$origurl,$function) = @_;
     my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server);      my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname);
     my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0" onLoad="initialize_codes()"',1);  
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');      my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
     if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {      if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {
         $tablecolor = '#EEEE99';          $tablecolor = '#EEEE99';
Line 78  sub print_request_form { Line 79  sub print_request_form {
     $urole = $env{'request.role'};      $urole = $env{'request.role'};
     $usec = $env{'request.course.sec'};      $usec = $env{'request.course.sec'};
     $cid = $env{'request.course.id'};      $cid = $env{'request.course.id'};
       $formname = 'logproblem';
     if ($origurl =~ m-^http://-) {      if ($origurl =~ m-^http://-) {
         $server = $origurl;          $server = $origurl;
     } else {      } else {
Line 96  function validmail(field) { Line 98  function validmail(field) {
     var str = field.value;      var str = field.value;
     if (window.RegExp) {      if (window.RegExp) {
         var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";          var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
         var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$";          var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
         var reg1 = new RegExp(reg1str);          var reg1 = new RegExp(reg1str);
         var reg2 = new RegExp(reg2str);          var reg2 = new RegExp(reg2str);
         if (!reg1.test(str) && reg2.test(str)) {          if (!reg1.test(str) && reg2.test(str)) {
Line 113  function validmail(field) { Line 115  function validmail(field) {
     }      }
 }  }
 END  END
     #" stupid emacs  
     if ($cid =~ m/_/) {      if ($cid =~ m/_/) {
         ($cdom,$cnum) = split/_/,$cid;          ($cdom,$cnum) = split/_/,$cid;
     }      }
Line 188  function initialize_codes() { Line 190  function initialize_codes() {
             if ($format_reply eq 'ok') {              if ($format_reply eq 'ok') {
                 my $numtypes = @codetitles;                  my $numtypes = @codetitles;
                 &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);                  &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
                 &javascript_code_selections($numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);                  &javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);
                 $loaditems = '';                  $loaditems = '';
             }              }
         }          }
     }      }
     my $html=&Apache::lonxml::xmlbegin();  
     $r->print(<<ENDHEAD);      my $js = '<script type"text/javascript">'."\n$scripttag\n$jscript\n".
 $html   '</script>';
 <head>      my %add_entries = (topmargin    => "0",
  <title>LON-CAPA support request</title>         marginheight => "0",
 <script type"text/javascript">         onLoad       =>"initialize_codes()",);
 $scripttag  
 $jscript      my $start_page =
 </script>   &Apache::loncommon::start_page('Support Request',$js,
 </head>         { 'function'    => $function,
 $bodytag   'add_entries' => \%add_entries,
 ENDHEAD   'only_body'   => 1,});
       $r->print($start_page);
   
     if ($r->uri eq '/adm/helpdesk') {      if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$origurl);          &print_header($r,$origurl);
     }      }
Line 593  END Line 597  END
            </tr>             </tr>
 END  END
     }      }
   
     $r->print(<<END);      $r->print(<<END);
            <tr>             <tr>
             <td width="140" bgcolor="$tablecolor">              <td width="140" bgcolor="$tablecolor">
Line 629  END Line 634  END
   </tr>    </tr>
  </table>   </table>
 </form>  </form>
 </body>  
 </html>  
 END  END
       $r->print(&Apache::loncommon::end_page());
     return;      return;
 }  }
   
Line 640  sub print_request_receipt { Line 644  sub print_request_receipt {
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');      my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
     my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');      my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');      my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
       my @cookievars = ('lonID');
   
     my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);  
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};      my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $to =  $Apache::lonnet::perlvar{'lonSupportEMail'};      my $to =  $Apache::lonnet::perlvar{'lonSupportEMail'};
     my $from = $admin;      my $from = $admin;
Line 692  Date/Time: $reporttime Line 696  Date/Time: $reporttime
 <font color="$fontcolor">URL: </font><font color="$vlinkcolor">$env{'form.sourceurl'}</font><br />  <font color="$fontcolor">URL: </font><font color="$vlinkcolor">$env{'form.sourceurl'}</font><br />
 <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />  <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />
     |;      |;
     my $html=&Apache::lonxml::xmlbegin();  
       my $start_page = 
    &Apache::loncommon::start_page('Support request recorded',undef,
          {'function'    => $function,
    'add_entries' => {
       topmargin    => "0",
       marginheight => "0",
    },
    'only_body'   => 1,});
   
     $r->print(<<"END");      $r->print(<<"END");
 $html  $start_page
 <head>  
  <title>LON-CAPA support request recorded</title>  
 </head>  
 $bodytag  
 <form name="logproblem">  <form name="logproblem">
 <input type="hidden" name="action" value="result" />  <input type="hidden" name="action" value="result" />
 </form>  </form>
Line 749  END Line 758  END
         }          }
     }      }
   
       my %cookies = ();
       my $cookie=CGI::Cookie->parse($r->header_in('Cookie'));
       if ($$cookie{'lonID'} =~ /lonID=(\w+);/) {
           $cookies{'lonID'} = $1;
       }
   
     if ($attachmentpath =~ m-/([^/]+)$-) {      if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;          $fname = $1;
         $displaymsg .= "<br />An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $env{'user.name'} from LON-CAPA domain: $env{'user.domain'}";          $displaymsg .= "<br />An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $env{'user.name'} from LON-CAPA domain: $env{'user.domain'}";
         $supportmsg .= "\n";          $supportmsg .= "\n";
           foreach (@cookievars) {
               $supportmsg .= "$_: $cookies{$_}\n";
           }
         foreach (@ENVvars) {          foreach (@ENVvars) {
             $supportmsg .= "$_: $ENV{$_}\n";              $supportmsg .= "$_: $ENV{$_}\n";
         }          }
Line 778  END Line 796  END
   
     } else {      } else {
         my $envdata = '';          my $envdata = '';
           foreach (@cookievars) {
               $envdata .= "$_: $cookies{$_}\n";
           }
         foreach (@ENVvars) {          foreach (@ENVvars) {
             $envdata .= "$_: $ENV{$_}\n";              $envdata .= "$_: $ENV{$_}\n";
         }          }
Line 845  END Line 866  END
               <tr>                <tr>
                <td>                 <td>
     |);      |);
       foreach (@cookievars) {
           unless($cookies{$_} eq '') {
               $r->print("$_:&nbsp;<font color='$vlinkcolor'>$cookies{$_}</font>, ");
           }
       }
     foreach (@ENVvars) {      foreach (@ENVvars) {
         unless($ENV{$_} eq '') {          unless($ENV{$_} eq '') {
             $r->print("$_:&nbsp;<font color='$vlinkcolor'>$ENV{$_}</font>, ");              $r->print("$_:&nbsp;<font color='$vlinkcolor'>$ENV{$_}</font>, ");
Line 871  END Line 897  END
    </td>     </td>
   </tr>    </tr>
  </table>   </table>
 </body>  
 </html>  
     ");      ");
       $r->print(&Apache::loncommon::end_page());
 }  }
   
 sub print_header {  sub print_header {
Line 948  Please review the information in "Log-in Line 973  Please review the information in "Log-in
   
 sub retrieve_instcodes {  sub retrieve_instcodes {
     my ($coursecodes,$codedom,$totcodes) = @_;      my ($coursecodes,$codedom,$totcodes) = @_;
     my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.');      my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.');
     foreach my $course (keys %courses) {      foreach my $course (keys %courses) {
         if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {          if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
             $$coursecodes{$course} = &Apache::lonnet::unescape($1);              $$coursecodes{$course} = &Apache::lonnet::unescape($1);
Line 1167  sub recurse_list { Line 1192  sub recurse_list {
 }  }
   
 sub javascript_code_selections {  sub javascript_code_selections {
     my ($numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;      my ($formname,$numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;
     my $numtitles = @{$codetitles};      my $numtitles = @{$codetitles};
     my @seltitles = ();      my @seltitles = ();
     for (my $j=0; $j<$numtitles; $j++) {      for (my $j=0; $j<$numtitles; $j++) {
Line 1188  function courseSet(caller) { Line 1213  function courseSet(caller) {
     var ids = new Array ("$seltitle_str");      var ids = new Array ("$seltitle_str");
     var formitems = new Array ($numtitles);      var formitems = new Array ($numtitles);
     var longtitles = new Array ("$longtitles_str");      var longtitles = new Array ("$longtitles_str");
     var idyr = document.logproblem.Year.selectedIndex      var idyr = document.$formname.Year.selectedIndex
     var idsem  = document.logproblem.Semester.selectedIndex      var idsem  = document.$formname.Semester.selectedIndex
     var iddept = document.logproblem.Department.selectedIndex      var iddept = document.$formname.Department.selectedIndex
     var idclass = document.logproblem.Number.selectedIndex      var idclass = document.$formname.Number.selectedIndex
     var idyears = new Array("$$idlist{$$codetitles[0]}");      var idyears = new Array("$$idlist{$$codetitles[0]}");
 END  END
     if ($longtitles[0]) {      if ($longtitles[0]) {
Line 1255  END Line 1280  END
     }      }
     $$script_tag .= (<<END_OF_BLOCK);      $$script_tag .= (<<END_OF_BLOCK);
  var display = new Array($numtitles)   var display = new Array($numtitles)
  if (caller == "") {   if (caller == "" || caller == "$$codetitles[0]") {
     document.logproblem.Year.length = 0       if (caller == "") {
     document.logproblem.Year.options[0] = new Option("Select","-1",true,true)           document.$formname.Year.length = 0
     display[0] = new Array(idyears.length)           document.$formname.Year.options[0] = new Option("Select","-1",true,true)
     for (var i=0; i<idyears.length; i++) {           display[0] = new Array(idyears.length)
       display[0][i] = idyears[i]           for (var i=0; i<idyears.length; i++) {
       if (longtitles[0] == 1) {               display[0][i] = idyears[i]
           if (idyearslongs[i] != "") {               if (longtitles[0] == 1) {
               display[0][i] = idyearslongs[i]                   if (idyearslongs[i] != "") {
           }                       display[0][i] = idyearslongs[i]
       }                   }
       document.logproblem.Year.options[i+1] = new Option(display[0][i],idyears[i],false,false)               }
     }               else {
     document.logproblem.Year.selectedIndex = 0;                   if (idyearslongs[i] != "") {
  }                       display[0][i] = idyears[i]
  if (caller == "$$codetitles[0]") {                   }
    document.logproblem.Department.length = 0               }
    document.logproblem.Number.length = 0               document.$formname.Year.options[i+1] = new Option(display[0][i],idyears[i],false,false)
    document.logproblem.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)           }
    document.logproblem.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)           document.$formname.Year.selectedIndex = 0;
    if (idyr == 0) {       }
     document.logproblem.Semester.length = 0       document.$formname.Semester.length = 0
     document.logproblem.Semester.options[0] = new Option("<-Pick $$codetitles[0]","-1",true,true)       document.$formname.Department.length = 0;
    }       document.$formname.Number.length = 0
    else {       document.$formname.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)
     document.logproblem.Semester.length = 0       document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
     document.logproblem.Semester.options[0] = new Option("Select","-1",true,true)       if (idyr == 0 || caller == "") {
     display[1] = new Array(idsems[idyr-1].length)           document.$formname.Semester.options[0] = new Option("<-Pick $$codetitles[0]","-1",true,true)
     for (var i=0; i<idsems[idyr-1].length; i++) {       }
       display[1][i] = idsems[idyr-1][i]       else {
       if (longtitles[1] == 1) {           document.$formname.Semester.options[0] = new Option("Select","-1",true,true)
           if (idsemslongs[idyr-1][i] != "") {           display[1] = new Array(idsems[idyr-1].length)
               display[1][i] = idsemslongs[idyr-1][i]           for (var i=0; i<idsems[idyr-1].length; i++) {
           }               display[1][i] = idsems[idyr-1][i]
       }               if (longtitles[1] == 1) {
       document.logproblem.Semester.options[i+1] = new Option(display[1][i],idsems[idyr-1][i],false,false)                   if (idsemslongs[idyr-1][i] != "") {
     }                       display[1][i] = idsemslongs[idyr-1][i]
    }                   }
    document.logproblem.Semester.selectedIndex = 0;               }
                document.$formname.Semester.options[i+1] = new Option(display[1][i],idsems[idyr-1][i],false,false)
            }
        }
        document.$formname.Semester.selectedIndex = 0;
  }   }
  if (caller == "$$codetitles[1]") {   if (caller == "$$codetitles[1]") {
    document.logproblem.Department.length = 0     document.$formname.Department.length = 0
    document.logproblem.Number.length = 0     document.$formname.Number.length = 0
    document.logproblem.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)     document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
    if (idsem == 0) {     if (idsem == 0) {
      document.logproblem.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)       document.$formname.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)
    }     }
    else {     else {
     document.logproblem.Department.options[0] = new Option("Select","-1",true,true)          document.$formname.Department.options[0] = new Option("Select","-1",true,true)    
     display[2] = new Array(idcodes[idyr-1][idsem-1].length)      display[2] = new Array(idcodes[idyr-1][idsem-1].length)
     for (var i=0; i<idcodes[idyr-1][idsem-1].length; i++) {      for (var i=0; i<idcodes[idyr-1][idsem-1].length; i++) {
       display[2][i] = idcodes[idyr-1][idsem-1][i]        display[2][i] = idcodes[idyr-1][idsem-1][i]
Line 1312  END Line 1341  END
               display[2][i] = idcodeslongs[idyr-1][idsem-1][i]                display[2][i] = idcodeslongs[idyr-1][idsem-1][i]
           }            }
       }        }
       document.logproblem.Department.options[i+1] = new Option(display[2][i],idcodes[idyr-1][idsem-1][i],false,false)        document.$formname.Department.options[i+1] = new Option(display[2][i],idcodes[idyr-1][idsem-1][i],false,false)
     }      }
    }     }
    document.logproblem.Department.selectedIndex = 0     document.$formname.Department.selectedIndex = 0
  }   }
  if (caller == "$$codetitles[2]") {   if (caller == "$$codetitles[2]") {
    document.logproblem.Number.length = 0     document.$formname.Number.length = 0
    if (iddept == 0) {     if (iddept == 0) {
      document.logproblem.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)       document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
    }     }
    else {     else {
     document.logproblem.Number.options[0] = new Option("Select","-1",true,true)      document.$formname.Number.options[0] = new Option("Select","-1",true,true)
     display[3] = new Array (idcourses[idyr-1][idsem-1][iddept-1].length)      display[3] = new Array (idcourses[idyr-1][idsem-1][iddept-1].length)
     for (var i=0; i<idcourses[idyr-1][idsem-1][iddept-1].length; i++) {      for (var i=0; i<idcourses[idyr-1][idsem-1][iddept-1].length; i++) {
       display[3][i] = idcourses[idyr-1][idsem-1][iddept-1][i]        display[3][i] = idcourses[idyr-1][idsem-1][iddept-1][i]
Line 1332  END Line 1361  END
             display[3][i] = idcourseslongs[idyr-1][idsem-1][iddept-1][i]              display[3][i] = idcourseslongs[idyr-1][idsem-1][iddept-1][i]
         }          }
       }        }
       document.logproblem.Number.options[i+1] = new Option(display[3][i],idcourses[idyr-1][idsem-1][iddept-1][i],false,false)        document.$formname.Number.options[i+1] = new Option(display[3][i],idcourses[idyr-1][idsem-1][iddept-1][i],false,false)
     }      }
    }     }
    document.logproblem.Number.selectedIndex = 0     document.$formname.Number.selectedIndex = 0
  }   }
 }  }
   

Removed from v.1.26  
changed lines
  Added in v.1.34


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>