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.143 and 1.144

version 1.143, 2003/11/04 21:21:35	version 1.144, 2003/11/07 21:04:37
Line 91 my %category_extensions;	Line 91 my %category_extensions;
my %designhash;	my %designhash;

# ---------------------------------------------- Thesaurus variables	# ---------------------------------------------- Thesaurus variables
	#
# FIXME: I don't think it's necessary to document these things;	# %Keywords:
# they're privately used - Jeremy	# A hash used by &keyword to determine if a word is considered a keyword.
	# $thesaurus_db_file
=pod	# Scalar containing the full path to the thesaurus database.

=over 4

=item * %Keywords

A hash used by &keyword to determine if a word is considered a keyword.

=item * $thesaurus_db_file

Scalar containing the full path to the thesaurus database.

=back

=cut

my %Keywords;	my %Keywords;
my $thesaurus_db_file;	my $thesaurus_db_file;

# ----------------------------------------------------------------------- BEGIN	#
	# Initialize values from language.tab, copyright.tab, filetypes.tab,
# FIXME: I don't think this needs to be documented, it prepares	# thesaurus.tab, and filecategories.tab.
# private data structures - Jeremy	#
=pod

=head1 General Subroutines

=over 4

=item * BEGIN()

Initialize values from language.tab, copyright.tab, filetypes.tab,
thesaurus.tab, and filecategories.tab.

=back

=cut

# ----------------------------------------------------------------------- BEGIN

