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.965 and 1.985

version 1.965, 2010/04/19 09:22:13	version 1.985, 2010/10/29 20:41:43
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.'" style="vertical-align:middle;"'	.' title="'.$title.'" style="vertical-align:middle;"'.$imgid
.' /></a>';	.' /></a>';
if ($text ne "") {	if ($text ne "") {
$template.='</span>';	$template.='</span>';
Line 1786 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 1848 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 1888 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 3232 sub filemimetype {	Line 3246 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 3398 sub get_previous_attempt {	Line 3411 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;	my (%typeparts,%lasthidden);
my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});	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);
Line 3409 sub get_previous_attempt {	Line 3422 sub get_previous_attempt {
unless ($showsurv) {	unless ($showsurv) {
my $id = join(',',@parts);	my $id = join(',',@parts);
$typeparts{$ign.'.'.$id} = $lasthash{$key};	$typeparts{$ign.'.'.$id} = $lasthash{$key};
	if (($lasthash{$key} eq 'anonsurvey') \|\| ($lasthash{$key} eq 'anonsurveycred')) {
	$lasthidden{$ign.'.'.$id} = 1;
	}
}	}
delete($lasthash{$key});	delete($lasthash{$key});
} else {	} else {
Line 3423 sub get_previous_attempt {	Line 3439 sub get_previous_attempt {
}	}
}	}
$prevattempts.=&end_data_table_header_row();	$prevattempts.=&end_data_table_header_row();
my %lasthidden;
if ($getattempt eq '') {	if ($getattempt eq '') {
for ($version=1;$version<=$returnhash{'version'};$version++) {	for ($version=1;$version<=$returnhash{'version'};$version++) {
my @hidden;	my @hidden;
Line 3431 sub get_previous_attempt {	Line 3446 sub get_previous_attempt {
foreach my $id (keys(%typeparts)) {	foreach my $id (keys(%typeparts)) {
if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') \|\| ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {	if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') \|\| ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
push(@hidden,$id);	push(@hidden,$id);
$lasthidden{$id} = 1;
} elsif ($lasthidden{$id}) {
if (exists($returnhash{$version.':'.$id.'.award'})) {
delete($lasthidden{$id});
}
}	}
}	}
}	}
Line 3815 sub findallcourses {	Line 3825 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 4689 sub bodytag {	Line 4701 sub bodytag {

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 4791 sub standard_css {	Line 4803 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 5057 td.LC_table_cell_checkbox {	Line 5065 td.LC_table_cell_checkbox {
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 5423 span.LC_parm_symb {	Line 5432 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 5583 table.LC_group_priv td {	Line 5600 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 6026 fieldset > legend {	Line 6033 fieldset > legend {

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

#LC_realm {	#LC_realm {
Line 6041 fieldset > legend {	Line 6048 fieldset > legend {
font-style: normal;	font-style: normal;
}	}

/* Preliminary fix to hide nav_bar inside bookmarks window */
#LC_bookmarks #LC_nav_bar {
display:none;
}

ol.LC_primary_menu {	ol.LC_primary_menu {
float: right;	float: right;
margin: 0;	margin: 0;
Line 6076 ol.LC_primary_menu a.LC_new_message {	Line 6078 ol.LC_primary_menu a.LC_new_message {
color: darkred;	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 6250 ul.LC_CourseBreadcrumbs li a {	Line 6276 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 6346 div.LC_columnSection>* {	Line 6380 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 6517 ul.LC_funclist li {	Line 6505 ul.LC_funclist li {
padding: 0px 4px	padding: 0px 4px
}	}

	.LC_hidden {
	display: none;
	}

END	END
}	}

Line 6630 Inputs: none	Line 6622 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 6694 $args - additional optional args support	Line 6682 $args - additional optional args support
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 6897 sub simple_error_page {	Line 6885 sub simple_error_page {
}	}

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 7071 role status: active, previous or future.	Line 7061 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 8110 sub get_institutional_codes {	Line 8101 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 8301 sub get_env_multiple {	Line 8296 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,%newfiles);
<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 $upload_output;
	foreach my $embed_file (keys(%{$allfiles})) {
	unless ($embed_file =~ m{^\w+://} \|\| $embed_file =~ m{^/}) {
	my ($relpath,$fname);
	if ($embed_file =~ m{/}) {
	my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
	$subdependencies{$path}{$fname} = 1;
	} else {
	$dependencies{$embed_file} = 1;
	}
	}
	}
	my ($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';
	}
	$url .= $current_path;
	$getpropath = 1;
	} elsif ($actionurl eq '/adm/upload') {
	($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});
	$url = '/home/'.$uname.'/public_html';
	if ($rest ne '') {
	$url .= '/'.$rest;
	}
	}
	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') {
	if (opendir(my $dir,$url.'/'.$path)) {
	my @subdir_list = grep(!/^\./,readdir($dir));
	map {$currsubfile{$_} = 1;} @subdir_list;
	}
	}
	foreach my $file (keys(%{$subdependencies{$path}})) {
	unless ($currsubfile{$file}) {
	$newfiles{$path.'/'.$file} = 1;
	}
	}
	}
	my (@dir_list,%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') {
	if (opendir(my $dir,$url)) {
	@dir_list = grep(!/^\./,readdir($dir));
	map {$currfile{$_} = 1;} @dir_list;
	}
	}
	foreach my $file (keys(%dependencies)) {
	unless ($currfile{$file}) {
	$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>'.$embed_file.'</td><td>';
if ($args->{'ignore_remote_references'}	if ($args->{'ignore_remote_references'}
Line 8335 sub ask_for_embedded_content {	Line 8399 sub ask_for_embedded_content {
&escape($$codebase{$embed_file}).'" />';	&escape($$codebase{$embed_file}).'" />';
}	}
}	}
$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();	$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row()."\n";
$num++;	$num++;
}	}
$upload_output .= &Apache::loncommon::end_data_table().'<br />	if ($num) {
<input type ="hidden" name="number_embedded_items" value="'.$num.'" />	$upload_output = '<form name="upload_embedded" action="'.$actionurl.'"'.
<input type ="submit" value="'.&mt('Upload Listed Files').'" />	' method="post" enctype="multipart/form-data">'."\n".
'.&mt('(only files for which a location has been provided will be uploaded)').'	$state.
</form>';	'<b>Upload embedded files</b>:<br />'.&start_data_table().
	$upload_output.
	&Apache::loncommon::end_data_table().'<br />'."\n".
	'<input type ="hidden" name="number_embedded_items" value="'.$num.'" />'."\n".
	'<input type ="submit" value="'.&mt('Upload Listed Files').'" />'."\n".
	&mt('(only files for which a location has been provided will be uploaded)')."\n".
	'</form>';
	}
return $upload_output;	return $upload_output;
}	}

Line 8378 sub upload_embedded {	Line 8449 sub upload_embedded {
$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 8406 sub upload_embedded {	Line 8476 sub upload_embedded {

$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=
if ($result !~ m\|^/uploaded/\|) {	&Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',
$output .= '<span class="LC_error">'	$dirpath.$path,);
.&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 {	} else {
$output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.	$result=
$path.$fname.'</span>').'</p>';	&Apache::lonnet::userfileupload('embedded_item_'.$i,'',
	$dirpath.$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 .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
	$path.$fname.'</span>').'</p>';
	}
}	}
} else {	} else {
# Save the file	# Save the file
Line 8483 sub check_for_existing {	Line 8560 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;
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 '') {
Line 8499 sub check_for_upload {	Line 8586 sub check_for_upload {
$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) eq 'true') {
$locked_file = 1;	$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 8516 sub check_for_upload {	Line 8617 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);
}	}
}	}
}	}
Line 10657 sub init_user_environment {	Line 10756 sub init_user_environment {
$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";

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

Removed from v.1.965
changed lines
	Added in v.1.985