--- loncom/interface/portfolio.pm 2006/07/18 01:25:43 1.134 +++ loncom/interface/portfolio.pm 2006/07/19 11:43:47 1.136 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.134 2006/07/18 01:25:43 banghart Exp $ +# $Id: portfolio.pm,v 1.136 2006/07/19 11:43:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,24 +44,31 @@ use LONCAPA; # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { my ($url, $filename, $current_path, $current_mode, $field_name, - $continue_select,$group) = @_; + $continue_select,$group,$refarg) = @_; if ($continue_select ne 'true') {$continue_select = 'false'}; my $anchor = ''.$filename.''; return $anchor; } my $dirptr=16384; sub display_common { - my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,$refarg)=@_; my $namespace = &get_namespace($group); my $port_path = &get_port_path($group); if ($can_upload) { my $groupitem; if (defined($group)) { $groupitem = ''; + if (exists($env{'form.ref'})) { + $groupitem .= ''; + } } my $iconpath= $r->dir_config('lonIconsURL') . "/"; my %text=&Apache::lonlocal::texthash( @@ -109,12 +116,12 @@ sub display_common { TABLE } my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/'); + $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group,$refarg).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/'); + $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group,$refarg).'/'); } } $r->print(''); @@ -122,6 +129,9 @@ TABLE $r->print('
print('&'.$refarg); + } } $r->print('">'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', @@ -129,44 +139,11 @@ TABLE $r->print("
"); } sub display_directory_line { - my ($r,$select_mode,$fullpath, $css_class, $line, $access_controls, + my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access, $now, $version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text)=@_; - 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); $r->print(''); $r->print($line); - my $curr_access; - if ($select_mode ne 'true') { - 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('Passphrase-protected')); - } - if ($cond_access) { - push(@allaccesses,&mt('Conditional')); - } - $curr_access = join('+ ',@allaccesses); - } - } $r->print(''); $r->print(''.$$version_flag{$filename}.''. $filename.''); @@ -183,7 +160,7 @@ sub display_directory_line { } sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, - $can_modify,$can_delete,$can_setacl)=@_; + $can_modify,$can_delete,$can_setacl,$refarg)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my ($groupitem,$groupecho); my $display_out; @@ -196,8 +173,14 @@ sub display_directory { $access_admin_text = &mt('View/Change Status'); } if ((defined($group)) && (defined($env{'request.course.id'}))) { - $groupitem = ''; + $groupitem = ''; $groupecho = '&group='.$group; + if ($refarg ne '') { + $groupecho .= '&'.$refarg; + } + if (exists($env{'form.ref'})) { + $groupitem .= ''; + } } my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, @@ -282,7 +265,7 @@ sub display_directory { } $r->print(''.&mt('closed folder').''); $r->print('Go to ...'); - $r->print(''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''); + $r->print(''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group,$refarg).'/'); $r->print(''); } else { my $css_class = 'LC_browser_file'; @@ -317,10 +300,6 @@ sub display_directory { $line .= ''; } } -# &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, -# $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text); - $r->print(''); - $r->print($line); my $curr_access; if ($select_mode ne 'true') { my $pub_access = 0; @@ -354,21 +333,27 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - $r->print(''); - $r->print(''.$version_flag{$filename}.''. - $filename.''); - $r->print(''.$size.''); - $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); - if ($select_mode ne 'true') { - $r->print(''. - &mt($curr_access).'   '); - $r->print(''.$access_admin_text.''); - } - $r->print(''.$/); + &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, $groupecho, $access_admin_text); +# $r->print(''); +# $r->print($line); +# $r->print(''); +# $r->print(''.$version_flag{$filename}.''. +# $filename.''); +# $r->print(''.$size.''); +# $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); +# if ($select_mode ne 'true') { +# $r->print(''. +# &mt($curr_access).'   '); +# $r->print(''.$access_admin_text.''); +# } +# $r->print(''.$/); if ($show_versions) { - + &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, + $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text); + } } } @@ -422,6 +407,10 @@ sub close_form { if (defined($group)) { $r->print("\n".''); + if (exists($env{'form.ref'})) { + $r->print("\n".''); + } } $r->print('

'); $r->print('
@@ -430,7 +419,11 @@ sub close_form { $env{'form.currentpath'}.'" />'); if (defined($group)) { $r->print("\n".''); + $group.'" />'); + if (exists($env{'form.ref'})) { + $r->print("\n".''); + } } $r->print("\n".'

'); @@ -458,7 +451,7 @@ sub display_file { } sub done { - my ($message,$url,$group)=@_; + my ($message,$url,$group,$refarg)=@_; unless (defined $message) { $message='Done'; } @@ -467,14 +460,17 @@ sub done { '&fieldname='.$env{'form.fieldname'}. '&mode='.$env{'form.mode'}; if (defined($group)) { - $result .= '&group='.$group; + $result .= '&group='.$group; + if ($refarg ne '') { + $result .= '&'.$refarg; + } } $result .= '">'.&mt($message).''; return $result; } sub delete { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my @check; my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; $file_name = &prepend_group($file_name,$group); @@ -482,7 +478,7 @@ sub delete { my ($uname,$udom) = &get_name_dom($group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { $r->print ("The file is locked and cannot be deleted.
"); - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); } else { if (scalar(@files)) { &open_form($r,$url); @@ -490,13 +486,13 @@ sub delete { &close_form($r,$url,$group); } else { $r->print("No file was checked to delete.
"); - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } } } sub delete_confirmed { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; my ($uname,$udom) = &get_name_dom($group); @@ -510,7 +506,7 @@ sub delete_confirmed { ') while trying to delete '.&display_file(undef, $delete_file).'
'); } } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } sub delete_dir { @@ -521,7 +517,7 @@ sub delete_dir { } sub delete_dir_confirmed { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my $directory_name = $env{'form.currentpath'}; $directory_name =~ s|/$||; # remove any trailing slash my ($uname,$udom) = &get_name_dom($group); @@ -546,17 +542,17 @@ sub delete_dir_confirmed { } $env{'form.currentpath'} = $directory_name; } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } sub rename { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; 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.
"); - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } else { &open_form($r,$url); $r->print('

'.&mt('Rename').' '.&display_file().' to @@ -566,7 +562,7 @@ sub rename { } sub rename_confirmed { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path($group); @@ -574,7 +570,7 @@ sub rename_confirmed { $r->print(''. &mt("Error: no valid filename was provided to rename to."). '
'); - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); return; } my $result= @@ -592,11 +588,11 @@ sub rename_confirmed { ''.&display_file('',$env{'form.filenewname'}).'', ''.&display_file('',$filenewname).'')); } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } sub display_access { - my ($r,$url,$group,$can_setacl,$port_path) = @_; + my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_; my ($uname,$udom) = &get_name_dom($group); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; $file_name = &prepend_group($file_name,$group); @@ -621,12 +617,12 @@ sub display_access { $r->print($info); } &view_access_settings($r,$url,$group,$access_controls{$file_name}, - $aclcount); + $aclcount,$refarg); } } sub view_access_settings { - my ($r,$url,$group,$access_controls,$aclcount) = @_; + my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_; my ($showstart,$showend); my %todisplay; foreach my $key (sort(keys(%{$access_controls}))) { @@ -650,6 +646,9 @@ sub view_access_settings { my $group_arg; if ($group) { $group_arg = '&group='.$group; + if ($refarg ne '') { + $group_arg .= '&'.$refarg; + } } $r->print('
'.&mt('Return to directory listing').''); @@ -760,7 +759,7 @@ sub build_access_summary { sub update_access { - my ($r,$url,$group,$port_path) = @_; + my ($r,$url,$group,$port_path,$refarg) = @_; my $totalprocessed = 0; my %processing; my %title = ( @@ -879,6 +878,9 @@ sub update_access { my $group_arg; if ($group) { $group_arg = '&group='.$group; + if ($refarg) { + $group_arg .= '&'.$refarg; + } } $r->print('
'. @@ -1498,7 +1500,7 @@ ENDSMP } } sub upload { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my $fname=$env{'form.uploaddoc.filename'}; my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?) my $disk_quota = 20000; # expressed in k @@ -1537,17 +1539,17 @@ sub upload { if (($current_disk_usage + $filesize) > $disk_quota){ $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes). Disk quota will be exceeded.'. '
Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.'); - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); } elsif ($found_file){ if ($locked_file){ $r->print(''.'Unable to upload '.$fname.', a locked file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
You will be able to rename or delete existing '.$fname.' after a grade has been assigned.'); - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); } else { $r->print(''.'Unable to upload '.$fname.', a file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'}); - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); } } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', @@ -1555,15 +1557,15 @@ sub upload { if ($result !~ m|^/uploaded/|) { $r->print(''.'An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); } else { - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } } } sub lock_info { - my ($r,$url,$group) = @_; + my ($r,$url,$group,$refarg) = @_; my ($uname,$udom) = &get_name_dom($group); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); @@ -1591,11 +1593,11 @@ sub lock_info { } } } - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url,$group,$refarg)); return 'ok'; } sub createdir { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { $r->print(''. @@ -1629,7 +1631,7 @@ sub createdir { if ($newdir ne $env{'form.newdir'}) { $r->print("The new directory name was changed from:
".$env{'form.newdir'}." to $newdir "); } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url,$group,$refarg)); } sub get_portfolio_root { @@ -1711,7 +1713,7 @@ sub get_port_path { } sub missing_priv { - my ($r,$url,$priv,$group) = @_; + my ($r,$url,$priv,$group,$refarg) = @_; my $longtext = { upload => 'upload files', delete => 'delete files', @@ -1731,7 +1733,10 @@ sub missing_priv { $longtext->{$priv})); if ($group) { $r->print(&mt("in the group's file repository.")); - $rtnlink .= '&group='.$group; + $rtnlink .= '&group='.$group; + if ($refarg ne '') { + $rtnlink .= '&'.$refarg; + } } else { $r->print(&mt('in this portfolio.')); } @@ -1742,17 +1747,23 @@ sub missing_priv { } sub coursegrp_portfolio_header { - my ($cdom,$cnum,$group,$grp_desc)=@_; + my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_; my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; $ucgpterm =~ s/^(\w)/uc($1)/e; + if ($refarg) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursegroups", + text=>"Groups", + title=>"Course Groups"}); + } &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/$cdom/$cnum/$group/smppg", + ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg", text=>"$ucgpterm: $grp_desc", title=>"Go to group's home page"}, - {href=>"//?group=$group", + {href=>"/adm/coursegrp_portfolio?group=$group&$refarg", text=>"Group Portfolio", - title=>"Display group portfolio"},); + title=>"Display group portfolio"}); my $output = &Apache::lonhtmlcommon::breadcrumbs( &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc)); return $output; @@ -1765,13 +1776,13 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath','meta','lockinfo','currentfile','action', 'fieldname','mode','rename','continue','group','access','setnum', - 'cnum','cdom','type','setroles','showversions']); + 'cnum','cdom','type','setroles','showversions','ref']); my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; $caller = $2; } - my ($can_modify,$can_delete,$can_upload,$can_setacl); + my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg); if ($caller eq 'coursegrp_portfolio') { # Needs to be in a course if (! ($env{'request.course.fn'})) { @@ -1781,11 +1792,14 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } my $earlyout = 0; - my $view_permission = &Apache::lonnet::allowed('vcg', - $env{'request.course.id'}); + my $view_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); $group = $env{'form.group'}; $group =~ s/\W//g; if ($group) { + if (exists($env{'form.ref'})) { + $refarg = 'ref='.$env{'form.ref'}; + } ($uname,$udom) = &get_name_dom($group); my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, $group); @@ -1872,72 +1886,72 @@ sub handler { if ($env{'form.uploaddoc.filename'}) { if ($can_upload) { - &upload($r,$url,$group); + &upload($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'upload',$group), + &missing_priv($r,$url,'upload',$group,$refarg), } } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_confirmed($r,$url,$group); + &delete_confirmed($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'delete',$group); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'delete') { if ($can_delete) { - &delete($r,$url,$group); + &delete($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'delete',$group); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_dir_confirmed($r,$url,$group); + &delete_dir_confirmed($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'delete',$group); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'deletedir') { if ($can_delete) { &delete_dir($r,$url,$group); } else { - &missing_priv($r,$url,'delete',$group); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { if ($can_modify) { - &rename_confirmed($r,$url,$group); + &rename_confirmed($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'rename',$group); + &missing_priv($r,$url,'rename',$group,$refarg); } } elsif ($env{'form.rename'}) { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; if ($can_modify) { - &rename($r,$url,$group); + &rename($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'rename',$group); + &missing_priv($r,$url,'rename',$group,$refarg); } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; $env{'form.action'} = 'chgaccess'; - &display_access($r,$url,$group,$can_setacl,$port_path); + &display_access($r,$url,$group,$can_setacl,$port_path,$refarg); } elsif ($env{'form.action'} eq 'chgaccess') { if ($can_setacl) { - &update_access($r,$url,$group,$port_path); + &update_access($r,$url,$group,$port_path,$refarg); } else { - &missing_priv($r,$url,'setacl',$group); + &missing_priv($r,$url,'setacl',$group,$refarg); } } elsif ($env{'form.action'} eq 'rolepicker') { if ($can_setacl) { &role_options_window($r); } else { - &missing_priv($r,$url,'setacl',$group); + &missing_priv($r,$url,'setacl',$group,$refarg); } } elsif ($env{'form.createdir'}) { if ($can_upload) { - &createdir($r,$url,$group); + &createdir($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'upload',$group); + &missing_priv($r,$url,'upload',$group,$refarg); } } elsif ($env{'form.lockinfo'}) { - &lock_info($r,$url,$group); + &lock_info($r,$url,$group,$refarg); } else { my $current_path='/'; if ($env{'form.currentpath'}) { @@ -1945,7 +1959,8 @@ sub handler { } if ($caller eq 'coursegrp_portfolio') { &Apache::lonhtmlcommon::clear_breadcrumbs(); - $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc)); + $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc, + $refarg)); } my @dir_list=&get_dir_list($portfolio_root,$group); if ($dir_list[0] eq 'no_such_dir'){ @@ -1969,9 +1984,10 @@ sub handler { # need to know if directory is empty so it can be removed if desired my $is_empty=(@dir_list == 2); &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group, - $can_upload); + $can_upload,$refarg); &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, - $can_upload,$can_modify,$can_delete,$can_setacl); + $can_upload,$can_modify,$can_delete,$can_setacl, + $refarg); $r->print(&Apache::loncommon::end_page()); } return OK;