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.262 and 1.292

version 1.262, 2005/05/26 20:49:23	version 1.292, 2005/11/15 18:07:46
Line 152 BEGIN {	Line 152 BEGIN {
my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';	my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
opendir(DIR,$designdir);	opendir(DIR,$designdir);
while ($filename=readdir(DIR)) {	while ($filename=readdir(DIR)) {
	if ($filename!~/\.tab$/) { next; }
my ($domain)=($filename=~/^(\w+)\./);	my ($domain)=($filename=~/^(\w+)\./);
{	{
my $designfile = $designdir.'/'.$filename;	my $designfile = $designdir.'/'.$filename;
if ( open (my $fh,"<$designfile") ) {	if ( open (my $fh,"<$designfile") ) {
while (<$fh>) {	while (<$fh>) {
next if /^\#/;	next if /^\#/;
chomp;	chomp;
my ($key,$val)=(split(/\=/,$_));	my ($key,$val)=(split(/\=/,$_));
if ($val) { $designhash{$domain.'.'.$key}=$val; }	if ($val) { $designhash{$domain.'.'.$key}=$val; }
}	}
close($fh);	close($fh);
}	}
}	}

}	}
closedir(DIR);	closedir(DIR);
Line 418 sub selectcourse_link {	Line 419 sub selectcourse_link {
'","'.$udomele.'","'.$desc.'","'.$extra_element.'");'."'>".&mt('Select Course')."</a>";	'","'.$udomele.'","'.$desc.'","'.$extra_element.'");'."'>".&mt('Select Course')."</a>";
}	}

	sub check_uncheck_jscript {
	my $jscript = <<"ENDSCRT";
	function checkAll(field) {
	if (field.length > 0) {
	for (i = 0; i < field.length; i++) {
	field[i].checked = true ;
	}
	} else {
	field.checked = true
	}
	}

	function uncheckAll(field) {
	if (field.length > 0) {
	for (i = 0; i < field.length; i++) {
	field[i].checked = false ;
	} } else {
	field.checked = false ;
	}
	}
	ENDSCRT
	return $jscript;
	}


=pod	=pod

=item * linked_select_forms(...)	=item * linked_select_forms(...)
Line 673 sub help_open_menu {	Line 699 sub help_open_menu {
foreach (\$color,\$function,\$topic,\$component_help,\$faq,\$bug,\$origurl) {	foreach (\$color,\$function,\$topic,\$component_help,\$faq,\$bug,\$origurl) {
$$_ = &Apache::lonnet::escape($$_);	$$_ = &Apache::lonnet::escape($$_);
}	}

if (!$stayOnPage) {	if (!$stayOnPage) {
$link = "javascript:helpMenu('open')";	$link = "javascript:helpMenu('open')";
} else {	} else {
Line 684 sub help_open_menu {	Line 709 sub help_open_menu {
my $template;	my $template;
if ($text ne "") {	if ($text ne "") {
$template .=	$template .=
"<table bgcolor='#773311' cellspacing='1' cellpadding='1' border='0'><tr>".	"<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
"<td bgcolor='#886622'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";	"<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
}	}
my $nothing=&Apache::lonhtmlcommon::javascript_nothing();	my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $html=&Apache::lonxml::xmlbegin();	my $html=&Apache::lonxml::xmlbegin();
Line 713 function helpMenu(target) {	Line 738 function helpMenu(target) {
return;	return;
}	}
function writeHelp(caller) {	function writeHelp(caller) {
caller.document.write('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')	caller.document.writeln('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')
caller.document.write("<frameset rows='105,*' border='0'><frame name='bannerframe' src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")	caller.document.writeln("<frameset rows='105,*' border='0'><frame name='bannerframe' src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
caller.document.write("</html>")	caller.document.writeln("</html>")
caller.document.close()	caller.document.close()
caller.focus()	caller.focus()
}	}
Line 1124 sub domain_select {	Line 1149 sub domain_select {
} &get_domains;	} &get_domains;
if ($multiple) {	if ($multiple) {
$domains{''}=&mt('Any domain');	$domains{''}=&mt('Any domain');
return &multiple_select_form($name,$value,4,%domains);	return &multiple_select_form($name,$value,4,\%domains);
} else {	} else {
return &select_form($name,$value,%domains);	return &select_form($name,$value,%domains);
}	}
}	}

	#-------------------------------------------

	=pod

	=item * multiple_select_form($name,$value,$size,$hash,$order)

	Returns a string containing a <select> element int multiple mode


	Args:
	$name - name of the <select> element
	$value - sclara or array ref of values that should already be selected
	$size - number of rows long the select element is
	$hash - the elements should be 'option' => 'shown text'
	(shown text should already have been &mt())
	$order - (optional) array ref of the order to show the elments in

	=cut

	#-------------------------------------------
sub multiple_select_form {	sub multiple_select_form {
my ($name,$value,$size,%hash)=@_;	my ($name,$value,$size,$hash,$order)=@_;
my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);	my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);
my $output='';	my $output='';
if (! defined($size)) {	if (! defined($size)) {
$size = 4;	$size = 4;
if (scalar(keys(%hash))<4) {	if (scalar(keys(%$hash))<4) {
$size = scalar(keys(%hash));	$size = scalar(keys(%$hash));
}	}
}	}
$output.="\n<select name='$name' size='$size' multiple='1'>";	$output.="\n<select name='$name' size='$size' multiple='1'>";
foreach (sort(keys(%hash))) {	my @order = ref($order) ? @$order
$output.='<option value="'.$_.'" ';	: sort(keys(%$hash));
$output.='selected="selected" ' if ($selected{$_});	foreach my $key (@order) {
$output.='>'.$hash{$_}."</option>\n";	$output.='<option value="'.$key.'" ';
	$output.='selected="selected" ' if ($selected{$key});
	$output.='>'.$hash->{$key}."</option>\n";
}	}
$output.="</select>\n";	$output.="</select>\n";
return $output;	return $output;
Line 1540 sub authform_nochange{	Line 1587 sub authform_nochange{
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my $result = &mt('[_1] Do not change login data',	my $result = '<label>'.&mt('[_1] Do not change login data',
'<input type="radio" name="login" value="nochange" '.	'<input type="radio" name="login" value="nochange" '.
'checked="checked" onclick="'.	'checked="checked" onclick="'.
"javascript:changed_radio('nochange',$in{'formname'});".'" />');	"javascript:changed_radio('nochange',$in{'formname'});".'" />').
	'</label>';
return $result;	return $result;
}	}

Line 1575 sub authform_kerberos{	Line 1623 sub authform_kerberos{
my $jscall = "javascript:changed_radio('krb',$in{'formname'});";	my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
my $result .= &mt	my $result .= &mt
('[_1] Kerberos authenticated with domain [_2] '.	('[_1] Kerberos authenticated with domain [_2] '.
'[_3] Version 4 [_4] Version 5',	'[_3] Version 4 [_4] Version 5 [_5]',
'<input type="radio" name="login" value="krb" '.	'<label><input type="radio" name="login" value="krb" '.
'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',	'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
'<input type="text" size="10" name="krbarg" '.	'</label><input type="text" size="10" name="krbarg" '.
'value="'.$krbarg.'" '.	'value="'.$krbarg.'" '.
'onchange="'.$jscall.'" />',	'onchange="'.$jscall.'" />',
'<input type="radio" name="krbver" value="4" '.$check4.' />',	'<label><input type="radio" name="krbver" value="4" '.$check4.' />',
'<input type="radio" name="krbver" value="5" '.$check5.' />');	'</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
	'</label>');
return $result;	return $result;
}	}

Line 1607 sub authform_internal{	Line 1656 sub authform_internal{
my $jscall = "javascript:changed_radio('int',$args{'formname'});";	my $jscall = "javascript:changed_radio('int',$args{'formname'});";
my $result.=&mt	my $result.=&mt
('[_1] Internally authenticated (with initial password [_2])',	('[_1] Internally authenticated (with initial password [_2])',
'<input type="radio" name="login" value="int" '.$intcheck.	'<label><input type="radio" name="login" value="int" '.$intcheck.
' onchange="'.$jscall.'" onclick="'.$jscall.'" />',	' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
'<input type="text" size="10" name="intarg" '.$intarg.	'</label><input type="text" size="10" name="intarg" '.$intarg.
' onchange="'.$jscall.'" />');	' onchange="'.$jscall.'" />');
return $result;	return $result;
}	}
Line 1634 sub authform_local{	Line 1683 sub authform_local{

my $jscall = "javascript:changed_radio('loc',$in{'formname'});";	my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
my $result.=&mt('[_1] Local Authentication with argument [_2]',	my $result.=&mt('[_1] Local Authentication with argument [_2]',
'<input type="radio" name="login" value="loc" '.$loccheck.	'<label><input type="radio" name="login" value="loc" '.$loccheck.
' onchange="'.$jscall.'" onclick="'.$jscall.'" />',	' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
'<input type="text" size="10" name="locarg" '.$locarg.	'</label><input type="text" size="10" name="locarg" '.$locarg.
' onchange="'.$jscall.'" />');	' onchange="'.$jscall.'" />');
return $result;	return $result;
}	}
Line 1650 sub authform_filesystem{	Line 1699 sub authform_filesystem{
my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";	my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
my $result.= &mt	my $result.= &mt
('[_1] Filesystem Authenticated (with initial password [_2])',	('[_1] Filesystem Authenticated (with initial password [_2])',
'<input type="radio" name="login" value="fsys" '.	'<label><input type="radio" name="login" value="fsys" '.
'onchange="'.$jscall.'" onclick="'.$jscall.'" />',	'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
'<input type="text" size="10" name="fsysarg" value="" '.	'</label><input type="text" size="10" name="fsysarg" value="" '.
'onchange="'.$jscall.'" />');	'onchange="'.$jscall.'" />');
return $result;	return $result;
}	}
Line 1985 sub syllabuswrapper {	Line 2034 sub syllabuswrapper {
}	}

sub track_student_link {	sub track_student_link {
my ($linktext,$sname,$sdom,$target) = @_;	my ($linktext,$sname,$sdom,$target,$start) = @_;
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*$/ &&
defined($sdom) && $sdom !~ /^\s*$/) {	defined($sdom) && $sdom !~ /^\s*$/) {
$link .= "?selected_student=$sname:$sdom";	$link .= "selected_student=$sname:$sdom";
$title .= ' of this student';	$title .= ' of this student';
}	}
if (defined($target) && $target !~ /^\s*$/) {	if (defined($target) && $target !~ /^\s*$/) {
$target = qq{target="$target"};	$target = qq{target="$target"};
} else {	} else {
$target = '';	$target = '';
}	}
	if ($start) { $link.='&start='.$start; }
return qq{<a href="$link" title="$title" $target>$linktext</a>};	return qq{<a href="$link" title="$title" $target>$linktext</a>};
}	}



=pod	=pod

=back	=back
Line 2485 sub pgrdlink {	Line 2533 sub pgrdlink {
Inputs: $text $uname $udom $symb $target	Inputs: $text $uname $udom $symb $target

Returns: A link to parmset.pm such as to see the PPRM view of a	Returns: A link to parmset.pm such as to see the PPRM view of a
student andn resource	student and a specific resource

=cut	=cut

Line 2690 other decorations will be returned.	Line 2738 other decorations will be returned.
=cut	=cut

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle)=@_;	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,$notopbar)=@_;
$title=&mt($title);	$title=&mt($title);
$function = &get_users_function() if (!$function);	$function = &get_users_function() if (!$function);
my $img=&designparm($function.'.img',$domain);	my $img=&designparm($function.'.img',$domain);
Line 2726 sub bodytag {	Line 2774 sub bodytag {
<style type="text/css">	<style type="text/css">
h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }	h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
a:focus { color: red; background: yellow }	a:focus { color: red; background: yellow }
	table.thinborder { border-collapse: collapse; }
	table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
	form, .inline { display: inline; }
	.center { text-align: center; }
</style>	</style>
<body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"	<body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
style="margin-top: 0px;$addstyle" $addentries>	style="margin-top: 0px;$addstyle" $addentries>
END	END
	&Apache::lontexconvert::jsMath_reset();
if ($env{'environment.texengine'} eq 'jsMath') {	if ($env{'environment.texengine'} eq 'jsMath') {
$bodytag.='<script type="text/javascript">	$bodytag.=&Apache::lontexconvert::jsMath_header();
function NoFontMessage () {}
</script>'."\n".
'<script src="/adm/jsMath/jsMath.js"></script>'."\n";
}	}

my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.	my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
Line 2797 ENDROLE	Line 2847 ENDROLE
}	}
my $titletable = '<table bgcolor="'.$pgbg.'" width="100%" border="0" '.	my $titletable = '<table bgcolor="'.$pgbg.'" width="100%" border="0" '.
'cellspacing="3" cellpadding="3">'.	'cellspacing="3" cellpadding="3">'.
'<tr><td rowspan="3" bgcolor="'.$tabbg.'">'.	'<tr><td bgcolor="'.$tabbg.'">'.
$titleinfo.'</td>'.$roleinfo.'</tr></table>';	$titleinfo.'</td>'.$roleinfo.'</tr></table>';
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);	if ($notopbar) {
	$bodytag .= $titletable;
	} else {
	$bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);
	}
} else {	} else {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).	if ($notopbar) {
	$bodytag .= $titletable;
	} else {
	$bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).
$titletable;	$titletable;
	}
}	}
return $bodytag;	return $bodytag;
}	}
Line 2828 ENDROLE	Line 2886 ENDROLE
#	#
return(<<ENDBODY);	return(<<ENDBODY);
$bodytag	$bodytag
<table width="100%" cellspacing="0" border="0" cellpadding="0">	<table class="thinborder" width="100%" cellspacing="0" border="0" cellpadding="0">
<tr><td bgcolor="$sidebg">	<tr><td bgcolor="$sidebg">
$upperleft</td>	$upperleft</td>
<td bgcolor="$sidebg" align="right">$messages </td>	<td bgcolor="$sidebg" align="right">$messages </td>
Line 2881 Returns: A uniform footer for LON-CAPA w	Line 2939 Returns: A uniform footer for LON-CAPA w

