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.165 and 1.186

version 1.165, 2003/12/27 23:55:10	version 1.186, 2004/03/15 22:32:37
Line 220 formname and elementname indicate the na	Line 220 formname and elementname indicate the na
the element that the results of the browsing selection are to be placed in.	the element that the results of the browsing selection are to be placed in.

Specifying 'only' will restrict the browser to displaying only files	Specifying 'only' will restrict the browser to displaying only files
with the given extension. Can be a comma seperated list.	with the given extension. Can be a comma separated list.

Specifying 'omit' will restrict the browser to NOT displaying files	Specifying 'omit' will restrict the browser to NOT displaying files
with the given extension. Can be a comma seperated list.	with the given extension. Can be a comma separated list.

=item * opensearcher(formname, elementname) [javascript]	=item * opensearcher(formname, elementname) [javascript]

Line 235 of the element the selection from the se	Line 235 of the element the selection from the se
=cut	=cut

sub browser_and_searcher_javascript {	sub browser_and_searcher_javascript {
	my $resurl=&lastresurl();
return <<END;	return <<END;
var editbrowser = null;	var editbrowser = null;
function openbrowser(formname,elementname,only,omit,titleelement) {	function openbrowser(formname,elementname,only,omit,titleelement) {
var url = '/res/?';	var url = '$resurl/?';
if (editbrowser == null) {	if (editbrowser == null) {
url += 'launch=1&';	url += 'launch=1&';
}	}
Line 283 sub browser_and_searcher_javascript {	Line 284 sub browser_and_searcher_javascript {
END	END
}	}

	sub lastresurl {
	if ($ENV{'environment.lastresurl'}) {
	return $ENV{'environment.lastresurl'}
	} else {
	return '/res';
	}
	}

	sub storeresurl {
	my $resurl=&Apache::lonnet::clutter(shift);
	unless ($resurl=~/^\/res/) { return 0; }
	$resurl=~s/\/$//;
	&Apache::lonnet::put('environment',{'lastresurl' => $resurl});
	&Apache::lonnet::appenv('environment.lastresurl' => $resurl);
	return 1;
	}

sub studentbrowser_javascript {	sub studentbrowser_javascript {
unless (	unless (
(($ENV{'request.course.id'}) &&	(($ENV{'request.course.id'}) &&
Line 574 sub help_open_topic {	Line 592 sub help_open_topic {
}	}

# Add the graphic	# Add the graphic
	my $title = &mt('Online Help');
$template .= <<"ENDTEMPLATE";	$template .= <<"ENDTEMPLATE";
<a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)" /></a>	<a href="$link" title="$title"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)" /></a>
ENDTEMPLATE	ENDTEMPLATE
if ($text ne '') { $template.='</td></tr></table>' };	if ($text ne '') { $template.='</td></tr></table>' };
return $template;	return $template;
Line 602 sub helpLatexCheatsheet {	Line 621 sub helpLatexCheatsheet {
.'</td></tr></table>';	.'</td></tr></table>';
}	}

	sub help_open_bug {
	my ($topic, $text, $stayOnPage, $width, $height) = @_;
	unless ($ENV{'user.adv'}) { return ''; }
	unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
	$text = "" if (not defined $text);
	$stayOnPage = 0 if (not defined $stayOnPage);
	if ($ENV{'browser.interface'} eq 'textual' \|\|
	$ENV{'environment.remote'} eq 'off' ) {
	$stayOnPage=1;
	}
	$width = 600 if (not defined $width);
	$height = 600 if (not defined $height);

	$topic=~s/\W+/\+/g;
	my $link='';
	my $template='';
	my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.
	&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'&component='.$topic;
	if (!$stayOnPage)
	{
	$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
	}
	else
	{
	$link = $url;
	}
	# Add the text
	if ($text ne "")
	{
	$template .=
	"<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
	"<td bgcolor='#FF5555'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
	}

	# Add the graphic
	my $title = &mt('Report a Bug');
	$template .= <<"ENDTEMPLATE";
	<a href="$link" title="$title"><image src="/adm/lonMisc/smallBug.gif" border="0" alt="(Bug: $topic)" /></a>
	ENDTEMPLATE
	if ($text ne '') { $template.='</td></tr></table>' };
	return $template;

	}

	sub help_open_faq {
	my ($topic, $text, $stayOnPage, $width, $height) = @_;
	unless ($ENV{'user.adv'}) { return ''; }
	unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
	$text = "" if (not defined $text);
	$stayOnPage = 0 if (not defined $stayOnPage);
	if ($ENV{'browser.interface'} eq 'textual' \|\|
	$ENV{'environment.remote'} eq 'off' ) {
	$stayOnPage=1;
	}
	$width = 350 if (not defined $width);
	$height = 400 if (not defined $height);

	$topic=~s/\W+/\+/g;
	my $link='';
	my $template='';
	my $url=$Apache::lonnet::perlvar{'FAQHost'}.'/fom/cache/'.$topic.'.html';
	if (!$stayOnPage)
	{
	$link = "javascript:void(open('$url', 'FAQ-O-Matic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
	}
	else
	{
	$link = $url;
	}

	# Add the text
	if ($text ne "")
	{
	$template .=
	"<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
	"<td bgcolor='#448844'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
	}

	# Add the graphic
	my $title = &mt('View the FAQ');
	$template .= <<"ENDTEMPLATE";
	<a href="$link" title="$title"><image src="/adm/lonMisc/smallFAQ.gif" border="0" alt="(FAQ: $topic)" /></a>
	ENDTEMPLATE
	if ($text ne '') { $template.='</td></tr></table>' };
	return $template;

	}

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

=pod	=pod

=item * csv_translate($text)	=item * csv_translate($text)

Translate $text to allow it to be output as a 'comma seperated values'	Translate $text to allow it to be output as a 'comma separated values'
format.	format.

=cut	=cut

	###############################################################
	###############################################################
sub csv_translate {	sub csv_translate {
my $text = shift;	my $text = shift;
$text =~ s/\"/\"\"/g;	$text =~ s/\"/\"\"/g;
Line 618 sub csv_translate {	Line 730 sub csv_translate {
return $text;	return $text;
}	}


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

	=pod

	=item * define_excel_formats

	Define some commonly used Excel cell formats.

	Currently supported formats:

	=over 4

	=item header

	=item bold

	=item h1

	=item h2

	=item h3

	=item date

	=back

	Inputs: $workbook

	Returns: $format, a hash reference.

	=cut

	###############################################################
	###############################################################
	sub define_excel_formats {
	my ($workbook) = @_;
	my $format;
	$format->{'header'} = $workbook->add_format(bold => 1,
	bottom => 1,
	align => 'center');
	$format->{'bold'} = $workbook->add_format(bold=>1);
	$format->{'h1'} = $workbook->add_format(bold=>1, size=>18);
	$format->{'h2'} = $workbook->add_format(bold=>1, size=>16);
	$format->{'h3'} = $workbook->add_format(bold=>1, size=>14);
	$format->{'date'} = $workbook->add_format(num_format=>
	'mmm d yyyy hh:mm AM/PM');
	return $format;
	}

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

=pod	=pod

=item * change_content_javascript():	=item * change_content_javascript():
Line 726 sub get_domains {	Line 892 sub get_domains {
my @domains;	my @domains;
my %seen;	my %seen;
foreach (sort values(%Apache::lonnet::hostdom)) {	foreach (sort values(%Apache::lonnet::hostdom)) {
push (@domains,$_) unless $seen{$_}++;	push (@domains,$_) unless $seen{$_}++;
}	}
return @domains;	return @domains;
}	}

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

	sub domain_select {
	my ($name,$value,$multiple)=@_;
	my %domains=map {
	$_ => $_.' '.$Apache::lonnet::domaindescription{$_}
	} &get_domains;
	if ($multiple) {
	$domains{''}=&mt('Any domain');
	return &multiple_select_form($name,$value,%domains);
	} else {
	return &select_form($name,$value,%domains);
	}
	}

	sub multiple_select_form {
	my ($name,$value,%hash)=@_;
	my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);
	my $output='';
	my $size =(scalar keys %hash<4?scalar keys %hash:4);
	$output.="\n<select name='$name' size='$size' multiple='1'>";
	foreach (sort keys %hash) {
	$output.="<option name='$_'".
	($selected{$_}?' selected="1"' :'').">$hash{$_}</option>\n";
	}
	$output.="</select>\n";
	return $output;
	}

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

=pod	=pod
Line 762 sub select_form {	Line 957 sub select_form {
return $selectform;	return $selectform;
}	}

	sub gradeleveldescription {
	my $gradelevel=shift;
	my %gradelevels=(0 => 'Not specified',
	1 => 'Grade 1',
	2 => 'Grade 2',
	3 => 'Grade 3',
	4 => 'Grade 4',
	5 => 'Grade 5',
	6 => 'Grade 6',
	7 => 'Grade 7',
	8 => 'Grade 8',
	9 => 'Grade 9',
	10 => 'Grade 10',
	11 => 'Grade 11',
	12 => 'Grade 12',
	13 => 'Grade 13',
	14 => '100 Level',
	15 => '200 Level',
	16 => '300 Level',
	17 => '400 Level',
	18 => 'Graduate Level');
	return &mt($gradelevels{$gradelevel});
	}

sub select_level_form {	sub select_level_form {
my ($deflevel,$name)=@_;	my ($deflevel,$name)=@_;
unless ($deflevel) { $deflevel=0; }	unless ($deflevel) { $deflevel=0; }
return &select_form($deflevel,$name,(	my $selectform = "<select name=\"$name\" size=\"1\">\n";
0 => 'Not specified',	for (my $i=0; $i<=18; $i++) {
1 => 'Grade 1',	$selectform.="<option value=\"$i\" ".
2 => 'Grade 2',	($i==$deflevel ? 'selected' : '').
3 => 'Grade 3',	">".&gradeleveldescription($i)."</option>\n";
4 => 'Grade 4',	}
5 => 'Grade 5',	$selectform.="</select>";
6 => 'Grade 6',	return $selectform;
7 => 'Grade 7',
8 => 'Grade 8',
9 => 'Grade 9',
10 => 'Grade 10',
11 => 'Grade 11',
12 => 'Grade 12',
13 => 'Grade 13',
14 => '100 Level',
15 => '200 Level',
16 => '300 Level',
17 => '400 Level',
18 => 'Graduate Level'));
}	}

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

=pod	=pod
Line 1011 END	Line 1219 END
}	}

my $radioval = "'nochange'";	my $radioval = "'nochange'";
	if (exists($in{'curr_authtype'}) &&
	defined($in{'curr_authtype'}) &&
	$in{'curr_authtype'} ne '') {
	$radioval = "'$in{'curr_authtype'}arg'";
	}
my $argfield = 'null';	my $argfield = 'null';
if ( grep/^mode$/,(keys %in) ) {	if ( grep/^mode$/,(keys %in) ) {
if ($in{'mode'} eq 'modifycourse') {	if ($in{'mode'} eq 'modifycourse') {
Line 1508 sub noteswrapper {	Line 1721 sub noteswrapper {
# ------------------------------------------------------------- Aboutme Wrapper	# ------------------------------------------------------------- Aboutme Wrapper

sub aboutmewrapper {	sub aboutmewrapper {
my ($link,$username,$domain)=@_;	my ($link,$username,$domain,$target)=@_;
return "<a href='/adm/$domain/$username/aboutme'>$link</a>";	return "<a href='/adm/$domain/$username/aboutme'".
	($target?" target='$target'":'').">$link</a>";
}	}

# ------------------------------------------------------------ Syllabus Wrapper	# ------------------------------------------------------------ Syllabus Wrapper
Line 1587 returns description of a specified copyr	Line 1801 returns description of a specified copyr
=cut	=cut

sub copyrightdescription {	sub copyrightdescription {
return $cprtag{shift(@_)};	return &mt($cprtag{shift(@_)});
}	}

=pod	=pod
Line 1627 sub fileembstyle {	Line 1841 sub fileembstyle {
return $fe{lc(shift(@_))};	return $fe{lc(shift(@_))};
}	}


	sub filecategoryselect {
	my ($name,$value)=@_;
	return &select_form($name,$value,
	'' => &mt('Any category'),
	map { $_,$_ } sort(keys(%category_extensions)));
	}

=pod	=pod

=item * filedescription()	=item * filedescription()
Line 1636 returns description for a specified file	Line 1858 returns description for a specified file
=cut	=cut

sub filedescription {	sub filedescription {
return $fd{lc(shift(@_))};	return &mt($fd{lc(shift(@_))});
}	}

=pod	=pod
Line 1650 extra formatting	Line 1872 extra formatting

sub filedescriptionex {	sub filedescriptionex {
my $ex=shift;	my $ex=shift;
return '.'.$ex.' '.$fd{lc($ex)};	return '.'.$ex.' '.&mt($fd{lc($ex)});
}	}

# End of .tab access	# End of .tab access
Line 1685 sub display_languages {	Line 1907 sub display_languages {

sub preferred_languages {	sub preferred_languages {
my @languages=();	my @languages=();
if ($ENV{'environment.languages'}) {
@languages=split(/\s(\,\|\;\|\:)\s/,$ENV{'environment.languages'});
}
if ($ENV{'course.'.$ENV{'request.course.id'}.'.languages'}) {	if ($ENV{'course.'.$ENV{'request.course.id'}.'.languages'}) {
@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,	@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,
$ENV{'course.'.$ENV{'request.course.id'}.'.languages'}));	$ENV{'course.'.$ENV{'request.course.id'}.'.languages'}));
}	}
	if ($ENV{'environment.languages'}) {
	@languages=split(/\s(\,\|\;\|\:)\s/,$ENV{'environment.languages'});
	}
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];	my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
if ($browser) {	if ($browser) {
@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$browser));	@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$browser));
Line 1871 show a snapshot of what student was look	Line 2093 show a snapshot of what student was look
=cut	=cut

sub get_student_view {	sub get_student_view {
my ($symb,$username,$domain,$courseid,$target) = @_;	my ($symb,$username,$domain,$courseid,$target,$moreenv) = @_;
my ($map,$id,$feedurl) = &Apache::lonnet::decode_symb($symb);	my ($map,$id,$feedurl) = &Apache::lonnet::decode_symb($symb);
my (%old,%moreenv);	my (%form);
my @elements=('symb','courseid','domain','username');	my @elements=('symb','courseid','domain','username');
foreach my $element (@elements) {	foreach my $element (@elements) {
$old{$element}=$ENV{'form.grade_'.$element};	$form{'grade_'.$element}=eval '$'.$element #'
$moreenv{'form.grade_'.$element}=eval '$'.$element #'
}	}
if ($target eq 'tex') {$moreenv{'form.grade_target'} = 'tex';}	if (defined($moreenv)) {
&Apache::lonnet::appenv(%moreenv);	%form=(%form,%{$moreenv});
$feedurl=&Apache::lonnet::clutter($feedurl);
my $userview=&Apache::lonnet::ssi_body($feedurl);
&Apache::lonnet::delenv('form.grade_');
foreach my $element (@elements) {
$ENV{'form.grade_'.$element}=$old{$element};
}	}
	if ($target eq 'tex') {$form{'grade_target'} = 'tex';}
	$feedurl=&Apache::lonnet::clutter($feedurl);
	my $userview=&Apache::lonnet::ssi_body($feedurl,%form);
$userview=~s/\<body[^\>]*\>//gi;	$userview=~s/\<body[^\>]*\>//gi;
$userview=~s/\<\/body\>//gi;	$userview=~s/\<\/body\>//gi;
$userview=~s/\<html\>//gi;	$userview=~s/\<html\>//gi;
Line 1909 show a snapshot of how student was answe	Line 2128 show a snapshot of how student was answe
sub get_student_answers {	sub get_student_answers {
my ($symb,$username,$domain,$courseid,%form) = @_;	my ($symb,$username,$domain,$courseid,%form) = @_;
my ($map,$id,$feedurl) = &Apache::lonnet::decode_symb($symb);	my ($map,$id,$feedurl) = &Apache::lonnet::decode_symb($symb);
my (%old,%moreenv);	my (%moreenv);
my @elements=('symb','courseid','domain','username');	my @elements=('symb','courseid','domain','username');
foreach my $element (@elements) {	foreach my $element (@elements) {
$old{$element}=$ENV{'form.grade_'.$element};	$moreenv{'grade_'.$element}=eval '$'.$element #'
$moreenv{'form.grade_'.$element}=eval '$'.$element #'
}
$moreenv{'form.grade_target'}='answer';
&Apache::lonnet::appenv(%moreenv);
my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%form);
&Apache::lonnet::delenv('form.grade_');
foreach my $element (@elements) {
$ENV{'form.grade_'.$element}=$old{$element};
}	}
	$moreenv{'grade_target'}='answer';
	%moreenv=(%form,%moreenv);
	my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
return $userview;	return $userview;
}	}

Line 2137 other decorations will be returned.	Line 2351 other decorations will be returned.
sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg)=@_;	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg)=@_;
$title=&mt($title);	$title=&mt($title);
unless ($function) {	$function = &get_users_function() if (!$function);
$function='student';
if ($ENV{'request.role'}=~/^(cc\|in\|ta\|ep)/) {
$function='coordinator';
}
if ($ENV{'request.role'}=~/^(su\|dc\|ad\|li)/) {
$function='admin';
}
if (($ENV{'request.role'}=~/^(au\|ca)/) \|\|
($ENV{'REQUEST_URI'}=~/^(\/priv\|\~)/)) {
$function='author';
}
}
my $img=&designparm($function.'.img',$domain);	my $img=&designparm($function.'.img',$domain);
my $pgbg=&designparm($function.'.pgbg',$domain);	my $pgbg=&designparm($function.'.pgbg',$domain);
my $tabbg=&designparm($function.'.tabbg',$domain);	my $tabbg=&designparm($function.'.tabbg',$domain);
Line 2237 ENDBODY	Line 2439 ENDBODY

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

	=pod

	=item get_users_function

	Used by &bodytag to determine the current users primary role.
	Returns either 'student','coordinator','admin', or 'author'.

	=cut

	###############################################
	sub get_users_function {
	my $function = 'student';
	if ($ENV{'request.role'}=~/^(cc\|in\|ta\|ep)/) {
	$function='coordinator';
	}
	if ($ENV{'request.role'}=~/^(su\|dc\|ad\|li)/) {
	$function='admin';
	}
	if (($ENV{'request.role'}=~/^(au\|ca)/) \|\|
	($ENV{'REQUEST_URI'}=~/^(\/priv\|\~)/)) {
	$function='author';
	}
	return $function;
	}

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

sub get_posted_cgi {	sub get_posted_cgi {
my $r=shift;	my $r=shift;

Line 2371 sub no_cache {	Line 2600 sub no_cache {
}	}

sub content_type {	sub content_type {
my ($r,$type,$charset) = @_;	my ($r,$type,$charset) = @_;
unless ($charset) {	unless ($charset) {
$charset=&Apache::lonlocal::current_encoding;	$charset=&Apache::lonlocal::current_encoding;
}	}
$r->content_type($type.($charset?'; charset='.$charset:''));	if ($charset) { $type.='; charset='.$charset; }
	if ($r) {
	$r->content_type($type);
	} else {
	print("Content-type: $type\n\n");
	}
}	}

=pod	=pod
Line 2531 sub record_sep {	Line 2765 sub record_sep {
}	}
} elsif ($ENV{'form.upfiletype'} eq 'tab') {	} elsif ($ENV{'form.upfiletype'} eq 'tab') {
my $i=0;	my $i=0;
foreach (split(/\t+/,$record)) {	foreach (split(/\t/,$record)) {
my $field=$_;	my $field=$_;
$field=~s/^(\"\|\')//;	$field=~s/^(\"\|\')//;
$field=~s/(\"\|\')$//;	$field=~s/(\"\|\')$//;
Line 2639 Prints a table to create associations be	Line 2873 Prints a table to create associations be

$r is an Apache Request ref,	$r is an Apache Request ref,
$records is an arrayref from &Apache::loncommon::upfile_record_sep,	$records is an arrayref from &Apache::loncommon::upfile_record_sep,
$d is an array of 2 element arrays (internal name, displayed name)	$d is an array of 2 element arrays (internal name, displayed name,defaultcol)

=cut	=cut

Line 2654 sub csv_print_select_table {	Line 2888 sub csv_print_select_table {
'<th>'.&mt('Attribute').'</th>'.	'<th>'.&mt('Attribute').'</th>'.
'<th>'.&mt('Column').'</th></tr>'."\n");	'<th>'.&mt('Column').'</th></tr>'."\n");
foreach (@$d) {	foreach (@$d) {
my ($value,$display)=@{ $_ };	my ($value,$display,$defaultcol)=@{ $_ };
$r->print('<tr><td>'.$display.'</td>');	$r->print('<tr><td>'.$display.'</td>');

$r->print('<td><select name=f'.$i.	$r->print('<td><select name=f'.$i.
' onchange="javascript:flip(this.form,'.$i.');">');	' onchange="javascript:flip(this.form,'.$i.');">');
$r->print('<option value="none"></option>');	$r->print('<option value="none"></option>');
foreach (sort({$a <=> $b} keys(%sone))) {	foreach (sort({$a <=> $b} keys(%sone))) {
$r->print('<option value="'.$_.'">Column '.($_+1).'</option>');	$r->print('<option value="'.$_.'"'.
	($_ eq $defaultcol ? ' selected ' : '').
	'>Column '.($_+1).'</option>');
}	}
$r->print('</select></td></tr>'."\n");	$r->print('</select></td></tr>'."\n");
$i++;	$i++;
Line 2702 sub csv_samples_select_table {	Line 2938 sub csv_samples_select_table {
$r->print('<tr><td><select name="f'.$i.'"'.	$r->print('<tr><td><select name="f'.$i.'"'.
' onchange="javascript:flip(this.form,'.$i.');">');	' onchange="javascript:flip(this.form,'.$i.');">');
foreach (@$d) {	foreach (@$d) {
my ($value,$display)=@{ $_ };	my ($value,$display,$defaultcol)=@{ $_ };
$r->print('<option value="'.$value.'">'.$display.'</option>');	$r->print('<option value="'.$value.'"'.
	($i eq $defaultcol ? ' selected ':'').'>'.
	$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"); }
Line 2828 If $Max is < any data point, the graph w	Line 3066 If $Max is < any data point, the graph w
=item $colors: array ref holding the colors to be used for the data sets when	=item $colors: array ref holding the colors to be used for the data sets when
they are plotted. If undefined, default values will be used.	they are plotted. If undefined, default values will be used.

	=item $labels: array ref holding the labels to use on the x-axis for the bars.

=item @Values: An array of array references. Each array reference holds data	=item @Values: An array of array references. Each array reference holds data
to be plotted in a stacked bar chart.	to be plotted in a stacked bar chart.

Line 2843 information for the plot.	Line 3083 information for the plot.
############################################################	############################################################
############################################################	############################################################
sub DrawBarGraph {	sub DrawBarGraph {
my ($Title,$xlabel,$ylabel,$Max,$colors,@Values)=@_;	my ($Title,$xlabel,$ylabel,$Max,$colors,$labels,@Values)=@_;
#	#
if (! defined($colors)) {	if (! defined($colors)) {
$colors = ['#33ff00',	$colors = ['#33ff00',
Line 2886 sub DrawBarGraph {	Line 3126 sub DrawBarGraph {
}	}
#	#
my @Labels;	my @Labels;
for (my $i=0;$i<@{$Values[0]};$i++) {	if (defined($labels)) {
push (@Labels,$i+1);	@Labels = @$labels;
	} else {
	for (my $i=0;$i<@{$Values[0]};$i++) {
	push (@Labels,$i+1);
	}
}	}
#	#
$Max = 1 if ($Max < 1);	$Max = 1 if ($Max < 1);
Line 2946 plotted in. If undefined, default value	Line 3190 plotted in. If undefined, default value
=item $Xlabels: Array ref containing the labels to be used for the X-axis.	=item $Xlabels: Array ref containing the labels to be used for the X-axis.

=item $Ydata: Array ref containing Array refs.	=item $Ydata: Array ref containing Array refs.
Each of the contained arrays will be plotted as a seperate curve.	Each of the contained arrays will be plotted as a separate curve.

=item %Values: hash indicating or overriding any default values which are	=item %Values: hash indicating or overriding any default values which are
passed to graph.png.	passed to graph.png.
Line 3194 sub store_course_settings {	Line 3438 sub store_course_settings {
my %SaveHash;	my %SaveHash;
my %AppHash;	my %AppHash;
while (my ($setting,$type) = each(%$Settings)) {	while (my ($setting,$type) = each(%$Settings)) {
my $basename = 'env.internal.'.$prefix.'.'.$setting;	my $basename = 'internal.'.$prefix.'.'.$setting;
my $envname = 'course.'.$courseid.'.'.$basename;	my $envname = 'course.'.$courseid.'.'.$basename;
if (exists($ENV{'form.'.$setting})) {	if (exists($ENV{'form.'.$setting})) {
# Save this value away	# Save this value away
Line 3239 sub restore_course_settings {	Line 3483 sub restore_course_settings {
my ($prefix,$Settings) = @_;	my ($prefix,$Settings) = @_;
while (my ($setting,$type) = each(%$Settings)) {	while (my ($setting,$type) = each(%$Settings)) {
next if (exists($ENV{'form.'.$setting}));	next if (exists($ENV{'form.'.$setting}));
my $envname = 'course.'.$courseid.'.env.internal.'.$prefix.	my $envname = 'course.'.$courseid.'.internal.'.$prefix.
'.'.$setting;	'.'.$setting;
if (exists($ENV{$envname})) {	if (exists($ENV{$envname})) {
if ($type eq 'scalar') {	if ($type eq 'scalar') {
Line 3270 sub propath {	Line 3514 sub propath {

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;
my @file_ext = split(/\./,$file);	my $curfext = (split(/\./,$file))[-1];
my $curfext = $file_ext[-1];	my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
my $iconname="unknown.gif";
my $embstyle = &Apache::loncommon::fileembstyle($curfext);	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
# The unless conditional that follows is a bit of overkill	if (!(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn')) {
$iconname = $curfext.".gif" unless	if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn');	$Apache::lonnet::perlvar{'lonIconsURL'}.'/'.
return $Apache::lonnet::perlvar{'lonIconsURL'}."/$iconname";	$curfext.".gif") {
	$iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/'.
	$curfext.".gif";
	}
	}
	return $iconname;
}	}

=pod	=pod

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

Removed from v.1.165
changed lines
	Added in v.1.186