loncom/interface/lonrequestcourse.pm - diff

Return to lonrequestcourse.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonrequestcourse.pm between versions 1.22 and 1.27

version 1.22, 2009/08/22 20:17:03	version 1.27, 2009/08/31 14:57:06
Line 44 described at http://www.lon-capa.org.	Line 44 described at http://www.lon-capa.org.

=item handler()	=item handler()

	=item get_breadcrumbs()

=item header()	=item header()

=item form_elements()	=item form_elements()
Line 58 described at http://www.lon-capa.org.	Line 60 described at http://www.lon-capa.org.

=item request_administration()	=item request_administration()

	=item close_popup_form()

	=item get_instcode()

=item print_request_form()	=item print_request_form()

=item print_enrollment_menu()	=item print_enrollment_menu()

	=item show_invalid_crosslists()

=item inst_section_selector()	=item inst_section_selector()

=item date_setting_table()	=item date_setting_table()
Line 100 described at http://www.lon-capa.org.	Line 108 described at http://www.lon-capa.org.

=item get_request_settings()	=item get_request_settings()

	=item extract_instcode()

	=item generate_date_items()

=back	=back

=cut	=cut
Line 122 sub handler {	Line 134 sub handler {
return OK;	return OK;
}	}

	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['action','showdom','cnum','state']);
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();	my $dom = &get_course_dom();
my $action = $env{'form.action'};	my $action = $env{'form.action'};
my $state = $env{'form.state'};	my $state = $env{'form.state'};
my %stored;	my (%states,%stored);
my $jscript;	my ($jscript,$uname,$udom,$result,$warning);
if ((defined($state)) && (defined($action))) {
if (($action eq 'view') && ($state eq 'details')) {
if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
}
}
my %elements = &form_elements($dom);
my $elementsref = {};
if (ref($elements{$action}) eq 'HASH') {
if (ref($elements{$action}{$state}) eq 'HASH') {
$elementsref = $elements{$action}{$state};
}
}
if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
$env{'form.clonedom'} = $dom;
}
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
}

if ($state eq 'personnel') {	$states{'display'} = ['details'];
$jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
}

my $loaditems = &onload_action($action,$state);

my %states;
$states{'view'} = ['pick_request','details','cancel','removal'];	$states{'view'} = ['pick_request','details','cancel','removal'];
$states{'log'} = ['filter','display'];	$states{'log'} = ['filter','display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];	$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
Line 170 sub handler {	Line 160 sub handler {
}	}
}	}

	my @invalidcrosslist;
my %trail = (	my %trail = (
crstype => 'Course Request Action',	crstype => 'Course Request Action',
codepick => 'Category',	codepick => 'Category',
Line 186 sub handler {	Line 177 sub handler {

if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {	if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
$trail{'enrollment'} = 'Enrollment';	$trail{'enrollment'} = 'Enrollment';
}	}

my $page = 0;	my ($page,$crumb,$newinstcode,$codechk,$checkedcode) =
my $crumb;	&get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
if (defined($action)) {	if ($action eq 'display') {
my $done = 0;	if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
my $i=0;	my $namespace = 'courserequestqueue';
if (ref($states{$action}) eq 'ARRAY') {	if ($env{'form.cnum'} ne '') {
while ($i<@{$states{$action}} && !$done) {	my $cnum = $env{'form.cnum'};
if ($states{$action}[$i] eq $state) {	my $reqkey = $cnum.'_approval';
$page = $i;	my $namespace = 'courserequestqueue';
$done = 1;	my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
}	my %queued =
$i++;	&Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig);
}	if (ref($queued{$reqkey}) eq 'HASH') {
}	$uname = $queued{$reqkey}{'ownername'};
for (my $i=0; $i<@{$states{$action}}; $i++) {	$udom = $queued{$reqkey}{'ownerdom'};
if ($state eq $states{$action}[$i]) {	if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) {
&Apache::lonhtmlcommon::add_breadcrumb(	$result = &retrieve_settings($dom,$cnum,$udom,$uname);
{text=>"$trail{$state}"});	} else {
$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');	$warning = &mt('Invalid username or domain for course requestor');
last;	}
} else {
if (($state eq 'process') && ($i > 0)) {
&Apache::lonhtmlcommon::add_breadcrumb(
{href=>"javascript:backPage(document.requestcrs,'$states{$action}[0]')",
text=>"$trail{$states{$action}[$i]}"});
} else {	} else {
&Apache::lonhtmlcommon::add_breadcrumb(	$warning = &mt('No information was found for this course request.');
{href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')",
text=>"$trail{$states{$action}[$i]}"});
}	}
	} else {
	$warning = &mt('No course request ID provided.');
}	}
	} else {
	$warning = &mt('You do not have rights to view course request information.');
}	}
} else {	} elsif ((defined($state)) && (defined($action))) {
&Apache::lonhtmlcommon::add_breadcrumb(	if (($action eq 'view') && ($state eq 'details')) {
{text=>'Pick Action'});	if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');	my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
	}
	} elsif ($env{'form.crstype'} eq 'official') {
	if (&Apache::lonnet::auto_run('',$dom)) {
	if (($action eq 'new') && (($state eq 'enrollment') \|\|
	($state eq 'personnel'))) {
	my $checkcrosslist = 0;
	for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
	if ($env{'form.crosslist_'.$i}) {
	$checkcrosslist ++;
	}
	}
	if ($checkcrosslist) {
	my %codechk;
	my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,
	\%cat_titles,
	\%cat_order,
	\@code_order);
	my $numtitles = scalar(@codetitles);
	if ($numtitles) {
	for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
	if ($env{'form.crosslist_'.$i}) {
	my $codecheck;
	my $crosslistcode = '';
	foreach my $item (@code_order) {
	$crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item};
	}
	if ($crosslistcode ne '') {
	$codechk{$i} =
	&Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
	}
	unless ($codechk{$i} eq 'valid') {
	$env{'form.crosslist_'.$i} = '';
	push(@invalidcrosslist,$crosslistcode);
	}
	}
	}
	}
	}
	}
	}
	}
	my %elements = &form_elements($dom);
	my $elementsref = {};
	if (ref($elements{$action}) eq 'HASH') {
	if (ref($elements{$action}{$state}) eq 'HASH') {
	$elementsref = $elements{$action}{$state};
	}
	}
	if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
	$env{'form.clonedom'} = $dom;
	}
	$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
	}

	if ($state eq 'personnel') {
	$jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
}	}

	my $loaditems = &onload_action($action,$state);

