--- loncom/interface/lonsupportreq.pm 2005/10/13 17:18:14 1.29 +++ loncom/interface/lonsupportreq.pm 2006/03/23 22:01:57 1.31 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.29 2005/10/13 17:18:14 raeburn Exp $ +# $Id: lonsupportreq.pm,v 1.31 2006/03/23 22:01:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -63,7 +63,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 +97,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 +114,7 @@ function validmail(field) { } } END - #" stupid emacs + if ($cid =~ m/_/) { ($cdom,$cnum) = split/_/,$cid; } @@ -195,18 +194,18 @@ 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 +594,7 @@ END END } + $r->print(< @@ -631,9 +631,8 @@ END - - END + $r->print(&Apache::loncommon::end_page()); return; } @@ -696,11 +695,10 @@ Date/Time: $reporttime Date/Time: $reporttime
|; my $html=&Apache::lonxml::xmlbegin(); + my $head = &Apache::loncommon::head('LON-CAPA support request recorded'); $r->print(<<"END"); $html - - LON-CAPA support request recorded - +$head $bodytag
@@ -891,9 +889,8 @@ END - - "); + $r->print(&Apache::loncommon::end_page()); } sub print_header {