sub endbodytag {	sub endbodytag {
my $endbodytag='</body>';	my $endbodytag='</body>';
if ($env{'environment.texengine'} eq 'jsMath') {	$endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
$endbodytag='<script type="text/javascript">jsMath.Process()</script>'.
"\n".$endbodytag;
}
return $endbodytag;	return $endbodytag;
}	}

Line 2919 sub get_users_function {	Line 2974 sub get_users_function {

=pod	=pod

	=item check_user_status

	Determines current status of supplied role for a
	specific user. Roles can be active, previous or future.

	Inputs:
	user's domain, user's username, course's domain,
	course's number, optional section/group.

	Outputs:
	role status: active, previous or future.

	=cut

	sub check_user_status {
	my ($udom,$uname,$cdom,$crs,$role,$secgrp) = @_;
	my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
	my @uroles = keys %userinfo;
	my $srchstr;
	my $active_chk = 'none';
	if (@uroles > 0) {
	if (($role eq 'cc') \|\| ($secgrp eq '') \|\| (!defined($secgrp))) {
	$srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
	} else {
	$srchstr = '/'.$cdom.'/'.$crs.'/'.$secgrp.'_'.$role; }
	if (grep/^$srchstr$/,@uroles) {
	my $role_end = 0;
	my $role_start = 0;
	$active_chk = 'active';
	if ($userinfo{$srchstr} =~ m/^($role)_(\d+)/) {
	$role_end = $2;
	if ($userinfo{$srchstr} =~ m/^($role)_($role_end)_(\d+)$/) {
	$role_start = $3;
	}
	}
	if ($role_start > 0) {
	if (time < $role_start) {
	$active_chk = 'future';
	}
	}
	if ($role_end > 0) {
	if (time > $role_end) {
	$active_chk = 'previous';
	}
	}
	}
	}
	return $active_chk;
	}

	###############################################

	=pod

=item get_sections	=item get_sections

Determines all the sections for a course including	Determines all the sections for a course including
Line 2937 Returns number of sections.	Line 3046 Returns number of sections.
sub get_sections {	sub get_sections {
my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;	my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
if (!($cdom && $cnum)) { return 0; }	if (!($cdom && $cnum)) { return 0; }
my $cid = $cdom.'_'.$cnum;
my $numsections = 0;	my $numsections = 0;

if (!defined($possible_roles) \|\| (grep/^st$/,@$possible_roles)) {	if (!defined($possible_roles) \|\| (grep/^st$/,@$possible_roles)) {
my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
my $sec_index = &Apache::loncoursedata::CL_SECTION();	my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();	my $status_index = &Apache::loncoursedata::CL_STATUS();
while (my ($student,$data) = each %$classlist) {	while (my ($student,$data) = each %$classlist) {
Line 2971 sub get_sections {	Line 3079 sub get_sections {
return $numsections;	return $numsections;
}	}

	###############################################

	=pod

	=item get_course_users

	Retrieves usernames:domains for users in the specified course
	with specific role(s), and access status.

	Incoming parameters:
	1. course domain
	2. course number
	3. access status: users must have - either active,
	previous, future, or all.
	4. reference to array of permissible roles
	5. reference to array of section restrictions (optional)
	6. reference to results object (hash of hashes).
	7. reference to optional userdata hash
	Keys of top level hash are roles.
	Keys of inner hashes are username:domain, with
	values set to access type.
	Optional userdata hash returns an array with arguments in the
	same order as loncoursedata::get_classlist() for student data.

	Entries for end, start, section and status are blank because
	of the possibility of multiple values for non-student roles.

	=cut

	###############################################

	sub get_course_users {
	my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
	my %idx = ();

	$idx{udom} = &Apache::loncoursedata::CL_SDOM();
	$idx{uname} = &Apache::loncoursedata::CL_SNAME();
	$idx{end} = &Apache::loncoursedata::CL_END();
	$idx{start} = &Apache::loncoursedata::CL_START();
	$idx{id} = &Apache::loncoursedata::CL_ID();
	$idx{section} = &Apache::loncoursedata::CL_SECTION();
	$idx{fullname} = &Apache::loncoursedata::CL_FULLNAME();
	$idx{status} = &Apache::loncoursedata::CL_STATUS();

	if (grep(/^st$/,@{$roles})) {
	my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum);
	my $now = time;
	foreach my $student (keys(%{$classlist})) {
	my $match = 0;
	if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
	unless(grep(/^\Q$$classlist{$student}[$idx{section}]\E$/,
	@{$sections})) {
	next;
	}
	}
	if (defined($$types{'active'})) {
	if ($$classlist{$student}[$idx{status}] eq 'Active') {
	push(@{$$users{st}{$student}},'active');
	$match = 1;
	}
	}
	if (defined($$types{'previous'})) {
	if ($$classlist{$student}[$idx{end}] <= $now) {
	push(@{$$users{st}{$student}},'previous');
	$match = 1;
	}
	}
	if (defined($$types{'future'})) {
	if (($$classlist{$student}[$idx{start}] > $now) && ($$classlist{$student}[$idx{end}] > $now) \|\| ($$classlist{$student}[$idx{end}] == 0) \|\| ($$classlist{$student}[$idx{end}] eq '')) {
	push(@{$$users{st}{$student}},'future');
	$match = 1;
	}
	}
	if ($match && defined($userdata)) {
	$$userdata{$student} = $$classlist{$student};
	}
	}
	}
	if ((@{$roles} > 0) && (@{$roles} ne "st")) {
	my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum);
	foreach my $person (@coursepersonnel) {
	my $match = 0;
	my ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
	$user =~ s/:$//;
	if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {
	my ($uname,$udom,$usec) = split(/:/,$user);
	if ($usec ne '' && (ref($sections) eq 'ARRAY') &&
	@{$sections} > 0) {
	unless(grep(/^\Q$usec\E$/,@{$sections})) {
	next;
	}
	}
	if ($uname ne '' && $udom ne '') {
	my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role);
	foreach my $type (keys(%{$types})) {
	if ($status eq $type) {
	@{$$users{$role}{$user}} = $type;
	$match = 1;
	}
	}
	if ($match && defined($userdata) &&
	!exists($$userdata{$uname.':'.$udom})) {
	&get_user_info($udom,$uname,\%idx,$userdata);
	}
	}
	}
	}
	if (grep(/^ow$/,@{$roles})) {
	if ((defined($cdom)) && (defined($cnum))) {
	my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
	if ( defined($csettings{'internal.courseowner'}) ) {
	my $owner = $csettings{'internal.courseowner'};
	@{$$users{'ow'}{$owner.':'.$cdom}} = 'any';
	if (defined($userdata) &&
	!exists($$userdata{$owner.':'.$cdom})) {
	&get_user_info($cdom,$owner,\%idx,$userdata);
	}
	}
	}
	}
	}
	return;
	}

	sub get_user_info {
	my ($udom,$uname,$idx,$userdata) = @_;
	$$userdata{$uname.':'.$udom}[$$idx{fullname}] =
	&plainname($uname,$udom,'lastname');
	$$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname;
	$$userdata{$uname.':'.$udom}[$$idx{uname}] = $udom;
	return;
	}

	###############################################

sub get_posted_cgi {	sub get_posted_cgi {
my $r=shift;	my $r=shift;
Line 3066 sub get_unprocessed_cgi {	Line 3308 sub get_unprocessed_cgi {
if (!defined($possible_names) \|\| (grep {$_ eq $name} @$possible_names)) {	if (!defined($possible_names) \|\| (grep {$_ eq $name} @$possible_names)) {
$value =~ tr/+/ /;	$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;	$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
&Apache::lonxml::debug("Seting :$name: to :$value:");
unless (defined($env{'form.'.$name})) { &add_to_env('form.'.$name,$value) };	unless (defined($env{'form.'.$name})) { &add_to_env('form.'.$name,$value) };
}	}
}	}
Line 3109 sub no_cache {	Line 3350 sub no_cache {

sub content_type {	sub content_type {
my ($r,$type,$charset) = @_;	my ($r,$type,$charset) = @_;
	&no_cache($r);
if ($env{'browser.mathml'} && $type eq 'text/html') { $type='text/xml'; }	if ($env{'browser.mathml'} && $type eq 'text/html') { $type='text/xml'; }
unless ($charset) {	unless ($charset) {
$charset=&Apache::lonlocal::current_encoding;	$charset=&Apache::lonlocal::current_encoding;
Line 3264 Separate a record into fields $record sh	Line 3506 Separate a record into fields $record sh

=cut	=cut

	sub takeleft {
	my $index=shift;
	return substr('0000'.$index,-4,4);
	}

sub record_sep {	sub record_sep {
my $record=shift;	my $record=shift;
my %components=();	my %components=();
Line 3274 sub record_sep {	Line 3521 sub record_sep {
my $field=$_;	my $field=$_;
$field=~s/^(\"\|\')//;	$field=~s/^(\"\|\')//;
$field=~s/(\"\|\')$//;	$field=~s/(\"\|\')$//;
$components{$i}=$field;	$components{&takeleft($i)}=$field;
$i++;	$i++;
}	}
} elsif ($env{'form.upfiletype'} eq 'tab') {	} elsif ($env{'form.upfiletype'} eq 'tab') {
Line 3283 sub record_sep {	Line 3530 sub record_sep {
my $field=$_;	my $field=$_;
$field=~s/^(\"\|\')//;	$field=~s/^(\"\|\')//;
$field=~s/(\"\|\')$//;	$field=~s/(\"\|\')$//;
$components{$i}=$field;	$components{&takeleft($i)}=$field;
$i++;	$i++;
}	}
} else {	} else {
Line 3301 sub record_sep {	Line 3548 sub record_sep {
$field=~s/^\s*$delimiter//;	$field=~s/^\s*$delimiter//;
$field=~s/$delimiter\s*$//;	$field=~s/$delimiter\s*$//;
}	}
$components{$i}=$field;	$components{&takeleft($i)}=$field;
$i++;	$i++;
}	}
}	}
Line 3458 sub csv_samples_select_table {	Line 3705 sub csv_samples_select_table {
$display.'</option>');	$display.'</option>');
}	}
$r->print('</select></td><td>');	$r->print('</select></td><td>');
if (defined($sone{$_})) { $r->print($sone{$_}."</br>\n"); }	if (defined($sone{$_})) { $r->print($sone{$_}."<br />\n"); }
if (defined($stwo{$_})) { $r->print($stwo{$_}."</br>\n"); }	if (defined($stwo{$_})) { $r->print($stwo{$_}."<br />\n"); }
if (defined($sthree{$_})) { $r->print($sthree{$_}."</br>\n"); }	if (defined($sthree{$_})) { $r->print($sthree{$_}."<br />\n"); }
$r->print('</td></tr>');	$r->print('</td></tr>');
$i++;	$i++;
}	}
Line 3549 the routine &Apache::lonnet::transfer_pr	Line 3796 the routine &Apache::lonnet::transfer_pr
my $uniq=0;	my $uniq=0;
sub get_cgi_id {	sub get_cgi_id {
$uniq=($uniq+1)%100000;	$uniq=($uniq+1)%100000;
return (time.'_'.$uniq);	return (time.'_'.$$.'_'.$uniq);
}	}

############################################################	############################################################

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

Removed from v.1.262
changed lines
	Added in v.1.292