my %can_request;	my %can_request;
my $canreq = &check_can_request($dom,\%can_request);	my $canreq = &check_can_request($dom,\%can_request);
if ($action eq 'new') {	if ($action eq 'new') {
Line 234 sub handler {	Line 281 sub handler {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,	&print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
$crumb);	$crumb);
} else {	} else {
&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,	&request_administration($r,$action,$state,$page,\%states,$dom,
$loaditems,$crumb);	$jscript,$loaditems,$crumb,$newinstcode,
	$codechk,$checkedcode,\@invalidcrosslist);
}	}
} else {	} else {
$r->print(&header('Course Requests').$crumb.	$r->print(&header('Course Requests').$crumb.
Line 245 sub handler {	Line 293 sub handler {
}	}
} elsif ($action eq 'view') {	} elsif ($action eq 'view') {
if ($state eq 'crstype') {	if ($state eq 'crstype') {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);	&print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
	} else {
	&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
	$loaditems,$crumb);
	}
	} elsif ($action eq 'display') {
	if ($warning ne '') {
	my $args = { only_body => 1 };
	$r->print(&header('Course Requests','','',$args).$crumb.
	'<h3>'.&mt('Course Request Details').'</h3>'.
	'<div class="LC_warning">'.$warning.'</div>'.
	&close_popup_form());
} else {	} else {
&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,	&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
$loaditems,$crumb);	$loaditems,$crumb,'','','','',$uname,$udom);
}	}
} elsif ($action eq 'log') {	} elsif ($action eq 'log') {
&print_request_logs($jscript,$loaditems,$crumb);	&print_request_logs($jscript,$loaditems,$crumb);
Line 258 sub handler {	Line 317 sub handler {
return OK;	return OK;
}	}

	sub get_breadcrumbs {
	my ($dom,$action,$state,$states,$trail) = @_;
	my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
	my $page = 0;
	if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
	if (defined($action)) {
	my $done = 0;
	my $i=0;
	if (ref($states->{$action}) eq 'ARRAY') {
	while ($i<@{$states->{$action}} && !$done) {
	if ($states->{$action}[$i] eq $$state) {
	$page = $i;
	$done = 1;
	}
	$i++;
	}
	}
	if ($env{'form.crstype'} eq 'official') {
	if ($page > 1) {
	if ($states->{$action}[$page-1] eq 'codepick') {
	if ($env{'form.instcode'} eq '') {
	($newinstcode,$numtitles) = &get_instcode($dom);
	if ($numtitles) {
	if ($newinstcode eq '') {
	$$state = 'codepick';
	$page --;
	} else {
	$codechk =
	&Apache::lonnet::auto_validate_instcode('',
	$dom,$newinstcode);
	if ($codechk ne 'valid') {
	$$state = 'codepick';
	$page --;
	}
	$checkedcode = 1;
	}
	}
	}
	}
	}
	}
	for (my $i=0; $i<@{$states->{$action}}; $i++) {
	if ($$state eq $states->{$action}[$i]) {
	&Apache::lonhtmlcommon::add_breadcrumb(
	{text=>"$trail->{$$state}"});
	$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
	last;
	} else {
	if (($$state eq 'process') \|\| ($$state eq 'removal')) {
	&Apache::lonhtmlcommon::add_breadcrumb(
	{ href => '/adm/requestcourse',
	text => "$trail->{$states->{$action}[$i]}",
	}
	);
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb(
	{ href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')",
	text => "$trail->{$states->{$action}[$i]}", }
	);
	}
	}
	}
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb(
	{text=>'Pick Action'});
	$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
	}
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb(
	{text=>'Pick Action'});
	$crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
	}
	return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
	}

sub header {	sub header {
my ($bodytitle,$jscript,$loaditems,$jsextra) = @_;	my ($bodytitle,$jscript,$loaditems,$jsextra,$args) = @_;
if ($jscript) {	if ($jscript) {
$jscript = '<script type="text/javascript">'."\n".	$jscript = '<script type="text/javascript">'."\n".
'// <![CDATA['."\n".	'// <![CDATA['."\n".
$jscript."\n".'// ]]>'."\n".'</script>'."\n";	$jscript."\n".'// ]]>'."\n".'</script>'."\n";
}	}
if ($loaditems) {	if ($loaditems) {
$loaditems = {'add_entries' => $loaditems,};	if (ref($args) eq 'HASH') {
return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$loaditems);	my %loadhash = (
} else {	'add_entries' => $loaditems,
return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra);	);
	my %arghash = (%loadhash,%{$args});
	$args = \%arghash;
	} else {
	$args = {'add_entries' => $loaditems,};
	}
}	}
	return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
}	}

