--- loncom/interface/portfolio.pm 2006/05/09 14:38:10 1.98
+++ loncom/interface/portfolio.pm 2006/06/22 15:46:28 1.111
@@ -30,6 +30,9 @@ use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl';
+use LONCAPA;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
@@ -123,12 +126,16 @@ sub display_directory {
my $checked_files;
my $port_path = &get_port_path($group);
my ($uname,$udom) = &get_name_dom($group);
- my $namespace = &get_namespace($group);
if (defined($group)) {
$groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
$groupecho = '&group='.$group;
}
- my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname);
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash(
+ $current_permissions,$group);
+ my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
+ my $now = time;
if ($env{"form.mode"} eq 'selectfile'){
&select_files($r);
$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
@@ -151,7 +158,7 @@ sub display_directory {
$r->print('<form method="post" name="checkselect" action="'.$url.'">');
} 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>');
+ '<tr><th colspan="2">Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
$r->print('<form method="post" action="'.$url.'">');
}
if (defined($group)) {
@@ -159,6 +166,8 @@ sub display_directory {
}
my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
+ my @dir_lines;
+ my %versioned;
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
@@ -169,6 +178,15 @@ sub display_directory {
#$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
$filename =~ s/\s+$//;
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+ if ($version) {
+ $versioned{$fname} .= $version.",";
+ }
+ push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
+ }
+ foreach my $line (@dir_lines) {
+ my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
if ($dirptr&$testdir) {
if ($select_mode eq 'true'){
@@ -181,14 +199,22 @@ sub display_directory {
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
+ my $version_flag;
+ if (exists($versioned{$fname})) {
+ $version_flag = "*";
+ } else {
+ $version_flag = "";
+ }
+ my $fullpath = $current_path.$filename;
+ $fullpath = &prepend_group($fullpath,$group);
if ($select_mode eq 'true'){
- $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');
+ $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');
if ($$checked_files{$filename} eq 'selected') {
$r->print("CHECKED");
}
$r->print('></td>');
} else {
- if (exists $locked_files{$current_path.$filename}){
+ if (exists $locked_files{$fullpath}) {
$r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');
} else {
my $cat='<img alt="'.&mt('Catalog Information').
@@ -199,11 +225,46 @@ sub display_directory {
</td>');
}
}
+ my $curr_access;
+ my $pub_access = 0;
+ my $guest_access = 0;
+ my $cond_access = 0;
+ foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ if (($now > $start) && (!$end || $end > $now)) {
+ if ($scope eq 'public') {
+ $pub_access = 1;
+ } elsif ($scope eq 'guest') {
+ $guest_access = 1;
+ } else {
+ $cond_access = 1;
+ }
+ }
+ }
+ if (!$pub_access && !$guest_access && !$cond_access) {
+ $curr_access = &mt('Private');
+ } else {
+ my @allaccesses;
+ if ($pub_access) {
+ push(@allaccesses,&mt('Public'));
+ }
+ if ($guest_access) {
+ push(@allaccesses,&mt('Password-protected'));
+ }
+ if ($cond_access) {
+ push(@allaccesses,&mt('Conditional'));
+ }
+ $curr_access = join('+ ',@allaccesses);
+ }
$r->print('<td><img src="'.&Apache::loncommon::icon($filename).'"></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('<td><nobr>'.&mt($curr_access).' '.
+ '<a href="'.$url.'?access='.$filename.
+ '&currentpath='.$current_path.$groupecho.
+ '">'.&mt('View/Change').'</a></nobr></td>');
$r->print('</tr>');
}
}
@@ -229,7 +290,7 @@ sub display_directory {
sub open_form {
my ($r,$url)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- $r->print('<form method="post" action="'.$url.'">');
+ $r->print('<form name="portform" method="post" action="'.$url.'">');
$r->print('<input type="hidden" name="action" value="'.
$env{'form.action'}.'" />');
$r->print('<input type="hidden" name="confirmed" value="1" />');
@@ -242,8 +303,14 @@ sub open_form {
}
sub close_form {
- my ($r,$url,$group)=@_;
- $r->print('<p><input type="submit" value="'.&mt('Continue').'" />');
+ my ($r,$url,$group,$button_text)=@_;
+ if (!defined($button_text)) {
+ $button_text = {
+ 'continue' => &mt('Continue'),
+ 'cancel' => &mt('Cancel'),
+ };
+ }
+ $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />');
if (defined($group)) {
$r->print("\n".'<input type="hidden" name="group" value="'.
$group.'" />');
@@ -257,7 +324,7 @@ sub close_form {
$r->print("\n".'<input type="hidden" name="group" value="'.
$group.'" />');
}
- $r->print("\n".' <input type="submit" value="'.&mt('Cancel').'" />
+ $r->print("\n".' <input type="submit" value="'.$button_text->{'cancel'}.'" />
</p></form>');
}
@@ -298,6 +365,7 @@ sub delete {
my ($r,$url,$group)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
+ $file_name = &prepend_group($file_name,$group);
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
@@ -373,6 +441,7 @@ sub rename {
my ($r,$url,$group)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
my ($uname,$udom) = &get_name_dom($group);
+ $file_name = &prepend_group($file_name,$group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be renamed.<br />");
$r->print(&done(undef,$url,$group));
@@ -410,8 +479,786 @@ sub rename_confirmed {
}
$r->print(&done(undef,$url,$group));
}
+
+sub display_access {
+ my ($r,$url,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $file_name = $env{'form.currentpath'}.$env{'form.access'};
+ $file_name = &prepend_group($file_name,$group);
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
+ my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
+ &open_form($r,$url);
+ $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>'."\n");
+ $r->print(&mt('Access to this file by others can be set to be one or more of the following types: public, password-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Password-protected files do not require log-in, but will require the viewer to enter the password you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satify 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 you can grant access to people with specific LON-CAPA usernames and domains.').'</li></ul>');
+ &access_setting_table($r,$access_controls{$file_name});
+ my $button_text = {
+ 'continue' => &mt('Proceed'),
+ 'cancel' => &mt('Back to directory listing'),
+ };
+ &close_form($r,$url,$group,$button_text);
+}
+
+sub update_access {
+ my ($r,$url,$group) = @_;
+ my $function = &Apache::loncommon::get_users_function();
+ my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
+ my $totalprocessed = 0;
+ my %processing;
+ my %title = (
+ 'activate' => 'New control(s) added',
+ 'delete' => 'Existing control(s) deleted',
+ 'update' => 'Existing control(s) modified',
+ );
+ my $changes;
+ foreach my $chg (sort(keys(%title))) {
+ @{$processing{$chg}} = &Apache::loncommon::get_env_multiple('form.'.$chg);
+ $totalprocessed += @{$processing{$chg}};
+ foreach my $num (@{$processing{$chg}}) {
+ my $scope = $env{'form.scope_'.$num};
+ my ($start,$end) = &get_dates_from_form($num);
+ my $newkey = $num.':'.$scope.'_'.$end.'_'.$start;
+ if ($chg eq 'delete') {
+ $$changes{$chg}{$newkey} = 1;
+ } else {
+ $$changes{$chg}{$newkey} =
+ &build_access_record($num,$scope,$start,$end,$chg);
+ }
+ }
+ }
+ my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
+ $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
+ $file_name).'</h3>'."\n");
+ $file_name = &prepend_group($file_name,$group);
+ my ($uname,$udom) = &get_name_dom($group);
+ my ($errors,$outcome,$deloutcome,$new_values,$translation);
+ if ($totalprocessed) {
+ ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($file_name,$changes,$udom,
+ $uname);
+ }
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,
+ $group,$file_name);
+ if ($totalprocessed) {
+ if ($outcome eq 'ok') {
+ my $updated_controls = $access_controls{$file_name};
+ my ($showstart,$showend);
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print('<th>'.&mt('Type of change').'</th><th>'.
+ &mt('Access control').'</th><th>'.&mt('Dates available').
+ '</th><th>'.&mt('Additional information').'</th>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ foreach my $chg (sort(keys(%processing))) {
+ if (@{$processing{$chg}} > 0) {
+ if ($chg eq 'delete') {
+ if (!($deloutcome eq 'ok')) {
+ $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+ next;
+ }
+ }
+ my $numchgs = @{$processing{$chg}};
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print('<td rowspan="'.$numchgs.'">'.&mt($title{$chg}).
+ '.</td>');
+ my $count = 0;
+ foreach my $key (sort(keys(%{$$changes{$chg}}))) {
+ if ($count) {
+ $r->print(&Apache::loncommon::start_data_table_row());
+ }
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my $newkey = $key;
+ if ($chg eq 'activate') {
+ $newkey =~ s/^(\d+)/$$translation{$1}/;
+ }
+ my $content = $$updated_controls{$newkey};
+ if ($chg eq 'delete') {
+ $showstart = &mt('Deleted');
+ $showend = $showstart;
+ } else {
+ $showstart = localtime($start);
+ if ($end == 0) {
+ $showend = &mt('No end date');
+ } else {
+ $showend = localtime($end);
+ }
+ }
+ $r->print('<td>'.&mt($scope));
+ if (($scope eq 'course') || ($scope eq 'group')) {
+ if ($chg ne 'delete') {
+ my $cid = $content->{'domain'}.'_'.$content->{'number'};
+ my %course_description = &Apache::lonnet::coursedescription($cid);
+ $r->print('<br />('.$course_description{'description'}.')');
+ }
+ }
+ $r->print('</td><td>'.&mt('Start: ').$showstart.
+ '<br />'.&mt('End: ').$showend.'</td><td>');
+ if ($chg ne 'delete') {
+ if ($scope eq 'guest') {
+ $r->print(&mt('Password').': '.$content->{'password'});
+ } elsif ($scope eq 'course' || $scope eq 'group') {
+ $r->print('<table border="0"><tr bgcol = "'.
+ $tablecolor.'">');
+ $r->print('<th>'.&mt('Roles').'</th><th>'.
+ &mt('Access').'</th><th>'.
+ &mt('Sections').'</th>');
+ if ($scope eq 'course') {
+ $r->print('<th>'.&mt('Groups').'</th>');
+ } else {
+ $r->print('<th>'.&mt('Teams').'</th>');
+ }
+ $r->print('</tr>');
+ foreach my $id (sort(keys(%{$content->{'roles'}}))) {
+ $r->print('<tr>');
+ foreach my $item ('role','access','section','group') {
+ $r->print('<td>');
+ if ($item eq 'role') {
+ my $ucscope = $scope;
+ $ucscope =~ s/^(\w)/uc($1)/;
+ my $role_output;
+ foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
+ if ($role eq 'all') {
+ $role_output .= $role.',';
+ } elsif ($role =~ /^cr/) {
+ $role_output .= (split('/',$role))[3].',';
+ } else {
+ $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
+ }
+ }
+ $role_output =~ s/,$//;
+ $r->print($role_output);
+ } else {
+ $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
+ }
+ $r->print('</td>');
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
+ } elsif ($scope eq 'domains') {
+ $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
+ } elsif ($scope eq 'users') {
+ my $curr_user_list = &sort_users($content->{'users'});
+ $r->print(&mt('Users: ').$curr_user_list);
+ } else {
+ $r->print(' ');
+ }
+ } else {
+ $r->print(' ');
+ }
+ $r->print('</td>');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
+ $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);
+ }
+ }
+ if ($errors) {
+ $r->print($errors);
+ }
+ }
+ my $allnew = 0;
+ my $totalnew = 0;
+ my $status = 'new';
+ my ($firstitem,$lastitem);
+ foreach my $newitem ('course','group','domains','users') {
+ $allnew += $env{'form.new'.$newitem};
+ }
+ if ($allnew > 0) {
+ my $now = time;
+ my $then = $now + (60*60*24*180); # six months approx.
+ &open_form($r,$url,$group);
+ foreach my $newitem ('course','group','domains','users') {
+ if ($env{'form.new'.$newitem} > 0) {
+ $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
+ $firstitem = $totalnew;
+ $lastitem = $totalnew + $env{'form.new'.$newitem};
+ $totalnew = $lastitem;
+ my @numbers;
+ for (my $i=$firstitem; $i<$lastitem; $i++) {
+ push (@numbers,$i);
+ }
+ &display_access_row($r,$status,$newitem,\@numbers,
+ $access_controls{$file_name},$now,$then);
+ }
+ }
+ &close_form($r,$url,$group);
+ } else {
+ $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
+ '¤tpath='.$env{'form.currentpath'}.'">'.
+ &mt('Display all access settings for this file').'</a>');
+ }
+ return;
+}
+
+sub build_access_record {
+ my ($num,$scope,$start,$end,$chg) = @_;
+ my $record = {
+ type => $scope,
+ time => {
+ start => $start,
+ end => $end
+ },
+ };
+
+ if ($scope eq 'guest') {
+ $record->{'password'} = $env{'form.password'};
+ } elsif (($scope eq 'course') || ($scope eq 'group')) {
+ $record->{'domain'} = $env{'form.crsdom_'.$num};
+ $record->{'number'} = $env{'form.crsnum_'.$num};
+ my @role_ids;
+ my @delete_role_ids =
+ &Apache::loncommon::get_env_multiple('form.delete_role_'.$num);
+ my @preserves =
+ &Apache::loncommon::get_env_multiple('form.preserve_role_'.$num);
+ if (@delete_role_ids) {
+ foreach my $id (@preserves) {
+ if (grep {$_ = $id} (@delete_role_ids)) {
+ next;
+ }
+ push(@role_ids,$id);
+ }
+ } else {
+ push(@role_ids,@preserves);
+ }
+
+ my $next_id = $env{'form.add_role_'.$num};
+ if ($next_id) {
+ push(@role_ids,$next_id);
+ }
+
+ foreach my $id (@role_ids) {
+ my (@roles,@accesses,@sections,@groups);
+ if (($id == $next_id) && ($chg eq 'update')) {
+ @roles = split(/,/,$env{'form.role_'.$num.'_'.$next_id});
+ @accesses = split(/,/,$env{'form.access_'.$num.'_'.$next_id});
+ @sections = split(/,/,$env{'form.section_'.$num.'_'.$next_id});
+ @groups = split(/,/,$env{'form.group_'.$num.'_'.$next_id});
+ } else {
+ @roles = &Apache::loncommon::get_env_multiple('form.role_'.$num.'_'.$id);
+ @accesses = &Apache::loncommon::get_env_multiple('form.access_'.$num.'_'.$id);
+ @sections = &Apache::loncommon::get_env_multiple('form.section_'.$num.'_'.$id);
+ @groups = &Apache::loncommon::get_env_multiple('form.group_'.$num.'_'.$id);
+ }
+ $record->{'roles'}{$id}{'role'} = \@roles;
+ $record->{'roles'}{$id}{'access'} = \@accesses;
+ $record->{'roles'}{$id}{'section'} = \@sections;
+ $record->{'roles'}{$id}{'group'} = \@groups;
+ }
+ } elsif ($scope eq 'domains') {
+ my @doms = &Apache::loncommon::get_env_multiple('form.dom_'.$num);
+ $record->{'dom'} = \@doms;
+ } elsif ($scope eq 'users') {
+ my $userlist = $env{'form.users_'.$num};
+ $userlist =~ s/\s+//sg;
+ my %userhash = map { ($_,1) } (split(/,/,$userlist));
+ foreach my $user (keys(%userhash)) {
+ my ($uname,$udom) = split(/:/,$user);
+ push(@{$record->{'users'}}, {
+ 'uname' => $uname,
+ 'udom' => $udom
+ });
+ }
+ }
+ return $record;
+}
+
+sub get_dates_from_form {
+ my ($id) = @_;
+ my $startdate;
+ my $enddate;
+ $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$id);
+ $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$id);
+ if ( exists ($env{'form.noend_'.$id}) ) {
+ $enddate = 0;
+ }
+ return ($startdate,$enddate);
+}
+
+sub sort_users {
+ my ($users) = @_;
+ my @curr_users = map {
+ $_->{'uname'}.':'.$_->{'udom'}
+ } (@{$users});
+ my $curr_user_list = join(",\n",sort(@curr_users));
+ return $curr_user_list;
+}
+
+sub access_setting_table {
+ my ($r,$access_controls) = @_;
+ my ($public,$publictext);
+ $publictext = &mt('Off');
+ my ($guest,$guesttext);
+ $guesttext = &mt('Off');
+ my @courses = ();
+ my @groups = ();
+ my @domains = ();
+ my @users = ();
+ my $now = time;
+ my $then = $now + (60*60*24*180); # six months approx.
+ my ($num,$scope,$publicnum,$guestnum);
+ my (%acl_count,%end,%start);
+ foreach my $key (sort(keys(%{$access_controls}))) {
+ ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
+ if ($scope eq 'public') {
+ $public = $key;
+ $publicnum = $num;
+ $publictext = &acl_status($start{$key},$end{$key},$now);
+ } elsif ($scope eq 'guest') {
+ $guest=$key;
+ $guestnum = $num;
+ $guesttext = &acl_status($start{$key},$end{$key},$now);
+ } elsif ($scope eq 'course') {
+ push(@courses,$key);
+ } elsif ($scope eq 'group') {
+ push(@groups,$key);
+ } elsif ($scope eq 'domains') {
+ push(@domains,$key);
+ } elsif ($scope eq 'users') {
+ push(@users,$key);
+ }
+ $acl_count{$scope} ++;
+ }
+ $r->print('<table border="0"><tr><td valign="top">');
+ $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ if ($public) {
+ $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
+ &dateboxes($publicnum,$start{$public},$end{$public}).'</td>');
+ } else {
+ $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.
+ &dateboxes('0',$now,$then).'</td>');
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
+ $r->print('</td><td width="40"> </td><td valign="top">');
+ $r->print('<h3>'.&mt('Password-protected access:').' '.$guesttext.'</h3>');
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
+ '</th><th>'. &mt('Password').'</th>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ my $passwd;
+ if ($guest) {
+ $passwd = $$access_controls{$guest}{'password'};
+ $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.
+ &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>');
+ } else {
+ $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.
+ &dateboxes('1',$now,$then).'</td>');
+ }
+ $r->print('<td><input type="text" size="15" name="password" value="'.
+ $passwd.'" /></td>');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
+ $r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">');
+ &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+ $r->print('</td><td> </td><td valign="top">');
+ &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+ $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('<td colspan="3" valign="top">');
+ } else {
+ $r->print('<td valign="top">');
+ }
+ &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ $r->print('</td>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">');
+ } else {
+ $r->print('<td> </td><td valign="top">');
+ }
+ &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
+ $r->print('</td></tr></table>');
+}
+
+sub acl_status {
+ my ($start,$end,$now) = @_;
+ if ($start > $now) {
+ return &mt('Inactive');
+ }
+ if ($end && $end<$now) {
+ return &mt('Inactive');
+ }
+ return &mt('Active');
+}
+
+sub access_element {
+ my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
+ my $title = $type;
+ $title =~ s/s$//;
+ $title =~ s/^(\w)/uc($1)/e;
+ $r->print('<h3>'.&mt('[_1]-based conditional access: ',$title));
+ if ($$acl_count{$type}) {
+ $r->print($$acl_count{$type}.' ');
+ if ($$acl_count{$type} > 1) {
+ $r->print(&mt('conditions'));
+ } else {
+ $r->print(&mt('condition'));
+ }
+ } else {
+ $r->print(&mt('Off'));
+ }
+ $r->print('</h3>');
+ &display_access_row($r,'old',$type,$items,$access_controls,$now,$then);
+ return;
+}
+
+sub display_access_row {
+ my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
+ if (@{$items} > 0) {
+ my @all_doms;
+ my $tablecolor;
+ my $colspan = 3;
+ my $uctype = $type;
+ $uctype =~ s/^(\w)/uc($1)/e;
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
+ &mt('Dates available').'</th>');
+ if (($type eq 'course') || ($type eq 'group')) {
+ $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
+ '</th>');
+ $colspan ++;
+ my $function = &Apache::loncommon::get_users_function();
+ $tablecolor=&Apache::loncommon::designparm($function.'.tabbg');
+ } elsif ($type eq 'domains') {
+ @all_doms = &Apache::loncommon::get_domains();
+ }
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ foreach my $key (@{$items}) {
+ if (($type eq 'course') || ($type eq 'group')) {
+ &course_row($r,$status,$type,$key,$access_controls,
+ $tablecolor,$now,$then);
+ } elsif ($type eq 'domains') {
+ &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
+ $then);
+ } elsif ($type eq 'users') {
+ &users_row($r,$status,$key,$access_controls,$now,$then);
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
+ if ($status eq 'old') {
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print('<td colspan="',$colspan.'">'.&additional_item($type).
+ '</td>');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ }
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&mt('No [_1]-based conditions defined.<br />',$type).
+ &additional_item($type));
+ }
+ return;
+}
+
+sub course_js {
+ return qq|
+<script type="text/javascript">
+function setRoleOptions(caller,num,cdom,cnum,type) {
+ addIndexnum = getCallerIndex(caller);
+ updateIndexnum = getIndex('update',num);
+ if (caller.checked) {
+ document.portform.elements[updateIndexnum].checked = true;
+ var url = '/adm/portfolio?action=rolepicker&setroles='+addIndexnum+'&cnum='+cnum+'&cdom='+cdom+'&type='+type;
+ var title = 'Roles_Chooser';
+ var options = 'scrollbars=1,resizable=1,menubar=0';
+ options += ',width=700,height=600';
+ rolebrowser = open(url,title,options,'1');
+ rolebrowser.focus();
+ } else {
+ for (var j=0;j<5;j++) {
+ document.portform.elements[addIndexnum+j].value = '';
+ }
+ }
+}
+
+function getCallerIndex(caller) {
+ for (var i=0;i<document.portform.elements.length;i++) {
+ if (document.portform.elements[i] == caller) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+function getIndex(name,value) {
+ for (var i=0;i<document.portform.elements.length;i++) {
+ if (document.portform.elements[i].name == name && document.portform.elements[i].value == value) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+</script>
+|;
+}
+
+sub course_row {
+ my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
+ my %content;
+ my $defdom = $env{'user.domain'};
+ if ($status eq 'old') {
+ $defdom = $$access_controls{$item}{'domain'};
+ }
+ my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
+ .&course_js();
+ my $crsgrptext = 'Groups';
+ if ($type eq 'group') {
+ $crsgrptext = 'Teams';
+ }
+ my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
+ $type);
+ $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
+ if ($status eq 'old') {
+ my $cid = $content{'domain'}.'_'.$content{'number'};
+ my %course_description = &Apache::lonnet::coursedescription($cid);
+ $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content{'number'}.'" />'.$course_description{'description'}.'</td>');
+ } elsif ($status eq 'new') {
+ my $uctype = $type;
+ $uctype =~ s/^(\w)/uc($1)/e;
+ $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).' <input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
+ }
+ $r->print('<td>'.&dateboxes($num,$start,$end).'</td>');
+ $r->print('<td><table border="0"><tr bgcolor="'.$tablecolor.'">');
+ $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.
+ &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.
+ &mt($crsgrptext).'</th></tr>');
+ if ($status eq 'old') {
+ my $max_id = 0;
+ foreach my $role_id (sort(keys(%{$content{'roles'}}))) {
+ if ($role_id > $max_id) {
+ $max_id = $role_id;
+ }
+ $max_id ++;
+ my $role_selects = &role_selectors($num,$role_id,$status,$type,\%content,'display');
+ $r->print('<tr><td><nobr><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></nobr><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+ }
+ $r->print('</table><br />'.&mt('Add a roles-based condition').' <input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content{domain}','$content{number}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
+ } elsif ($status eq 'new') {
+ my $role_id = 1;
+ my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
+ $r->print('<tr><td><input type="checkbox" name="add_role_'.$num.'" value="'.$role_id.'" checked="checked" />'.&mt('Add').'<input type="hidden" name="grplist_'.$num.'_'.$role_id.'" /></td>'.$role_selects);
+ $r->print('</tr></table></td>');
+ }
+ return;
+}
+
+sub domains_row {
+ my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
+ my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
+ 'domains');
+ my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true"/>'.
+ ' <option value="">'.&mt('Please select').'</option>';
+ if ($status eq 'old') {
+ my $content = $$access_controls{$item};
+ foreach my $dom (@{$all_doms}) {
+ if ((@{$content->{'dom'}} > 0)
+ && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {
+ $dom_select .= '<option value="'.$dom.'" selected>'.
+ $dom.'</option>';
+ } else {
+ $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
+ }
+ }
+ } else {
+ foreach my $dom (@{$all_doms}) {
+ $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
+ }
+ }
+ $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.$dom_select.
+ '</td><td>'.&dateboxes($num,$start,$end).'</td>');
+}
+
+sub users_row {
+ my ($r,$status,$item,$access_controls,$now,$then) = @_;
+ my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
+ 'users');
+ my $curr_user_list;
+ if ($status eq 'old') {
+ my $content = $$access_controls{$item};
+ $curr_user_list = &sort_users($content->{'users'});
+ }
+ $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30" rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');
+}
+
+sub additional_item {
+ my ($type) = @_;
+ my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
+ return $output;
+}
+
+sub actionbox {
+ my ($status,$num,$scope) = @_;
+ my $output = '<nobr><label>';
+ if ($status eq 'new') {
+ $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.
+ &mt('Activate');
+ } else {
+ $output .= '<input type="checkbox" name="delete" value="'.$num.
+ '" />'.&mt('Delete').'</label><br /><nobr>'.
+ '<label><input type="checkbox" name="update" value="'.
+ $num.'" />'.&mt('Update');
+ }
+ $output .= '</label></nobr><input type="hidden" name="scope_'.$num. '" value="'.$scope.'" />';
+ return $output;
+}
+
+sub dateboxes {
+ my ($num,$start,$end) = @_;
+ my $noend;
+ if ($end == 0) {
+ $noend = 'checked="checked"';
+ }
+ my $startdate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'startdate_'.$num,$start,undef,undef,undef,1,undef,
+ undef,undef,1);
+ my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'enddate_'.$num,$end,undef,undef,undef,1,undef,
+ undef,undef,1). ' <nobr><label>'.
+ '<input type="checkbox" name="noend_'.
+ $num.'" '.$noend.' />'.&mt('No end date').
+ '</label></nobr>';
+
+ my $output = &mt('Start: ').$startdate.'<br />'.&mt('End: ').$enddate;
+ return $output;
+}
+
+sub unpack_acc_key {
+ my ($acc_key) = @_;
+ my ($num,$scope,$end,$start) = ($acc_key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+ return ($num,$scope,$end,$start);
+}
+
+sub set_identifiers {
+ my ($status,$item,$now,$then,$scope) = @_;
+ if ($status eq 'old') {
+ return(&unpack_acc_key($item));
+ } else {
+ return($item,$scope,$then,$now);
+ }
+}
+
+sub role_selectors {
+ my ($num,$role_id,$status,$type,$content,$caller) = @_;
+ my ($output,$cdom,$cnum,$longid);
+ if ($caller eq 'display') {
+ $longid = '_'.$num.'_'.$role_id;
+ if ($status eq 'new') {
+ foreach my $item ('role','access','section','group') {
+ $output .= '<td><select name="'.$item.$longid.'">'.
+ '<option value="">'.&mt('Pick [_1] first',$type).
+ '</option></select></td>';
+ }
+ return $output;
+ } else {
+ $cdom = $$content{'domain'};
+ $cnum = $$content{'number'};
+ }
+ } elsif ($caller eq 'rolepicker') {
+ $cdom = $env{'form.cdom'};
+ $cnum = $env{'form.cnum'};
+ }
+ my ($sections,$groups,$allroles,$rolehash,$accesshash) =
+ &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$type);
+ if (!@{$sections}) {
+ @{$sections} = ('none');
+ } else {
+ unshift(@{$sections},('all','none'));
+ }
+ if (!@{$groups}) {
+ @{$groups} = ('none');
+ } else {
+ unshift(@{$groups},('all','none'));
+ }
+ my @allacesses = sort(keys(%{$accesshash}));
+ my (%sectionhash,%grouphash);
+ foreach my $sec (@{$sections}) {
+ $sectionhash{$sec} = $sec;
+ }
+ foreach my $grp (@{$groups}) {
+ $grouphash{$grp} = $grp;
+ }
+ my %lookup = (
+ 'role' => $rolehash,
+ 'access' => $accesshash,
+ 'section' => \%sectionhash,
+ 'group' => \%grouphash,
+ );
+ my @allaccesses = sort(keys(%{$accesshash}));
+ my %allitems = (
+ 'role' => $allroles,
+ 'access' => \@allaccesses,
+ 'section' => $sections,
+ 'group' => $groups,
+ );
+ foreach my $item ('role','access','section','group') {
+ $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";
+ foreach my $entry (@{$allitems{$item}}) {
+ if ($caller eq 'display') {
+ if ((@{$$content{'roles'}{$role_id}{$item}} > 0) &&
+ (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {
+ $output .= ' <option value="'.$entry.'" selected>'.
+ $lookup{$item}{$entry}.'</option>';
+ next;
+ }
+ }
+ $output .= ' <option value="'.$entry.'">'.
+ $lookup{$item}{$entry}.'</option>';
+ }
+ $output .= '</select>';
+ }
+ $output .= '</td>';
+ return $output;
+}
+
+sub role_options_window {
+ my ($r) = @_;
+ my $cdom = $env{'form.cdom'};
+ my $cnum = $env{'form.cnum'};
+ my $type = $env{'form.type'};
+ my $addindex = $env{'form.setroles'};
+ my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');
+ $r->print(<<"END_SCRIPT");
+<script type="text/javascript">
+function setRoles() {
+ var addidx = $addindex+1;
+ for (var i=0; i<4; i++) {
+ var copylist = '';
+ for (var j=0; j<document.rolepicker.elements[i].length; j++) {
+ if (document.rolepicker.elements[i].options[j].selected) {
+ copylist = copylist + document.rolepicker.elements[i].options[j].value + ',';
+ }
+ }
+ copylist = copylist.substr(0,copylist.length-1);
+ opener.document.portform.elements[addidx+i].value = copylist;
+ }
+ self.close();
+}
+</script>
+END_SCRIPT
+ $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
+ $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+ return;
+}
+
sub select_files {
- my ($r,$group)=@_;
+ my ($r,$group) = @_;
if ($env{'form.continue'} eq 'true') {
# here we update the selections for the currentpath
# eventually, have to handle removing those not checked, but . . .
@@ -476,8 +1323,13 @@ sub upload {
foreach my $line (@dir_list) {
my ($file_name)=split(/\&/,$line,2);
if ($file_name eq $fname){
+ $file_name = $env{'form.currentpath'}.$file_name;
+ $file_name = &prepend_group($file_name,$group);
$found_file = 1;
- if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$udom,$uname) eq 'true') {
+ if (defined($group)) {
+ $file_name = $group.'/'.$file_name;
+ }
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$locked_file = 1;
}
}
@@ -501,7 +1353,6 @@ sub upload {
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
$port_path.$env{'form.currentpath'});
- print STDERR "result was $result for $port_path.$env{'form.currentpath'}\n";
if ($result !~ m|^/uploaded/|) {
$r->print('<font color="red"> An errror occured ('.$result.
') while trying to upload '.&display_file().'</font><br />');
@@ -514,21 +1365,31 @@ sub upload {
sub lock_info {
my ($r,$url,$group) = @_;
my ($uname,$udom) = &get_name_dom($group);
- my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname);
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
my $file_name = $env{'form.lockinfo'};
- foreach my $key(keys(%current_permissions)) {
- if ($file_name eq $key) {
- foreach my $array_item (@{$current_permissions{$key}}) {
- if (ref($array_item)) {
- $r->print('<strong>'.$key.'</strong> was submitted in response to problem: <strong>'.
- &Apache::lonnet::gettitle($$array_item[0]).'</strong><br />');
- my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
- $r->print('In the course: <strong>'.$course_description{'description'}.'</strong><br />');
- # $r->print('the third is '.$$array_item[2].'<br>');
- # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
- }
+ $file_name = &prepend_group($file_name,$group);
+ if (defined($file_name) && defined($$current_permissions{$file_name})) {
+ foreach my $array_item (@{$$current_permissions{$file_name}}) {
+ if (ref($array_item) eq 'ARRAY') {
+ my $filetext;
+ if (defined($group)) {
+ $filetext = '<strong>'.$env{'form.lockinfo'}.
+ '</strong> (group: '.$group.')';
+ } else {
+ $filetext = '<strong>'.$file_name.'</strong>';
+ }
+ $r->print(&mt('[_1] was submitted in response to problem: ',
+ $filetext).
+ '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
+ '</strong><br />');
+ my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+ $r->print(&mt('In the course: <strong>[_1]</strong><br />',
+ $course_description{'description'}));
+ # $r->print('the third is '.$$array_item[2].'<br>');
+ # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
}
- }
+ }
}
$r->print(&done('Back',$url,$group));
return 'ok';
@@ -603,6 +1464,14 @@ sub get_name_dom {
return ($uname,$udom);
}
+sub prepend_group {
+ my ($filename,$group) = @_;
+ if (defined($group)) {
+ $filename = $group.'/'.$filename;
+ }
+ return $filename;
+}
+
sub get_namespace {
my ($group) = @_;
my $namespace = 'portfolio';
@@ -628,8 +1497,9 @@ sub handler {
# this handles file management
my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath','meta','lockinfo','currentfile',
- 'action','fieldname','mode','rename','continue','group']);
+ ['selectfile','currentpath','meta','lockinfo','currentfile','action',
+ 'fieldname','mode','rename','continue','group','access','setnum',
+ 'cnum','cdom','type','setroles']);
my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
@@ -650,7 +1520,7 @@ sub handler {
$group =~ s/\W//g;
if ($group) {
($uname,$udom) = &get_name_dom($group);
- my %curr_groups = &Apache::loncommon::coursegroups($udom,$uname,
+ my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
if (($view_permission) || (&Apache::lonnet::allowed('rgf',
@@ -683,6 +1553,9 @@ sub handler {
if ($env{"form.mode"} eq 'selectfile'){
$r->print(&Apache::loncommon::start_page($title,undef,
{'only_body' => 1}));
+ } elsif ($env{'form.action'} eq 'rolepicker') {
+ $r->print(&Apache::loncommon::start_page('New role-based condition',undef,
+ {'no_nav_bar' => 1, }));
} else {
$r->print(&Apache::loncommon::start_page($title));
}
@@ -717,6 +1590,14 @@ sub handler {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
&rename($r,$url,$group);
+ } elsif ($env{'form.access'}) {
+ $env{'form.selectfile'} = $env{'form.access'};
+ $env{'form.action'} = 'chgaccess';
+ &display_access($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'chgaccess') {
+ &update_access($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'rolepicker') {
+ &role_options_window($r);
} elsif ($env{'form.createdir'}) {
&createdir($r,$url,$group);
} elsif ($env{'form.lockinfo'}) {
@@ -732,7 +1613,8 @@ sub handler {
# 1) never been here, so directory structure not created
# 2) back-button navigation after deleting a directory
if ($current_path eq '/'){
- &Apache::lonnet::mkdiruserfile($uname,$udom,'portfolio');
+ &Apache::lonnet::mkdiruserfile($uname,$udom,
+ &get_port_path($group));
} else {
# some directory that snuck in get rid of the directory
# from the recent pulldown, just in case