loncom/interface/portfolio.pm - diff

Return to portfolio.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.62 and 1.81

version 1.62, 2004/12/04 19:08:42	version 1.81, 2005/04/07 04:46:36
Line 83 sub display_directory {	Line 83 sub display_directory {
my ($r,$current_path,$is_empty,$dir_list)=@_;	my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";	my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $display_out;	my $display_out;
my %locked_files=&Apache::lonnet::dump('file_permissions',	my $select_mode;
$ENV{'user.domain'},$ENV{'user.name'});	my $checked_files;
my $locked_file;	my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
foreach my $key (keys %locked_files) {	if ($ENV{"form.mode"} eq 'selectfile'){
$locked_file .= $locked_files{$key}.':';	&select_files($r);
}	$checked_files =&Apache::lonnet::files_in_path($ENV{'user.name'},$ENV{'form.currentpath'});
if ($is_empty && ($current_path ne '/')) {	$select_mode = 'true';
$display_out = '<form method="post" action="/adm/portfolio">'.	}
'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
'<input type="hidden" name="selectfile" value="" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
'</form>';

$r->print($display_out);
return;
}
$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
'<tr><th>Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
my ($bfile)=split('&',$b,2);
return (lc($afile) cmp lc($bfile));
} (@$dir_list)) {
#$strip holds directory/file name
#$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
if (($filename ne '.') && ($filename ne '..')) {
if ($dirptr&$testdir) {
$r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
$r->print('<td>Go to ...</td>');
$r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
$r->print('<td>
<form method="post" action="/adm/portfolio">
<select name="action">
<option value=""></option>
<option value="delete">'.&mt("Delete").'</option>
<option value="rename">'.&mt("Rename").'</option>
</select>
<input type="submit" name="doit" value="Go" />
<input type="hidden" name="selectfile" value="'.$filename.'" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>
</td>');
$r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
$r->print('<td><a href="'.$href_location.$filename.'">'.
$filename.'</a></td>');
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
$r->print('</tr>');
}
}
}
# <tr bgcolor="#FFAA99"> pink bg
# <tr bgcolor="#CCCCFF"> blue bg
# $r->print(&display_directory($current_path, $currentFile, @dir_list));
# $r->print('</td>><td>');
# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
$r->print('</table></form>');
}
sub display_file_select {
my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $display_out;
my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
foreach my $key (keys %$checked_files) {
&Apache::lonnet::logthis("a key is $key $$checked_files{$key} is the value");
}
if ($is_empty && ($current_path ne '/')) {	if ($is_empty && ($current_path ne '/')) {
$display_out = '<form method="post" action="/adm/portfolio">'.	$display_out = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.	'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.	'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
'<input type="hidden" name="selectfile" value="" />'.	'<input type="hidden" name="selectfile" value="" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.	'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.

'</form>';	'</form>';

$r->print($display_out);	$r->print($display_out);
return;	return;
}	}
$r->print('<table border="0" cellspacing="2" cellpadding="2">'.	if ($select_mode eq 'true') {
	$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
'<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');	'<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
	$r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
	} else {
	$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
	'<tr><th colspan="2">Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
	$r->print('<form method="post" action="/adm/portfolio">');
	}
my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";	my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
$r->print('<form method="post" name="checkselect" action="/adm/portfolio">');	my $href_edit_location="/editupload/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
foreach my $line (sort	foreach my $line (sort
{	{
my ($afile)=split('&',$a,2);	my ($afile)=split('&',$a,2);
Line 182 sub display_file_select {	Line 123 sub display_file_select {
#$dom	#$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
$filename =~ s/\s+$//;	$filename =~ s/\s+$//;
if (($filename ne '.') && ($filename ne '..')) {	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ )) {
if ($dirptr&$testdir) {	if ($dirptr&$testdir) {
$r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');	if ($select_mode eq 'true'){
	$r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
	} else {
	$r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
	}
$r->print('<td>Go to ...</td>');	$r->print('<td>Go to ...</td>');
$r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');	$r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
$r->print('</tr>');	$r->print('</tr>');
} else {	} else {
$r->print('<tr bgcolor="#CCCCFF">');	$r->print('<tr bgcolor="#CCCCFF">');
$r->print('<td><input type="checkbox" name="selectedfile" value="'.$filename.'"');	if ($select_mode eq 'true'){
if ($$checked_files{$filename} eq 'selected') {	$r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"');
$r->print("CHECKED");	if ($$checked_files{$filename} eq 'selected') {
&Apache::lonnet::logthis("checked");	$r->print("CHECKED");
	}
	$r->print('></td>');
} else {	} else {
&Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename");	if (exists $locked_files{$current_path.$filename}){
	$r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
	} else {
	$r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
	<a href="/adm/portfolio?rename='.$filename.'&currentpath='.$current_path.'">Rename</a></td>
	<td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
	</td>');
	}
}	}
$r->print('></td>');
$r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');	$r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
$r->print('<td><a href="'.$href_location.$filename.'">'.	$r->print('<td><a href="'.$href_location.$filename.'">'.
$filename.'</a></td>');	$filename.'</a></td>');
Line 207 sub display_file_select {	Line 160 sub display_file_select {
}	}
}	}
}	}
$r->print('</table>	if ($select_mode eq 'true') {
	$r->print('</table>
<input type="hidden" name="continue" value="true">	<input type="hidden" name="continue" value="true">
<input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">	<input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
<input type="hidden" name="mode" value="selectfile">	<input type="hidden" name="mode" value="selectfile">
<input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />	<input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
<input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />	<input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />	<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');	</form>');
	} else {
	$r->print('</table>
	<input type="submit" name="doit" value="Delete Checked Files" />
	<input type="hidden" name="action" value="delete" />
	<input type="hidden" name="currentpath" value="'.$current_path.'" />
	</form>');
	}
}	}

sub open_form {	sub open_form {
my ($r)=@_;	my ($r)=@_;
	my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
$r->print('<form method="post" action="/adm/portfolio">');	$r->print('<form method="post" action="/adm/portfolio">');
$r->print('<input type="hidden" name="action" value="'.	$r->print('<input type="hidden" name="action" value="'.
$ENV{'form.action'}.'" />');	$ENV{'form.action'}.'" />');
$r->print('<input type="hidden" name="confirmed" value="1" />');	$r->print('<input type="hidden" name="confirmed" value="1" />');
$r->print('<input type="hidden" name="selectfile" value="'.	foreach (@files) {
$ENV{'form.selectfile'}.'" />');	$r->print('<input type="hidden" name="selectfile" value="'.
	$_.'" />');
	}
$r->print('<input type="hidden" name="currentpath" value="'.	$r->print('<input type="hidden" name="currentpath" value="'.
$ENV{'form.currentpath'}.'" />');	$ENV{'form.currentpath'}.'" />');
}	}
Line 244 sub close_form {	Line 208 sub close_form {

sub display_file {	sub display_file {
my ($path,$filename)=@_;	my ($path,$filename)=@_;
	my $display_file_text;
if (!defined($path)) { $path=$ENV{'form.currentpath'}; }	if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }	if (!defined($filename)) {
return '<tt>'.$path.$filename.'</tt>';	$filename=$ENV{'form.selectfile'};
	$display_file_text = '<tt>'.$path.$filename.'</tt>';
	} elsif (ref($filename) eq "ARRAY") {
	foreach (@$filename) {
	$display_file_text .= '<tt>'.$path.$_.'</tt><br />';
	}
	} elsif (ref($filename) eq "SCALAR") {
	$display_file_text = '<tt>'.$path.$filename.'</tt>';
	}
	return $display_file_text;
}	}

sub done {	sub done {
	my ($message)=@_;
	unless (defined $message) {
	$message='Done';
	}
return ('<h3><a href="/adm/portfolio?currentpath='.	return ('<h3><a href="/adm/portfolio?currentpath='.
$ENV{'form.currentpath'}.	$ENV{'form.currentpath'}.
'&fieldname='.$ENV{'form.fieldname'}.	'&fieldname='.$ENV{'form.fieldname'}.
'&mode='.$ENV{'form.mode'}.	'&mode='.$ENV{'form.mode'}.
'">'.&mt('Done').'</a></h3>');	'">'.&mt($message).'</a></h3>');
}	}

sub delete {	sub delete {
my ($r)=@_;	my ($r)=@_;
my @check;	my @check;
my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};	my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
	my @files=&Apache::loncommon::get_env_multiple('form.selectfile');

if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {	if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
$r->print ("The file is locked and cannot be deleted.<br />");	$r->print ("The file is locked and cannot be deleted.<br />");
$r->print(&done());	$r->print(&done('Back'));
} else {	} else {
&open_form($r);	if (scalar(@files)) {
$r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');	&open_form($r);
&close_form($r);	$r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
	&close_form($r);
	} else {
	$r->print("No file was checked to delete.<br />");
	$r->print(&done());
	}
}	}
}	}

sub delete_confirmed {	sub delete_confirmed {
my ($r)=@_;	my ($r)=@_;
my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},	my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
	my $result;
	foreach my $delete_file (@files) {
	$result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
$ENV{'user.domain'},'portfolio'.	$ENV{'user.domain'},'portfolio'.
$ENV{'form.currentpath'}.	$ENV{'form.currentpath'}.
$ENV{'form.selectfile'});	$delete_file);
if ($result ne 'ok') {	if ($result ne 'ok') {
$r->print('<font color="red"> An error occured ('.$result.	$r->print('<font color="red"> An error occured ('.$result.
') while trying to delete '.&display_file().'</font><br />');	') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
	}
}	}
$r->print(&done());	$r->print(&done());
}	}
Line 294 sub delete_dir {	Line 283 sub delete_dir {
sub delete_dir_confirmed {	sub delete_dir_confirmed {
my ($r)=@_;	my ($r)=@_;
my $directory_name = $ENV{'form.currentpath'};	my $directory_name = $ENV{'form.currentpath'};
$directory_name =~ m/\/$/;	$directory_name =~ s\|/$\|\|; # remove any trailing slash
$directory_name = $`;
my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},	my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
$ENV{'user.domain'},'portfolio'.	$ENV{'user.domain'},'portfolio'.
$directory_name);	$directory_name);
Line 321 sub delete_dir_confirmed {	Line 309 sub delete_dir_confirmed {

sub rename {	sub rename {
my ($r)=@_;	my ($r)=@_;
my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};	my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {	if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
$r->print ("The file is locked and cannot be renamed.<br />");	$r->print ("The file is locked and cannot be renamed.<br />");
$r->print(&done());	$r->print(&done());
Line 352 sub rename_confirmed {	Line 340 sub rename_confirmed {
') while trying to rename '.&display_file().' to '.	') while trying to rename '.&display_file().' to '.
&display_file(undef,$filenewname).'</font><br />');	&display_file(undef,$filenewname).'</font><br />');
}	}
	if ($filenewname ne $ENV{'form.filenewname'}) {
	$r->print("The new file name was changed from:<br /><strong>".$ENV{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
	}
$r->print(&done());	$r->print(&done());
}	}
sub select_files {	sub select_files {
Line 359 sub select_files {	Line 350 sub select_files {
if ($ENV{'form.continue'} eq 'true') {	if ($ENV{'form.continue'} eq 'true') {
# here we update the selections for the currentpath	# here we update the selections for the currentpath
# eventually, have to handle removing those not checked, but . . .	# eventually, have to handle removing those not checked, but . . .
my @items=&Apache::loncommon::get_env_multiple('form.selectedfile');	my @items=&Apache::loncommon::get_env_multiple('form.selectfile');
&Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);	&Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
} else {	} else {
if ($ENV{'form.currentpath'} eq '/') {	if ($ENV{'form.currentpath'} eq '/') {
Line 372 sub select_files {	Line 363 sub select_files {
if ($java_files) {	if ($java_files) {
$java_files.=',';	$java_files.=',';
}	}
my $java_script =(<<ENDSMP);	my $javascript =(<<ENDSMP);
<script language='javascript'>	<script language='javascript'>
function finishSelect() {	function finishSelect() {
ENDSMP	ENDSMP
$java_script .= 'fileList = "'.$java_files.'";';	$javascript .= 'fileList = "'.$java_files.'";';
$java_script .= (<<ENDSMP);	$javascript .= (<<ENDSMP);
for (i=0;i<document.forms.checkselect.length;i++) {	for (i=0;i<document.forms.checkselect.length;i++) {
if (document.forms.checkselect[i].checked){	if (document.forms.checkselect[i].checked){
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;	fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
Line 385 ENDSMP	Line 376 ENDSMP
}	}
opener.document.forms.lonhomework.	opener.document.forms.lonhomework.
ENDSMP	ENDSMP
$java_script .= $ENV{'form.fieldname'};	$javascript .= $ENV{'form.fieldname'};
$java_script .= (<<ENDSMP);	$javascript .= (<<ENDSMP);
.value=fileList;	.value=fileList;
self.close();	self.close();
}	}
</script>	</script>
ENDSMP	ENDSMP
$r->print($java_script);	$r->print($javascript);
$r->print("<h1>Select portfolio files</h1>	$r->print("<h1>Select portfolio files</h1>
Check as many as you wish in response to the essay problem.<br />");	Check as many as you wish in response to the essay problem.<br />");
$r->print("<strong>Files selected from other directories:</strong><br />");	$r->print("<strong>Files selected from other directories:</strong><br />");
Line 414 sub upload {	Line 405 sub upload {
$ENV{'user.domain'},	$ENV{'user.domain'},
$ENV{'user.name'},$portfolio_root);	$ENV{'user.name'},$portfolio_root);
my $found_file = 0;	my $found_file = 0;
	my $locked_file = 0;
foreach my $line (@dir_list) {	foreach my $line (@dir_list) {
my ($filename)=split(/\&/,$line,2);	my ($file_name)=split(/\&/,$line,2);
if ($filename eq $fname){	if ($file_name eq $fname){
$found_file = 1;	$found_file = 1;
	if (&Apache::lonnet::is_locked($ENV{'form.currentpath'}.$file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
	$locked_file = 1;
	}
}	}
}	}
my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);	my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
if (($current_disk_usage + $filesize) > $disk_quota){	if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
$r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.	$r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
'<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');	'<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
	$r->print(&done('Back'));
}	}
elsif ($found_file){	elsif ($found_file){
$r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.	if ($locked_file){
'<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});	$r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
	'<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
	$r->print(&done('Back'));
	} else {
	$r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
	'<br />To upload, rename or delete existing '.$fname.' in portfolio'.$ENV{'form.currentpath'});
	$r->print(&done('Back'));
	}
} else {	} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',	my $result=&Apache::lonnet::userfileupload('uploaddoc','',
'portfolio'.$ENV{'form.currentpath'});	'portfolio'.$ENV{'form.currentpath'});
if ($result !~ m\|^/uploaded/\|) {	if ($result !~ m\|^/uploaded/\|) {
$r->print('<font color="red"> An errror occured ('.$result.	$r->print('<font color="red"> An errror occured ('.$result.
') while trying to upload '.&display_file().'</font><br />');	') while trying to upload '.&display_file().'</font><br />');
	$r->print(&done('Back'));
	} else {
	$r->print(&done());
}	}
}	}
$r->print(&done());
}	}
	sub lock_info {
	my ($r) = @_;
	$r->print("lock info here");
	return 'ok';
	}
sub createdir {	sub createdir {
my ($r)=@_;	my ($r)=@_;
my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});	my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
Line 473 sub createdir {	Line 482 sub createdir {
') while trying to create a new directory '.&display_file().'</font><br />');	') while trying to create a new directory '.&display_file().'</font><br />');
}	}
}	}
	if ($newdir ne $ENV{'form.newdir'}) {
	$r->print("The new directory name was changed from:<br /><strong>".$ENV{'form.newdir'}."</strong> to <strong>$newdir </strong>");
	}
$r->print(&done());	$r->print(&done());
}	}

Line 482 sub handler {	Line 494 sub handler {
my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
$ENV{'user.name'}).	$ENV{'user.name'}).
'/userfiles/portfolio';	'/userfiles/portfolio';
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['selectfile','currentpath','meta','lockinfo',
	'currentfile','action','fieldname','mode','rename']);
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
# Give the LON-CAPA page header	# Give the LON-CAPA page header
$r->print('<html><head><title>'.	my $html=&Apache::lonxml::xmlbegin();
	$r->print($html.'<head><title>'.
&mt('Portfolio Manager').	&mt('Portfolio Manager').
"</title></head>\n".	"</title></head>\n");
&Apache::loncommon::bodytag('Portfolio Manager'));	if ($ENV{"form.mode"} eq 'selectfile'){
	$r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
	} else {
	$r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
	}
$r->rflush();	$r->rflush();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
'currentfile','action','fieldname','mode']);
if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){	if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
$r->print('<font color="red"> No file was selected to upload.'.	$r->print('<font color="red"> No file was selected to upload.'.
'To upload a file, click <strong>Browse...</strong>'.	'To upload a file, click <strong>Browse...</strong>'.
', select a file, then click <strong>Upload</strong>,</font>');	', select a file, then click <strong>Upload</strong>,</font>');
}	}
	if ($ENV{'form.meta'}) {
	&open_form($r);
	# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
	$r->print('Edit the meta data<br />');
	&close_form($r);
	}
	if ($ENV{'form.store'}) {
	}

if ($ENV{'form.uploaddoc.filename'}) {	if ($ENV{'form.uploaddoc.filename'}) {
&upload($r);	&upload($r);
} elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {	} elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
Line 511 sub handler {	Line 537 sub handler {
&delete_dir($r);	&delete_dir($r);
} elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {	} elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
&rename_confirmed($r);	&rename_confirmed($r);
} elsif ($ENV{'form.action'} eq 'rename') {	} elsif ($ENV{'form.rename'}) {
	$ENV{'form.selectfile'} = $ENV{'form.rename'};
	$ENV{'form.action'} = 'rename';
&rename($r);	&rename($r);
} elsif ($ENV{'form.createdir'}) {	} elsif ($ENV{'form.createdir'}) {
&createdir($r);	&createdir($r);
	} elsif ($ENV{'form.lockinfo'}) {
	&lock_info($r);
} else {	} else {
my $current_path='/';	my $current_path='/';
if ($ENV{'form.currentpath'}) {	if ($ENV{'form.currentpath'}) {
Line 545 sub handler {	Line 575 sub handler {
# need to know if directory is empty so it can be removed if desired	# need to know if directory is empty so it can be removed if desired
my $is_empty=(@dir_list == 2);	my $is_empty=(@dir_list == 2);
&display_common($r,$current_path,$is_empty,\@dir_list);	&display_common($r,$current_path,$is_empty,\@dir_list);
if ($ENV{"form.mode"} eq 'selectfile'){	&display_directory($r,$current_path,$is_empty,\@dir_list);
&select_files($r);
&display_file_select($r,$current_path,$is_empty,\@dir_list);
} else {
&display_directory($r,$current_path,$is_empty,\@dir_list);
}
$r->print("</body>\n</html>\n");	$r->print("</body>\n</html>\n");
return OK;	return OK;
}	}

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

Removed from v.1.62
changed lines
	Added in v.1.81