sub form_elements {	sub form_elements {
Line 354 sub form_elements {	Line 494 sub form_elements {
enrollend_year => 'text',	enrollend_year => 'text',
enrollend_minute => 'text',	enrollend_minute => 'text',
enrollend_second => 'text',	enrollend_second => 'text',
crosslisttotal => 'hidden',
addcrosslist => 'checkbox',	addcrosslist => 'checkbox',
autoadds => 'radio',	autoadds => 'radio',
autodrops => 'radio',	autodrops => 'radio',
Line 363 sub form_elements {	Line 502 sub form_elements {
for (my $i=0; $i<$env{'form.sectotal'}; $i++) {	for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
$extras{'sec_'.$i} = 'checkbox',	$extras{'sec_'.$i} = 'checkbox',
$extras{'secnum_'.$i} = 'text',	$extras{'secnum_'.$i} = 'text',
$extras{'loncapasec_'.$i} = 'checkbox',	$extras{'loncapasec_'.$i} = 'text',
}	}
}	}
my $crosslisttotal = $env{'form.crosslisttotal'};	my $crosslisttotal = $env{'form.crosslisttotal'};
if ($env{'form.addcrosslist'}) {	if ($env{'form.addcrosslist'}) {
$crosslisttotal ++;	$crosslisttotal ++;
}	}
if (!defined($crosslisttotal)) {	if (!$crosslisttotal) {
$crosslisttotal = 1;	$crosslisttotal = 1;
}	}
if ($crosslisttotal > 0) {
for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {	for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
if ($numtitles) {	if ($numtitles) {
$extras{'crosslist_'.$i.'_'.$lastitem} = 'text';	$extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
}	}
if (@codetitles > 0) {	if (@codetitles > 0) {
foreach my $item (@codetitles) {	foreach my $item (@codetitles) {
$extras{'crosslist_'.$i.'_'.$item} = 'selectbox';	$extras{'crosslist_'.$i.'_'.$item} = 'selectbox';
}
}	}
$extras{'crosslist_'.$i} = 'checkbox';
$extras{'crosslist_'.$i.'_instsec'} = 'text',
$extras{'crosslist_'.$i.'_lcsec'} = 'text',
}	}
	$extras{'crosslist_'.$i} = 'checkbox';
	$extras{'crosslist_'.$i.'_instsec'} = 'text',
	$extras{'crosslist_'.$i.'_lcsec'} = 'text',
}	}
my %mergedhash = (%{$elements{'new'}{'enrollment'}},%extras);	my %mergedhash = (%{$elements{'new'}{'enrollment'}},%extras);
%{$elements{'new'}{'enrollment'}} = %mergedhash;	%{$elements{'new'}{'enrollment'}} = %mergedhash;
Line 491 sub print_main_menu {	Line 629 sub print_main_menu {
my $js = <<"END";	my $js = <<"END";

function nextPage(formname) {	function nextPage(formname) {
var crschoice = document.requestcrs.crstype.value;	var crschoice = document.mainmenu_coursetype.crstype.value;
var actionchoice = document.requestcrs.action.value;	var actionchoice = document.mainmenu_action.action.value;
if (check_can_request(crschoice,actionchoice) == true) {	if (check_can_request(crschoice,actionchoice) == true) {
if ((actionchoice == 'new') && (crschoice == 'official')) {	if ((actionchoice == 'new') && (crschoice == 'official')) {
nextstate = 'codepick';	nextstate = 'codepick';
} else {	} else {
$nextstate_setter	$nextstate_setter
}	}
	formname.crstype.value = crschoice;
	formname.action.value = actionchoice;
formname.state.value= nextstate;	formname.state.value= nextstate;
formname.submit();	formname.submit();
}	}
Line 553 END	Line 693 END

END	END

$r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.	$r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
'<div>'.
'<form name="domforcourse" method="post" action="/adm/requestcourse">'.
&Apache::lonhtmlcommon::start_pick_box().	&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Course Domain').	&Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
	'<form name="domforcourse" method="post" action="/adm/requestcourse">'.
&Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));	&Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
if (!$onchange) {	if (!$onchange) {
$r->print(' <input type="submit" name="godom" value="'.	$r->print(' <input type="submit" name="godom" value="'.
&mt('Change').'" />');	&mt('Change').'" />');
}	}
$r->print(&Apache::lonhtmlcommon::row_closure(1).	$r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
&Apache::lonhtmlcommon::end_pick_box().'</form></div>');

my $formname = 'requestcrs';	my $formname = 'requestcrs';
my $nexttext = &mt('Next');	my $nexttext = &mt('Next');
$r->print(	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
'<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.	<form name="mainmenu_action" method="post" action="">
&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Action').'
<input type="hidden" name="showdom" value="'.$dom.'" />
<select size="1" name="action" >	<select size="1" name="action" >
<option value="new">'.&mt('New request').'</option>	<option value="new">'.&mt('New request').'</option>
<option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>	<option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
<option value="log">'.&mt('View request history').'</option>	<option value="log">'.&mt('View request history').'</option>
</select>'.	</select></form>'.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title('Course Type').'	&Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
	<form name="mainmenu_coursetype" method="post" action="">
<select size="1" name="crstype">	<select size="1" name="crstype">
<option value="any">'.&mt('All types').'</option>');	<option value="any">'.&mt('All types').'</option>');
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {	if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
Line 592 END	Line 728 END
'</option>'."\n");	'</option>'."\n");
}	}
}	}
$r->print('</select>	$r->print('</select></form>'."\n".
<input type="hidden" name="state" value="crstype" />'.	&Apache::lonhtmlcommon::row_closure(1)."\n".
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
&Apache::lonhtmlcommon::end_pick_box().'<br />	'<div><form name="'.$formname.'" method="post" action="">'."\n".
<input type="button" name="next" value="'.$nexttext.'" onclick="javascript:nextPage(document.'.$formname.')" />	'<input type="hidden" name="state" value="crstype" />'."\n".
</form></div>');	'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
	'<input type="hidden" name="crstype" value="" />'."\n".
	'<input type="hidden" name="action" value="" />'."\n".
	'<input type="button" name="next" value="'.$nexttext.
	'" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
	'</form></div>');
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return;	return;
}	}

sub request_administration {	sub request_administration {
my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_;	my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
	$newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
my $js;	my $js;
if (($action eq 'new') \|\| (($action eq 'view') && ($state eq 'pick_request'))) {	if (($action eq 'new') \|\| (($action eq 'view') && ($state eq 'pick_request'))) {
$js = <<END;	$js = <<END;
Line 631 END	Line 773 END
$jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);	$jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
}	}
$r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);	$r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
&print_request_form($r,$action,$state,$page,$states,$dom);	&print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
	$codechk,$checkedcode,$invalidcrosslist);
} elsif ($action eq 'view') {	} elsif ($action eq 'view') {
my $jsextra;	my $jsextra;
my $formname = 'requestcrs';	my $formname = 'requestcrs';
Line 663 END	Line 806 END
\%cat_order,\@code_order);	\%cat_order,\@code_order);
}	}
$r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".	$r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
&print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,	&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
\@code_order)."\n".	\@code_order)."\n".
'<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");	'<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
my @excluded = &get_excluded_elements($dom,$states,'new','review');	my @excluded = &get_excluded_elements($dom,$states,'new','review');
Line 736 END	Line 879 END
}	}
$r->print('</form>');	$r->print('</form>');
}	}
	} elsif ($action eq 'display') {
	my $formname = 'requestcrs';
	my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
	if ($env{'form.crstype'} eq 'official') {
	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
	\%cat_order,\@code_order);
	}
	$r->print(&header('Course Request','','','',{ 'only_body' => 1}).
	$crumb."\n".'<h3>'.&mt('Course Request Details').'</h3>'.
	&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
	\@code_order,$uname,$udom)."\n".'</div>'.
	&close_popup_form());
} elsif ($action eq 'log') {	} elsif ($action eq 'log') {
$r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);	$r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
}	}
Line 743 END	Line 898 END
return;	return;
}	}

	sub close_popup_form {
	my $close= &mt('Close Window');
	return << "END";
	<p><form name="displayreq" action="" method="post">
	<input type="button" name="closeme" value="$close" onclick="javascript:self.close();" />
	</form></p>
	END
	}

	sub get_instcode {
	my ($dom) = @_;
	my ($instcode,$numtitles);
	my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
	\%cat_order,\@code_order);
	$numtitles = scalar(@codetitles);
	if (@code_order > 0) {
	my $message;
	foreach my $item (@code_order) {
	$instcode .= $env{'form.instcode_'.$item};
	}
	}
	return ($instcode,$numtitles);
	}

