--- loncom/interface/portfolio.pm 2006/07/19 21:58:16 1.139
+++ loncom/interface/portfolio.pm 2006/08/04 20:41:32 1.144
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.139 2006/07/19 21:58:16 albertel Exp $
+# $Id: portfolio.pm,v 1.144 2006/08/04 20:41:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -149,7 +149,7 @@ TABLE
sub display_directory_line {
my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
$line, $access_controls, $curr_access, $now, $version_flag,
- $href_location, $url, $current_path, $access_admin_text)=@_;
+ $href_location, $url, $current_path, $access_admin_text, $versions)=@_;
# my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
$r->print('<tr class="'.$css_class.'">');
$r->print($line);
@@ -221,7 +221,7 @@ sub display_directory {
my @dir_lines;
my @version_lines;
my %versioned;
- foreach my $line (sort
+ foreach my $dir_line (sort
{
my ($afile)=split('&',$a,2);
my ($bfile)=split('&',$b,2);
@@ -229,7 +229,7 @@ sub display_directory {
} (@$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);
+ my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
$filename =~ s/\s+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if ($version) {
@@ -239,8 +239,8 @@ sub display_directory {
push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
}
}
- foreach my $line (@dir_lines) {
- my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
+ foreach my $dir_line (@dir_lines) {
+ my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
my %version_flag;
@@ -332,27 +332,20 @@ sub display_directory {
$curr_access = join('+ ',@allaccesses);
}
}
- &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,
- $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
-# $r->print('<tr class="'.$css_class.'">');
-# $r->print($line);
-# $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-# $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
-# $filename.'</a></td>');
-# $r->print('<td>'.$size.'</td>');
-# $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-# if ($select_mode ne 'true') {
-# $r->print('<td><span style="white-space: nowrap">'.
-# &mt($curr_access).' ');
-# $r->print('<a href="'.$url.'?access='.$filename.
-# '&currentpath='.$current_path.&group_args().
-# '">'.$access_admin_text.'</a></span></td>');
-# }
-# $r->print('</tr>'.$/);
+ &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line,
+ \%access_controls, $curr_access,$now, \%version_flag, $href_location,
+ $url, $current_path, $access_admin_text);
if ($show_versions) {
- &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls,
- $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
-
+ foreach my $dir_line (@version_lines) {
+ my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
+ my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+ $line = '<td colspan="2"> </td>';
+ if (($v_fname eq $fname)&&($v_extension eq $extension)) {
+ &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size,
+ $css_class, $line, \%access_controls, $curr_access, $now,
+ \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
+ }
+ }
}
}
}
@@ -579,8 +572,13 @@ sub display_access {
$uname);
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
my $aclcount = keys(%access_controls);
- my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+ my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+
+ if ($group eq '') {
+ $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));
+ }
+
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
@@ -755,7 +753,7 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
+ $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
$port_path.$file_name).'</h3>'."\n");
$file_name = &prepend_group($file_name);
my ($uname,$udom) = &get_name_dom();
@@ -1478,7 +1476,6 @@ sub upload {
}
}
$fname=&Apache::lonnet::clean_filename($fname);
-
my $portfolio_root=&get_portfolio_root();
my ($uname,$udom) = &get_name_dom();
my $port_path = &get_port_path();
@@ -1492,10 +1489,6 @@ sub upload {
$file_name = $env{'form.currentpath'}.$file_name;
$file_name = &prepend_group($file_name);
$found_file = 1;
- # FIXME I think this is incorrect, prepend_group took care of this?
- if (defined($group)) {
- $file_name = $group.'/'.$file_name;
- }
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$locked_file = 1;
}
@@ -1602,7 +1595,10 @@ sub createdir {
}
sub get_portfolio_root {
- my ($uname,$udom) = &get_name_dom();
+ my ($udom,$uname) = @_;
+ if (!defined($uname) || !defined($udom)) {
+ ($uname,$udom) = &get_name_dom();
+ }
my $path;
if (defined($env{'form.group'})) {
$path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';