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.497 and 1.521

version 1.497, 2006/12/24 21:13:37	version 1.521, 2007/04/11 02:42:00
Line 59 use Apache::lonnet;	Line 59 use Apache::lonnet;
use GDBM_File;	use GDBM_File;
use POSIX qw(strftime mktime);	use POSIX qw(strftime mktime);
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonenc;	use Apache::lonenc();
use Apache::lonlocal;	use Apache::lonlocal;
use HTML::Entities;	use HTML::Entities;
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
Line 68 use Apache::lontexconvert();	Line 68 use Apache::lontexconvert();
use Apache::lonclonecourse();	use Apache::lonclonecourse();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);

	# ---------------------------------------------- Designs
	use vars qw(%defaultdesign);

my $readit;	my $readit;


##	##
## Global Variables	## Global Variables
##	##
Line 82 my %scprtag;	Line 86 my %scprtag;
my %fe; my %fd; my %fm;	my %fe; my %fd; my %fm;
my %category_extensions;	my %category_extensions;

# ---------------------------------------------- Designs

my %designhash;

# ---------------------------------------------- Thesaurus variables	# ---------------------------------------------- Thesaurus variables
#	#
# %Keywords:	# %Keywords:
Line 151 BEGIN {	Line 151 BEGIN {
}	}
}	}

# -------------------------------------------------------------- domain designs	# -------------------------------------------------------------- default domain designs