sub print_request_form {	sub print_request_form {
my ($r,$action,$state,$page,$states,$dom) = @_;	my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
	$invalidcrosslist) = @_;
my $formname = 'requestcrs';	my $formname = 'requestcrs';
my ($next,$prev,$message,$output,$codepicker,$crstype);	my ($next,$prev,$message,$output,$codepicker,$crstype);
$prev = $states->{$action}[$page-1];	$prev = $states->{$action}[$page-1];
Line 759 sub print_request_form {	Line 940 sub print_request_form {
if ($crstype eq 'official') {	if ($crstype eq 'official') {
if ($env{'form.instcode'} ne '') {	if ($env{'form.instcode'} ne '') {
$instcode = $env{'form.instcode'};	$instcode = $env{'form.instcode'};
	} elsif ($newinstcode ne '') {
	$instcode = $newinstcode;
}	}
}	if ($checkedcode) {
if ($prev eq 'codepick') {	if ($codechk eq 'valid') {
if ($crstype eq 'official') {	$message = '<div class="LC_info">'.
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,	&mt('The chosen course category [_1] is valid.','<b>'.
\%cat_order,\@code_order);	$instcode.'</b>').
}	'<input type="hidden" name="instcode" value="'.
if (@code_order > 0) {	$instcode.'" /></div>';
my $message;
if ($instcode eq '') {
foreach my $item (@code_order) {
$instcode .= $env{'form.instcode_'.$item};
}
$r->print('<input type="hidden" name="instcode" value="'.$instcode.'" />'."\n");
}
if ($instcode ne '') {
$code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode);
if ($code_chk eq 'valid') {
$message = '<div class="LC_info">'.
&mt('The chosen course category [_1] is valid.','<b>'.
$instcode.'</b>').'</div>';
} else {
$message = '<div class="LC_warning">'.
&mt('No course was found matching your choice of institutional course category.');
if ($code_chk ne '') {
$message .= '<br />'.$code_chk;
}
$message .= '</div>';
}
} else {	} else {
$message = '<div class="LC_warning">'.	$message = '<div class="LC_warning">'.
&mt('No course was found matching your choice of institutional course category.');	&mt('No course was found matching your choice of institutional course category.');
}	if ($codechk ne '') {
unless ($code_chk eq 'valid') {	$message .= '<br />'.$codechk;
	}
	$message .= '</div>';
$prev = 'crstype';	$prev = 'crstype';
}	}
$r->print($message);	$r->print($message);
Line 820 sub print_request_form {	Line 984 sub print_request_form {
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));	$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}	}
} elsif ($prev eq 'codepick') {	} elsif ($prev eq 'codepick') {
if ($env{'form.instcode'} eq '') {	if ($instcode eq '') {
$prev = $states->{$action}[$page-2];	$prev = $states->{$action}[$page-2];
}	}
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));	$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
Line 830 sub print_request_form {	Line 994 sub print_request_form {
\%cat_order,\@code_order);	\%cat_order,\@code_order);
}	}
$r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,	$r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
\%cat_titles,\%cat_order,\@code_order));	\%cat_titles,\%cat_order,\@code_order,
	$invalidcrosslist));
} elsif ($state eq 'personnel') {	} elsif ($state eq 'personnel') {
$r->print(&print_personnel_menu($dom,$formname,$crstype));	$r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {	} elsif ($state eq 'review') {
my $cnum;	my $cnum;
if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {	if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
Line 842 sub print_request_form {	Line 1007 sub print_request_form {
}	}
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);	\%cat_order,\@code_order);
$r->print('<p>'.&mt('Review the details of the course request before submission.').'</p>'.	$r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
&print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,	&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order).
\@code_order).
'<input type="hidden" name="cnum" value="'.$cnum.'" />');	'<input type="hidden" name="cnum" value="'.$cnum.'" />');
$navtxt{'next'} = &mt('Submit course request');	$navtxt{'next'} = &mt('Submit course request');
} elsif ($state eq 'process') {	} elsif ($state eq 'process') {
Line 852 sub print_request_form {	Line 1016 sub print_request_form {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,	&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);	\%cat_order,\@code_order);
}	}
my $result = &print_request_outcome($dom,\@codetitles,\@code_order);	my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
	\@code_order);
$r->print($result);	$r->print($result);
	if (($storeresult eq 'ok') \|\| ($storeresult eq 'created')) {
	$r->print('<p>');
	if ($storeresult eq 'ok') {
	$r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
	&mt('Modify this request').'</a>'.(' 'x4));
	}
	$r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
	return;
	}
}	}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);	my @excluded = &get_excluded_elements($dom,$states,$action,$state);
	if ($state eq 'personnel') {
	push(@excluded,'persontotal');
	}
	if ($state eq 'enrollment') {
	push(@excluded,'crosslisttotal');
	}
$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');	$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
&display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);	&display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
return;	return;
Line 890 sub get_excluded_elements {	Line 1070 sub get_excluded_elements {
}	}

