--- loncom/interface/lonsupportreq.pm 2005/10/13 17:18:14 1.29 +++ loncom/interface/lonsupportreq.pm 2006/07/11 15:37:59 1.36 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.29 2005/10/13 17:18:14 raeburn Exp $ +# $Id: lonsupportreq.pm,v 1.36 2006/07/11 15:37:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,10 @@ use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonnet; use Apache::lonlocal; +use Apache::lonacc(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + sub handler { my ($r) = @_; @@ -46,10 +50,10 @@ sub handler { } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']); if ($r->uri eq '/adm/helpdesk') { - &Apache::loncommon::get_posted_cgi($r); + &Apache::lonacc::get_posted_cgi($r); } my $function = $env{'form.function'}; - my $origurl = &Apache::lonnet::unescape($env{'form.origurl'}); + my $origurl = &unescape($env{'form.origurl'}); my $action = $env{'form.action'}; if ($action eq 'process') { @@ -63,7 +67,6 @@ 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 $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0" onLoad="initialize_codes()"',1); my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { $tablecolor = '#EEEE99'; @@ -98,7 +101,7 @@ function validmail(field) { var str = field.value; if (window.RegExp) { 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 reg2 = new RegExp(reg2str); if (!reg1.test(str) && reg2.test(str)) { @@ -115,7 +118,7 @@ function validmail(field) { } } END - #" stupid emacs + if ($cid =~ m/_/) { ($cdom,$cnum) = split/_/,$cid; } @@ -195,18 +198,20 @@ function initialize_codes() { } } } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< - LON-CAPA support request - - -$bodytag -ENDHEAD + + my $js = ''; + my %add_entries = (topmargin => "0", + marginheight => "0", + onLoad =>"initialize_codes()",); + + my $start_page = + &Apache::loncommon::start_page('Support Request',$js, + { 'function' => $function, + 'add_entries' => \%add_entries, + 'only_body' => 1,}); + $r->print($start_page); + if ($r->uri eq '/adm/helpdesk') { &print_header($r,$origurl); } @@ -595,6 +600,7 @@ END END } + $r->print(< @@ -631,9 +637,8 @@ END - - END + $r->print(&Apache::loncommon::end_page()); return; } @@ -644,7 +649,6 @@ sub print_request_receipt { 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 $to = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $from = $admin; @@ -695,13 +699,18 @@ Date/Time: $reporttime URL: $env{'form.sourceurl'}
Date/Time: $reporttime
|; - 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"); -$html - - LON-CAPA support request recorded - -$bodytag +$start_page
@@ -891,9 +900,8 @@ END - - "); + $r->print(&Apache::loncommon::end_page()); } sub print_header { @@ -968,10 +976,11 @@ Please review the information in "Log-in sub retrieve_instcodes { my ($coursecodes,$codedom,$totcodes) = @_; - my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.'); + my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.', + undef,undef,'Course'); foreach my $course (keys %courses) { if ($courses{$course} =~ m/^[^:]*:([^:]+)/) { - $$coursecodes{$course} = &Apache::lonnet::unescape($1); + $$coursecodes{$course} = &unescape($1); $totcodes ++; } }