--- loncom/interface/portfolio.pm 2006/07/18 01:25:43 1.134 +++ loncom/interface/portfolio.pm 2006/07/19 14:57:18 1.137 @@ -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.137 2006/07/19 14:57:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,29 +40,47 @@ use Apache::lonhtmlcommon; use HTML::Entities; use LONCAPA; +sub group_args { + my $output; + if (defined($env{'form.group'})) { + $ouput .= '&group='.$env{'form.group'}; + if (defined($env{'form.ref'})) { + $output .= '&ref='.$env{'form.ref'}; + } + } + return $output; +} + +sub group_form_data { + my $output; + if (defined($env{'form.group'})) { + $ouput = ''; + if (exists($env{'form.ref'})) { + $output .= ''; + } + } +} + # receives a file name and path stub from username/userfiles/portfolio/ # 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) = @_; 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,$can_upload)=@_; my $namespace = &get_namespace($group); my $port_path = &get_port_path($group); if ($can_upload) { - my $groupitem; - if (defined($group)) { - $groupitem = ''; - } + my $groupitem = &group_form_data(); + my $iconpath= $r->dir_config('lonIconsURL') . "/"; my %text=&Apache::lonlocal::texthash( 'upload' => 'Upload', @@ -109,83 +127,49 @@ 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"}).'/'); 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"}).'/'); } } $r->print(''); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', 'this.form.submit();')); $r->print("
"); } + sub display_directory_line { - my ($r,$select_mode,$fullpath, $css_class, $line, $access_controls, - $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); - $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.''); - $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(''.$/); + 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)=@_; + # 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); + $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(''.$/); } + sub display_directory { - my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, + my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload, $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my ($groupitem,$groupecho); my $display_out; my $select_mode; my $checked_files; @@ -195,10 +179,6 @@ sub display_directory { if ($can_setacl) { $access_admin_text = &mt('View/Change Status'); } - if ((defined($group)) && (defined($env{'request.course.id'}))) { - $groupitem = ''; - $groupecho = '&group='.$group; - } my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); @@ -212,7 +192,8 @@ sub display_directory { $select_mode = 'true'; } if ($is_empty && ($current_path ne '/') && $can_delete) { - $display_out = '
'.$groupitem. + $display_out = ''. + &group_form_data(). ''. ''. ''. @@ -231,9 +212,8 @@ sub display_directory { $r->print(''. ''); } - if (defined($group)) { - $r->print("\n".$groupitem."\n"); - } + $r->print("\n".&group_form_data()."\n"); + my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; my @dir_lines; @@ -282,7 +262,7 @@ sub display_directory { } $r->print(''); $r->print(''); - $r->print(''); + $r->print(''); $r->print(''); } else { my $css_class = 'LC_browser_file'; @@ -297,7 +277,7 @@ sub display_directory { $line.=' />'; } else { if (exists $locked_files{$fullpath}) { - $line.=''; + $line.=''; $css_class= 'LC_browser_file_locked'; } else { if (!$can_modify) { @@ -311,16 +291,12 @@ sub display_directory { if ($can_modify) { my $cat=''.&mt('Catalog Information'). ''; - $line .= 'Rename'; + $line .= 'Rename'; $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 +330,27 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - if ($select_mode ne 'true') { - $r->print(''); - } - $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, $access_admin_text); +# $r->print(''); +# $r->print($line); +# $r->print(''); +# $r->print(''); +# $r->print(''); +# $r->print(''); +# if ($select_mode ne 'true') { +# $r->print(''); +# } +# $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, $access_admin_text); + } } } @@ -411,27 +393,20 @@ sub open_form { } sub close_form { - my ($r,$url,$group,$button_text)=@_; + my ($r,$url,$button_text)=@_; if (!defined($button_text)) { $button_text = { 'continue' => &mt('Continue'), 'cancel' => &mt('Cancel'), }; } - $r->print('

'); - if (defined($group)) { - $r->print("\n".''); - } - $r->print('

'); + $r->print('

') + $r->print(&group_form_data().'

'); $r->print('

'); - if (defined($group)) { - $r->print("\n".''); - } + $env{'form.currentpath'}.'" />'. + &group_form_data()); $r->print("\n".'

'); } @@ -458,17 +433,15 @@ sub display_file { } sub done { - my ($message,$url,$group)=@_; + my ($message,$url)=@_; unless (defined $message) { $message='Done'; } my $result = '

'.&mt($message).'

'; return $result; } @@ -482,15 +455,15 @@ 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)); } else { if (scalar(@files)) { &open_form($r,$url); $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); - &close_form($r,$url,$group); + &close_form($r,$url); } else { $r->print("No file was checked to delete.
"); - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url)); } } } @@ -510,14 +483,14 @@ sub delete_confirmed { ') while trying to delete '.&display_file(undef, $delete_file).'
'); } } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url)); } sub delete_dir { - my ($r,$url,$group)=@_; + my ($r,$url)=@_; &open_form($r,$url); $r->print('

'.&mt('Delete').' '.&display_file().'?

'); - &close_form($r,$url,$group); + &close_form($r,$url); } sub delete_dir_confirmed { @@ -546,7 +519,7 @@ sub delete_dir_confirmed { } $env{'form.currentpath'} = $directory_name; } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url)); } sub rename { @@ -556,12 +529,12 @@ sub rename { $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)); } else { &open_form($r,$url); $r->print('

'.&mt('Rename').' '.&display_file().' to ?