BEGIN {	BEGIN {
# Variable initialization	# Variable initialization
$thesaurus_db_file = $Apache::lonnet::perlvar{'lonTabDir'}."/thesaurus.db";	$thesaurus_db_file = $Apache::lonnet::perlvar{'lonTabDir'}."/thesaurus.db";
Line 235 BEGIN {	Line 204 BEGIN {

=pod	=pod

	=head1 General Subroutines

	=over 4

=head1 HTML and Javascript Functions	=head1 HTML and Javascript Functions

=over 4	=over 4
Line 1088 END	Line 1061 END

sub authform_authorwarning{	sub authform_authorwarning{
my $result='';	my $result='';
$result=<<"END";	$result='<i>'.
<i>As a general rule, only authors or co-authors should be filesystem	&mt('As a general rule, only authors or co-authors should be '.
authenticated (which allows access to the server filesystem).</i>	'filesystem authenticated '.
END	'(which allows access to the server filesystem).')."</i>\n";
return $result;	return $result;
}	}

Line 1101 sub authform_nochange{	Line 1074 sub authform_nochange{
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my $result='';	my $result = &mt('[_1] Do not change login data',
$result.=<<"END";	'<input type="radio" name="login" value="nochange" '.
<input type="radio" name="login" value="nochange" checked="checked"	'checked="checked" onclick="'.
onclick="javascript:changed_radio('nochange',$in{'formname'});" />	"javascript:changed_radio('nochange',$in{'formname'});".'" />');
Do not change login data
END
return $result;	return $result;
}	}

Line 1117 sub authform_kerberos{	Line 1088 sub authform_kerberos{
kerb_def_auth => 'krb4',	kerb_def_auth => 'krb4',
@_,	@_,
);	);
my $result='';	my ($check4,$check5);
my $check4;
my $check5;
if ($in{'kerb_def_auth'} eq 'krb5') {	if ($in{'kerb_def_auth'} eq 'krb5') {
$check5 = " checked=\"on\"";	$check5 = " checked=\"on\"";
} else {	} else {
$check4 = " checked=\"on\"";	$check4 = " checked=\"on\"";
}	}
$result.=<<"END";	my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
<input type="radio" name="login" value="krb"	my $result .= &mt
onclick="javascript:changed_radio('krb',$in{'formname'});"	('[_1] Kerberos authenticated with domain [_2] '.
onchange="javascript:changed_radio('krb',$in{'formname'});" />	'[_3] Version 4 [_4] Version 5',
Kerberos authenticated with domain	'<input type="radio" name="login" value="krb" '.
<input type="text" size="10" name="krbarg" value="$in{'kerb_def_dom'}"	'onclick="'.$jscall.'" onchange="'.$jscall.'" />',
onchange="javascript:changed_text('krb',$in{'formname'});" />	'<input type="text" size="10" name="krbarg" '.
<input type="radio" name="krbver" value="4" $check4 />Version 4	'value="'.$in{'kerb_def_dom'}.'" '.
<input type="radio" name="krbver" value="5" $check5 />Version 5	'onchange="'.$jscall.'" />',
END	'<input type="radio" name="krbver" value="4" '.$check4.' />',
	'<input type="radio" name="krbver" value="5" '.$check5.' />');
return $result;	return $result;
}	}

Line 1144 sub authform_internal{	Line 1114 sub authform_internal{
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my $result='';	my $jscall = "javascript:changed_radio('int',$args{'formname'});";
$result.=<<"END";	my $result.=&mt
<input type="radio" name="login" value="int"	('[_1] Internally authenticated (with initial password [_2])',
onchange="javascript:changed_radio('int',$args{'formname'});"	'<input type="radio" name="login" value="int" '.
onclick="javascript:changed_radio('int',$args{'formname'});" />	'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
Internally authenticated (with initial password	'<input type="text" size="10" name="intarg" value="" '.
<input type="text" size="10" name="intarg" value=""	'onchange="'.$jscall.'" />');
onchange="javascript:changed_text('int',$args{'formname'});" />)
END
return $result;	return $result;
}	}

Line 1162 sub authform_local{	Line 1130 sub authform_local{
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my $result='';	my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
$result.=<<"END";	my $result.=&mt('[_1] Local Authentication with arguement [_2]',
<input type="radio" name="login" value="loc"	'<input type="radio" name="login" value="loc" '.
onchange="javascript:changed_radio('loc',$in{'formname'});"	'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
onclick="javascript:changed_radio('loc',$in{'formname'});" />	'<input type="text" size="10" name="locarg" value="" '.
Local Authentication with argument	'onchange="'.$jscall.'" />');
<input type="text" size="10" name="locarg" value=""
onchange="javascript:changed_text('loc',$in{'formname'});" />
END
return $result;	return $result;
}	}

Line 1180 sub authform_filesystem{	Line 1145 sub authform_filesystem{
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my $result='';	my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
$result.=<<"END";	my $result.= &mt
<input type="radio" name="login" value="fsys"	('[_1] Filesystem Authenticated (with initial password [_2])',
onchange="javascript:changed_radio('fsys',$in{'formname'});"	'<input type="radio" name="login" value="fsys" '.
onclick="javascript:changed_radio('fsys',$in{'formname'});" />	'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
Filesystem authenticated (with initial password	'<input type="text" size="10" name="fsysarg" value="" '.
<input type="text" size="10" name="fsysarg" value=""	'onchange="'.$jscall.'" />');
onchange="javascript:changed_text('fsys',$in{'formname'});">)
END
return $result;	return $result;
}	}

Line 2510 sub record_sep {	Line 2473 sub record_sep {
return %components;	return %components;
}	}

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

=pod	=pod

=item * upfile_select_html()	=item * upfile_select_html()

return HTML code to select file and specify its type	Return HTML code to select a file from the users machine and specify
	the file type.

=cut	=cut

	######################################################
	######################################################
sub upfile_select_html {	sub upfile_select_html {
return (<<'ENDUPFORM');	my %Types = (
<input type="file" name="upfile" size="50" />	csv => &mt('CSV (comma separated values, spreadsheet)'),
<br />Type: <select name="upfiletype">	space => &mt('Space separated'),
<option value="csv">CSV (comma separated values, spreadsheet)</option>	tab => &mt('Tabulator separated'),
<option value="space">Space separated</option>	# xml => &mt('HTML/XML'),
<option value="tab">Tabulator separated</option>	);
<option value="xml">HTML/XML</option>	my $Str = '<input type="file" name="upfile" size="50" />'.
</select>	'<br />Type: <select name="upfiletype">';
ENDUPFORM	foreach my $type (sort(keys(%Types))) {
	$Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
	}
	$Str .= "</select>\n";
	return $Str;
}	}

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

=pod	=pod

=item * csv_print_samples($r,$records)	=item * csv_print_samples($r,$records)
Line 2540 Apache Request ref, $records is an array	Line 2516 Apache Request ref, $records is an array

=cut	=cut

	######################################################
	######################################################
sub csv_print_samples {	sub csv_print_samples {
my ($r,$records) = @_;	my ($r,$records) = @_;
my (%sone,%stwo,%sthree);	my (%sone,%stwo,%sthree);
%sone=&record_sep($$records[0]);	%sone=&record_sep($$records[0]);
if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}	if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}	if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
	#
$r->print('Samples<br /><table border="2"><tr>');	$r->print(&mt('Samples').'<br /><table border="2"><tr>');
foreach (sort({$a <=> $b} keys(%sone))) { $r->print('<th>Column '.($_+1).'</th>'); }	foreach (sort({$a <=> $b} keys(%sone))) {
	$r->print('<th>'.&mt('Column [_1]',($_+1)).'</th>'); }
$r->print('</tr>');	$r->print('</tr>');
foreach my $hash (\%sone,\%stwo,\%sthree) {	foreach my $hash (\%sone,\%stwo,\%sthree) {
$r->print('<tr>');	$r->print('<tr>');
Line 2562 sub csv_print_samples {	Line 2541 sub csv_print_samples {
$r->print('</tr></table><br />'."\n");	$r->print('</tr></table><br />'."\n");
}	}

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

=pod	=pod

=item * csv_print_select_table($r,$records,$d)	=item * csv_print_select_table($r,$records,$d)

Prints a table to create associations between values and table columns.	Prints a table to create associations between values and table columns.

$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)

=cut	=cut

	######################################################
	######################################################
sub csv_print_select_table {	sub csv_print_select_table {
my ($r,$records,$d) = @_;	my ($r,$records,$d) = @_;
my $i=0;my %sone;	my $i=0;my %sone;
%sone=&record_sep($$records[0]);	%sone=&record_sep($$records[0]);
$r->print('Associate columns with student attributes.'."\n".	$r->print(&mt('Associate columns with student attributes.')."\n".
'<table border="2"><tr><th>Attribute</th><th>Column</th></tr>'."\n");	'<table border="2"><tr>'.
	'<th>'.&mt('Attribute').'</th>'.
	'<th>'.&mt('Column').'</th></tr>'."\n");
foreach (@$d) {	foreach (@$d) {
my ($value,$display)=@{ $_ };	my ($value,$display)=@{ $_ };
$r->print('<tr><td>'.$display.'</td>');	$r->print('<tr><td>'.$display.'</td>');
Line 2596 sub csv_print_select_table {	Line 2583 sub csv_print_select_table {
return $i;	return $i;
}	}

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

=pod	=pod

=item * csv_samples_select_table($r,$records,$d)	=item * csv_samples_select_table($r,$records,$d)
Line 2608 $d is an array of 2 element arrays (inte	Line 2598 $d is an array of 2 element arrays (inte

=cut	=cut

	######################################################
	######################################################
sub csv_samples_select_table {	sub csv_samples_select_table {
my ($r,$records,$d) = @_;	my ($r,$records,$d) = @_;
my %sone; my %stwo; my %sthree;	my %sone; my %stwo; my %sthree;
my $i=0;	my $i=0;
	#
$r->print('<table border=2><tr><th>Field</th><th>Samples</th></tr>');	$r->print('<table border=2><tr><th>'.
	&mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
%sone=&record_sep($$records[0]);	%sone=&record_sep($$records[0]);
if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}	if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}	if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
	#
foreach (sort keys %sone) {	foreach (sort keys %sone) {
$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)=@{ $_ };
$r->print('<option value='.$value.'>'.$display.'</option>');	$r->print('<option value="'.$value.'">'.$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 2636 sub csv_samples_select_table {	Line 2629 sub csv_samples_select_table {
return($i);	return($i);
}	}

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

=pod	=pod

=item clean_excel_name($name)	=item clean_excel_name($name)
Line 2644 Returns a replacement for $name which do	Line 2640 Returns a replacement for $name which do

=cut	=cut

	######################################################
	######################################################
sub clean_excel_name {	sub clean_excel_name {
my ($name) = @_;	my ($name) = @_;
$name =~ s/[:\*\?\/\\]//g;	$name =~ s/[:\*\?\/\\]//g;

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

Removed from v.1.143
changed lines
	Added in v.1.144