--- loncom/interface/lonsupportreq.pm 2004/12/30 21:16:38 1.20
+++ loncom/interface/lonsupportreq.pm 2005/02/17 08:29:43 1.23
@@ -36,7 +36,7 @@ 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);
- my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0",marginheight="0"',1);
+ 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';
@@ -52,7 +52,11 @@ sub print_request_form {
$urole = $ENV{'request.role'};
$usec = $ENV{'request.course.sec'};
$cid = $ENV{'request.course.id'};
- $server = $ENV{'SERVER_NAME'};
+ if ($origurl =~ m-^http://-) {
+ $server = $origurl;
+ } else {
+ $server = 'http://'.$ENV{'SERVER_NAME'}.$origurl;
+ }
my $scripttag = (<<'END');
function validate() {
if (validmail(document.logproblem.email) == false) {
@@ -115,6 +119,10 @@ END
if (exists($ENV{'form.codedom'})) {
$codedom = $ENV{'form.codedom'};
}
+ my $details_title;
+ if ($codedom) {
+ $details_title = '
('.$codedom.')';
+ }
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -127,7 +135,11 @@ END
my $totcodes = 0;
my $format_reply;
my $jscript = '';
-
+ my $loaditems = qq|
+function initialize_codes() {
+ return;
+}
+ |;
if ($cdom) {
$codedom = $cdom;
}
@@ -144,15 +156,19 @@ END
$totcodes = &retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
}
if ($totcodes > 0) {
- $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
if ($ccode eq '') {
- my $numtypes = @codetitles;
- &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);
+ $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+ if ($format_reply eq 'ok') {
+ my $numtypes = @codetitles;
+ &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);
+ $loaditems = '';
+ }
}
}
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<
+$html
LON-CAPA support request