sub print_enrollment_menu {	sub print_enrollment_menu {
my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_;	my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
my ($sections,$autoenroll,$access_dates);	$invalidcrosslist) =@_;
	my ($sections,$autoenroll,$access_dates,$output);
my $starttime = time;	my $starttime = time;
my $endtime = time+(630246060); # 6 months from now, approx	my $endtime = time+(630246060); # 6 months from now, approx

Line 905 sub print_enrollment_menu {	Line 1086 sub print_enrollment_menu {
);	);
if ($env{'form.crstype'} eq 'official') {	if ($env{'form.crstype'} eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {	if (&Apache::lonnet::auto_run('',$dom)) {
my ($section_form,$crosslist_form,$autoenroll_form);	$output = &show_invalid_crosslists($invalidcrosslist);
	my ($section_form,$crosslist_form);
$section_form = &inst_section_selector($dom,$instcode);	$section_form = &inst_section_selector($dom,$instcode);
	if ($section_form) {
	$sections = &Apache::lonhtmlcommon::row_headline().
	'<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
	&Apache::lonhtmlcommon::row_closure(1).
	$section_form;
	}
my $crosslisttotal = $env{'form.crosslisttotal'};	my $crosslisttotal = $env{'form.crosslisttotal'};
if (!defined($crosslisttotal)) {	if (!$crosslisttotal) {
$crosslisttotal = 1;	$crosslisttotal = 1;
}	}
if ($env{'form.addcrosslist'}) {	if ($env{'form.addcrosslist'}) {
Line 924 sub print_enrollment_menu {	Line 1112 sub print_enrollment_menu {
'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.	'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.	'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.	' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1);	"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
	$sections .= &Apache::lonhtmlcommon::row_headline.
	'<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
	&Apache::lonhtmlcommon::row_closure(1).
	$crosslist_form;
}	}
if ($section_form \|\| $crosslist_form) {	$autoenroll =
$sections = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
$section_form.$crosslist_form.
&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
}
$autoenroll_form =
&Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).	&Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
'<span class="LC_nobreak"><label>'.	'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autoadds" value="1">'.	'<input type="radio" name="autoadds" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.	&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autoadds" value="0" checked="checked">'.	'<input type="radio" name="autoadds" value="0" checked="checked">'.
&mt('No').'</label></span>'.	&mt('No').'</label></span>'.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).	&Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
'<span class="LC_nobreak"><label>'.	'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autodrops" value="1">'.	'<input type="radio" name="autodrops" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.	&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autodrops" value="0" checked="checked">'.	'<input type="radio" name="autodrops" value="0" checked="checked">'.
&mt('No').'</label></span>'.	&mt('No').'</label></span>'.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure(1).
&date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);	&date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
if ($autoenroll_form) {
$autoenroll = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
$autoenroll_form.
&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
}
}	}
}	}
my $access_dates_form =	my $access_dates =
&date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);	&date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
if ($access_dates_form) {	$output .= &Apache::lonhtmlcommon::start_pick_box();
$access_dates = '<div>'.&Apache::lonhtmlcommon::start_pick_box().	if ($sections) {
$access_dates_form.	$output .= $sections;
&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";	}
	if ($autoenroll) {
	$output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll').
	'<h3>'.&mt('Auto-enrollment settings').'</h3>'.
	&Apache::lonhtmlcommon::row_closure(1).
	$autoenroll;
	}
	if ($access_dates) {
	my $header = &mt('Access dates for students');
	if ($env{'form.crstype'} eq 'community') {
	$header = &mt('Access dates for community members');
	}
	$output .= &Apache::lonhtmlcommon::row_headline('Access').
	'<h3>'.$header.'</h3>'.
	&Apache::lonhtmlcommon::row_closure(1).
	$access_dates
	}
	return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
	&Apache::lonhtmlcommon::end_pick_box().'</div>';
	}

	sub show_invalid_crosslists {
	my ($invalidcrosslist) = @_;
	my $output;
	if (ref($invalidcrosslist) eq 'ARRAY') {
	if (@{$invalidcrosslist} > 0) {
	$output = '<div class="LC_warning">'.
	&mt('The following crosslisted courses were invalid:').'<ul>';
	foreach my $item (@{$invalidcrosslist}) {
	$output .= '<li>'.$item.'</li>';
	}
	$output .= '</ul></div><br />';
	}
}	}
return $sections.$autoenroll.$access_dates;	return $output;
}	}


sub inst_section_selector {	sub inst_section_selector {
my ($dom,$instcode) = @_;	my ($dom,$instcode) = @_;
my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);	my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
my $sectotal = scalar(@sections);	my $sectotal = scalar(@sections);
my $output;	my $output;
if ($sectotal) {	if ($sectotal) {
$output .= &Apache::lonhtmlcommon::row_title('Sections').	$output .= &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)).
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.	'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
'value="'.$sectotal.'"</th>'.	'value="'.$sectotal.'" /></th>'.
'<th>'.&mt('Institutional Section').'</th>'.	'<th>'.&mt('Institutional Section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th>'.	'<th>'.&mt('LON-CAPA section').'</th>'.
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
for (my $i=0; $i<@sections; $i++) {	for (my $i=0; $i<@sections; $i++) {
my $colflag = $i%2;	my $colflag = $i%2;
	my $checked = ' checked="checked"';
	if ($env{'form.origcnum'}) {
	$checked='';
	}
$output .= &Apache::loncommon::start_data_table_row().	$output .= &Apache::loncommon::start_data_table_row().
'<td><input type="checkbox" name="sec_'.$i.	'<td><input type="checkbox" name="sec_'.$i.
'" checked="checked" /></td>'.	'"'.$checked.' value="1" /></td>'.
'<td>'.$sections[$i].	'<td>'.$sections[$i].
'<input type="hidden" name="secnum_'.$i.'" value="'.	'<input type="hidden" name="secnum_'.$i.'" value="'.
$sections[$i].'" /></td>'.	$sections[$i].'" /></td>'.
Line 1003 sub date_setting_table {	Line 1222 sub date_setting_table {
$starttime,'','','',1,'','','',1);	$starttime,'','','',1,'','','',1);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',	my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
$endtime,'','','',1,'','','',1);	$endtime,'','','',1,'','','',1);
	my $closure = '';
if ($prefix eq 'access') {	if ($prefix eq 'access') {
$perpetual = ' <span class="LC_nobreak"><label>'.	$perpetual = ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="no_end_date" />'.	'<input type="checkbox" name="no_end_date" />'.
&mt('No end date').'</label></span>';	&mt('No end date').'</label></span>';
	$closure = '1';
}	}
$table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).	$table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
$startform.	$startform.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($datetitles{'end'}).	&Apache::lonhtmlcommon::row_title($datetitles{'end'}).
$endform.$perpetual.	$endform.$perpetual.
&Apache::lonhtmlcommon::row_closure(1);	&Apache::lonhtmlcommon::row_closure($closure);
return $table;	return $table;
}	}

