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.926 and 1.991

version 1.926, 2009/12/08 14:44:17	version 1.991, 2010/12/30 19:35:28
Line 483 ENDAUTHORBRW	Line 483 ENDAUTHORBRW

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;	my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
my $wintitle = &mt('Course Browser');	my $wintitle = 'Course_Browser';
if ($crstype ne '') {	if ($crstype eq 'Community') {
$wintitle = &mt($crstype);	$wintitle = 'Community_Browser';
}	}
my $id_functions = &javascript_index_functions();	my $id_functions = &javascript_index_functions();
my $output = '	my $output = '
Line 900 sub select_language {	Line 900 sub select_language {
$langchoices{$code} = &plainlanguagedescription($id);	$langchoices{$code} = &plainlanguagedescription($id);
}	}
}	}
return &select_form($selected,$name,%langchoices);	return &select_form($selected,$name,\%langchoices);
}	}

=pod	=pod
Line 1072 END	Line 1072 END

=pod	=pod

=item * &help_open_topic($topic,$text,$stayOnPage,$width,$height)	=item * &help_open_topic($topic,$text,$stayOnPage,$width,$height,$imgid)

Returns a string corresponding to an HTML link to the given help	Returns a string corresponding to an HTML link to the given help
$topic, where $topic corresponds to the name of a .tex file in	$topic, where $topic corresponds to the name of a .tex file in
Line 1090 a new window using Javascript. (Default	Line 1090 a new window using Javascript. (Default

$width and $height are optional numerical parameters that will	$width and $height are optional numerical parameters that will
override the width and height of the popped up window, which may	override the width and height of the popped up window, which may
be useful for certain help topics with big pictures included.	be useful for certain help topics with big pictures included.

	$imgid is the id of the img tag used for the help icon. This may be
	used in a javascript call to switch the image src. See
	lonhtmlcommon::htmlareaselectactive() for an example.

=cut	=cut

sub help_open_topic {	sub help_open_topic {
my ($topic, $text, $stayOnPage, $width, $height) = @_;	my ($topic, $text, $stayOnPage, $width, $height, $imgid) = @_;
$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);	$stayOnPage = 0 if (not defined $stayOnPage);
$width = 350 if (not defined $width);	$width = 350 if (not defined $width);
Line 1124 sub help_open_topic {	Line 1128 sub help_open_topic {
# (Always) Add the graphic	# (Always) Add the graphic
my $title = &mt('Online Help');	my $title = &mt('Online Help');
my $helpicon=&lonhttpdurl("/adm/help/help.png");	my $helpicon=&lonhttpdurl("/adm/help/help.png");
	if ($imgid ne '') {
	$imgid = ' id="'.$imgid.'"';
	}
$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'	$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
.'<img src="'.$helpicon.'" border="0"'	.'<img src="'.$helpicon.'" border="0"'
.' alt="'.&mt('Help: [_1]',$topic).'"'	.' alt="'.&mt('Help: [_1]',$topic).'"'
.' title="'.$title.'"'	.' title="'.$title.'" style="vertical-align:middle;"'.$imgid
.' /></a>';	.' /></a>';
if ($text ne "") {	if ($text ne "") {
$template.='</span>';	$template.='</span>';
Line 1202 ENDOUTPUT	Line 1209 ENDOUTPUT
sub help_open_menu {	sub help_open_menu {
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)	my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
= @_;	= @_;
$stayOnPage = 0 if (not defined $stayOnPage);	$stayOnPage = 1;
# only use pop-up help (stayOnPage == 0)
# if environment.remote is on (using remote control UI)
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
}
my $output;	my $output;
if ($component_help) {	if ($component_help) {
if (!$text) {	if (!$text) {
Line 1228 sub help_open_menu {	Line 1230 sub help_open_menu {
sub top_nav_help {	sub top_nav_help {
my ($text) = @_;	my ($text) = @_;
$text = &mt($text);	$text = &mt($text);
my $stay_on_page =	my $stay_on_page = 1;
($env{'environment.remote'} eq 'off' );
my $link = ($stay_on_page) ? "javascript:helpMenu('display')"	my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
: "javascript:helpMenu('open')";	: "javascript:helpMenu('open')";
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);	my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
Line 1244 END	Line 1246 END

sub help_menu_js {	sub help_menu_js {
my ($text) = @_;	my ($text) = @_;
	my $stayOnPage = 1;
my $stayOnPage =
($env{'environment.remote'} eq 'off' );

my $width = 620;	my $width = 620;
my $height = 600;	my $height = 600;
my $helptopic=&general_help();	my $helptopic=&general_help();
Line 1304 sub help_open_bug {	Line 1303 sub help_open_bug {
unless ($env{'user.adv'}) { return ''; }	unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }	unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;	$stayOnPage=1;
}
$width = 600 if (not defined $width);	$width = 600 if (not defined $width);
$height = 600 if (not defined $height);	$height = 600 if (not defined $height);

Line 1348 sub help_open_faq {	Line 1344 sub help_open_faq {
unless ($env{'user.adv'}) { return ''; }	unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }	unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;	$stayOnPage=1;
}
$width = 350 if (not defined $width);	$width = 350 if (not defined $width);
$height = 400 if (not defined $height);	$height = 400 if (not defined $height);

Line 1719 sub create_workbook {	Line 1712 sub create_workbook {
my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);	my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
if (! defined($workbook)) {	if (! defined($workbook)) {
$r->log_error("Error creating excel spreadsheet $filename: $!");	$r->log_error("Error creating excel spreadsheet $filename: $!");
$r->print('<p>'.&mt("Unable to create new Excel file. ".	$r->print(
"This error has been logged. ".	'<p class="LC_error">'
"Please alert your LON-CAPA administrator").	.&mt('Problems occurred in creating the new Excel file.')
'</p>');	.' '.&mt('This error has been logged.')
	.' '.&mt('Please alert your LON-CAPA administrator.')
	.'</p>'
	);
return (undef);	return (undef);
}	}
#	#
Line 1762 sub create_text_file {	Line 1758 sub create_text_file {
$fh = Apache::File->new('>/home/httpd'.$filename);	$fh = Apache::File->new('>/home/httpd'.$filename);
if (! defined($fh)) {	if (! defined($fh)) {
$r->log_error("Couldn't open $filename for output $!");	$r->log_error("Couldn't open $filename for output $!");
$r->print(&mt('Problems occurred in creating the output file. '	$r->print(
.'This error has been logged. '	'<p class="LC_error">'
.'Please alert your LON-CAPA administrator.'));	.&mt('Problems occurred in creating the output file.')
	.' '.&mt('This error has been logged.')
	.' '.&mt('Please alert your LON-CAPA administrator.')
	.'</p>'
	);
}	}
return ($fh,$filename)	return ($fh,$filename)
}	}
Line 1793 sub domain_select {	Line 1793 sub domain_select {
return &multiple_select_form($name,$value,4,\%domains);	return &multiple_select_form($name,$value,4,\%domains);
} else {	} else {
$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
return &select_form($name,$value,%domains);	return &select_form($name,$value,\%domains);
}	}
}	}

Line 1855 sub multiple_select_form {	Line 1855 sub multiple_select_form {

=pod	=pod

=item * &select_form($defdom,$name,%hash)	=item * &select_form($defdom,$name,$hashref,$onchange)

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 options from a hash option_name => displayed text.	allow a user to select options from a ref to a hash containing:
	option_name => displayed text. An optional $onchange can include
	a javascript onchange item, e.g., onchange="this.form.submit();"

See lonrights.pm for an example invocation and use.	See lonrights.pm for an example invocation and use.

=cut	=cut

#-------------------------------------------	#-------------------------------------------
sub select_form {	sub select_form {
my ($def,$name,%hash) = @_;	my ($def,$name,$hashref,$onchange) = @_;
my $selectform = "<select name=\"$name\" size=\"1\">\n";	return unless (ref($hashref) eq 'HASH');
	if ($onchange) {
	$onchange = ' onchange="'.$onchange.'"';
	}
	my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";
my @keys;	my @keys;
if (exists($hash{'select_form_order'})) {	if (exists($hashref->{'select_form_order'})) {
@keys=@{$hash{'select_form_order'}};	@keys=@{$hashref->{'select_form_order'}};
} else {	} else {
@keys=sort(keys(%hash));	@keys=sort(keys(%{$hashref}));
}	}
foreach my $key (@keys) {	foreach my $key (@keys) {
$selectform.=	$selectform.=
'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.	'<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
($key eq $def ? 'selected="selected" ' : '').	($key eq $def ? 'selected="selected" ' : '').
">".$hash{$key}."</option>\n";	">".$hashref->{$key}."</option>\n";
}	}
$selectform.="</select>";	$selectform.="</select>";
return $selectform;	return $selectform;
Line 1895 sub display_filter {	Line 1902 sub display_filter {
&mt('Filter [_1]',	&mt('Filter [_1]',
&select_form($env{'form.displayfilter'},	&select_form($env{'form.displayfilter'},
'displayfilter',	'displayfilter',
('currentfolder' => 'Current folder/page',	{'currentfolder' => 'Current folder/page',
'containing' => 'Containing phrase',	'containing' => 'Containing phrase',
'none' => 'None'))).	'none' => 'None'})).
'<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';	'<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
}	}

Line 2267 function changed_text(choice,currentform	Line 2274 function changed_text(choice,currentform
}	}

function set_auth_radio_buttons(newvalue,currentform) {	function set_auth_radio_buttons(newvalue,currentform) {
	var numauthchoices = currentform.login.length;
	if (typeof numauthchoices == "undefined") {
	return;
	}
var i=0;	var i=0;
while (i < currentform.login.length) {	while (i < numauthchoices) {
if (currentform.login[i].value == newvalue) { break; }	if (currentform.login[i].value == newvalue) { break; }
i++;	i++;
}	}
if (i == currentform.login.length) {	if (i == numauthchoices) {
return;	return;
}	}
current.radiovalue = newvalue;	current.radiovalue = newvalue;
Line 3239 sub filemimetype {	Line 3250 sub filemimetype {
sub filecategoryselect {	sub filecategoryselect {
my ($name,$value)=@_;	my ($name,$value)=@_;
return &select_form($value,$name,	return &select_form($value,$name,
'' => &mt('Any category'),	{'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});
map { $_,$_ } sort(keys(%category_extensions)));
}	}

=pod	=pod
Line 3405 sub get_previous_attempt {	Line 3415 sub get_previous_attempt {
}	}
$prevattempts=&start_data_table().&start_data_table_header_row();	$prevattempts=&start_data_table().&start_data_table_header_row();
$prevattempts.='<th>'.&mt('History').'</th>';	$prevattempts.='<th>'.&mt('History').'</th>';
	my (%typeparts,%lasthidden);
	my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});
foreach my $key (sort(keys(%lasthash))) {	foreach my $key (sort(keys(%lasthash))) {
my ($ign,@parts) = split(/\./,$key);	my ($ign,@parts) = split(/\./,$key);
if ($#parts > 0) {	if ($#parts > 0) {
my $data=$parts[-1];	my $data=$parts[-1];
	next if ($data eq 'foilorder');
pop(@parts);	pop(@parts);
$prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.' </th>';	if ($data eq 'type') {
	unless ($showsurv) {
	my $id = join(',',@parts);
	$typeparts{$ign.'.'.$id} = $lasthash{$key};
	if (($lasthash{$key} eq 'anonsurvey') \|\| ($lasthash{$key} eq 'anonsurveycred')) {
	$lasthidden{$ign.'.'.$id} = 1;
	}
	}
	delete($lasthash{$key});
	} else {
	$prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.' </th>';
	}
} else {	} else {
if ($#parts == 0) {	if ($#parts == 0) {
$prevattempts.='<th>'.$parts[0].'</th>';	$prevattempts.='<th>'.$parts[0].'</th>';
Line 3422 sub get_previous_attempt {	Line 3446 sub get_previous_attempt {
$prevattempts.=&end_data_table_header_row();	$prevattempts.=&end_data_table_header_row();
if ($getattempt eq '') {	if ($getattempt eq '') {
for ($version=1;$version<=$returnhash{'version'};$version++) {	for ($version=1;$version<=$returnhash{'version'};$version++) {
$prevattempts.=&start_data_table_row().	my @hidden;
'<td>'.&mt('Transaction [_1]',$version).'</td>';	if (%typeparts) {
foreach my $key (sort(keys(%lasthash))) {	foreach my $id (keys(%typeparts)) {
my $value = &format_previous_attempt_value($key,	if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') \|\| ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
$returnhash{$version.':'.$key});	push(@hidden,$id);
$prevattempts.='<td>'.$value.' </td>';	}
}	}
$prevattempts.=&end_data_table_row();	}
	$prevattempts.=&start_data_table_row().
	'<td>'.&mt('Transaction [_1]',$version).'</td>';
	if (@hidden) {
	foreach my $key (sort(keys(%lasthash))) {
	next if ($key =~ /\.foilorder$/);
	my $hide;
	foreach my $id (@hidden) {
	if ($key =~ /^\Q$id\E/) {
	$hide = 1;
	last;
	}
	}
	if ($hide) {
	my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
	if (($data eq 'award') \|\| ($data eq 'awarddetail')) {
	my $value = &format_previous_attempt_value($key,
	$returnhash{$version.':'.$key});
	$prevattempts.='<td>'.$value.' </td>';
	} else {
	$prevattempts.='<td> </td>';
	}
	} else {
	if ($key =~ /\./) {
	my $value = &format_previous_attempt_value($key,
	$returnhash{$version.':'.$key});
	$prevattempts.='<td>'.$value.' </td>';
	} else {
	$prevattempts.='<td> </td>';
	}
	}
	}
	} else {
	foreach my $key (sort(keys(%lasthash))) {
	next if ($key =~ /\.foilorder$/);
	my $value = &format_previous_attempt_value($key,
	$returnhash{$version.':'.$key});
	$prevattempts.='<td>'.$value.' </td>';
	}
	}
	$prevattempts.=&end_data_table_row();
}	}
}	}
	my @currhidden = keys(%lasthidden);
$prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';	$prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
foreach my $key (sort(keys(%lasthash))) {	foreach my $key (sort(keys(%lasthash))) {
my $value = &format_previous_attempt_value($key,$lasthash{$key});	next if ($key =~ /\.foilorder$/);
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}	if (%typeparts) {
$prevattempts.='<td>'.$value.' </td>';	my $hidden;
	foreach my $id (@currhidden) {
	if ($key =~ /^\Q$id\E/) {
	$hidden = 1;
	last;
	}
	}
	if ($hidden) {
	my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
	if (($data eq 'award') \|\| ($data eq 'awarddetail')) {
	my $value = &format_previous_attempt_value($key,$lasthash{$key});
	if ($key =~/$regexp$/ && (defined &$gradesub)) {
	$value = &$gradesub($value);
	}
	$prevattempts.='<td>'.$value.' </td>';
	} else {
	$prevattempts.='<td> </td>';
	}
	} else {
	my $value = &format_previous_attempt_value($key,$lasthash{$key});
	if ($key =~/$regexp$/ && (defined &$gradesub)) {
	$value = &$gradesub($value);
	}
	$prevattempts.='<td>'.$value.' </td>';
	}
	} else {
	my $value = &format_previous_attempt_value($key,$lasthash{$key});
	if ($key =~/$regexp$/ && (defined &$gradesub)) {
	$value = &$gradesub($value);
	}
	$prevattempts.='<td>'.$value.' </td>';
	}
}	}
$prevattempts.= &end_data_table_row().&end_data_table();	$prevattempts.= &end_data_table_row().&end_data_table();
} else {	} else {
Line 3459 sub format_previous_attempt_value {	Line 3555 sub format_previous_attempt_value {
$value = &Apache::lonlocal::locallocaltime($value);	$value = &Apache::lonlocal::locallocaltime($value);
} elsif (ref($value) eq 'ARRAY') {	} elsif (ref($value) eq 'ARRAY') {
$value = '('.join(', ', @{ $value }).')';	$value = '('.join(', ', @{ $value }).')';
	} elsif ($key =~ /answerstring$/) {
	my %answers = &Apache::lonnet::str2hash($value);
	my @anskeys = sort(keys(%answers));
	if (@anskeys == 1) {
	my $answer = $answers{$anskeys[0]};
	if ($answer =~ m{\Q\0\E}) {
	$answer =~ s{\Q\0\E}{, }g;
	}
	my $tag_internal_answer_name = 'INTERNAL';
	if ($anskeys[0] eq $tag_internal_answer_name) {
	$value = $answer;
	} else {
	$value = $anskeys[0].'='.$answer;
	}
	} else {
	foreach my $ans (@anskeys) {
	my $answer = $answers{$ans};
	if ($answer =~ m{\Q\0\E}) {
	$answer =~ s{\Q\0\E}{, }g;
	}
	$value .= $ans.'='.$answer.'<br />';;
	}
	}
} else {	} else {
$value = &unescape($value);	$value = &unescape($value);
}	}
Line 3609 sub submlink {	Line 3728 sub submlink {
}	}
if (!$symb) { $symb=&Apache::lonnet::symbread(); }	if (!$symb) { $symb=&Apache::lonnet::symbread(); }
$symb=&escape($symb);	$symb=&escape($symb);
if ($target) { $target="target=\"$target\""; }	if ($target) { $target=" target=\"$target\""; }
return '<a href="/adm/grades?&command=submission&'.	return
'symb='.$symb.'&student='.$uname.	'<a href="/adm/grades?command=submission'.
'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';	'&symb='.$symb.
	'&student='.$uname.
	'&userdom='.$udom.'"'.
	$target.'>'.$text.'</a>';
}	}
##############################################	##############################################

Line 3734 sub findallcourses {	Line 3856 sub findallcourses {
$udom = $env{'user.domain'};	$udom = $env{'user.domain'};
}	}
if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {	if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {
my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);	my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
	my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,
	$extra);
if (!%roles) {	if (!%roles) {
%roles = (	%roles = (
cc => 1,	cc => 1,
Line 4139 sub get_domainconf {	Line 4263 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','autoenroll'],$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 4175 sub get_domainconf {	Line 4322 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 4430 Inputs:	Line 4582 Inputs:

=item * $bgcolor, used to override the bgcolor on a webpage to a specific value	=item * $bgcolor, used to override the bgcolor on a webpage to a specific value

=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link

=item * $args, optional argument valid values are	=item * $args, optional argument valid values are
no_auto_mt_title -> prevents &mt()ing the title arg	no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
Line 4450 other decorations will be returned.	Line 4599 other decorations will be returned.

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;	$no_nav_bar,$bgcolor,$args)=@_;

	my $public;
	if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
	\|\| ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
	$public = 1;
	}
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }	if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }

$function = &get_users_function() if (!$function);	$function = &get_users_function() if (!$function);
Line 4487 sub bodytag {	Line 4641 sub bodytag {
}	}

if (!$realm) { $realm=' '; }	if (!$realm) { $realm=' '; }
# Set messages
my $messages=&domainlogo($domain);

my $extra_body_attr = &make_attr_string($forcereg,\%design);	my $extra_body_attr = &make_attr_string($forcereg,\%design);

Line 4501 sub bodytag {	Line 4653 sub bodytag {
}	}

my $name = &plainname($env{'user.name'},$env{'user.domain'});	my $name = &plainname($env{'user.name'},$env{'user.domain'});
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {	if ($public) {
undef($role);	undef($role);
} else {	} else {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
Line 4522 sub bodytag {	Line 4674 sub bodytag {
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);	&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);

if ($env{'environment.remote'} eq 'off') {
# No Remote
if ($no_nav_bar \|\| $env{'form.inhibitmenu'} eq 'yes') {	if ($no_nav_bar \|\| $env{'form.inhibitmenu'} eq 'yes') {
return $bodytag;	return $bodytag;
}	}
Line 4545 sub bodytag {	Line 4695 sub bodytag {
return $bodytag;	return $bodytag;
}	}

$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>\|;	unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
	$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>\|;
	}

$bodytag .= Apache::lonhtmlcommon::scripttag(	$bodytag .= Apache::lonhtmlcommon::scripttag(
Apache::lonmenu::utilityfunctions(), 'start');	Apache::lonmenu::utilityfunctions(), 'start');
Line 4558 sub bodytag {	Line 4710 sub bodytag {
$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;	$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;

#don't show menus for public users	#don't show menus for public users
if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){	if (!$public){
$bodytag .= Apache::lonmenu::secondary_menu();	$bodytag .= Apache::lonmenu::secondary_menu();
$bodytag .= Apache::lonmenu::serverform();	$bodytag .= Apache::lonmenu::serverform();
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,'',	$bodytag .= &Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});	$args->{'bread_crumbs'});
} elsif ($forcereg) {	} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg);	$bodytag .= &Apache::lonmenu::innerregister($forcereg);
Line 4575 sub bodytag {	Line 4727 sub bodytag {
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
}	}

#SD testing
#$bodytag .= Apache::lonmenu::menubuttons($forcereg);
return $bodytag;	return $bodytag;
}

#
# Top frame rendering, Remote is up
#

my $imgsrc = $img;
if ($img =~ /^\/adm/) {
$imgsrc = &lonhttpdurl($img);
}
my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';

# Explicit link to get inline menu
my $menu= ($no_inline_link?''
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');

if ($dc_info) {
$dc_info = qq\|<span class="LC_cusr_subheading">($dc_info)</span>\|;
}

$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>
<ol class="LC_primary_menu LC_right">
<li>$menu</li>
</ol><div id="LC_realm"> $realm $dc_info</div>\| unless $env{'form.inhibitmenu'};
return(<<ENDBODY);
$bodytag
<table id="LC_title_bar" class="LC_with_remote">
<tr><td>$upperleft</td>
<td>$messages </td>
</tr>
<tr><td>$titleinfo $dc_info $menu</td>
</tr>
</table>
ENDBODY
}	}

sub dc_courseid_toggle {	sub dc_courseid_toggle {
my ($dc_info) = @_;	my ($dc_info) = @_;
return ' <span id="dccidtext" class="LC_cusr_subheading">'.	return ' <span id="dccidtext" class="LC_cusr_subheading LC_nobreak">'.
'<a href="javascript:showCourseID();">'.	'<a href="javascript:showCourseID();">'.
&mt('(More ...)').'</a></span>'.	&mt('(More ...)').'</a></span>'.
'<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';	'<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
Line 4643 sub make_attr_string {	Line 4759 sub make_attr_string {
delete($attr_ref->{$key});	delete($attr_ref->{$key});
}	}
}	}
$attr_ref->{'onload'} =	$attr_ref->{'onload'} = $on_load;
&Apache::lonmenu::loadevents(). $on_load;	$attr_ref->{'onunload'}= $on_unload;
$attr_ref->{'onunload'}=
&Apache::lonmenu::unloadevents().$on_unload;
}

# Accessibility font enhance
if ($env{'browser.fontenhance'} eq 'on') {
my $style;
foreach my $key (keys(%{$attr_ref})) {
if (lc($key) eq 'style') {
$style.=$attr_ref->{$key}.';';
delete($attr_ref->{$key});
}
}
$attr_ref->{'style'}=$style.'; font-size: x-large;';
}	}

my $attr_string;	my $attr_string;
Line 4732 sub standard_css {	Line 4834 sub standard_css {
my $vlink = &designparm($function.'.vlink', $domain);	my $vlink = &designparm($function.'.vlink', $domain);
my $link = &designparm($function.'.link', $domain);	my $link = &designparm($function.'.link', $domain);

my $loginbg = &designparm('login.sidebg',$domain);
my $bgcol = &designparm('login.bgcol',$domain);
my $textcol = &designparm('login.textcol',$domain);

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 = $sidebg;
Line 4754 sub standard_css {	Line 4852 sub standard_css {
my $table_header = '#DDDDDD';	my $table_header = '#DDDDDD';
my $feedback_link_bg = '#BBBBBB';	my $feedback_link_bg = '#BBBBBB';
my $lg_border_color = '#C8C8C8';	my $lg_border_color = '#C8C8C8';
	my $button_hover = '#BF2317';

my $border = ($env{'browser.type'} eq 'explorer' \|\|	my $border = ($env{'browser.type'} eq 'explorer' \|\|
$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'	$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
Line 4761 sub standard_css {	Line 4860 sub standard_css {


return <<END;	return <<END;

	/* needed for iframe to allow 100% height in FF */
	body, html {
	margin: 0;
	padding: 0 0.5%;
	height: 99%; /* to avoid scrollbars */
	}

body {	body {
font-family: $sans;	font-family: $sans;
line-height:130%;	line-height:130%;
Line 4768 body {	Line 4875 body {
color:$font;	color:$font;
}	}

a:focus {	a:focus,
	a:focus img {
color: red;	color: red;
background: yellow;	background: yellow;
}	}
Line 4785 form, .inline {	Line 4893 form, .inline {
vertical-align:middle;	vertical-align:middle;
}	}

/* just for tests */
.LC_400Box {	.LC_400Box {
width:400px;	width:400px;
}	}
/* end */
	.LC_iframecontainer {
	width: 98%;
	margin: 0;
	position: fixed;
	top: 8.5em;
	bottom: 0;
	}

	.LC_iframecontainer iframe{
	border: none;
	width: 100%;
	height: 100%;
	}

.LC_filename {	.LC_filename {
font-family: $mono;	font-family: $mono;
Line 4903 table#LC_title_bar {	Line 5023 table#LC_title_bar {
}	}

table#LC_title_bar,	table#LC_title_bar,
table.LC_breadcrumbs,	table.LC_breadcrumbs, /* obsolete? */
table#LC_title_bar.LC_with_remote {	table#LC_title_bar.LC_with_remote {
width: 100%;	width: 100%;
border-color: $pgbg;	border-color: $pgbg;
Line 4916 table#LC_title_bar.LC_with_remote {	Line 5036 table#LC_title_bar.LC_with_remote {
margin: 0;	margin: 0;
}	}

/* #SD START (work in progress)*/	ul.LC_breadcrumb_tools_outerlist {

ul.LC_bct {
margin: 0;	margin: 0;
padding: 0;	padding: 0;
	position: relative;
	list-style: none;
}	}
ul.LC_bct ol {	ul.LC_breadcrumb_tools_outerlist li {
display: inline;	display: inline;
}	}
ul.LC_bct ul {
display: inline;
padding: 0;
}
ul.LC_bct li {
list-style-type: none;
display: inline;
}


ul.LC_breadcrumb_tools {
}

li.LC_breadcrumb_tools {	.LC_breadcrumb_tools_navigation {
}	padding: 0;
li.LC_breadcrumb_tools img{	margin: 0;
vertical-align: middle;	float: left;
}

.LC_breadcrumb_tools_A {
margin: 0 0 0 1em;
}
.LC_breadcrumb_tools_B {
float: right;
margin-top: 0.4em;
}	}
.LC_breadcrumb_tools_C {	.LC_breadcrumb_tools_tools {
margin: 0 1em 0 0;	padding: 0;
	margin: 0;
float: right;	float: right;
}	}
/* #SD END */

table#LC_title_bar td {	table#LC_title_bar td {
background: $tabbg;	background: $tabbg;
Line 4986 td.LC_table_cell_checkbox {	Line 5086 td.LC_table_cell_checkbox {
background: $sidebg;	background: $sidebg;
border-bottom: 1px solid $lg_border_color;	border-bottom: 1px solid $lg_border_color;
line-height: 2.5em;	line-height: 2.5em;
/* SD working here	overflow: hidden;
height: 2.5em;
overflow: hidden; */
margin: 0;	margin: 0;
padding: 0;	padding: 0;
}	}

/* Preliminary fix to hide breadcrumbs inside remote control window */
#LC_remote #LC_breadcrumbs {
display:none;
}

#LC_head_subbox {	#LC_head_subbox {
clear:both;	clear:both;
background: #F8F8F8; /* $sidebg; */	background: #F8F8F8; /* $sidebg; */
border: 1px solid $sidebg;	border: 1px solid $sidebg;
margin: 0 0 10px 0;	margin: 0 0 10px 0;
	padding: 3px;
}	}

.LC_fontsize_medium {	.LC_fontsize_medium {
Line 5019 td.LC_table_cell_checkbox {	Line 5113 td.LC_table_cell_checkbox {
padding-left:3px;	padding-left:3px;
}	}

	.LC_menubuttons_inline_text img{
	vertical-align: middle;
	}

	li.LC_menubuttons_inline_text img,a {
	cursor:pointer;
	}

.LC_menubuttons_link {	.LC_menubuttons_link {
text-decoration: none;	text-decoration: none;
}	}
Line 5038 td.LC_menubuttons_text {	Line 5140 td.LC_menubuttons_text {
background: $tabbg;	background: $tabbg;
}	}

table.LC_data_table,	table.LC_data_table {
table.LC_mail_list {
border: 1px solid #000000;	border: 1px solid #000000;
border-collapse: separate;	border-collapse: separate;
border-spacing: 1px;	border-spacing: 1px;
Line 5065 table.LC_nested {	Line 5166 table.LC_nested {
width: 100%;	width: 100%;
}	}

	.ui-accordion,
	.ui-accordion table.LC_data_table,
	.ui-accordion table.LC_nested_outer{
	border: 0px;
	border-spacing: 0px;
	margin: 3px;
	}

table.LC_data_table tr th,	table.LC_data_table tr th,
table.LC_calendar tr th,	table.LC_calendar tr th,
table.LC_mail_list tr th,
table.LC_prior_tries tr th,	table.LC_prior_tries tr th,
table.LC_innerpickbox tr th {	table.LC_innerpickbox tr th {
font-weight: bold;	font-weight: bold;
Line 5120 table.LC_data_table tr td.LC_leftcol_hea	Line 5228 table.LC_data_table tr td.LC_leftcol_hea

table.LC_data_table tr.LC_empty_row td,	table.LC_data_table tr.LC_empty_row td,
table.LC_nested tr.LC_empty_row td {	table.LC_nested tr.LC_empty_row td {
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_data_table tr.LC_empty_row td {
	background-color: $sidebg;
	}

	table.LC_nested tr.LC_empty_row td {
	background-color: #FFFFFF;
	}

table.LC_caption {	table.LC_caption {
}	}

Line 5174 table.LC_nested tr td.LC_right_item {	Line 5289 table.LC_nested tr td.LC_right_item {
text-align: right;	text-align: right;
}	}

	.ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
	.ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
	text-align: right;
	width: 40%;
	padding-right:10px;
	vertical-align: top;
	padding: 5px;
	}

	.ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
	.ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
	text-align: left;
	width: 60%;
	padding: 2px 4px;
	}

table.LC_nested tr.LC_odd_row td {	table.LC_nested tr.LC_odd_row td {
background-color: #EEEEEE;	background-color: #EEEEEE;
}	}
Line 5215 table.LC_calendar tr td.LC_calendar_day_	Line 5346 table.LC_calendar tr td.LC_calendar_day_
background-color: $data_table_highlight;	background-color: $data_table_highlight;
}	}

table.LC_mail_list tr.LC_mail_new {	table.LC_data_table tr td.LC_mail_new {
background-color: $mail_new;	background-color: $mail_new;
}	}

table.LC_mail_list tr.LC_mail_new:hover {	table.LC_data_table tr.LC_mail_new:hover {
background-color: $mail_new_hover;	background-color: $mail_new_hover;
}	}

table.LC_mail_list tr.LC_mail_read {	table.LC_data_table tr td.LC_mail_read {
background-color: $mail_read;	background-color: $mail_read;
}	}

table.LC_mail_list tr.LC_mail_read:hover {	/*
	table.LC_data_table tr.LC_mail_read:hover {
background-color: $mail_read_hover;	background-color: $mail_read_hover;
}	}
	*/

table.LC_mail_list tr.LC_mail_replied {	table.LC_data_table tr td.LC_mail_replied {
background-color: $mail_replied;	background-color: $mail_replied;
}	}

table.LC_mail_list tr.LC_mail_replied:hover {	/*
	table.LC_data_table tr.LC_mail_replied:hover {
background-color: $mail_replied_hover;	background-color: $mail_replied_hover;
}	}
	*/

table.LC_mail_list tr.LC_mail_other {	table.LC_data_table tr td.LC_mail_other {
background-color: $mail_other;	background-color: $mail_other;
}	}

table.LC_mail_list tr.LC_mail_other:hover {	/*
	table.LC_data_table tr.LC_mail_other:hover {
background-color: $mail_other_hover;	background-color: $mail_other_hover;
}	}
	*/

table.LC_data_table tr > td.LC_browser_file,	table.LC_data_table tr > td.LC_browser_file,
table.LC_data_table tr > td.LC_browser_file_published {	table.LC_data_table tr > td.LC_browser_file_published {
Line 5275 table.LC_data_table tr > td.LC_roles_is	Line 5412 table.LC_data_table tr > td.LC_roles_is
}	}

table.LC_data_table tr > td.LC_roles_future {	table.LC_data_table tr > td.LC_roles_future {
background: #FFFF77;	border-right: 8px solid #FFFF77;
}	}

table.LC_data_table tr > td.LC_roles_will {	table.LC_data_table tr > td.LC_roles_will {
background: #FFAA77;	border-right: 8px solid #FFAA77;
}	}

table.LC_data_table tr > td.LC_roles_expired {	table.LC_data_table tr > td.LC_roles_expired {
background: #FF7777;	border-right: 8px solid #FF7777;
}	}

table.LC_data_table tr > td.LC_roles_will_not {	table.LC_data_table tr > td.LC_roles_will_not {
background: #AAFF77;	border-right: 8px solid #AAFF77;
}	}

table.LC_data_table tr > td.LC_roles_selected {	table.LC_data_table tr > td.LC_roles_selected {
background: #11CC55;	border-right: 8px solid #11CC55;
}	}

span.LC_current_location {	span.LC_current_location {
Line 5326 span.LC_parm_symb {	Line 5463 span.LC_parm_symb {
color: #AAAAAA;	color: #AAAAAA;
}	}

	ul.LC_parm_parmlist li {
	display: inline-block;
	padding: 0.3em 0.8em;
	vertical-align: top;
	width: 150px;
	border-top:1px solid $lg_border_color;
	}

td.LC_parm_overview_level_menu,	td.LC_parm_overview_level_menu,
td.LC_parm_overview_map_menu,	td.LC_parm_overview_map_menu,
td.LC_parm_overview_parm_selectors,	td.LC_parm_overview_parm_selectors,
Line 5486 table.LC_group_priv td {	Line 5631 table.LC_group_priv td {
padding: 0;	padding: 0;
}	}

table.LC_notify_front_page {
background: white;
border: 1px solid black;
padding: 8px;
}

table.LC_notify_front_page td {
padding: 8px;
}

.LC_navbuttons {	.LC_navbuttons {
margin: 2ex 0ex 2ex 0ex;	margin: 2ex 0ex 2ex 0ex;
}	}
Line 5753 div.LC_clear_float_footer {	Line 5888 div.LC_clear_float_footer {
}	}

div.LC_grade_show_user {	div.LC_grade_show_user {
margin-top: 20px;	/* border-left: 5px solid $sidebg; */
border: 1px solid black;	border-top: 5px solid #000000;
	margin: 50px 0 0 0;
	padding: 15px 0 5px 10px;
}	}

div.LC_grade_user_name {	div.LC_grade_show_user_odd_row {
background: #DDDDEE;	/* border-left: 5px solid #000000; */
border-bottom: 1px solid black;
font-weight: bold;
font-size: large;
}	}

div.LC_grade_show_user_odd_row div.LC_grade_user_name {	div.LC_grade_show_user div.LC_Box {
background: #DDEEDD;	margin-right: 50px;
}	}

div.LC_grade_show_problem,
div.LC_grade_submissions,	div.LC_grade_submissions,
div.LC_grade_message_center,	div.LC_grade_message_center,
div.LC_grade_info_links,	div.LC_grade_info_links {
div.LC_grade_assign {
margin: 5px;	margin: 5px;
width: 99%;	width: 99%;
background: #FFFFFF;	background: #FFFFFF;
}	}

div.LC_grade_show_problem_header,
div.LC_grade_submissions_header,	div.LC_grade_submissions_header,
div.LC_grade_message_center_header,	div.LC_grade_message_center_header {
div.LC_grade_assign_header {
font-weight: bold;	font-weight: bold;
font-size: large;	font-size: large;
}	}

div.LC_grade_show_problem_problem,
div.LC_grade_submissions_body,	div.LC_grade_submissions_body,
div.LC_grade_message_center_body,	div.LC_grade_message_center_body {
div.LC_grade_assign_body {
border: 1px solid black;	border: 1px solid black;
width: 99%;	width: 99%;
background: #FFFFFF;	background: #FFFFFF;
}	}

span.LC_grade_check_note {
font-weight: normal;
font-size: medium;
display: inline;
position: absolute;
right: 1em;
}

table.LC_scantron_action {	table.LC_scantron_action {
width: 100%;	width: 100%;
}	}
Line 5836 div.LC_edit_problem_header_title {	Line 5956 div.LC_edit_problem_header_title {
}	}

table.LC_edit_problem_header_title {	table.LC_edit_problem_header_title {
font-size: larger;
font-weight: bold;
width: 100%;	width: 100%;
border-color: $pgbg;
border-style: solid;
border-width: $border;
background: $tabbg;	background: $tabbg;
border-collapse: collapse;
padding: 0;
}	}

div.LC_edit_problem_discards {	div.LC_edit_problem_discards {
Line 5877 div.LC_createcourse {	Line 5990 div.LC_createcourse {
display:none;	display:none;
}	}

/* ---- Remove when done ----
# The following styles is part of the redesign of LON-CAPA and are
# subject to change during this project.
# Don't rely on their current functionality as they might be
# changed or removed.
# --------------------------*/

a:hover,	a:hover,
ol.LC_primary_menu a:hover,	ol.LC_primary_menu a:hover,
ol#LC_MenuBreadcrumbs a:hover,	ol#LC_MenuBreadcrumbs a:hover,
Line 5891 ol#LC_PathBreadcrumbs a:hover,	Line 5997 ol#LC_PathBreadcrumbs a:hover,
ul#LC_secondary_menu a:hover,	ul#LC_secondary_menu a:hover,
.LC_FormSectionClearButton input:hover	.LC_FormSectionClearButton input:hover
ul.LC_TabContent li:hover a {	ul.LC_TabContent li:hover a {
color:#BF2317;	color:$button_hover;
text-decoration:none;	text-decoration:none;
}	}

Line 5958 fieldset > legend {	Line 6064 fieldset > legend {

#LC_nav_bar {	#LC_nav_bar {
float: left;	float: left;
margin: 0.2em 0 0 0;	margin: 0 0 2px 0;
}	}

#LC_realm {	#LC_realm {
Line 5975 fieldset > legend {	Line 6081 fieldset > legend {

ol.LC_primary_menu {	ol.LC_primary_menu {
float: right;	float: right;
margin: 0.2em 0 0 0;	margin: 0;
}	}

ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
Line 5990 ol.LC_primary_menu li {	Line 6096 ol.LC_primary_menu li {

ol.LC_primary_menu li img {	ol.LC_primary_menu li img {
vertical-align: bottom;	vertical-align: bottom;
	height: 1.1em;
}	}

ol.LC_primary_menu a {	ol.LC_primary_menu a {
font-size: 90%;
color: RGB(80, 80, 80);	color: RGB(80, 80, 80);
text-decoration: none;	text-decoration: none;
}	}

	ol.LC_primary_menu a.LC_new_message {
	font-weight:bold;
	color: darkred;
	}

	ol.LC_docs_parameters {
	margin-left: 0;
	padding: 0;
	list-style: none;
	}

	ol.LC_docs_parameters li {
	margin: 0;
	padding-right: 20px;
	display: inline;
	}

	ol.LC_docs_parameters li:before {
	content: "\\002022 \\0020";
	}

	li.LC_docs_parameters_title {
	font-weight: bold;
	}

	ol.LC_docs_parameters li.LC_docs_parameters_title:before {
	content: "";
	}

ul#LC_secondary_menu {	ul#LC_secondary_menu {
clear: both;	clear: both;
color: $fontmenu;	color: $fontmenu;
Line 6037 ul#LC_secondary_menu li a {	Line 6172 ul#LC_secondary_menu li a {
}	}

ul.LC_TabContent {	ul.LC_TabContent {
min-height:1.5em;	min-height:20px;
}	}

ul.LC_TabContent li {	ul.LC_TabContent li {
vertical-align:middle;	vertical-align:middle;
padding: 0 10px 0 10px;	padding: 0 16px 0 10px;
background-color:$tabbg;	background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;	border-bottom:solid 1px $lg_border_color;
	border-right: solid 1px $font;
}	}

ul.LC_TabContent .right {	ul.LC_TabContent .right {
Line 6057 ul.LC_TabContent li {	Line 6193 ul.LC_TabContent li {
text-decoration:none;	text-decoration:none;
font-size:95%;	font-size:95%;
font-weight:bold;	font-weight:bold;
padding-right: 16px;	min-height:20px;
	}

	ul.LC_TabContent li a:hover,
	ul.LC_TabContent li a:focus {
	color: $button_hover;
	background:none;
	outline:none;
	}

	ul.LC_TabContent li:hover {
	color: $button_hover;
	cursor:pointer;
}	}

ul.LC_TabContent li:hover,
ul.LC_TabContent li.active {	ul.LC_TabContent li.active {
	color: $font;
background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;	background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
border-bottom:solid 2px #FFFFFF;	border-bottom:solid 1px #FFFFFF;
padding-right: 16px;	cursor: default;
}	}

	ul.LC_TabContent li.active a {
	color:$font;
	background:#FFFFFF;
	outline: none;
	}
#maincoursedoc {	#maincoursedoc {
clear:both;	clear:both;
}	}
Line 6085 ul.LC_TabContentBigger li {	Line 6238 ul.LC_TabContentBigger li {
color: #737373;	color: #737373;
}	}

	ul.LC_TabContentBigger li.active {
	position: relative;
	top: 1px;
	}

ul.LC_TabContentBigger li a {	ul.LC_TabContentBigger li a {
background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;	background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
Line 6093 ul.LC_TabContentBigger li a {	Line 6250 ul.LC_TabContentBigger li a {
text-align: center;	text-align: center;
display: block;	display: block;
text-decoration: none;	text-decoration: none;
	outline: none;
}	}

ul.LC_TabContentBigger li:hover a,
ul.LC_TabContentBigger li.active a {	ul.LC_TabContentBigger li.active a {
background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;	background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
color:$font;	color:$font;
text-decoration: underline;
}	}


ul.LC_TabContentBigger li b {	ul.LC_TabContentBigger li b {
background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;	background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
display: block;	display: block;
float: left;	float: left;
padding: 0 30px;	padding: 0 30px;
	border-bottom: 1px solid $lg_border_color;
	}

	ul.LC_TabContentBigger li:hover b {
	color:$button_hover;
}	}

ul.LC_TabContentBigger li:hover b,
ul.LC_TabContentBigger li.active b {	ul.LC_TabContentBigger li.active b {
background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;	background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
color:$font;	color:$font;
border-bottom: 1px solid #FFFFFF;	border: 0;
	cursor:default;
}	}


Line 6131 ol#LC_MenuBreadcrumbs,	Line 6291 ol#LC_MenuBreadcrumbs,
ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
padding-left: 10px;	padding-left: 10px;
margin: 0;	margin: 0;
list-style-position: inside;	height: 2.5em; /* equal to #LC_breadcrumbs line-height */
/* SD working here
white-space: nowrap; */
}	}

ol#LC_MenuBreadcrumbs li,	ol#LC_MenuBreadcrumbs li,
ol#LC_PathBreadcrumbs li,	ol#LC_PathBreadcrumbs li,
ul.LC_CourseBreadcrumbs li {	ul.LC_CourseBreadcrumbs li {
display: inline;	display: inline;
white-space: nowrap;	white-space: normal;
/* SD working here
white-space: normal; */
}	}

ol#LC_MenuBreadcrumbs li a,	ol#LC_MenuBreadcrumbs li a,
Line 6151 ul.LC_CourseBreadcrumbs li a {	Line 6307 ul.LC_CourseBreadcrumbs li a {
font-size:90%;	font-size:90%;
}	}

	ol#LC_MenuBreadcrumbs h1 {
	display: inline;
	font-size: 90%;
	line-height: 2.5em;
	margin: 0;
	padding: 0;
	}

ol#LC_PathBreadcrumbs li a {	ol#LC_PathBreadcrumbs li a {
text-decoration:none;	text-decoration:none;
font-size:100%;	font-size:100%;
Line 6247 div.LC_columnSection>* {	Line 6411 div.LC_columnSection>* {
overflow:hidden;	overflow:hidden;
}	}

.LC_loginpage_container {
text-align:left;
margin : 0 auto;
width:90%;
padding: 10px;
height: auto;
background-color:#FFFFFF;
border:1px solid #CCCCCC;
}


.LC_loginpage_loginContainer {
float:left;
width: 182px;
padding: 2px;
border:1px solid #CCCCCC;
background-color:$loginbg;
}

.LC_loginpage_loginContainer h2 {
margin-top: 0;
display:block;
background:$bgcol;
color:$textcol;
padding-left:5px;
}

.LC_loginpage_loginInfo {
float:left;
width:182px;
border:1px solid #CCCCCC;
padding:2px;
}

.LC_loginpage_space {
clear: both;
margin-bottom: 20px;
border-bottom: 1px solid #CCCCCC;
}

.LC_loginpage_floatLeft {
float: left;
width: 200px;
margin: 0;
}

table em {	table em {
font-weight: bold;	font-weight: bold;
font-style: normal;	font-style: normal;
Line 6328 a#LC_content_toolbar_firsthomework {	Line 6446 a#LC_content_toolbar_firsthomework {
background-image:url(/res/adm/pages/open-first-problem.gif);	background-image:url(/res/adm/pages/open-first-problem.gif);
}	}

a#LC_content_toolbar_launchnav {
background-image:url(/res/adm/pages/start-navigation.gif);
}

a#LC_content_toolbar_closenav {
background-image:url(/res/adm/pages/close-navigation.gif);
}

a#LC_content_toolbar_everything {	a#LC_content_toolbar_everything {
background-image:url(/res/adm/pages/show-all.gif);	background-image:url(/res/adm/pages/show-all.gif);
}	}
Line 6395 ul.LC_funclist {	Line 6505 ul.LC_funclist {
padding: 0.5em 1em 0.5em 0;	padding: 0.5em 1em 0.5em 0;
}	}

	ul.LC_funclist > li:first-child {
	font-weight:bold;
	margin-left:0.8em;
	}

ul.LC_funclist + ul.LC_funclist {	ul.LC_funclist + ul.LC_funclist {
/*	/*
left border as a seperator if we have more than	left border as a seperator if we have more than
Line 6415 ul.LC_funclist li {	Line 6530 ul.LC_funclist li {
line-height: 150%;	line-height: 150%;
}	}

	.ui-accordion .LC_advanced_toggle {
	float: right;
	font-size: 90%;
	padding: 0px 4px
	}

	.LC_hidden {
	display: none;
	}

END	END
}	}
Line 6467 sub headtag {	Line 6591 sub headtag {
if (!$args->{'frameset'}) {	if (!$args->{'frameset'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}	}
if ($args->{'force_register'}) {	if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
$result .= &Apache::lonmenu::registerurl(1);	$result .= Apache::lonxml::display_title();
}	}
if (!$args->{'no_nav_bar'}	if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}	&& !$args->{'only_body'}
Line 6494 ADDMETA	Line 6618 ADDMETA
$result .= '<title> LON-CAPA '.$title.'</title>'	$result .= '<title> LON-CAPA '.$title.'</title>'
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
.$head_extra;	.$head_extra;
return $result;	return $result.'</head>';
}	}

=pod	=pod
Line 6529 Inputs: none	Line 6653 Inputs: none
sub xml_begin {	sub xml_begin {
my $output='';	my $output='';

if ($env{'internal.start_page'}==1) {
&Apache::lonhtmlcommon::init_htmlareafields();
}

if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
$output='<?xml version="1.0"?>'	$output='<?xml version="1.0"?>'
#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"	#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
Line 6551 sub xml_begin {	Line 6671 sub xml_begin {

=pod	=pod

=item * &endheadtag()

Returns a uniform </head> for LON-CAPA web pages.

Inputs: none

=cut

sub endheadtag {
return '</head>';
}

=pod

=item * &head()

Returns a uniform complete <head>..</head> section for LON-CAPA web pages.

Inputs:

=over 4

$title - optional title for the page

$head_extra - optional extra HTML to put inside the <head>

=back

=cut

sub head {
my ($title,$head_extra,$args) = @_;
return &headtag($title,$head_extra,$args).&endheadtag();
}

=pod

=item * &start_page()	=item * &start_page()

Returns a complete <html> .. <body> section for LON-CAPA web pages.	Returns a complete <html> .. <body> section for LON-CAPA web pages.
Line 6625 $args - additional optional args support	Line 6708 $args - additional optional args support
skip_phases -> hash ref of	skip_phases -> hash ref of
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation
no_inline_link -> if true and in remote mode, don't show the
'Switch To Inline Menu' link
no_auto_mt_title -> prevent &mt()ing the title arg	no_auto_mt_title -> prevent &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
should it have jsmath forced on by the	should it have jsmath forced on by the
current page	current page
bread_crumbs -> Array containing breadcrumbs	bread_crumbs -> Array containing breadcrumbs
bread_crumbs_components -> if exists show it as headline else show only the breadcrumbs	bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs

=back	=back

Line 6643 $args - additional optional args support	Line 6724 $args - additional optional args support
sub start_page {	sub start_page {
my ($title,$head_extra,$args) = @_;	my ($title,$head_extra,$args) = @_;
#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));	#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
	#SD
	#I don't see why we copy certain elements of %$args to %head_args
	#head args is passed to headtag() and this routine only reads those
	#keys that are needed. There doesn't happen any writes or any processing
	#of other keys.
	#proposal: just pass $args to headtag instead of \%head_args and delete
	#marked lines
	#<- MARK
my %head_args;	my %head_args;
foreach my $arg ('redirect','force_register','domain','function',	foreach my $arg ('redirect','force_register','domain','function',
'bgcolor','frameset','no_nav_bar','only_body',	'bgcolor','frameset','no_nav_bar','only_body',
Line 6651 sub start_page {	Line 6740 sub start_page {
$head_args{$arg} = $args->{$arg};	$head_args{$arg} = $args->{$arg};
}	}
}	}
	#MARK ->

$env{'internal.start_page'}++;	$env{'internal.start_page'}++;
my $result;	my $result;

if (! exists($args->{'skip_phases'}{'head'}) ) {	if (! exists($args->{'skip_phases'}{'head'}) ) {
$result.=	$result .=
&xml_begin().	&xml_begin() . &headtag($title,$head_extra,\%head_args);
&headtag($title,$head_extra,\%head_args).&endheadtag();	#replace prev line by
	# &xml_begin() . &headtag($title, $head_extra, $args);
}	}

if (! exists($args->{'skip_phases'}{'body'}) ) {	if (! exists($args->{'skip_phases'}{'body'}) ) {
Line 6671 sub start_page {	Line 6763 sub start_page {
$args->{'function'}, $args->{'add_entries'},	$args->{'function'}, $args->{'add_entries'},
$args->{'only_body'}, $args->{'domain'},	$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},	$args->{'force_register'}, $args->{'no_nav_bar'},
$args->{'bgcolor'}, $args->{'no_inline_link'},	$args->{'bgcolor'}, $args);
$args);
}	}
}	}

Line 6688 sub start_page {	Line 6779 sub start_page {
# $result .= &build_functionlist();	# $result .= &build_functionlist();
#}	#}

# Don't add anything more if only_body wanted	# Don't add anything more if only_body wanted or in const space
return $result if $args->{'only_body'};	return $result if $args->{'only_body'}
	\|\| $env{'request.state'} eq 'construct';

#Breadcrumbs for Construction Space provided by &bodytag.
if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
return $result;
}

#Breadcrumbs	#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {	if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
Line 6716 sub start_page {	Line 6803 sub start_page {
return $result;	return $result;
}	}


=pod

=item * &head()

Returns a complete </body></html> section for LON-CAPA web pages.

Inputs: $args - additional optional args supported are:
js_ready -> return a string ready for being used in
a javascript writeln
html_encode -> return a string ready for being used in
a html attribute
frameset -> if true will start with a <frameset>
rather than <body>
dicsussion -> if true will get discussion from
lonxml::xmlend
(you can pass the target and parser arguments
through optional 'target' and 'parser' args
to this routine)

=cut

sub end_page {	sub end_page {
my ($args) = @_;	my ($args) = @_;
$env{'internal.end_page'}++;	$env{'internal.end_page'}++;
Line 6827 sub simple_error_page {	Line 6892 sub simple_error_page {

{	{
my @row_count;	my @row_count;

	sub start_data_table_count {
	unshift(@row_count, 0);
	return;
	}

	sub end_data_table_count {
	shift(@row_count);
	return;
	}

sub start_data_table {	sub start_data_table {
my ($add_class) = @_;	my ($add_class) = @_;
my $css_class = (join(' ','LC_data_table',$add_class));	my $css_class = (join(' ','LC_data_table',$add_class));
unshift(@row_count,0);	&start_data_table_count();
return '<table class="'.$css_class.'">'."\n";	return '<table class="'.$css_class.'">'."\n";
}	}

sub end_data_table {	sub end_data_table {
shift(@row_count);	&end_data_table_count();
return '</table>'."\n";;	return '</table>'."\n";;
}	}

sub start_data_table_row {	sub start_data_table_row {
my ($add_class) = @_;	my ($add_class, $id) = @_;
$row_count[0]++;	$row_count[0]++;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
return '<tr class="'.$css_class.'">'."\n";;	$id = (' id="'.$id.'"') unless ($id eq '');
	return '<tr class="'.$css_class.'"'.$id.'>'."\n";
}	}

sub continue_data_table_row {	sub continue_data_table_row {
my ($add_class) = @_;	my ($add_class, $id) = @_;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
return '<tr class="'.$css_class.'">'."\n";;	$id = (' id="'.$id.'"') unless ($id eq '');
	return '<tr class="'.$css_class.'"'.$id.'>'."\n";
}	}

sub end_data_table_row {	sub end_data_table_row {
Line 7014 role status: active, previous or future.	Line 7092 role status: active, previous or future.

sub check_user_status {	sub check_user_status {
my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;	my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);	my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
	my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra);
my @uroles = keys %userinfo;	my @uroles = keys %userinfo;
my $srchstr;	my $srchstr;
my $active_chk = 'none';	my $active_chk = 'none';
Line 8053 sub get_institutional_codes {	Line 8132 sub get_institutional_codes {
return;	return;
}	}

	sub get_standard_codeitems {
	return ('Year','Semester','Department','Number','Section');
	}

=pod	=pod

=head1 Slot Helpers	=head1 Slot Helpers
Line 8244 sub get_env_multiple {	Line 8327 sub get_env_multiple {

sub ask_for_embedded_content {	sub ask_for_embedded_content {
my ($actionurl,$state,$allfiles,$codebase,$args)=@_;	my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
my $upload_output = '	my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges);
<form name="upload_embedded" action="'.$actionurl.'"
method="post" enctype="multipart/form-data">';
$upload_output .= $state;
$upload_output .= '<b>Upload embedded files</b>:<br />'.&start_data_table();

my $num = 0;	my $num = 0;
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {	my $numremref = 0;
	my $numinvalid = 0;
	my $numpathchg = 0;
	my $numexisting = 0;
	my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath);
	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
	my $current_path='/';
	if ($env{'form.currentpath'}) {
	$current_path = $env{'form.currentpath'};
	}
	if ($actionurl eq '/adm/coursegrp_portfolio') {
	$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
	$url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
	} else {
	$udom = $env{'user.domain'};
	$uname = $env{'user.name'};
	$url = '/userfiles/portfolio';
	}
	$toplevel = $url.'/';
	$url .= $current_path;
	$getpropath = 1;
	} elsif (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|
	($actionurl eq '/adm/imsimport')) {
	($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});
	$url = '/home/'.$uname.'/public_html/';
	$toplevel = $url;
	if ($rest ne '') {
	$url .= $rest;
	}
	} elsif ($actionurl eq '/adm/coursedocs') {
	if (ref($args) eq 'HASH') {
	$url = $args->{'docs_url'};
	$toplevel = $url;
	}
	}
	my $now = time();
	foreach my $embed_file (keys(%{$allfiles})) {
	my $absolutepath;
	if ($embed_file =~ m{^\w+://}) {
	$newfiles{$embed_file} = 1;
	$mapping{$embed_file} = $embed_file;
	} else {
	if ($embed_file =~ m{^/}) {
	$absolutepath = $embed_file;
	$embed_file =~ s{^(/+)}{};
	}
	if ($embed_file =~ m{/}) {
	my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
	$path = &check_for_traversal($path,$url,$toplevel);
	my $item = $fname;
	if ($path ne '') {
	$item = $path.'/'.$fname;
	$subdependencies{$path}{$fname} = 1;
	} else {
	$dependencies{$item} = 1;
	}
	if ($absolutepath) {
	$mapping{$item} = $absolutepath;
	} else {
	$mapping{$item} = $embed_file;
	}
	} else {
	$dependencies{$embed_file} = 1;
	if ($absolutepath) {
	$mapping{$embed_file} = $absolutepath;
	} else {
	$mapping{$embed_file} = $embed_file;
	}
	}
	}
	}
	foreach my $path (keys(%subdependencies)) {
	my %currsubfile;
	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
	my @subdir_list = &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
	foreach my $line (@subdir_list) {
	my ($file_name,$rest) = split(/\&/,$line,2);
	$currsubfile{$file_name} = 1;
	}
	} elsif (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank')) {
	if (opendir(my $dir,$url.'/'.$path)) {
	my @subdir_list = grep(!/^\./,readdir($dir));
	map {$currsubfile{$_} = 1;} @subdir_list;
	}
	}
	foreach my $file (keys(%{$subdependencies{$path}})) {
	if ($currsubfile{$file}) {
	my $item = $path.'/'.$file;
	unless ($mapping{$item} eq $item) {
	$pathchanges{$item} = 1;
	}
	$existing{$item} = 1;
	$numexisting ++;
	} else {
	$newfiles{$path.'/'.$file} = 1;
	}
	}
	}
	my %currfile;
	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
	my @dir_list = &Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);
	foreach my $line (@dir_list) {
	my ($file_name,$rest) = split(/\&/,$line,2);
	$currfile{$file_name} = 1;
	}
	} elsif (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank')) {
	if (opendir(my $dir,$url)) {
	my @dir_list = grep(!/^\./,readdir($dir));
	map {$currfile{$_} = 1;} @dir_list;
	}
	}
	foreach my $file (keys(%dependencies)) {
	if ($currfile{$file}) {
	unless ($mapping{$file} eq $file) {
	$pathchanges{$file} = 1;
	}
	$existing{$file} = 1;
	$numexisting ++;
	} else {
	$newfiles{$file} = 1;
	}
	}
	foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
$upload_output .= &start_data_table_row().	$upload_output .= &start_data_table_row().
'<td>'.$embed_file.'</td><td>';	'<td><span class="LC_filename">'.$embed_file.'</span>';
	unless ($mapping{$embed_file} eq $embed_file) {
	$upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.&mt('changed from: [_1]',$mapping{$embed_file}).'</span>';
	}
	$upload_output .= '</td><td>';
if ($args->{'ignore_remote_references'}	if ($args->{'ignore_remote_references'}
&& $embed_file =~ m{^\w+://}) {	&& $embed_file =~ m{^\w+://}) {
$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';	$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
	$numremref++;
} elsif ($args->{'error_on_invalid_names'}	} elsif ($args->{'error_on_invalid_names'}
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {	&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {

$upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';	$upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';
	$numinvalid++;
} else {	} else {
$upload_output .='	$upload_output .= &embedded_file_element('upload_embedded',$num,
<input name="embedded_item_'.$num.'" type="file" value="" />	$embed_file,\%mapping,
<input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';	$allfiles,$codebase);
my $attrib = join(':',@{$$allfiles{$embed_file}});	$num++;
$upload_output .=	}
"\n\t\t".	$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row()."\n";
'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.	}
$attrib.'" />';	foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%existing)) {
if (exists($$codebase{$embed_file})) {	$upload_output .= &start_data_table_row().
$upload_output .=	'<td><span class="LC_filename">'.$embed_file.'</span></td>'.
"\n\t\t".	'<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'.
'<input name="codebase_'.$num.'" type="hidden" value="'.	&Apache::loncommon::end_data_table_row()."\n";
&escape($$codebase{$embed_file}).'" />';	}
}	if ($upload_output) {
}	$upload_output = &start_data_table().
$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();	$upload_output.
$num++;	&end_data_table()."\n";
}	}
$upload_output .= &Apache::loncommon::end_data_table().'<br />	my $applies = 0;
<input type ="hidden" name="number_embedded_items" value="'.$num.'" />	if ($numremref) {
<input type ="submit" value="'.&mt('Upload Listed Files').'" />	$applies ++;
'.&mt('(only files for which a location has been provided will be uploaded)').'	}
</form>';	if ($numinvalid) {
return $upload_output;	$applies ++;
	}
	if ($numexisting) {
	$applies ++;
	}
	if ($num) {
	$output = '<form name="upload_embedded" action="'.$actionurl.'"'.
	' method="post" enctype="multipart/form-data">'."\n".
	$state.
	'<h3>'.&mt('Upload embedded files').
	':</h3>'.$upload_output.'<br />'."\n".
	'<input type ="hidden" name="number_embedded_items" value="'.
	$num.'" />'."\n";
	if ($actionurl eq '') {
	$output .= '<input type="hidden" name="phase" value="three" />';
	}
	} elsif ($applies) {
	$output = '<b>'.&mt('Referenced files').'</b>:<br />';
	if ($applies > 1) {
	$output .=
	&mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';
	if ($numremref) {
	$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";
	}
	if ($numinvalid) {
	$output .= '<li>'.&mt('reference is to file with a name containing invalid characters').'</li>'."\n";
	}
	if ($numexisting) {
	$output .= '<li>'.&mt('reference is to an existing file at the specified location').'</li>'."\n";
	}
	$output .= '</ul><br />';
	} elsif ($numremref) {
	$output .= '<p>'.&mt('None to upload, as all references are to URLs pointing to another server.').'</p>';
	} elsif ($numinvalid) {
	$output .= '<p>'.&mt('None to upload, as all references are to files with names containing invalid characters.').'</p>';
	} elsif ($numexisting) {
	$output .= '<p>'.&mt('None to upload, as all references are to existing files.').'</p>';
	}
	$output .= $upload_output.'<br />';
	}
	my ($pathchange_output,$chgcount);
	$chgcount = $num;
	if (keys(%pathchanges) > 0) {
	foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%pathchanges)) {
	if ($num) {
	$output .= &embedded_file_element('pathchange',$chgcount,
	$embed_file,\%mapping,
	$allfiles,$codebase);
	} else {
	$pathchange_output .=
	&start_data_table_row().
	'<td><input type ="checkbox" name="namechange" value="'.
	$chgcount.'" checked="checked" /></td>'.
	'<td>'.$mapping{$embed_file}.'</td>'.
	'<td>'.$embed_file.
	&embedded_file_element('pathchange',$numpathchg,$embed_file,
	\%mapping,$allfiles,$codebase).
	'</td>'.&end_data_table_row();
	}
	$numpathchg ++;
	$chgcount ++;
	}
	}
	if ($num) {
	if ($numpathchg) {
	$output .= '<input type ="hidden" name="number_pathchange_items" value="'.
	$numpathchg.'" />'."\n";
	}
	if (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|
	($actionurl eq '/adm/imsimport')) {
	$output .= '<input type="hidden" name="phase" value="three" />'."\n";
	} elsif ($actionurl eq '/adm/portfolio' \|\| $actionurl eq '/adm/coursegrp_portfolio') {
	$output .= '<input type="hidden" name="action" value="upload_embedded" />';
	}
	$output .= '<input type ="submit" value="'.&mt('Upload Listed Files').'" />'."\n".
	&mt('(only files for which a location has been provided will be uploaded)').'</form>'."\n";
	} elsif ($numpathchg) {
	my %pathchange = ();
	$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);
	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
	$output .= '<p>'.&mt('or').'</p>';
	}
	}
	return ($output,$num,$numpathchg);
	}

	sub embedded_file_element {
	my ($context,$num,$embed_file,$mapping,$allfiles,$codebase) = @_;
	return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
	(ref($codebase) eq 'HASH'));
	my $output;
	if ($context eq 'upload_embedded') {
	$output = '<input name="embedded_item_'.$num.'" type="file" value="" />'."\n";
	}
	$output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'.
	&escape($embed_file).'" />';
	unless (($context eq 'upload_embedded') &&
	($mapping->{$embed_file} eq $embed_file)) {
	$output .='
	<input name="embedded_ref_'.$num.'" type="hidden" value="'.&escape($mapping->{$embed_file}).'" />';
	}
	my $attrib;
	if (ref($allfiles->{$mapping->{$embed_file}}) eq 'ARRAY') {
	$attrib = &escape(join(':',@{$allfiles->{$mapping->{$embed_file}}}));
	}
	$output .=
	"\n\t\t".
	'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
	$attrib.'" />';
	if (exists($codebase->{$mapping->{$embed_file}})) {
	$output .=
	"\n\t\t".
	'<input name="codebase_'.$num.'" type="hidden" value="'.
	&escape($codebase->{$mapping->{$embed_file}}).'" />';
	}
	return $output;
}	}

sub upload_embedded {	sub upload_embedded {
my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,	my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
$current_disk_usage) = @_;	$current_disk_usage,$hiddenstate,$actionurl) = @_;
my $output;	my (%pathchange,$output,$modifyform,$footer,$returnflag);
for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {	for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));	next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
my $orig_uploaded_filename =	my $orig_uploaded_filename =
$env{'form.embedded_item_'.$i.'.filename'};	$env{'form.embedded_item_'.$i.'.filename'};
	foreach my $type ('orig','ref','attrib','codebase') {
$env{'form.embedded_orig_'.$i} =	if ($env{'form.embedded_'.$type.'_'.$i} ne '') {
&unescape($env{'form.embedded_orig_'.$i});	$env{'form.embedded_'.$type.'_'.$i} =
	&unescape($env{'form.embedded_'.$type.'_'.$i});
	}
	}
my ($path,$fname) =	my ($path,$fname) =
($env{'form.embedded_orig_'.$i} =~ m{(./)([^/])});	($env{'form.embedded_orig_'.$i} =~ m{(./)([^/])});
# no path, whole string is fname	# no path, whole string is fname
if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };	if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };

$path = $env{'form.currentpath'}.$path;
$fname = &Apache::lonnet::clean_filename($fname);	$fname = &Apache::lonnet::clean_filename($fname);
# See if there is anything left	# See if there is anything left
next if ($fname eq '');	next if ($fname eq '');
Line 8317 sub upload_embedded {	Line 8639 sub upload_embedded {
if ($group ne '') {	if ($group ne '') {
$port_path = "groups/$group/$port_path";	$port_path = "groups/$group/$port_path";
}	}
($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,	($state,$msg) = &check_for_upload($env{'form.currentpath'}.$path,
	$fname,$group,'embedded_item_'.$i,
$dir_root,$port_path,$disk_quota,	$dir_root,$port_path,$disk_quota,
$current_disk_usage,$uname,$udom);	$current_disk_usage,$uname,$udom);
if ($state eq 'will_exceed_quota'	if ($state eq 'will_exceed_quota'
\|\| $state eq 'file_locked'	\|\| $state eq 'file_locked') {
\|\| $state eq 'file_exists' ) {
$output .= $msg;	$output .= $msg;
next;	next;
}	}
Line 8336 sub upload_embedded {	Line 8658 sub upload_embedded {
# Check if extension is valid	# Check if extension is valid
if (($fname =~ /\.(\w+)$/) &&	if (($fname =~ /\.(\w+)$/) &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {	(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
$output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1);	$output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';
next;	next;
} elsif (($fname =~ /\.(\w+)$/) &&	} elsif (($fname =~ /\.(\w+)$/) &&
(!defined(&Apache::loncommon::fileembstyle($1)))) {	(!defined(&Apache::loncommon::fileembstyle($1)))) {
$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);	$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';
next;	next;
} elsif ($fname=~/\.(\d+)\.(\w+)$/) {	} elsif ($fname=~/\.(\d+)\.(\w+)$/) {
$output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);	$output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
next;	next;
}	}

$env{'form.embedded_item_'.$i.'.filename'}=$fname;	$env{'form.embedded_item_'.$i.'.filename'}=$fname;
if ($context eq 'portfolio') {	if ($context eq 'portfolio') {
my $result=	my $result;
&Apache::lonnet::userfileupload('embedded_item_'.$i,'',	if ($state eq 'existingfile') {
$dirpath.$path);	$result=
	&Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',
	$dirpath.$env{'form.currentpath'}.$path);
	} else {
	$result=
	&Apache::lonnet::userfileupload('embedded_item_'.$i,'',
	$dirpath.
	$env{'form.currentpath'}.$path);
	if ($result !~ m\|^/uploaded/\|) {
	$output .= '<span class="LC_error">'
	.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
	,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
	.'</span><br />';
	next;
	} else {
	$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
	$path.$fname.'</span>').'<br />';
	}
	}
	} elsif ($context eq 'coursedoc') {
	my $result =
	&Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc',
	$dirpath.'/'.$path);
if ($result !~ m\|^/uploaded/\|) {	if ($result !~ m\|^/uploaded/\|) {
$output .= '<span class="LC_error">'	$output .= '<span class="LC_error">'
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'	.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})	,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
.'</span><br />';	.'</span><br />';
next;	next;
} else {	} else {
$output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.	$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
$path.$fname.'</span>').'</p>';	$path.$fname.'</span>').'<br />';
}	}
} else {	} else {
# Save the file	# Save the file
Line 8390 sub upload_embedded {	Line 8734 sub upload_embedded {
&mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).	&mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
'</span><br />';	'</span><br />';
} else {	} else {
if ($context eq 'testbank') {	$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
$output .= &mt('Embedded file uploaded successfully:').	$url.'</span>').'<br />';
' <a href="'.$url.'">'.	unless ($context eq 'testbank') {
$orig_uploaded_filename.'</a><br />';	$footer .= &mt('View embedded file: [_1]',
} else {	'<a href="'.$url.'">'.$fname.'</a>').'<br />';
$output .= '<span class=\"LC_fontsize_large\">'.
&mt('View embedded file: [_1]','<a href="'.$url.'">'.
$orig_uploaded_filename.'</a>').'</span><br />';
}	}
}	}
close($fh);	close($fh);
}	}
}	}
	if ($env{'form.embedded_ref_'.$i}) {
	$pathchange{$i} = 1;
	}
	}
	if ($output) {
	$output = '<p>'.$output.'</p>';
	}
	$output .= &modify_html_form('upload_embedded',$actionurl,$hiddenstate,\%pathchange);
	$returnflag = 'ok';
	if (keys(%pathchange) > 0) {
	if ($context eq 'portfolio') {
	$output .= '<p>'.&mt('or').'</p>';
	} elsif ($context eq 'testbank') {
	$output .= '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
	$returnflag = 'modify_orightml';
	}
	}
	return ($output.$footer,$returnflag);
	}

	sub modify_html_form {
	my ($context,$actionurl,$hiddenstate,$pathchange,$pathchgtable) = @_;
	my $end = 0;
	my $modifyform;
	if ($context eq 'upload_embedded') {
	return unless (ref($pathchange) eq 'HASH');
	if ($env{'form.number_embedded_items'}) {
	$end += $env{'form.number_embedded_items'};
	}
	if ($env{'form.number_pathchange_items'}) {
	$end += $env{'form.number_pathchange_items'};
	}
	if ($end) {
	for (my $i=0; $i<$end; $i++) {
	if ($i < $env{'form.number_embedded_items'}) {
	next unless($pathchange->{$i});
	}
	$modifyform .=
	&start_data_table_row().
	'<td><input type ="checkbox" name="namechange" value="'.$i.'" '.
	'checked="checked" /></td>'.
	'<td>'.$env{'form.embedded_ref_'.$i}.
	'<input type="hidden" name="embedded_ref_'.$i.'" value="'.
	&escape($env{'form.embedded_ref_'.$i}).'" />'.
	'<input type="hidden" name="embedded_codebase_'.$i.'" value="'.
	&escape($env{'form.embedded_codebase_'.$i}).'" />'.
	'<input type="hidden" name="embedded_attrib_'.$i.'" value="'.
	&escape($env{'form.embedded_attrib_'.$i}).'" /></td>'.
	'<td>'.$env{'form.embedded_orig_'.$i}.
	'<input type="hidden" name="embedded_orig_'.$i.'" value="'.
	&escape($env{'form.embedded_orig_'.$i}).'" /></td>'.
	&end_data_table_row();
	}
	}
	} else {
	$modifyform = $pathchgtable;
	if (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank')) {
	$hiddenstate .= '<input type="hidden" name="phase" value="four" />';
	} elsif (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
	$hiddenstate .= '<input type="hidden" name="action" value="modify_orightml" />';
	}
	}
	if ($modifyform) {
	return '<h3>'.&mt('Changes in content of HTML file required').'</h3>'."\n".
	'<p>'.&mt('Changes need to be made to the reference(s) used for one or more of the dependencies, if your HTML file is to work correctly:').'<ol>'."\n".
	'<li>'.&mt('For consistency between the reference(s) and the location of the corresponding stored file within LON-CAPA.').'</li>'."\n".
	'<li>'.&mt('To change absolute paths to relative paths, or replace directory traversal via "../" within the original reference.').'</li>'."\n".
	'</ol></p>'."\n".'<p>'.
	&mt('LON-CAPA can make the required changes to your HTML file.').'</p>'."\n".
	'<form method="post" name="refchanger" action="'.$actionurl.'">'.
	&start_data_table()."\n".
	&start_data_table_header_row().
	'<th>'.&mt('Change?').'</th>'.
	'<th>'.&mt('Current reference').'</th>'.
	'<th>'.&mt('Required reference').'</th>'.
	&end_data_table_header_row()."\n".
	$modifyform.
	&end_data_table().'<br />'."\n".$hiddenstate.
	'<input type="submit" name="pathchanges" value="'.&mt('Modify HTML file').'" />'.
	'</form>'."\n";
	}
	return;
	}

	sub modify_html_refs {
	my ($context,$dirpath,$uname,$udom,$dir_root) = @_;
	my $container;
	if ($context eq 'portfolio') {
	$container = $env{'form.container'};
	} elsif ($context eq 'coursedoc') {
	$container = $env{'form.primaryurl'};
	} else {
	$container = $env{'form.filename'};
	$container =~ s{^/priv/(\Q$uname\E)/(.*)}{/home/$1/public_html/$2};
	}
	my (%allfiles,%codebase,$output,$content);
	my @changes = &get_env_multiple('form.namechange');
	return unless (@changes > 0);
	if (($context eq 'portfolio') \|\| ($context eq 'coursedoc')) {
	return unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/});
	$content = &Apache::lonnet::getfile($container);
	return if ($content eq '-1');
	} else {
	return unless ($container =~ /^\Q$dir_root\E/);
	if (open(my $fh,"<$container")) {
	$content = join('', <$fh>);
	close($fh);
	} else {
	return;
	}
	}
	my ($count,$codebasecount) = (0,0);
	my $mm = new File::MMagic;
	my $mime_type = $mm->checktype_contents($content);
	if ($mime_type eq 'text/html') {
	my $parse_result =
	&Apache::lonnet::extract_embedded_items($container,\%allfiles,
	\%codebase,\$content);
	if ($parse_result eq 'ok') {
	foreach my $i (@changes) {
	my $orig = &unescape($env{'form.embedded_orig_'.$i});
	my $ref = &unescape($env{'form.embedded_ref_'.$i});
	if ($allfiles{$ref}) {
	my $newname = $orig;
	my ($attrib_regexp,$codebase);
	my $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
	if ($attrib_regexp =~ /:/) {
	$attrib_regexp =~ s/\:/\|/g;
	}
	if ($content =~ m{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}) {
	my $numchg = ($content =~ s{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
	$count += $numchg;
	}
	if ($env{'form.embedded_codebase_'.$i} ne '') {
	my $codebase = &unescape($env{'form.embedded_codebase_'.$i});
	my $numchg = ($content =~ s/(codebase\s=\s["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs
	$codebasecount ++;
	}
	}
	}
	if ($count \|\| $codebasecount) {
	my $saveresult;
	if ($context eq 'portfolio' \|\| $context eq 'coursedoc') {
	my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
	if ($url eq $container) {
	my ($fname) = ($container =~ m{/([^/]+)$});
	$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
	$count,'<span class="LC_filename">'.
	$fname.'</span>').'</p>';
	} else {
	$output = '<p class="LC_error">'.
	&mt('Error: update failed for: [_1].',
	'<span class="LC_filename">'.
	$container.'</span>').'</p>';
	}
	} else {
	if (open(my $fh,">$container")) {
	print $fh $content;
	close($fh);
	$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
	$count,'<span class="LC_filename">'.
	$container.'</span>').'</p>';
	} else {
	$output = '<p class="LC_error">'.
	&mt('Error: could not update [_1].',
	'<span class="LC_filename">'.
	$container.'</span>').'</p>';
	}
	}
	}
	} else {
	&logthis('Failed to parse '.$container.
	' to modify references: '.$parse_result);
	}
}	}
return $output;	return $output;
}	}
Line 8426 sub check_for_existing {	Line 8941 sub check_for_existing {
sub check_for_upload {	sub check_for_upload {
my ($path,$fname,$group,$element,$portfolio_root,$port_path,	my ($path,$fname,$group,$element,$portfolio_root,$port_path,
$disk_quota,$current_disk_usage,$uname,$udom) = @_;	$disk_quota,$current_disk_usage,$uname,$udom) = @_;
my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)	my $filesize = length($env{'form.'.$element});
	if (!$filesize) {
	my $msg = '<span class="LC_error">'.
	&mt('Unable to upload [_1]. (size = [_2] bytes)',
	'<span class="LC_filename">'.$fname.'</span>',
	$filesize).'<br />'.
	&mt('Either the file you uploaded was empty, or your web browser was unable to read its contents.').'<br />';
	'</span>';
	return ('zero_bytes',$msg);
	}
	$filesize = $filesize/1000; #express in k (1024?)
my $getpropath = 1;	my $getpropath = 1;
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,	my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
$getpropath);	$getpropath);
my $found_file = 0;	my $found_file = 0;
my $locked_file = 0;	my $locked_file = 0;
	my @lockers;
	my $navmap;
	if ($env{'request.course.id'}) {
	$navmap = Apache::lonnavmaps::navmap->new();
	}
foreach my $line (@dir_list) {	foreach my $line (@dir_list) {
my ($file_name)=split(/\&/,$line,2);	my ($file_name,$rest)=split(/\&/,$line,2);
if ($file_name eq $fname){	if ($file_name eq $fname){
$file_name = $path.$file_name;	$file_name = $path.$file_name;
if ($group ne '') {	if ($group ne '') {
$file_name = $group.$file_name;	$file_name = $group.$file_name;
}	}
$found_file = 1;	$found_file = 1;
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {	if (&Apache::lonnet::is_locked($file_name,$udom,$uname,\@lockers) eq 'true') {
$locked_file = 1;	foreach my $lock (@lockers) {
	if (ref($lock) eq 'ARRAY') {
	my ($symb,$crsid) = @{$lock};
	if ($crsid eq $env{'request.course.id'}) {
	if (ref($navmap)) {
	my $res = $navmap->getBySymb($symb);
	foreach my $part (@{$res->parts()}) {
	my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
	unless (($slot_status == $res->RESERVED) \|\|
	($slot_status == $res->RESERVED_LOCATION)) {
	$locked_file = 1;
	}
	}
	} else {
	$locked_file = 1;
	}
	} else {
	$locked_file = 1;
	}
	}
	}
	} else {
	my @info = split(/\&/,$rest);
	my $currsize = $info[6]/1000;
	if ($currsize < $filesize) {
	my $extra = $filesize - $currsize;
	if (($current_disk_usage + $extra) > $disk_quota) {
	my $msg = '<span class="LC_error">'.
	&mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded if existing (smaller) file with same name (size = [_3] kilobytes) is replaced.',
	'<span class="LC_filename">'.$fname.'</span>',$filesize,$currsize).'</span>'.
	'<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',
	$disk_quota,$current_disk_usage);
	return ('will_exceed_quota',$msg);
	}
	}
}	}
}	}
}	}
Line 8459 sub check_for_upload {	Line 9023 sub check_for_upload {
return ('file_locked',$msg);	return ('file_locked',$msg);
} else {	} else {
my $msg = '<span class="LC_error">';	my $msg = '<span class="LC_error">';
$msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});	$msg .= &mt(' A file by that name: [_1] was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
$msg .= '</span>';	$msg .= '</span>';
$msg .= '<br />';	return ('existingfile',$msg);
$msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
return ('file_exists',$msg);
}	}
}	}
}	}

	sub check_for_traversal {
	my ($path,$url,$toplevel) = @_;
	my @parts=split(/\//,$path);
	my $cleanpath;
	my $fullpath = $url;
	for (my $i=0;$i<@parts;$i++) {
	next if ($parts[$i] eq '.');
	if ($parts[$i] eq '..') {
	$fullpath =~ s{([^/]+/)$}{};
	} else {
	$fullpath .= $parts[$i].'/';
	}
	}
	if ($fullpath =~ /^\Q$url\E(.*)$/) {
	$cleanpath = $1;
	} elsif ($fullpath =~ /^\Q$toplevel\E(.*)$/) {
	my $curr_toprel = $1;
	my @parts = split(/\//,$curr_toprel);
	my ($url_toprel) = ($url =~ /^\Q$toplevel\E(.*)$/);
	my @urlparts = split(/\//,$url_toprel);
	my $doubledots;
	my $startdiff = -1;
	for (my $i=0; $i<@urlparts; $i++) {
	if ($startdiff == -1) {
	unless ($urlparts[$i] eq $parts[$i]) {
	$startdiff = $i;
	$doubledots .= '../';
	}
	} else {
	$doubledots .= '../';
	}
	}
	if ($startdiff > -1) {
	$cleanpath = $doubledots;
	for (my $i=$startdiff; $i<@parts; $i++) {
	$cleanpath .= $parts[$i].'/';
	}
	}
	}
	$cleanpath =~ s{(/)$}{};
	return $cleanpath;
	}

=pod	=pod

Line 9989 sub check_clone {	Line 10593 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->{'type'});	my $lctype = lc($args->{'crstype'});
if ($lctype ne 'community') {	if ($lctype ne 'community') {
$lctype = 'course';	$lctype = 'course';
}	}
if ($clonehome eq 'no_host') {	if ($clonehome eq 'no_host') {
if ($args->{'type'} eq 'Community') {	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'});	$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 {	} 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'});	$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 ($args->{'type'} eq 'Community') {	if ($args->{'crstype'} eq 'Community') {
if ($clonedesc{'type'} ne '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'});	$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);	return ($can_clone, $clonemsg, $cloneid, $clonehome);
Line 10020 sub check_clone {	Line 10624 sub check_clone {
$can_clone = 1;	$can_clone = 1;
} else {	} else {
my $ccrole = 'cc';	my $ccrole = 'cc';
if ($args->{'type'} eq 'Community') {	if ($args->{'crstype'} eq 'Community') {
$ccrole = 'co';	$ccrole = 'co';
}	}
my %roleshash =	my %roleshash =
Line 10029 sub check_clone {	Line 10633 sub check_clone {
'userroles',['active'],[$ccrole],	'userroles',['active'],[$ccrole],
[$args->{'clonedomain'}]);	[$args->{'clonedomain'}]);
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) \|\| (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {	if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) \|\| (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
$can_clone = 1;	$can_clone = 1;
} else {	} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
if ($args->{'type'} eq 'Community') {	$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'});	$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 {	} 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'});	$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'});
Line 10090 sub construct_course {	Line 10696 sub construct_course {
# if anyone ever decides to not show this, and Utils::Course::new	# if anyone ever decides to not show this, and Utils::Course::new
# will need to be suitably modified.	# will need to be suitably modified.
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;	$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
	if ($$courseid =~ /^error:/) {
	return (0,$outcome);
	}

#	#
# Check if created correctly	# Check if created correctly
#	#
($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);	($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);	my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
	if ($crsuhome eq 'no_host') {
	$outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed;
	return (0,$outcome);
	}
$outcome .= &mt('Created on').': '.$crsuhome.$linefeed;	$outcome .= &mt('Created on').': '.$crsuhome.$linefeed;

#	#
Line 10113 sub construct_course {	Line 10727 sub construct_course {
$cenv{'url'}=$oldcenv{'url'};	$cenv{'url'}=$oldcenv{'url'};
# Restore title	# Restore title
$cenv{'description'}=$oldcenv{'description'};	$cenv{'description'}=$oldcenv{'description'};
	# Restore creation date, creator and creation context.
	$cenv{'internal.created'}=$oldcenv{'internal.created'};
	$cenv{'internal.creator'}=$oldcenv{'internal.creator'};
	$cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
# Mark as cloned	# Mark as cloned
$cenv{'clonedfrom'}=$cloneid;	$cenv{'clonedfrom'}=$cloneid;
# Need to clone grading mode	# Need to clone grading mode
Line 10359 sub construct_course {	Line 10977 sub construct_course {
$title=&mt('Syllabus');	$title=&mt('Syllabus');
$url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';	$url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
} else {	} else {
$title=&mt('Navigate Contents');	$title=&mt('Table of Contents');
$url='/adm/navmaps';	$url='/adm/navmaps';
}	}

Line 10376 sub construct_course {	Line 10994 sub construct_course {
############################################################	############################################################
############################################################	############################################################

	#SD
	# only Community and Course, or anything else?
sub course_type {	sub course_type {
my ($cid) = @_;	my ($cid) = @_;
if (!defined($cid)) {	if (!defined($cid)) {
Line 10541 sub init_user_environment {	Line 11161 sub init_user_environment {
my %userenv = &Apache::lonnet::dump('environment',$domain,$username);	my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {	if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
# default remote control to off
if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
} else {	} else {
undef(%userenv);	undef(%userenv);
}	}
if (($userenv{'interface'}) && (!$form->{'interface'})) {	if (($userenv{'interface'}) && (!$form->{'interface'})) {
$form->{'interface'}=$userenv{'interface'};	$form->{'interface'}=$userenv{'interface'};
}	}
$env{'environment.remote'}=$userenv{'remote'};
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }	if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }

# --------------- Do not trust query string to be put directly into environment	# --------------- Do not trust query string to be put directly into environment
Line 10581 sub init_user_environment {	Line 11198 sub init_user_environment {
$initial_env{"browser.localres"} = $form->{'localres'};	$initial_env{"browser.localres"} = $form->{'localres'};
}	}

if ($public) {
$initial_env{"environment.remote"} = "off";
}
if ($form->{'interface'}) {	if ($form->{'interface'}) {
$form->{'interface'}=~s/\W//gs;	$form->{'interface'}=~s/\W//gs;
$initial_env{"browser.interface"} = $form->{'interface'};	$initial_env{"browser.interface"} = $form->{'interface'};
$env{'browser.interface'}=$form->{'interface'};	$env{'browser.interface'}=$form->{'interface'};
}	}

	my %is_adv = ( is_adv => $env{'user.adv'} );
	my %domdef = &Apache::lonnet::get_domain_defaults($domain);

foreach my $tool ('aboutme','blog','portfolio') {	foreach my $tool ('aboutme','blog','portfolio') {
$userenv{'availabletools.'.$tool} =	$userenv{'availabletools.'.$tool} =
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload');	&Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
	undef,\%userenv,\%domdef,\%is_adv);
}	}

foreach my $crstype ('official','unofficial','community') {	foreach my $crstype ('official','unofficial','community') {
$userenv{'canrequest.'.$crstype} =	$userenv{'canrequest.'.$crstype} =
&Apache::lonnet::usertools_access($username,$domain,$crstype,	&Apache::lonnet::usertools_access($username,$domain,$crstype,
'reload','requestcourses');	'reload','requestcourses',
	\%userenv,\%domdef,\%is_adv);
}	}

$env{'user.environment'} = "$lonids/$cookie.id";	$env{'user.environment'} = "$lonids/$cookie.id";
Line 10677 sub clean_symb {	Line 11296 sub clean_symb {
return ($symb,$enc);	return ($symb,$enc);
}	}

	sub build_release_hashes {
	my ($checkparms,$checkresponsetypes,$checkcrstypes,$anonsurvey,$randomizetry) = @_;
	return unless((ref($checkparms) eq 'HASH') && (ref($checkresponsetypes) eq 'HASH') &&
	(ref($checkcrstypes) eq 'HASH') && (ref($anonsurvey) eq 'HASH') &&
	(ref($randomizetry) eq 'HASH'));
	foreach my $key (keys(%Apache::lonnet::needsrelease)) {
	my ($item,$name,$value) = split(/:/,$key);
	if ($item eq 'parameter') {
	if (ref($checkparms->{$name}) eq 'ARRAY') {
	unless(grep(/^\Q$name\E$/,@{$checkparms->{$name}})) {
	push(@{$checkparms->{$name}},$value);
	}
	} else {
	push(@{$checkparms->{$name}},$value);
	}
	} elsif ($item eq 'resourcetag') {
	if ($name eq 'responsetype') {
	$checkresponsetypes->{$value} = $Apache::lonnet::needsrelease{$key}
	}
	} elsif ($item eq 'course') {
	if ($name eq 'crstype') {
	$checkcrstypes->{$value} = $Apache::lonnet::needsrelease{$key};
	}
	}
	}
	($anonsurvey->{major},$anonsurvey->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'});
	($randomizetry->{major},$randomizetry->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'});
	return;
	}

=pod	=pod

=back	=back

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

Removed from v.1.926
changed lines
	Added in v.1.991