loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.692.4.12 and 1.692.4.32

version 1.692.4.12, 2009/08/14 08:37:53	version 1.692.4.32, 2010/03/11 13:42:49
Line 481 ENDAUTHORBRW	Line 481 ENDAUTHORBRW
}	}

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname)=@_;	my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role');	my $wintitle = 'Course_Browser';
	if ($crstype eq 'Community') {
	$wintitle = 'Community_Browser';
	}
my $id_functions = &javascript_index_functions();	my $id_functions = &javascript_index_functions();
my $output = '	my $output = '
<script type="text/javascript" language="JavaScript">	<script type="text/javascript" language="JavaScript">
Line 490 sub coursebrowser_javascript {	Line 493 sub coursebrowser_javascript {
var stdeditbrowser;'."\n";	var stdeditbrowser;'."\n";

$output .= <<"ENDSTDBRW";	$output .= <<"ENDSTDBRW";
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {	function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,type,type_elem) {
var url = '/adm/pickcourse?';	var url = '/adm/pickcourse?';
	var formid = getFormIdByName(formname);
var domainfilter = getDomainFromSelectbox(formname,udom);	var domainfilter = getDomainFromSelectbox(formname,udom);
if (domainfilter != null) {	if (domainfilter != null) {
if (domainfilter != '') {	if (domainfilter != '') {
Line 511 sub coursebrowser_javascript {	Line 515 sub coursebrowser_javascript {
else {	else {
if (formname == 'portform') {	if (formname == 'portform') {
url += '&setroles='+extra_element;	url += '&setroles='+extra_element;
	} else {
	if (formname == 'rules') {
	url += '&fixeddom='+extra_element;
	}
}	}
}	}
}	}
	if (type != null && type != '') {
	url += '&type='+type;
	}
	if (type_elem != null && type_elem != '') {
	url += '&typeelement='+type_elem;
	}
if (formname == 'ccrs') {	if (formname == 'ccrs') {
var ownername = document.forms[formid].ccuname.value;	var ownername = document.forms[formid].ccuname.value;
var ownerdom = document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;	var ownerdom = document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
Line 522 sub coursebrowser_javascript {	Line 536 sub coursebrowser_javascript {
if (multflag !=null && multflag != '') {	if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;	url += '&multiple='+multflag;
}	}
if (crstype == 'Course/Community') {	var title = '$wintitle';
if (formname == 'cu') {
crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
if (crstype == "") {
alert("$crs_or_grp_alert");
return;
}
}
}
if (crstype !=null && crstype != '') {
url += '&type='+crstype;
}
var title = 'Course_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';	var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';	options += ',width=700,height=600';
stdeditbrowser = open(url,title,options,'1');	stdeditbrowser = open(url,title,options,'1');
Line 542 sub coursebrowser_javascript {	Line 544 sub coursebrowser_javascript {
}	}
$id_functions	$id_functions
ENDSTDBRW	ENDSTDBRW
if ($sec_element ne '') {	if (($sec_element ne '') \|\| ($role_element ne '')) {
$output .= &setsec_javascript($sec_element,$formname);	$output .= &setsec_javascript($sec_element,$formname,$role_element);
}	}
$output .= '	$output .= '
// ]]>	// ]]>
Line 597 sub userbrowser_javascript {	Line 599 sub userbrowser_javascript {
my $id_functions = &javascript_index_functions();	my $id_functions = &javascript_index_functions();
return <<"ENDUSERBRW";	return <<"ENDUSERBRW";

function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom) {	function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) {
var url = '/adm/pickuser?';	var url = '/adm/pickuser?';
var userdom = getDomainFromSelectbox(formname,udom);	var userdom = getDomainFromSelectbox(formname,udom);
if (userdom != null) {	if (userdom != null) {
Line 612 function openuserbrowser(formname,uname,	Line 614 function openuserbrowser(formname,uname,
'&uemailelement='+uemail+	'&uemailelement='+uemail+
'&hideudomelement='+hideudom+	'&hideudomelement='+hideudom+
'&coursedom='+crsdom;	'&coursedom='+crsdom;
	if ((caller != null) && (caller != undefined)) {
	url += '&caller='+caller;
	}
var title = 'User_Browser';	var title = 'User_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';	var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';	options += ',width=700,height=600';
Line 619 function openuserbrowser(formname,uname,	Line 624 function openuserbrowser(formname,uname,
stdeditbrowser.focus();	stdeditbrowser.focus();
}	}

function fix_domain (formname,udom,origdom) {	function fix_domain (formname,udom,origdom,uname) {
var formid = getFormIdByName(formname);	var formid = getFormIdByName(formname);
if (formid > -1) {	if (formid > -1) {
	var unameid = getIndexByName(formid,uname);
var domid = getIndexByName(formid,udom);	var domid = getIndexByName(formid,udom);
var hidedomid = getIndexByName(formid,origdom);	var hidedomid = getIndexByName(formid,origdom);
if (hidedomid > -1) {	if (hidedomid > -1) {
var fixeddom = document.forms[formid].elements[hidedomid].value;	var fixeddom = document.forms[formid].elements[hidedomid].value;
if (domid > -1) {	var unameval = document.forms[formid].elements[unameid].value;
var slct = document.forms[formid].elements[domid];	if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) {
if (slct.type == 'select-one') {	if (domid > -1) {
var i;	var slct = document.forms[formid].elements[domid];
for (i=0;i<slct.length;i++) {	if (slct.type == 'select-one') {
if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }	var i;
	for (i=0;i<slct.length;i++) {
	if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }
	}
	}
	if (slct.type == 'hidden') {
	slct.value = fixeddom;
}	}
}
if (slct.type == 'hidden') {
slct.value = fixeddom;
}	}
}	}
}	}
Line 649 ENDUSERBRW	Line 658 ENDUSERBRW


sub setsec_javascript {	sub setsec_javascript {
my ($sec_element,$formname) = @_;	my ($sec_element,$formname,$role_element) = @_;
	my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
	$communityrolestr);
	if ($role_element ne '') {
	my @allroles = ('st','ta','ep','in','ad');
	foreach my $crstype ('Course','Community') {
	if ($crstype eq 'Community') {
	foreach my $role (@allroles) {
	push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype));
	}
	push(@communityrolenames,&Apache::lonnet::plaintext('co'));
	} else {
	foreach my $role (@allroles) {
	push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype));
	}
	push(@courserolenames,&Apache::lonnet::plaintext('cc'));
	}
	}
	$rolestr = '"'.join('","',@allroles).'"';
	$courserolestr = '"'.join('","',@courserolenames).'"';
	$communityrolestr = '"'.join('","',@communityrolenames).'"';
	}
my $setsections = qq\|	my $setsections = qq\|
function setSect(sectionlist) {	function setSect(sectionlist) {
var sectionsArray = new Array();	var sectionsArray = new Array();
Line 683 function setSect(sectionlist) {	Line 713 function setSect(sectionlist) {
}	}
}	}
}	}

	function setRole(crstype) {
\|;	\|;
	if ($role_element eq '') {
	$setsections .= ' return;
	}
	';
	} else {
	$setsections .= qq\|
	var elementLength = document.$formname.$role_element.length;
	var allroles = Array($rolestr);
	var courserolenames = Array($courserolestr);
	var communityrolenames = Array($communityrolestr);
	if (elementLength != undefined) {
	if (document.$formname.$role_element.options[5].value == 'cc') {
	if (crstype == 'Course') {
	return;
	} else {
	allroles[5] = 'co';
	for (var i=0; i<6; i++) {
	document.$formname.$role_element.options[i].value = allroles[i];
	document.$formname.$role_element.options[i].text = communityrolenames[i];
	}
	}
	} else {
	if (crstype == 'Community') {
	return;
	} else {
	allroles[5] = 'cc';
	for (var i=0; i<6; i++) {
	document.$formname.$role_element.options[i].value = allroles[i];
	document.$formname.$role_element.options[i].text = courserolenames[i];
	}
	}
	}
	}
	return;
	}
	\|;
	}
return $setsections;	return $setsections;
}	}


sub selectcourse_link {	sub selectcourse_link {
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;	my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype,
	$typeelement) = @_;
	my $type = $selecttype;
my $linktext = &mt('Select Course');	my $linktext = &mt('Select Course');
if ($selecttype eq 'Community') {	if ($selecttype eq 'Community') {
$linktext = &mt('Select Community');	$linktext = &mt('Select Community');
	} elsif ($selecttype eq 'Course/Community') {
	$linktext = &mt('Select Course/Community');
	$type = '';
}	}
return '<span class="LC_nobreak">'	return '<span class="LC_nobreak">'
."<a href='"	."<a href='"
.'javascript:opencrsbrowser("'.$form.'","'.$unameele	.'javascript:opencrsbrowser("'.$form.'","'.$unameele
.'","'.$udomele.'","'.$desc.'","'.$extra_element	.'","'.$udomele.'","'.$desc.'","'.$extra_element
.'","'.$multflag.'","'.$selecttype.'");'	.'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
."'>".$linktext.'</a>'	."'>".$linktext.'</a>'
.'</span>';	.'</span>';
}	}
Line 711 sub selectauthor_link {	Line 784 sub selectauthor_link {

sub selectuser_link {	sub selectuser_link {
my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,	my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
$coursedom,$linktext) = @_;	$coursedom,$linktext,$caller) = @_;
return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".	return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".
"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom'".	"'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'".
');">'.$linktext.'</a>';	');">'.$linktext.'</a>';
}	}

Line 1097 sub general_help {	Line 1170 sub general_help {
my $helptopic='Student_Intro';	my $helptopic='Student_Intro';
if ($env{'request.role'}=~/^(ca\|au)/) {	if ($env{'request.role'}=~/^(ca\|au)/) {
$helptopic='Authoring_Intro';	$helptopic='Authoring_Intro';
} elsif ($env{'request.role'}=~/^cc/) {	} elsif ($env{'request.role'}=~/^(cc\|co)/) {
$helptopic='Course_Coordination_Intro';	$helptopic='Course_Coordination_Intro';
} elsif ($env{'request.role'}=~/^dc/) {	} elsif ($env{'request.role'}=~/^dc/) {
$helptopic='Domain_Coordination_Intro';	$helptopic='Domain_Coordination_Intro';
Line 1809 sub select_form {	Line 1882 sub select_form {
$selectform.=	$selectform.=
'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.	'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
($key eq $def ? 'selected="selected" ' : '').	($key eq $def ? 'selected="selected" ' : '').
">".&mt($hash{$key})."</option>\n";	">".$hash{$key}."</option>\n";
}	}
$selectform.="</select>";	$selectform.="</select>";
return $selectform;	return $selectform;
Line 1874 sub select_level_form {	Line 1947 sub select_level_form {

=pod	=pod

=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange)	=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)

Returns a string containing a <select name='$name' size='1'> form to	Returns a string containing a <select name='$name' size='1'> form to
allow a user to select the domain to preform an operation in.	allow a user to select the domain to preform an operation in.
Line 1887 If the $showdomdesc flag is set, the dom	Line 1960 If the $showdomdesc flag is set, the dom

The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.	The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.

	The optional $incdoms is a reference to an array of domains which will be the only available options.

=cut	=cut

#-------------------------------------------	#-------------------------------------------
sub select_dom_form {	sub select_dom_form {
my ($defdom,$name,$includeempty,$showdomdesc,$onchange) = @_;	my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;
if ($onchange) {	if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';	$onchange = ' onchange="'.$onchange.'"';
}	}
my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());	my @domains;
	if (ref($incdoms) eq 'ARRAY') {
	@domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
	} else {
	@domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
	}
if ($includeempty) { @domains=('',@domains); }	if ($includeempty) { @domains=('',@domains); }
my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
foreach my $dom (@domains) {	foreach my $dom (@domains) {
Line 2971 sub syllabuswrapper {	Line 3051 sub syllabuswrapper {
}	}

sub track_student_link {	sub track_student_link {
my ($linktext,$sname,$sdom,$target,$start) = @_;	my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
my $link ="/adm/trackstudent?";	my $link ="/adm/trackstudent?";
my $title = 'View recent activity';	my $title = 'View recent activity';
if (defined($sname) && $sname !~ /^\s*$/ &&	if (defined($sname) && $sname !~ /^\s*$/ &&
Line 2985 sub track_student_link {	Line 3065 sub track_student_link {
$target = '';	$target = '';
}	}
if ($start) { $link.='&start='.$start; }	if ($start) { $link.='&start='.$start; }
	if ($only_body) { $link .= '&only_body=1'; }
$title = &mt($title);	$title = &mt($title);
$linktext = &mt($linktext);	$linktext = &mt($linktext);
return qq{<a href="$link" title="$title" $target>$linktext</a>}.	return qq{<a href="$link" title="$title" $target>$linktext</a>}.
Line 3660 sub findallcourses {	Line 3741 sub findallcourses {
if (!%roles) {	if (!%roles) {
%roles = (	%roles = (
cc => 1,	cc => 1,
	co => 1,
in => 1,	in => 1,
ep => 1,	ep => 1,
ta => 1,	ta => 1,
Line 4089 sub determinedomain {	Line 4171 sub determinedomain {
my $domain=shift;	my $domain=shift;
if (! $domain) {	if (! $domain) {
# Determine domain if we have not been given one	# Determine domain if we have not been given one
$domain = $Apache::lonnet::perlvar{'lonDefDomain'};	$domain = &Apache::lonnet::default_login_domain();
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }	if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
if ($env{'request.role.domain'}) {	if ($env{'request.role.domain'}) {
$domain=$env{'request.role.domain'};	$domain=$env{'request.role.domain'};
Line 4112 sub get_domainconf {	Line 4194 sub get_domainconf {
if (defined($cached)) { return %{$result}; }	if (defined($cached)) { return %{$result}; }

my %domconfig = &Apache::lonnet::get_dom('configuration',	my %domconfig = &Apache::lonnet::get_dom('configuration',
['login','rolecolors'],$udom);	['login','rolecolors','loginvia'],$udom);
my (%designhash,%legacy);	my (%designhash,%legacy);
if (keys(%domconfig) > 0) {	if (keys(%domconfig) > 0) {
if (ref($domconfig{'login'}) eq 'HASH') {	if (ref($domconfig{'login'}) eq 'HASH') {
if (keys(%{$domconfig{'login'}})) {	if (keys(%{$domconfig{'login'}})) {
foreach my $key (keys(%{$domconfig{'login'}})) {	foreach my $key (keys(%{$domconfig{'login'}})) {
if (ref($domconfig{'login'}{$key}) eq 'HASH') {	if (ref($domconfig{'login'}{$key}) eq 'HASH') {
foreach my $img (keys(%{$domconfig{'login'}{$key}})) {	if ($key eq 'loginvia') {
$designhash{$udom.'.login.'.$key.'_'.$img} =	if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
$domconfig{'login'}{$key}{$img};	my @ids = &Apache::lonnet::current_machine_ids();
	foreach my $hostname (@ids) {
	if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
	if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
	my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
	$designhash{$udom.'.login.loginvia'} = $server;
	if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {

	$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
	} else {
	$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
	}
	if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
	$designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
	}
	}
	}
	}
	}
	} else {
	foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
	$designhash{$udom.'.login.'.$key.'_'.$img} =
	$domconfig{'login'}{$key}{$img};
	}
}	}
} else {	} else {
$designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};	$designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
Line 4148 sub get_domainconf {	Line 4253 sub get_domainconf {
} else {	} else {
$legacy{'rolecolors'} = 1;	$legacy{'rolecolors'} = 1;
}	}
	if (ref($domconfig{'autoenroll'}) eq 'HASH') {
	if ($domconfig{'autoenroll'}{'co-owners'}) {
	$designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
	}
	}
if (keys(%legacy) > 0) {	if (keys(%legacy) > 0) {
my %legacyhash = &get_legacy_domconf($udom);	my %legacyhash = &get_legacy_domconf($udom);
foreach my $item (keys(%legacyhash)) {	foreach my $item (keys(%legacyhash)) {
Line 4634 sub standard_css {	Line 4744 sub standard_css {

my $sans = 'Verdana,Arial,Helvetica,sans-serif';	my $sans = 'Verdana,Arial,Helvetica,sans-serif';
my $mono = 'monospace';	my $mono = 'monospace';
my $data_table_head = $sidebg;	my $data_table_head = $tabbg;
my $data_table_light = '#FAFAFA';	my $data_table_light = '#FAFAFA';
my $data_table_dark = '#F0F0F0';	my $data_table_dark = '#F0F0F0';
my $data_table_darker = '#CCCCCC';	my $data_table_darker = '#CCCCCC';
Line 4727 div.LC_confirm_box .LC_success img {	Line 4837 div.LC_confirm_box .LC_success img {
color: #999999;	color: #999999;
}	}

	.LC_discussion {
	background: $tabbg;
	border: 1px solid black;
	margin: 2px;
	}

	.LC_disc_action_links_bar {
	background: $tabbg;
	border: none;
	margin: 4px;
	}

	.LC_disc_action_left {
	text-align: left;
	}

	.LC_disc_action_right {
	text-align: right;
	}

	.LC_disc_new_item {
	background: white;
	border: 2px solid red;
	margin: 2px;
	}

	.LC_disc_old_item {
	background: white;
	border: 1px solid black;
	margin: 2px;
	}

table.LC_pastsubmission {	table.LC_pastsubmission {
border: 1px solid black;	border: 1px solid black;
margin: 2px;	margin: 2px;
Line 5136 table#LC_browser tr.LC_browser_folder {	Line 5278 table#LC_browser tr.LC_browser_folder {
background: #CCCCFF;	background: #CCCCFF;
}	}

	table.LC_data_table tr > td.LC_browser_file,
	table.LC_data_table tr > td.LC_browser_file_published {
	background: #AAEE77;
	}

	table.LC_data_table tr > td.LC_browser_file_locked,
	table.LC_data_table tr > td.LC_browser_file_unpublished {
	background: #FFAA99;
	}

	table.LC_data_table tr > td.LC_browser_file_obsolete {
	background: #888888;
	}

	table.LC_data_table tr > td.LC_browser_file_modified,
	table.LC_data_table tr > td.LC_browser_file_metamodified {
	background: #F8F866;
	}

	table.LC_data_table tr.LC_browser_folder > td {
	background: #E0E8FF;
	}

table.LC_data_table tr > td.LC_roles_is {	table.LC_data_table tr > td.LC_roles_is {
/* background: #77FF77; */	/* background: #77FF77; */
}	}
Line 5252 table.LC_pick_box {	Line 5417 table.LC_pick_box {
border-spacing: 1px;	border-spacing: 1px;
}	}
table.LC_pick_box td.LC_pick_box_title {	table.LC_pick_box td.LC_pick_box_title {
background: $sidebg;	background: $tabbg;
font-weight: bold;	font-weight: bold;
text-align: right;	text-align: right;
vertical-align: top;	vertical-align: top;
Line 5260 table.LC_pick_box td.LC_pick_box_title {	Line 5425 table.LC_pick_box td.LC_pick_box_title {
padding: 8px;	padding: 8px;
}	}
table.LC_pick_box td.LC_selfenroll_pick_box_title {	table.LC_pick_box td.LC_selfenroll_pick_box_title {
background: $sidebg;	background: $tabbg;
font-weight: bold;	font-weight: bold;
text-align: right;	text-align: right;
width: 350px;	width: 350px;
Line 5474 table.LC_prior_match tr td {	Line 5639 table.LC_prior_match tr td {
border: 1px solid #000000;	border: 1px solid #000000;
}	}

span.LC_nobreak {	.LC_nobreak {
white-space: nowrap;	white-space: nowrap;
}	}

Line 6263 Returns either 'student','coordinator','	Line 6428 Returns either 'student','coordinator','
###############################################	###############################################
sub get_users_function {	sub get_users_function {
my $function = 'student';	my $function = 'student';
if ($env{'request.role'}=~/^(cc\|in\|ta\|ep)/) {	if ($env{'request.role'}=~/^(cc\|co\|in\|ta\|ep)/) {
$function='coordinator';	$function='coordinator';
}	}
if ($env{'request.role'}=~/^(su\|dc\|ad\|li)/) {	if ($env{'request.role'}=~/^(su\|dc\|ad\|li)/) {
Line 6333 sub check_user_status {	Line 6498 sub check_user_status {
my $active_chk = 'none';	my $active_chk = 'none';
my $now = time;	my $now = time;
if (@uroles > 0) {	if (@uroles > 0) {
if (($role eq 'cc') \|\| ($sec eq '') \|\| (!defined($sec))) {	if (($role eq 'cc') \|\| ($role eq 'co') \|\| ($sec eq '') \|\| (!defined($sec))) {
$srchstr = '/'.$cdom.'/'.$crs.'_'.$role;	$srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
} else {	} else {
$srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;	$srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
Line 6814 If the user's status includes multiple t	Line 6979 If the user's status includes multiple t
the largest default quota which applies to the user determines the	the largest default quota which applies to the user determines the
default quota returned.	default quota returned.

	=back

=cut	=cut

###############################################	###############################################
Line 7413 sub sorted_slots {	Line 7580 sub sorted_slots {

=pod	=pod

=back

=head1 HTTP Helpers	=head1 HTTP Helpers

=over 4	=over 4
Line 8710 sub restore_settings {	Line 8875 sub restore_settings {

=item * &build_recipient_list()	=item * &build_recipient_list()

Build recipient lists for four types of e-mail:	Build recipient lists for five types of e-mail:
(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors	(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
(d) Help requests, generated by	(d) Help requests, (e) Course requests needing approval, generated by
lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.	lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
	loncoursequeueadmin.pm respectively.

Inputs:	Inputs:
defmail (scalar - email address of default recipient),	defmail (scalar - email address of default recipient),
Line 8883 sub extract_categories {	Line 9049 sub extract_categories {
my $trailstr;	my $trailstr;
if ($name eq 'instcode') {	if ($name eq 'instcode') {
$trailstr = &mt('Official courses (with institutional codes)');	$trailstr = &mt('Official courses (with institutional codes)');
	} elsif ($name eq 'communities') {
	$trailstr = &mt('Communities');
} else {	} else {
$trailstr = $name;	$trailstr = $name;
}	}
Line 8993 Inputs:	Line 9161 Inputs:
cathash - reference to hash of categories defined for the domain (from	cathash - reference to hash of categories defined for the domain (from
configuration.db)	configuration.db)

currcat - scalar with an & separated list of categories assigned to a course.	currcat - scalar with an & separated list of categories assigned to a course.

	type - scalar contains course type (Course or Community).

Returns: $output (markup to be displayed)	Returns: $output (markup to be displayed)

=cut	=cut

sub assign_categories_table {	sub assign_categories_table {
my ($cathash,$currcat) = @_;	my ($cathash,$currcat,$type) = @_;
my $output;	my $output;
if (ref($cathash) eq 'HASH') {	if (ref($cathash) eq 'HASH') {
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);	my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
Line 9009 sub assign_categories_table {	Line 9179 sub assign_categories_table {
if (@cats > 0) {	if (@cats > 0) {
my $itemcount = 0;	my $itemcount = 0;
if (ref($cats[0]) eq 'ARRAY') {	if (ref($cats[0]) eq 'ARRAY') {
$output = &Apache::loncommon::start_data_table();
my @currcategories;	my @currcategories;
if ($currcat ne '') {	if ($currcat ne '') {
@currcategories = split('&',$currcat);	@currcategories = split('&',$currcat);
}	}
	my $table;
for (my $i=0; $i<@{$cats[0]}; $i++) {	for (my $i=0; $i<@{$cats[0]}; $i++) {
my $parent = $cats[0][$i];	my $parent = $cats[0][$i];
my $css_class = $itemcount%2?' class="LC_odd_row"':'';
next if ($parent eq 'instcode');	next if ($parent eq 'instcode');
	if ($type eq 'Community') {
	next unless ($parent eq 'communities');
	} else {
	next if ($parent eq 'communities');
	}
	my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $item = &escape($parent).'::0';	my $item = &escape($parent).'::0';
my $checked = '';	my $checked = '';
if (@currcategories > 0) {	if (@currcategories > 0) {
Line 9025 sub assign_categories_table {	Line 9200 sub assign_categories_table {
$checked = ' checked="checked" ';	$checked = ' checked="checked" ';
}	}
}	}
$output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.	my $parent_title = $parent;
'<input type="checkbox" name="usecategory" value="'.	if ($parent eq 'communities') {
$item.'"'.$checked.' />'.$parent.'</span>'.	$parent_title = &mt('Communities');
'<input type="hidden" name="catname" value="'.$parent.'" /></td>';	}
	$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
	'<input type="checkbox" name="usecategory" value="'.
	$item.'"'.$checked.' />'.$parent_title.'</span>'.
	'<input type="hidden" name="catname" value="'.$parent.'" /></td>';
my $depth = 1;	my $depth = 1;
push(@path,$parent);	push(@path,$parent);
$output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);	$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
pop(@path);	pop(@path);
$output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';	$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
$itemcount ++;	$itemcount ++;
}	}
$output .= &Apache::loncommon::end_data_table();	if ($itemcount) {
	$output = &Apache::loncommon::start_data_table().
	$table.
	&Apache::loncommon::end_data_table();
	}
}	}
}	}
}	}
Line 9281 sub check_clone {	Line 9464 sub check_clone {
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
my $clonemsg;	my $clonemsg;
my $can_clone = 0;	my $can_clone = 0;
	my $lctype = lc($args->{'crstype'});
	if ($lctype ne 'community') {
	$lctype = 'course';
	}
if ($clonehome eq 'no_host') {	if ($clonehome eq 'no_host') {
$clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});	if ($args->{'crstype'} eq 'Community') {
	$clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
	} else {
	$clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
	}
} else {	} else {
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&	if ($args->{'crstype'} eq 'Community') {
	if ($clonedesc{'type'} ne 'Community') {
	$clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
	return ($can_clone, $clonemsg, $cloneid, $clonehome);
	}
	}
	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
$can_clone = 1;	$can_clone = 1;
} else {	} else {
my %clonehash = &Apache::lonnet::get('environment',['cloners'],	my %clonehash = &Apache::lonnet::get('environment',['cloners'],
$args->{'clonedomain'},$args->{'clonecourse'});	$args->{'clonedomain'},$args->{'clonecourse'});
my @cloners = split(/,/,$clonehash{'cloners'});	my @cloners = split(/,/,$clonehash{'cloners'});
if (grep(/^\*$/,@cloners)) {	if (grep(/^\*$/,@cloners)) {
$can_clone = 1;	$can_clone = 1;
} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {	} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
$can_clone = 1;	$can_clone = 1;
} else {	} else {
my %roleshash =	my $ccrole = 'cc';
&Apache::lonnet::get_my_roles($args->{'ccuname'},	if ($args->{'crstype'} eq 'Community') {
$args->{'ccdomain'},	$ccrole = 'co';
'userroles',['active'],['cc'],	}
[$args->{'clonedomain'}]);	my %roleshash =
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) \|\| (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {	&Apache::lonnet::get_my_roles($args->{'ccuname'},
$can_clone = 1;	$args->{'ccdomain'},
} else {	'userroles',['active'],[$ccrole],
$clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});	[$args->{'clonedomain'}]);
}	if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) \|\| (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
}	$can_clone = 1;
	} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
	$can_clone = 1;
	} else {
	if ($args->{'crstype'} eq 'Community') {
	$clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
	} else {
	$clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
	}
	}
	}
}	}
}	}
return ($can_clone, $clonemsg, $cloneid, $clonehome);	return ($can_clone, $clonemsg, $cloneid, $clonehome);
}	}

sub construct_course {	sub construct_course {
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum) = @_;	my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;
my $outcome;	my $outcome;
my $linefeed = '<br />'."\n";	my $linefeed = '<br />'."\n";
if ($context eq 'auto') {	if ($context eq 'auto') {
Line 9354 sub construct_course {	Line 9560 sub construct_course {
$args->{'ccuname'}.':'.	$args->{'ccuname'}.':'.
$args->{'ccdomain'},	$args->{'ccdomain'},
$args->{'crstype'},	$args->{'crstype'},
$cnum);	$cnum,$context,$category);


# Note: The testing routines depend on this being output; see	# Note: The testing routines depend on this being output; see
Line 9669 sub group_term {	Line 9875 sub group_term {
return $names{$crstype};	return $names{$crstype};
}	}

	sub course_types {
	my @types = ('official','unofficial','community');
	my %typename = (
	official => 'Official course',
	unofficial => 'Unofficial course',
	community => 'Community',
	);
	return (\@types,\%typename);
	}

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;
my $curfext = lc((split(/\./,$file))[-1]);	my $curfext = lc((split(/\./,$file))[-1]);

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

Removed from v.1.692.4.12
changed lines
	Added in v.1.692.4.32