'); - &close_form($r,$url,$group); + &close_form($r,$url); } } @@ -574,7 +547,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)); return; } my $result= @@ -592,7 +565,7 @@ sub rename_confirmed { ''.&display_file('',$env{'form.filenewname'}).'', ''.&display_file('',$filenewname).'')); } - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url)); } sub display_access { @@ -614,19 +587,18 @@ sub display_access { 'continue' => &mt('Proceed'), 'cancel' => &mt('Back to directory listing'), }; - &close_form($r,$url,$group,$button_text); + &close_form($r,$url,$button_text); } else { $r->print($header); if ($aclcount) { $r->print($info); } - &view_access_settings($r,$url,$group,$access_controls{$file_name}, - $aclcount); + &view_access_settings($r,$url,$access_controls{$file_name},$aclcount); } } sub view_access_settings { - my ($r,$url,$group,$access_controls,$aclcount) = @_; + my ($r,$url,$access_controls,$aclcount) = @_; my ($showstart,$showend); my %todisplay; foreach my $key (sort(keys(%{$access_controls}))) { @@ -647,12 +619,8 @@ sub view_access_settings { } else { $r->print(&mt('No access control settings currently exist for this file.
' )); } - my $group_arg; - if ($group) { - $group_arg = '&group='.$group; - } $r->print('
'.&mt('Return to directory listing').''); + &group_args().'">'.&mt('Return to directory listing').''); return; } @@ -874,18 +842,14 @@ sub update_access { $access_controls{$file_name},$now,$then); } } - &close_form($r,$url,$group); + &close_form($r,$url); } else { - my $group_arg; - if ($group) { - $group_arg = '&group='.$group; - } $r->print('
'. &mt('Display all access settings for this file').''. '     '. ''.&mt('Return to directory listing').''); + &group_args().'">'.&mt('Return to directory listing').''); } return; } @@ -1537,17 +1501,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)); } 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)); } 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)); } } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', @@ -1555,9 +1519,9 @@ 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)); } else { - $r->print(&done(undef,$url,$group)); + $r->print(&done(undef,$url)); } } } @@ -1591,7 +1555,7 @@ sub lock_info { } } } - $r->print(&done('Back',$url,$group)); + $r->print(&done('Back',$url)); return 'ok'; } sub createdir { @@ -1629,13 +1593,13 @@ 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)); } sub get_portfolio_root { my ($group) = @_; - my ($portfolio_root,$udom,$uname,$path); - ($uname,$udom) = &get_name_dom($group); + my ($uname,$udom) = &get_name_dom($group); + my $path; if (defined($group)) { $path = '/userfiles/groups/'.$group.'/portfolio'; } else { @@ -1731,7 +1695,7 @@ sub missing_priv { $longtext->{$priv})); if ($group) { $r->print(&mt("in the group's file repository.")); - $rtnlink .= '&group='.$group; + $rtnlink .= &group_args() } else { $r->print(&mt('in this portfolio.')); } @@ -1742,17 +1706,23 @@ sub missing_priv { } sub coursegrp_portfolio_header { - my ($cdom,$cnum,$group,$grp_desc)=@_; + my ($cdom,$cnum,$grp_desc)=@_; my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; $ucgpterm =~ s/^(\w)/uc($1)/e; + if ($env{'form.ref'}) { + &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?ref=$env{'form.ref'}", text=>"$ucgpterm: $grp_desc", title=>"Go to group's home page"}, - {href=>"//?group=$group", + {href=>"/adm/coursegrp_portfolio?".&group_args(), 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,7 +1735,7 @@ 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; @@ -1781,10 +1751,10 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } my $earlyout = 0; - my $view_permission = &Apache::lonnet::allowed('vcg', - $env{'request.course.id'}); - $group = $env{'form.group'}; - $group =~ s/\W//g; + my $view_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + $env{'form.group'} =~ s/\W//g; + my $group = $env{'form.group'}; if ($group) { ($uname,$udom) = &get_name_dom($group); my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, @@ -1865,7 +1835,7 @@ sub handler { &open_form($r,$url); # $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'})); $r->print('Edit the meta data
'); - &close_form($r,$url,$group); + &close_form($r,$url); } if ($env{'form.store'}) { } @@ -1874,7 +1844,7 @@ sub handler { if ($can_upload) { &upload($r,$url,$group); } 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) { @@ -1884,7 +1854,7 @@ sub handler { } } 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); } @@ -1896,7 +1866,7 @@ sub handler { } } elsif ($env{'form.action'} eq 'deletedir') { if ($can_delete) { - &delete_dir($r,$url,$group); + &delete_dir($r,$url); } else { &missing_priv($r,$url,'delete',$group); } @@ -1945,7 +1915,7 @@ 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,$grp_desc)); } my @dir_list=&get_dir_list($portfolio_root,$group); if ($dir_list[0] eq 'no_such_dir'){ @@ -1968,9 +1938,9 @@ 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); - &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, + &display_common($r,$url,$current_path,$is_empty,\@dir_list, + $can_upload); + &display_directory($r,$url,$current_path,$is_empty,\@dir_list, $can_upload,$can_modify,$can_delete,$can_setacl); $r->print(&Apache::loncommon::end_page()); }
Actions NameSizeLast ModifiedCurrent Access Status
'.&mt('closed folder').'Go to ...'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/
LockedLocked'.$version_flag{$filename}.''.$cat.''; } $line .= '
'.$version_flag{$filename}.''. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. - &mt($curr_access).'   '); - $r->print(''.$access_admin_text.'
'.$version_flag{$filename}.''. +# $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. +# &mt($curr_access).'   '); +# $r->print(''.$access_admin_text.'