sub print_personnel_menu {	sub print_personnel_menu {
my ($dom,$formname,$crstype) = @_;	my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();	my $output;
	if ($crstype eq 'official') {
	if (&Apache::lonnet::auto_run('',$dom)) {
	$output .= &show_invalid_crosslists($invalidcrosslist);
	}
	}
	$output .= '<div>'.&Apache::lonhtmlcommon::start_pick_box();
my $persontotal = $env{'form.persontotal'};	my $persontotal = $env{'form.persontotal'};
if ((!defined($persontotal)) \|\| (!$persontotal)) {	if ((!defined($persontotal)) \|\| (!$persontotal)) {
$persontotal = 1;	$persontotal = 1;
Line 1080 sub print_personnel_menu {	Line 1307 sub print_personnel_menu {
$newtitle = &mt('Other').': ';	$newtitle = &mt('Other').': ';
}	}

	if ($persontotal) {
	$output .= &Apache::lonhtmlcommon::row_headline().
	'<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
	}
for (my $i=0; $i<$persontotal; $i++) {	for (my $i=0; $i<$persontotal; $i++) {
my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);	my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
my $linkargstr = join("','",@linkargs);	my $linkargstr = join("','",@linkargs);
Line 1345 sub print_request_logs {	Line 1576 sub print_request_logs {
}	}

sub print_review {	sub print_review {
my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_;	my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom) = @_;
my ($types,$typename) = &course_types();	my ($types,$typename) = &course_types();
my ($owner,$ownername,$owneremail);	my ($owner,$ownername,$owneremail);
$owner = $env{'user.name'}.':'.$env{'user.domain'};	if ($uname eq '' \|\| $udom eq '') {
$ownername = &Apache::loncommon::plainname($env{'user.name'},	$uname = $env{'user.name'};
$env{'user.domain'},'first');	$udom = $env{'user.domain'};
my %emails = &Apache::loncommon::getemails();	}
	$owner = $uname.':'.$udom;
	$ownername = &Apache::loncommon::plainname($uname,$udom,'first');
	my %emails = &Apache::loncommon::getemails($uname,$udom);
foreach my $email ('permanentemail','critnotification','notification') {	foreach my $email ('permanentemail','critnotification','notification') {
$owneremail = $emails{$email};	$owneremail = $emails{$email};
last if ($owneremail ne '');	last if ($owneremail ne '');
Line 1430 sub print_review {	Line 1664 sub print_review {
&mt('Institutional course/section').'</th>'.	&mt('Institutional course/section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th></tr>';	'<th>'.&mt('LON-CAPA section').'</th></tr>';
my $xlistinfo;	my $xlistinfo;
if ($env{'form.crosslisttotal'}) {	my $crosslisttotal = $env{'form.crosslisttotal'};
for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {	if (!$crosslisttotal) {
if ($env{'form.crosslist_'.$i}) {	$crosslisttotal = 1;
$xlistinfo .= '<tr><td>';	}
if (ref($code_order) eq 'ARRAY') {	for (my $i=0; $i<$crosslisttotal; $i++) {
if (@{$code_order} > 0) {	if ($env{'form.crosslist_'.$i}) {
foreach my $item (@{$code_order}) {	$xlistinfo .= '<tr><td>';
$xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};	if (ref($code_order) eq 'ARRAY') {
}	if (@{$code_order} > 0) {
	foreach my $item (@{$code_order}) {
	$xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
}	}
}	}
$xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.'</td><td>';
if ($env{'form.crosslist_'.$i.'_lcsec'}) {
$xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
} else {
$xlistinfo .= &mt('None');
}
$xlistinfo .= '</td></tr>';
}	}
	$xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.'</td><td>';
	if ($env{'form.crosslist_'.$i.'_lcsec'}) {
	$xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
	} else {
	$xlistinfo .= &mt('None');
	}
	$xlistinfo .= '</td></tr>';
}	}
}	}
if ($xlistinfo eq '') {	if ($xlistinfo eq '') {
$xlistinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';	$xlistinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
}	}
$section_values .= $xlistinfo.'</table></td>';	$section_values .= $xlistinfo;
}	}
	$section_values .= '</table></td>';
}	}

my %ctxt = &clone_text();	my %ctxt = &clone_text();
Line 1531 sub print_review {	Line 1768 sub print_review {
}	}
}	}
}	}
my $showsec = 'None';	my $showsec;
if (@allsecs) {	if (@allsecs) {
$showsec = join(', ',@allsecs);	$showsec = join(', ',@allsecs);
}	}
	if ($showsec eq '') {
	$showsec = &mt('None');
	}
	if ($env{'form.person_'.$i.'_role'} eq 'cc') {
	$showsec = &mt('None');
	}
$personnel_values .=	$personnel_values .=
'<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.	'<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
$env{'form.person_'.$i.'_lastname'}.'</td>'.	$env{'form.person_'.$i.'_lastname'}.'</td>'.
Line 1575 sub print_review {	Line 1818 sub print_review {
'<table class="LC_innerpickbox"><tr>'.$personnel_headers.'</tr>'."\n".	'<table class="LC_innerpickbox"><tr>'.$personnel_headers.'</tr>'."\n".
$personnel_values.'</table>'."\n".	$personnel_values.'</table>'."\n".
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box();	&Apache::lonhtmlcommon::end_pick_box().'</div>';
return $output;	return $output;
}	}

Line 1609 function validateForm() {	Line 1852 function validateForm() {
</script>	</script>

ENDJS	ENDJS
	my $title = &mt('Brief Course Description');
	if ($crstype eq 'community') {
	$title = &mt('Brief Community Description');
	}
my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().	my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Course Description').	&Apache::lonhtmlcommon::row_headline().
	'<h3>'.$title.'</h3>'.
	&Apache::lonhtmlcommon::row_closure(1).
	&Apache::lonhtmlcommon::row_title(&mt('Description')).
'<input type="text" size="40" name="cdescr" />';	'<input type="text" size="40" name="cdescr" />';
my ($home_server_pick,$numlib) =	my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',	&Apache::loncommon::home_server_form_item($dom,'chome',
Line 1621 ENDJS	Line 1870 ENDJS
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));	&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}	}
$output .= $home_server_pick.	$output .= $home_server_pick.
	&Apache::lonhtmlcommon::row_closure().
	&Apache::lonhtmlcommon::row_headline().
	'<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</div>'.	&clone_form($dom,$formname,$crstype).
'<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";	&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
return $output;	return $output;
}	}

Line 1637 sub clone_form {	Line 1889 sub clone_form {
&Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);	&Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
my %lt = &clone_text();	my %lt = &clone_text();
my $output .=	my $output .=
&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.	&Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
'<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.	'<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.	'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.	'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.	&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().	$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.	&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.	'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
'</label><br /><label>'.	'</label><br /><label>'.
Line 1652 sub clone_form {	Line 1903 sub clone_form {
'<input type="radio" name="datemode" value="shift" checked="checked" /> '.	'<input type="radio" name="datemode" value="shift" checked="checked" /> '.
$lt{'shd'}.'</label>'.	$lt{'shd'}.'</label>'.
'<input type="text" size="5" name="dateshift" value="365" />'.	'<input type="text" size="5" name="dateshift" value="365" />'.
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1);
&Apache::lonhtmlcommon::end_pick_box();
return $output;	return $output;
}	}