my $filename;
my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';	my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
opendir(DIR,$designdir);	my $designfile = $designdir.'/default.tab';
while ($filename=readdir(DIR)) {	if ( open (my $fh,"<$designfile") ) {
if ($filename!~/\.tab$/) { next; }	while (my $line = <$fh>) {
my ($domain)=($filename=~/^($match_domain)\./);	next if ($line =~ /^\#/);
{	chomp($line);
my $designfile = $designdir.'/'.$filename;	my ($key,$val)=(split(/\=/,$line));
if ( open (my $fh,"<$designfile") ) {	if ($val) { $defaultdesign{$key}=$val; }
while (my $line = <$fh>) {	}
next if ($line =~ /^\#/);	close($fh);
chomp($line);
my ($key,$val)=(split(/\=/,$line));
if ($val) { $designhash{$domain.'.'.$key}=$val; }
}
close($fh);
}
}

}	}
closedir(DIR);


# ------------------------------------------------------------- file categories	# ------------------------------------------------------------- file categories
{	{
Line 1265 sub create_text_file {	Line 1253 sub create_text_file {
## Home server <option> list generating code ##	## Home server <option> list generating code ##
###############################################################	###############################################################

=pod

=head1 Home Server option list generating code

=over 4

=item * get_domains()

Returns an array containing each of the domains listed in the hosts.tab
file.

=cut

#-------------------------------------------
sub get_domains {
# The code below was stolen from "The Perl Cookbook", p 102, 1st ed.
my @domains;
my %seen;
foreach my $dom (sort(values(%Apache::lonnet::hostdom))) {
push(@domains,$dom) unless $seen{$dom}++;
}
return @domains;
}

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

sub domain_select {	sub domain_select {
my ($name,$value,$multiple)=@_;	my ($name,$value,$multiple)=@_;
my %domains=map {	my %domains=map {
$_ => $_.' '.$Apache::lonnet::domaindescription{$_}	$_ => $_.' '. &Apache::lonnet::domain($_,'description')
} &get_domains;	} &Apache::lonnet::all_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);
Line 1308 sub domain_select {	Line 1272 sub domain_select {

=pod	=pod

	=head1 Routines for form select boxes

	=over 4

	=cut

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

Returns a string containing a <select> element int multiple mode	Returns a string containing a <select> element int multiple mode
Line 1315 Returns a string containing a <select> e	Line 1285 Returns a string containing a <select> e

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

=cut	=cut

Line 1335 sub multiple_select_form {	Line 1305 sub multiple_select_form {
}	}
}	}
$output.="\n<select name='$name' size='$size' multiple='1'>";	$output.="\n<select name='$name' size='$size' multiple='1'>";
my @order = ref($order) ? @$order	my @order;
: sort(keys(%$hash));	if (ref($order) eq 'ARRAY') {
	@order = @{$order};
	} else {
	@order = sort(keys(%$hash));
	}
	if (exists($$hash{'select_form_order'})) {
	@order = @{$$hash{'select_form_order'}};
	}

foreach my $key (@order) {	foreach my $key (@order) {
$output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';	$output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
$output.='selected="selected" ' if ($selected{$key});	$output.='selected="selected" ' if ($selected{$key});
Line 1451 selected");	Line 1429 selected");
#-------------------------------------------	#-------------------------------------------
sub select_dom_form {	sub select_dom_form {
my ($defdom,$name,$includeempty) = @_;	my ($defdom,$name,$includeempty) = @_;
my @domains = get_domains();	my @domains = sort(&Apache::lonnet::all_domains());
if ($includeempty) { @domains=('',@domains); }	if ($includeempty) { @domains=('',@domains); }
my $selectdomain = "<select name=\"$name\" size=\"1\">\n";	my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
foreach my $dom (@domains) {	foreach my $dom (@domains) {
Line 1467 sub select_dom_form {	Line 1445 sub select_dom_form {

=pod	=pod

=item * get_library_servers($domain)

Returns a hash which contains keys like '103l3' and values like
'kirk.lite.msu.edu'. All of the keys will be for machines in the
given $domain.

=cut

#-------------------------------------------
sub get_library_servers {
my $domain = shift;
my %library_servers;
foreach my $hostid (keys(%Apache::lonnet::libserv)) {
if ($Apache::lonnet::hostdom{$hostid} eq $domain) {
$library_servers{$hostid} = $Apache::lonnet::hostname{$hostid};
}
}
return %library_servers;
}

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

=pod

=item * home_server_option_list($domain)	=item * home_server_option_list($domain)

returns a string which contains an <option> list to be used in a	returns a string which contains an <option> list to be used in a
Line 1501 returns a string which contains an <opti	Line 1455 returns a string which contains an <opti
#-------------------------------------------	#-------------------------------------------
sub home_server_option_list {	sub home_server_option_list {
my $domain = shift;	my $domain = shift;
my %servers = &get_library_servers($domain);	my %servers = &Apache::lonnet::get_servers($domain,'library');
my $result = '';	my $result = '';
foreach my $hostid (sort(keys(%servers))) {	foreach my $hostid (sort(keys(%servers))) {
$result.=	$result.=
Line 1513 sub home_server_option_list {	Line 1467 sub home_server_option_list {

=pod	=pod

=back

=cut	=cut

###############################################################	###############################################################
Line 1903 If target_domain is not found in domain.	Line 1855 If target_domain is not found in domain.
#-------------------------------------------	#-------------------------------------------
sub get_auth_defaults {	sub get_auth_defaults {
my $domain=shift;	my $domain=shift;
return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain});	return (&Apache::lonnet::domain($domain,'auth_def'),
	&Apache::lonnet::domain($domain,'auth_arg_def'));

}	}
###############################################################	###############################################################
## End Get Authentication Defaults for Domain ##	## End Get Authentication Defaults for Domain ##
Line 2259 sub track_student_link {	Line 2213 sub track_student_link {
&help_open_topic('View_recent_activity');	&help_open_topic('View_recent_activity');
}	}

	# ===================================================== Display a student photo


	sub student_image_tag {
	my ($domain,$user)=@_;
	my $imgsrc=&Apache::lonnet::studentphoto($domain,$user,'jpg');
	if (($imgsrc) && ($imgsrc ne '/adm/lonKaputt/lonlogo_broken.gif')) {
	return '<img src="'.$imgsrc.'" align="right" />';
	} else {
	return '';
	}
	}

=pod	=pod

=back	=back
Line 2474 sub preferred_languages {	Line 2441 sub preferred_languages {
if ($browser) {	if ($browser) {
@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$browser));	@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$browser));
}	}
if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {	if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
@languages=(@languages,	@languages=(@languages,
$Apache::lonnet::domain_lang_def{$env{'user.domain'}});	&Apache::lonnet::domain($env{'user.domain'},
	'lang_def'));
}	}
if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) {	if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) {
@languages=(@languages,	@languages=(@languages,
$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}});	&Apache::lonnet::domain($env{'request.role.domain'},
	'lang_def'));
}	}
if ($Apache::lonnet::domain_lang_def{	if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
$Apache::lonnet::perlvar{'lonDefDomain'}}) {	'lang_def')) {
@languages=(@languages,	@languages=(@languages,
$Apache::lonnet::domain_lang_def{	&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
$Apache::lonnet::perlvar{'lonDefDomain'}});	'lang_def'));
}	}
# turn "en-ca" into "en-ca,en"	# turn "en-ca" into "en-ca,en"
my @genlanguages;	my @genlanguages;
Line 2896 sub blockcheck {	Line 2865 sub blockcheck {
$uname = $env{'user.name'};	$uname = $env{'user.name'};
}	}

my ($startblock,$endblock);

# If uname and udom are for a course, check for blocks in the course.	# If uname and udom are for a course, check for blocks in the course.

if (&Apache::lonnet::is_course($udom,$uname)) {	if (&Apache::lonnet::is_course($udom,$uname)) {
my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);	my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);	my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
return ($startblock,$endblock);	return ($startblock,$endblock);
}	}

	my $startblock = 0;
	my $endblock = 0;
my %live_courses = &findallcourses(undef,$uname,$udom);	my %live_courses = &findallcourses(undef,$uname,$udom);

# If uname is for a user, and activity is course-specific, i.e.,	# If uname is for a user, and activity is course-specific, i.e.,
Line 2966 sub blockcheck {	Line 2935 sub blockcheck {
if ($sec ne 'none') {	if ($sec ne 'none') {
$checkrole .= '/'.$sec;	$checkrole .= '/'.$sec;
}	}
# Resource belongs to user other than current user.
# Assemble privs for that user, and check for 'evb' priv.
if ($otheruser) {	if ($otheruser) {
# Resource belongs to user other than current user.	# Resource belongs to user other than current user.
# Assemble privs for that user, and check for 'evb' priv.	# Assemble privs for that user, and check for 'evb' priv.
Line 3017 sub blockcheck {	Line 2984 sub blockcheck {

# Retrieve blocking times and identity of blocker for course	# Retrieve blocking times and identity of blocker for course
# of specified user, unless user has 'evb' privilege.	# of specified user, unless user has 'evb' privilege.

($startblock,$endblock)=&get_blocks($setters,$activity,$cdom,$cnum);	my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
	if (($start != 0) &&
	(($startblock == 0) \|\| ($startblock > $start))) {
	$startblock = $start;
	}
	if (($end != 0) &&
	(($endblock == 0) \|\| ($endblock < $end))) {
	$endblock = $end;
	}
}	}
return ($startblock,$endblock);	return ($startblock,$endblock);
}	}
Line 3201 sub determinedomain {	Line 3176 sub determinedomain {
return $domain;	return $domain;
}	}
###############################################	###############################################

	sub devalidate_domconfig_cache {
	my ($udom)=@_;
	&Apache::lonnet::devalidate_cache_new('domainconfig',$udom);
	}

	# ---------------------- Get domain configuration for a domain
	sub get_domainconf {
	my ($udom) = @_;
	my $cachetime=1800;
	my ($result,$cached)=&Apache::lonnet::is_cached_new('domainconfig',$udom);
	if (defined($cached)) { return %{$result}; }

	my %domconfig = &Apache::lonnet::get_dom('configuration',
	['login','rolecolors'],$udom);
	my %designhash;
	if (keys(%domconfig) > 0) {
	if (ref($domconfig{'login'}) eq 'HASH') {
	foreach my $key (keys(%{$domconfig{'login'}})) {
	$designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
	}
	}
	if (ref($domconfig{'rolecolors'}) eq 'HASH') {
	foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
	if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
	foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
	$designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
	}
	}
	}
	}
	} else {
	my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
	my $designfile = $designdir.'/'.$udom.'.tab';
	if (-e $designfile) {
	if ( open (my $fh,"<$designfile") ) {
	while (my $line = <$fh>) {
	next if ($line =~ /^\#/);
	chomp($line);
	my ($key,$val)=(split(/\=/,$line));
	if ($val) { $designhash{$udom.'.'.$key}=$val; }
	}
	close($fh);
	}
	}
	if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
	$designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
	}
	}
	&Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
	$cachetime);
	return %designhash;
	}

=pod	=pod

=item * &domainlogo()	=item * &domainlogo()
Line 3214 If the domain logo does not exist, a des	Line 3243 If the domain logo does not exist, a des

###############################################	###############################################
sub domainlogo {	sub domainlogo {
my $domain = &determinedomain(shift);	my $domain = &determinedomain(shift);
# See if there is a logo	my %designhash = &get_domainconf($domain);
if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {	# See if there is a logo
my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");	if ($designhash{$domain.'.login.domlogo'} ne '') {
return '<img src="'.$logo.'" alt="'.$domain.'" />';	my $imgsrc = $designhash{$domain.'.login.domlogo'};
} elsif(exists($Apache::lonnet::domaindescription{$domain})) {	if ($imgsrc =~ /^\/(adm\|res)/) {
return $Apache::lonnet::domaindescription{$domain};	$imgsrc = &lonhttpdurl($imgsrc);
	}
	return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
	} elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
	return &Apache::lonnet::domain($domain,'description');
} else {	} else {
return '';	return '';
}	}
Line 3256 sub designparm {	Line 3289 sub designparm {
return $env{'environment.color.'.$which};	return $env{'environment.color.'.$which};
}	}
$domain=&determinedomain($domain);	$domain=&determinedomain($domain);
if (exists($designhash{$domain.'.'.$which})) {	my %domdesign = &get_domainconf($domain);
return $designhash{$domain.'.'.$which};	my $output;
	if ($domdesign{$domain.'.'.$which} ne '') {
	$output = $domdesign{$domain.'.'.$which};
} else {	} else {
return $designhash{'default.'.$which};	$output = $defaultdesign{$which};
}	}
	if (($which =~ /^(student\|coordinator\|author\|admin)\.img$/) \|\|
	($which =~ /login\.(img\|logo\|domlogo)/)) {
	if ($output =~ /^\/(adm\|res)\//) {
	$output = &lonhttpdurl($output);
	}
	}
	return $output;
}	}

###############################################	###############################################
Line 3344 sub bodytag {	Line 3386 sub bodytag {
my ($role,$realm) = split(/\./,$env{'request.role'},2);	my ($role,$realm) = split(/\./,$env{'request.role'},2);
if ($role eq 'ca') {	if ($role eq 'ca') {
my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});	my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
$realm = &plainname($rname,$rdom).':'.$rdom;	$realm = &plainname($rname,$rdom);
}	}
# realm	# realm
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
Line 3479 ENDROLE	Line 3521 ENDROLE
# Top frame rendering, Remote is up	# Top frame rendering, Remote is up
#	#

my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.	my $imgsrc = $img;
$lonhttpdPort.$img.'" alt="'.$function.'" />';	if ($img =~ /^\/adm/) {
	$imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
	}
	my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';

# Explicit link to get inline menu	# Explicit link to get inline menu
my $menu= ($no_inline_link?''	my $menu= ($no_inline_link?''
Line 3648 sub standard_css {	Line 3693 sub standard_css {
return <<END;	return <<END;
h1, h2, h3, th { font-family: $sans }	h1, h2, h3, th { font-family: $sans }
a:focus { color: red; background: yellow }	a:focus { color: red; background: yellow }
table.thinborder { border-collapse: collapse; }	table.thinborder,
table.thinborder tr th { border-style: solid; border-width: 1px; background: $tabbg;}	table.LC_optres_prior {
table.thinborder tr td { border-style: solid; border-width: 1px}	border-collapse: collapse;
	}
	table.thinborder tr th {
	border-style: solid;
	border-width: 1px;
	background: $tabbg;
	}
	table.thinborder tr td,
	table.LC_optres_prior tr td {
	border-style: solid;
	border-width: 1px
	}

form, .inline { display: inline; }	form, .inline { display: inline; }
.center { text-align: center; }	.center { text-align: center; }
Line 3793 td.LC_table_cell_checkbox {	Line 3849 td.LC_table_cell_checkbox {
font-size: smaller;	font-size: smaller;
}	}

	.LC_menu_category {
	color: $font;
	font-family: $sans;
	font-size: larger;
	font-weight: bold;
	}

td.LC_menubuttons_text {	td.LC_menubuttons_text {
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
Line 3822 table.LC_data_table, table.LC_mail_list	Line 3885 table.LC_data_table, table.LC_mail_list
.LC_data_table_dense {	.LC_data_table_dense {
font-size: small;	font-size: small;
}	}
	table.LC_nested_outer {
	border: 1px solid #000000;
	border-collapse: separate;
	border-spacing: 0px;
	width: 100%;
	}
	table.LC_nested {
	border: 0px;
	border-collapse: separate;
	border-spacing: 0px;
	width: 100%;
	}
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {	table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
font-weight: bold;	font-weight: bold;
background-color: $data_table_head;	background-color: $data_table_head;
Line 3840 table.LC_data_table tr.LC_data_table_hig	Line 3915 table.LC_data_table tr.LC_data_table_hig
background-color: $data_table_darker;	background-color: $data_table_darker;
}	}
table.LC_data_table tr.LC_empty_row td,	table.LC_data_table tr.LC_empty_row td,
table.LC_whatsnew tr.LC_empty_row td {	table.LC_nested tr.LC_empty_row td {
background-color: #FFFFFF;	background-color: #FFFFFF;
font-weight: bold;	font-weight: bold;
font-style: italic;	font-style: italic;
text-align: center;	text-align: center;
padding: 8px;	padding: 8px;
}	}
table.LC_whatsnew tr.LC_empty_row td {	table.LC_nested tr.LC_empty_row td {
padding: 4ex	padding: 4ex
}	}
table.LC_whatsnew {	table.LC_nested_outer tr th {
	font-weight: bold;
	background-color: $data_table_head;
	font-size: smaller;
	border-bottom: 1px solid #000000;
}	}
	table.LC_nested_outer tr td.LC_subheader {
table.LC_whatsnew tr th,	background-color: $data_table_head;
table.LC_whatsnew tr.LC_info_row td {
background-color: #CCC;
font-weight: bold;	font-weight: bold;
font-size: small;	font-size: small;
	border-bottom: 1px solid #000000;
text-align: right;	text-align: right;
}	}
table.LC_whatsnew tr td {	table.LC_nested tr.LC_info_row td {
background-color: #FFF;	background-color: #CCC;
	font-weight: bold;
font-size: small;	font-size: small;
text-align: right;	text-align: center;
}	}
table.LC_whatsnew tr td.LC_first_item {	table.LC_nested tr.LC_info_row td.LC_left_item {
text-align: left;	text-align: left;
}	}
	table.LC_nested td {
	background-color: #FFF;
	font-size: small;
	}
	table.LC_nested_outer tr th.LC_right_item,
	table.LC_nested tr.LC_info_row td.LC_right_item,
	table.LC_nested tr.LC_odd_row td.LC_right_item,
	table.LC_nested tr td.LC_right_item {
	text-align: right;
	}

table.LC_whatsnew tr.LC_odd_row td {	table.LC_nested tr.LC_odd_row td {
background-color: #EEE;	background-color: #EEE;
}	}

Line 4185 span.LC_feedback_link {	Line 4274 span.LC_feedback_link {
font-size: larger;	font-size: larger;
}	}

	table.LC_prior_tries {
	border-width: 1px;
	border-style: solid;
	border-color: gray;
	border-collapse: collapse;
	}
	table.LC_prior_tries th,
	table.LC_prior_tries td {
	border-width: 1px;
	border-style: solid;
	border-color: gray;
	padding: 3px;
	}
	table.LC_prior_tries tr.LC_correct {
	font-weight: bold;
	background: #aaffaa;
	}
	span.LC_prior_numerical {
	font-family: monospace;
	white-space: pre;
	}

	span.LC_nobreak {
	white-space: nowrap;
	}

END	END
}	}

Line 4939 sub get_course_users {	Line 5054 sub get_course_users {
$usec = 'none';	$usec = 'none';
}	}
if ($uname ne '' && $udom ne '') {	if ($uname ne '' && $udom ne '') {
if ($end < $now) {	if ($end > 0 && $end < $now) {
$status = 'previous';	$status = 'previous';
} elsif ($start > $now) {	} elsif ($start > $now) {
$status = 'future';	$status = 'future';
Line 5381 sub record_sep {	Line 5496 sub record_sep {
} else {	} else {
my @allfields;	my @allfields;
if ($env{'form.upfiletype'} eq 'semisv') {	if ($env{'form.upfiletype'} eq 'semisv') {
@allfields=split(/;/,$record);	@allfields=split(/;/,$record,-1);
} else {	} else {
@allfields=split(/\,/,$record);	@allfields=split(/\,/,$record,-1);
}	}
my $i=0;	my $i=0;
my $j;	my $j;
Line 6125 sub store_settings {	Line 6240 sub store_settings {
}	}
# Make sure these settings stick around in this session, too	# Make sure these settings stick around in this session, too
&Apache::lonnet::appenv(%AppHash);	&Apache::lonnet::appenv(%AppHash);
&Apache::lonnet::logthis(join(':',%AppHash));
return;	return;
}	}

sub restore_course_settings {	sub restore_course_settings {
return &return_settings($env{'request.course.id'},@_);	return &restore_settings($env{'request.course.id'},@_);
}	}

sub restore_settings {	sub restore_settings {
Line 6552 sub group_term {	Line 6666 sub group_term {

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;
my $curfext = (split(/\./,$file))[-1];	my $curfext = lc((split(/\./,$file))[-1]);
my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';	my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
my $embstyle = &Apache::loncommon::fileembstyle($curfext);	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
if (!(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn')) {	if (!(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn')) {

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

Removed from v.1.497
changed lines
	Added in v.1.521