Line 1832 sub print_request_outcome {	Line 2082 sub print_request_outcome {
my ($dom,$codetitles,$code_order) = @_;	my ($dom,$codetitles,$code_order) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,	my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);	%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
	my $sectotal = $env{'form.sectotal'};
	my $crosslisttotal = 0;
$cnum = $env{'form.cnum'};	$cnum = $env{'form.cnum'};
unless ($cnum =~ /^$match_courseid$/) {	unless ($cnum =~ /^$match_courseid$/) {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";	$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
Line 1874 sub print_request_outcome {	Line 2126 sub print_request_outcome {
}	}
}	}
$crosslistings{$i}{'instcode'} = $xlistinfo;	$crosslistings{$i}{'instcode'} = $xlistinfo;
	if ($xlistinfo ne '') {
	$crosslisttotal ++;
	}
$crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'};	$crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'};
$crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};	$crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
}	}
Line 1940 sub print_request_outcome {	Line 2195 sub print_request_outcome {
if ($env{'form.autoadds'}) {	if ($env{'form.autoadds'}) {
$autodrops = $env{'form.autoadds'};	$autodrops = $env{'form.autoadds'};
}	}
my $sectotal = 0;
if ($env{'form.sectotal'}) {
$sectotal = $env{'form.sectotal'};
}
if ($env{'form.autoadds'}) {	if ($env{'form.autoadds'}) {
$autodrops = $env{'form.autoadds'};	$autodrops = $env{'form.autoadds'};
}	}
my $crosslisttotal = 0;
if ($env{'form.crosslisttotal'}) {
$crosslisttotal = $env{'form.crosslisttotal'};
}
my $instcode = '';	my $instcode = '';
if (exists($env{'form.instcode'})) {	if (exists($env{'form.instcode'})) {
$instcode = $env{'form.instcode'};	$instcode = $env{'form.instcode'};
Line 1996 sub print_request_outcome {	Line 2243 sub print_request_outcome {
accessend => $accessend,	accessend => $accessend,
personnel => \%personnel,	personnel => \%personnel,
};	};
my @inststatuses;	my (@inststatuses,$storeresult,$creationresult);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);	my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {	if ($val eq '') {
if ($crstype eq 'official') {	if ($crstype eq 'official') {
Line 2008 sub print_request_outcome {	Line 2255 sub print_request_outcome {
} else {	} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);	$output = &mt('Unrecognized course type: [_1]',$crstype);
}	}
	$storeresult = 'notpermitted';
} else {	} else {
my ($disposition,$message,$reqstatus);	my ($disposition,$message,$reqstatus);
my %reqhash = (	my %reqhash = (
Line 2044 sub print_request_outcome {	Line 2292 sub print_request_outcome {
if ($validation =~ /^error(.*)$/) {	if ($validation =~ /^error(.*)$/) {
$disposition = 'approval';	$disposition = 'approval';
$validationerror = $1;	$validationerror = $1;
	} else {
	$disposition = $validation;
}	}
} else {	} else {
$disposition = 'approval';	$disposition = 'approval';
Line 2056 sub print_request_outcome {	Line 2306 sub print_request_outcome {
if ($message) {	if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';	$output .= '<div class="LC_warning">'.$message.'</div>';
}	}
	$storeresult = 'rejected';
} elsif ($disposition eq 'process') {	} elsif ($disposition eq 'process') {
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);	my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);	my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
Line 2076 sub print_request_outcome {	Line 2327 sub print_request_outcome {
$output = &mt('Your course request has been processed and the course has been created.').	$output = &mt('Your course request has been processed and the course has been created.').
'<br />'.	'<br />'.
&mt('You will need to logout and log-in again to be able to select a role in the course.');	&mt('You will need to logout and log-in again to be able to select a role in the course.');
	$creationresult = 'created';
} else {	} else {
$output = '<span class="LC_error">'.	$output = '<span class="LC_error">'.
&mt('An error occurred when processing your course request.').	&mt('An error occurred when processing your course request.').
'<br />'.	'<br />'.
&mt('You may want to review the request details and submit the request again.').	&mt('You may want to review the request details and submit the request again.').
'</span>';	'</span>';
	$creationresult = 'error';
}	}
} else {	} else {
my $requestid = $cnum.'_'.$disposition;	my $requestid = $cnum.'_'.$disposition;
Line 2099 sub print_request_outcome {	Line 2352 sub print_request_outcome {
$env{'user.domain'},$env{'user.name'});	$env{'user.domain'},$env{'user.name'});
if ($userreqhash{$statuskey} ne '') {	if ($userreqhash{$statuskey} ne '') {
$modified = 1;	$modified = 1;
my %queuehash = &Apache::lonnet::get_dom('courserequestqueue',	my $uname = &Apache::lonnet::get_domainconfiguser($dom);
[$cnum.'_approval',	my %queuehash = &Apache::lonnet::get('courserequestqueue',
$cnum.'_pending'],$dom);	[$cnum.'_approval',
	$cnum.'_pending'],$dom,$uname);
if (($queuehash{$cnum.'_approval'} ne '') \|\|	if (($queuehash{$cnum.'_approval'} ne '') \|\|
($queuehash{$cnum.'_pending'} ne '')) {	($queuehash{$cnum.'_pending'} ne '')) {
$queued = 1;	$queued = 1;
Line 2122 sub print_request_outcome {	Line 2376 sub print_request_outcome {
}	}
}	}
}	}
my ($storeresult,$statusresult);	my ($statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {	if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,	$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');	'courserequests');
Line 2130 sub print_request_outcome {	Line 2384 sub print_request_outcome {
my %status = (	my %status = (
'status:'.$dom.':'.$cnum => $reqstatus,	'status:'.$dom.':'.$cnum => $reqstatus,
);	);
$statusresult = &Apache::lonnet::put('courserequests',\%status);	$statusresult = &Apache::lonnet::put('courserequests',\%status);
}	}
} else {	} else {
$storeresult = 'error: invalid requestkey format';	$storeresult = 'error: invalid requestkey format';
Line 2150 sub print_request_outcome {	Line 2404 sub print_request_outcome {
$output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';	$output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
}	}
}	}
return $output;	if ($creationresult ne '') {
	return ($creationresult,$output);
	} else {
	return ($storeresult,$output);
	}
}	}

sub notification_information {	sub notification_information {
Line 2207 sub get_processtype {	Line 2465 sub get_processtype {
if (ref($domconfig->{'requestcourses'}) eq 'HASH') {	if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
%settings = %{$domconfig->{'requestcourses'}};	%settings = %{$domconfig->{'requestcourses'}};
if (ref($settings{$crstype}) eq 'HASH') {	if (ref($settings{$crstype}) eq 'HASH') {
if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {	if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
$val = $settings{$crstype}{'_LC_adv'};	$val = $settings{$crstype}{'_LC_adv'};
@{$inststatuses} = ('_LC_adv_');	@{$inststatuses} = ('_LC_adv_');
} else {	} else {
Line 2313 sub check_autolimit {	Line 2571 sub check_autolimit {
}	}

sub retrieve_settings {	sub retrieve_settings {
my ($dom,$cnum) = @_;	my ($dom,$cnum,$udom,$uname) = @_;
my ($result,%reqinfo) = &get_request_settings($dom,$cnum);	if ($udom eq '' \|\| $uname eq '') {
	$udom = $env{'user.domain'};
	$uname = $env{'user.name'};
	}
	my ($result,%reqinfo) = &get_request_settings($dom,$cnum,$udom,$uname);
if ($result eq 'ok') {	if ($result eq 'ok') {
if (($env{'user.name'} eq $reqinfo{'owner'}) &&	if (($udom eq $reqinfo{'domain'}) && ($uname eq $reqinfo{'owner'})) {
($env{'user.domain'} eq $reqinfo{'domain'})) {
$env{'form.chome'} = $reqinfo{'coursehome'};	$env{'form.chome'} = $reqinfo{'coursehome'};
$env{'form.cdescr'} = $reqinfo{'cdescr'};	$env{'form.cdescr'} = $reqinfo{'cdescr'};
$env{'form.crstype'} = $reqinfo{'crstype'};	$env{'form.crstype'} = $reqinfo{'crstype'};
Line 2340 sub retrieve_settings {	Line 2601 sub retrieve_settings {
$env{'form.autoadds'} = $reqinfo{'autoadds'};	$env{'form.autoadds'} = $reqinfo{'autoadds'};
$env{'form.autdrops'} = $reqinfo{'autodrops'};	$env{'form.autdrops'} = $reqinfo{'autodrops'};
$env{'form.instcode'} = $reqinfo{'instcode'};	$env{'form.instcode'} = $reqinfo{'instcode'};
my %crscode = (	my $crscode = {
instcode => $reqinfo{'instcode'},	$cnum => $reqinfo{'instcode'},
);	};
&extract_instcode($dom,'instcode',\%crscode);	&extract_instcode($dom,'instcode',$crscode,$cnum);
}	}
my @currsec;	my @currsec;
if (ref($reqinfo{'sections'}) eq 'HASH') {	if (ref($reqinfo{'sections'}) eq 'HASH') {
foreach my $i (sort(keys(%{$reqinfo{'sections'}}))) {	foreach my $i (sort(keys(%{$reqinfo{'sections'}}))) {
if (ref($reqinfo{'sections'}{$i}) eq 'HASH') {	if (ref($reqinfo{'sections'}{$i}) eq 'HASH') {
my $sec = $reqinfo{'sections'}{$i}{'inst'};;	my $sec = $reqinfo{'sections'}{$i}{'inst'};
$env{'form.secnum_'.$i} = $sec;	$env{'form.secnum_'.$i} = $sec;
	$env{'form.sec_'.$i} = '1';
if (!grep(/^\Q$sec\E$/,@currsec)) {	if (!grep(/^\Q$sec\E$/,@currsec)) {
push(@currsec,$sec);	push(@currsec,$sec);
}	}
Line 2358 sub retrieve_settings {	Line 2620 sub retrieve_settings {
}	}
}	}
}	}
if (ref($reqinfo{'crosslistings'}) eq 'HASH') {	if (ref($reqinfo{'crosslists'}) eq 'HASH') {
foreach my $i (sort(keys(%{$reqinfo{'crosslistings'}}))) {	foreach my $i (sort(keys(%{$reqinfo{'crosslists'}}))) {
if (ref($reqinfo{'crosslistings'}{$i}) eq 'HASH') {	if (ref($reqinfo{'crosslists'}{$i}) eq 'HASH') {
$env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslistings'}{$i}{'loncapa'};	$env{'form.crosslist_'.$i} = '1';
my $xlistsec = $reqinfo{'crosslistings'}{$i}{'instsec'};	$env{'form.crosslist_'.$i.'_instsec'} = $reqinfo{'crosslists'}{$i}{'instsec'};
my %crscode = (	$env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslists'}{$i}{'loncapa'};
$i => $reqinfo{'crosslistings'}{$i}{'instcode'},	if ($reqinfo{'crosslists'}{$i}{'instcode'} ne '') {
);	my $key = $cnum.$i;
&extract_instcode($dom,'crosslist',\%crscode,$i,$xlistsec);	my $crscode = {
	$key => $reqinfo{'crosslists'}{$i}{'instcode'},
	};
	&extract_instcode($dom,'crosslist',$crscode,$key,$i);
	}
}	}
}	}
}	}
Line 2414 sub retrieve_settings {	Line 2680 sub retrieve_settings {
}	}

sub get_request_settings {	sub get_request_settings {
my ($dom,$cnum) = @_;	my ($dom,$cnum,$udom,$uname) = @_;
my $requestkey = $dom.'_'.$cnum;	my $requestkey = $dom.'_'.$cnum;
my ($result,%reqinfo);	my ($result,%reqinfo);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {	if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
my %history = &Apache::lonnet::restore($requestkey,'courserequests',	my %history = &Apache::lonnet::restore($requestkey,'courserequests',$udom,$uname);
$env{'user.domain'},$env{'user.name'});
my $disposition = $history{'disposition'};	my $disposition = $history{'disposition'};
if (($disposition eq 'approval') \|\| ($disposition eq 'pending')) {	if (($disposition eq 'approval') \|\| ($disposition eq 'pending')) {
if (ref($history{'details'}) eq 'HASH') {	if (ref($history{'details'}) eq 'HASH') {
Line 2438 sub get_request_settings {	Line 2703 sub get_request_settings {
}	}

sub extract_instcode {	sub extract_instcode {
my ($cdom,$element,$crscodehashref,$counter,$xlistsec) = @_;	my ($cdom,$element,$crscode,$crskey,$counter) = @_;
my (%codes,@codetitles,%cat_titles,%cat_order);	my (%codes,@codetitles,%cat_titles,%cat_order);
if (ref($crscodehashref) eq 'HASH') {	if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscode,\%codes,
if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscodehashref,	\@codetitles,\%cat_titles,
\%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') {	\%cat_order) eq 'ok') {
	if (ref($codes{$crskey}) eq 'HASH') {
if (@codetitles > 0) {	if (@codetitles > 0) {
my $sel = $element;	my $sel = $element;
if ($element eq 'crosslist') {	if ($element eq 'crosslist') {
$sel .= '_'.$counter;	$sel .= '_'.$counter;
}	}
my $lastitem = pop(@codetitles);
foreach my $title (@codetitles) {	foreach my $title (@codetitles) {
if (ref($cat_order{$title}) eq 'ARRAY') {	$env{'form.'.$sel.'_'.$title} = $codes{$crskey}{$title};
if (@{$cat_order{$title}} > 0) {
$env{'form.'.$sel.'_'.$title} = $cat_order{$title}[0];
}
}
}
if ($element eq 'crosslist') {
$env{'form.'.$sel.'_'.$lastitem} = $xlistsec;
}	}
}	}
}	}

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

Removed from v.1.22
changed lines
	Added in v.1.27