--- loncom/interface/portfolio.pm 2005/02/11 06:18:52 1.74 +++ loncom/interface/portfolio.pm 2006/03/15 19:41:26 1.95 @@ -29,63 +29,113 @@ use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; +use Apache::lonnet; # receives a file name and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { - my ($filename, $current_path, $current_mode, $field_name) = @_; - my $anchor = ''.$filename.''; + my ($url, $filename, $current_path, $current_mode, $field_name, + $continue_select,$group) = @_; + if ($continue_select ne 'true') {$continue_select = 'false'}; + my $anchor = ''.$filename.''; return $anchor; } my $dirptr=16384; sub display_common { - my ($r,$current_path,$is_empty,$dir_list)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_; + my $groupitem; + my $namespace = &get_namespace($group); + my $port_path = &get_port_path($group); + if (defined($group)) { + $groupitem = ''; + } my $iconpath= $r->dir_config('lonIconsURL') . "/"; - $r->print(''); - $r->print('
'); - my $displayOut = '
'; - $displayOut .= ''. - ''. - ''. - ''. - ''. - ''. - '
'; - $r->print($displayOut); - $r->print('
'); - $displayOut = '
'; - $displayOut .= ''. - ''. - ''. - ''. - ''. - ''. - '
'; - $r->print($displayOut); - $r->print('
'); + my %text=&Apache::lonlocal::texthash('upload' => 'Upload', + 'upload_label' => + 'Upload file to current directory:', + 'createdir' => 'Create Subdirectory', + 'createdir_label' => + 'Create subdirectory in current directory:'); + $r->print(<<"TABLE"); + + + + + + + + + + + + + +
+ $text{'upload_label'} + $groupitem + + + + + + +
+ $text{'createdir_label'} + + $groupitem + + + + + +
+TABLE my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); + $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/'); + $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/'); } } $r->print(''); - &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path); - $r->print('
'. - &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', + &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 { - my ($r,$current_path,$is_empty,$dir_list)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my ($groupitem,$groupecho); my $display_out; - my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'}); + my $select_mode; + 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 = ''; + $groupecho = '&group='.$group; + } + my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname); + if ($env{"form.mode"} eq 'selectfile'){ + &select_files($r); + $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); + $select_mode = 'true'; + } if ($is_empty && ($current_path ne '/')) { - $display_out = '
'. + $display_out = ''.$groupitem. ''. ''. ''. @@ -95,76 +145,20 @@ sub display_directory { $r->print($display_out); return; } - $r->print(''. + if ($select_mode eq 'true') { + $r->print('
'. + ''); + $r->print(''); + } else { + $r->print('
Select NameSizeLast Modified
'. ''); - my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; - $r->print(''); - 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(''); - $r->print(''); - $r->print(''); - $r->print(''); - } else { - $r->print(''); - if (exists $locked_files{$current_path.$filename}){ - $r->print(''); - } else { - $r->print(' - '); - } - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - } - } + $r->print(''); } -# pink bg -# blue bg -# $r->print(&display_directory($current_path, $currentFile, @dir_list)); -# $r->print('>
Actions NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'
Locked - RenameMeta - '. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
'); -# $r->print(&display_actions($current_path, $currentFile, $isEmpty)); - $r->print('
- - - -
'); -} -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'}); - if ($is_empty && ($current_path ne '/')) { - $display_out = '
'. - ''. - ''. - ''. - ''. - - '
'; - - $r->print($display_out); - return; + if (defined($group)) { + $r->print("\n".$groupitem."\n"); } - $r->print(''. - ''); - my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; - $r->print(''); + my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; + my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -175,20 +169,37 @@ sub display_file_select { #$dom my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); $filename =~ s/\s+$//; - if (($filename ne '.') && ($filename ne '..')) { + if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { if ($dirptr&$testdir) { - $r->print(''); + if ($select_mode eq 'true'){ + $r->print(''); + } else { + $r->print(''); + } $r->print(''); - $r->print(''); + $r->print(''); $r->print(''); } else { $r->print(''); - $r->print(''); + } else { + if (exists $locked_files{$current_path.$filename}){ + $r->print(''); + } else { + my $cat=''.&mt('Catalog Information').
+			    ''; + $r->print(' + '); + } } - $r->print('>'); - $r->print(''); + $r->print(''); $r->print(''); $r->print(''); @@ -197,50 +208,65 @@ sub display_file_select { } } } - $r->print('
Select NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).''.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'
print("CHECKED"); + if ($select_mode eq 'true'){ + $r->print('print("CHECKED"); + } + $r->print('>Locked + Rename'.$cat.' + '. $filename.''.$size.'
+ if ($select_mode eq 'true') { + $r->print(' - +
- '); + '); + } else { + $r->print(' + + + + '); + } } sub open_form { - my ($r)=@_; + my ($r,$url)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); - $r->print('
'); + $r->print(''); $r->print(''); + $env{'form.action'}.'" />'); $r->print(''); foreach (@files) { $r->print(''); } $r->print(''); + $env{'form.currentpath'}.'" />'); } sub close_form { - my ($r)=@_; - $r->print('

'); - $r->print('
+ my ($r,$url,$group)=@_; + $r->print('

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

'); + $r->print('

- -

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

'); } sub display_file { 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'}; + $filename=$env{'form.selectfile'}; $display_file_text = ''.$path.$filename.''; } elsif (ref($filename) eq "ARRAY") { foreach (@$filename) { @@ -253,65 +279,75 @@ sub display_file { } sub done { - return ('

'.&mt('Done').'

'); + my ($message,$url,$group)=@_; + unless (defined $message) { + $message='Done'; + } + my $result = '

'.&mt($message).'

'; + return $result; } sub delete { - my ($r)=@_; + my ($r,$url,$group)=@_; 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') { + 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()); + $r->print(&done('Back',$url,$group)); } else { if (scalar(@files)) { - &open_form($r); + &open_form($r,$url); $r->print('

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

'); - &close_form($r); + &close_form($r,$url,$group); } else { $r->print("No file was checked to delete.
"); - $r->print(&done()); + $r->print(&done(undef,$url,$group)); } } } sub delete_confirmed { - my ($r)=@_; + my ($r,$url,$group)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); foreach my $delete_file (@files) { - $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'. - $ENV{'form.currentpath'}. + $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. + $env{'form.currentpath'}. $delete_file); if ($result ne 'ok') { $r->print(' An error occured ('.$result. ') while trying to delete '.&display_file(undef, $delete_file).'
'); } } - $r->print(&done()); + $r->print(&done(undef,$url,$group)); } sub delete_dir { - my ($r)=@_; - &open_form($r); + my ($r,$url,$group)=@_; + &open_form($r,$url); $r->print('

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

'); - &close_form($r); + &close_form($r,$url,$group); } sub delete_dir_confirmed { - my ($r)=@_; - my $directory_name = $ENV{'form.currentpath'}; - $directory_name =~ m/\/$/; - $directory_name = $`; - my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'. + my ($r,$url,$group)=@_; + my $directory_name = $env{'form.currentpath'}; + $directory_name =~ s|/$||; # remove any trailing slash + my ($uname,$udom) = &get_name_dom($group); + my $namespace = &get_namespace($group); + my $port_path = &get_port_path($group); + my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $directory_name); if ($result ne 'ok') { @@ -320,7 +356,7 @@ sub delete_dir_confirmed { } else { # now remove from recent # $r->print('
removing '.$directory_name.'
print(&done()); + $r->print(&done(undef,$url,$group)); } sub rename { - my ($r)=@_; - my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'}; - if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') { + my ($r,$url,$group)=@_; + my $file_name = $env{'form.currentpath'}.$env{'form.rename'}; + 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 renamed.
"); - $r->print(&done()); + $r->print(&done(undef,$url,$group)); } else { - &open_form($r); + &open_form($r,$url); $r->print('

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

'); - &close_form($r); + &close_form($r,$url,$group); } } sub rename_confirmed { - my ($r)=@_; - my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'}); + my ($r,$url,$group)=@_; + my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); if ($filenewname eq '') { $r->print(''. &mt("Error: no valid filename was provided to rename to."). '
'); - $r->print(&done()); + $r->print(&done(undef,$url,$group)); return; } my $result= - &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'}, - 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'}, - 'portfolio'.$ENV{'form.currentpath'}.$filenewname); + &Apache::lonnet::renameuserfile($uname,$udom, + $port_path.$env{'form.currentpath'}.$env{'form.selectfile'}, + $port_path.$env{'form.currentpath'}.$filenewname); if ($result ne 'ok') { $r->print(' An errror occured ('.$result. ') while trying to rename '.&display_file().' to '. &display_file(undef,$filenewname).'
'); } - if ($filenewname ne $ENV{'form.filenewname'}) { - $r->print("The new file name was changed from:
".$ENV{'form.filenewname'}." to $filenewname "); + if ($filenewname ne $env{'form.filenewname'}) { + $r->print("The new file name was changed from:
".$env{'form.filenewname'}." to $filenewname "); } - $r->print(&done()); + $r->print(&done(undef,$url,$group)); } sub select_files { - my ($r)=@_; - if ($ENV{'form.continue'} eq 'true') { + 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 . . . - my @items=&Apache::loncommon::get_env_multiple('form.selectfile'); - &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items); + my @items=&Apache::loncommon::get_env_multiple('form.checkfile'); + if (scalar(@items)){ + &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items); + } } else { - if ($ENV{'form.currentpath'} eq '/') { #empty the file for a fresh start - # &Apache::lonnet::clear_selected_files($ENV{'user.name'}); - } + &Apache::lonnet::clear_selected_files($env{'user.name'}); } - my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'}); + my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'}); my $java_files = join ",", @files; if ($java_files) { $java_files.=','; @@ -402,7 +441,7 @@ ENDSMP } opener.document.forms.lonhomework. ENDSMP - $javascript .= $ENV{'form.fieldname'}; + $javascript .= $env{'form.fieldname'}; $javascript .= (<print($javascript); $r->print("

Select portfolio files

- Check as many as you wish in response to the essay problem.
"); - $r->print("Files selected from other directories:
"); - foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) { - $r->print($_."
"); + Check as many as you wish in response to the problem.
"); + my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'}); + if (@otherfiles) { + $r->print("Files selected from other directories:
"); + foreach my $file (@otherfiles) { + $r->print($file."
"); + } } } sub upload { - my ($r)=@_; - my $fname=$ENV{'form.uploaddoc.filename'}; - my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?) + my ($r,$url,$group)=@_; + my $fname=$env{'form.uploaddoc.filename'}; + my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?) my $disk_quota = 20000; # expressed in k $fname=&Apache::lonnet::clean_filename($fname); - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; + + my $portfolio_root=&get_portfolio_root($group); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); # Fixme --- Move the checking for existing file to LOND error return - my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'}, - $ENV{'user.domain'}, - $ENV{'user.name'},$portfolio_root); + my @dir_list=&get_dir_list($portfolio_root,$group); my $found_file = 0; + my $locked_file = 0; foreach my $line (@dir_list) { - my ($filename)=split(/\&/,$line,2); - if ($filename eq $fname){ + my ($file_name)=split(/\&/,$line,2); + if ($file_name eq $fname){ $found_file = 1; + if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$udom,$uname) eq 'true') { + $locked_file = 1; + } } } - my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); - if ((($current_disk_usage/1000) + $filesize) > $disk_quota){ - $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes. Disk quota will be exceeded.'. + my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root); + 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)); } - elsif ($found_file){ - $r->print('Unable to upload '.$fname.', a file by that name was found in '.$ENV{'form.currentpath'}.''. - '
To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'}); + 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)); + } 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)); + } } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', - 'portfolio'.$ENV{'form.currentpath'}); + $port_path.$env{'form.currentpath'}); + print STDERR "result was $result for $port_path.$env{'form.currentpath'}\n"; if ($result !~ m|^/uploaded/|) { $r->print(' An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); + $r->print(&done('Back',$url,$group)); + } else { + $r->print(&done(undef,$url,$group)); } } - $r->print(&done()); } - +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 $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(''.$key.' was submitted in response to problem: '. + &Apache::lonnet::gettitle($$array_item[0]).'
'); + my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); + $r->print('In the course: '.$course_description{'description'}.'
'); + # $r->print('the third is '.$$array_item[2].'
'); + # $r->print("item is $$array_item[0]
and $$array_item[0]"); + } + } + } + } + $r->print(&done('Back',$url,$group)); + return 'ok'; +} sub createdir { - my ($r)=@_; - my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'}); + my ($r,$url,$group)=@_; + my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { $r->print(''. &mt("Error: no directory name was provided."). '
'); - $r->print(&done()); + $r->print(&done(undef,$url,$group)); return; - } - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; - my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'}, - $ENV{'user.domain'}, - $ENV{'user.name'},$portfolio_root); + } + my $portfolio_root = &get_portfolio_root($group); + my @dir_list=&get_dir_list($portfolio_root,$group); my $found_file = 0; foreach my $line (@dir_list) { my ($filename)=split(/\&/,$line,2); @@ -483,88 +556,184 @@ sub createdir { $r->print(' Unable to create a directory named '.$newdir. ' a file or directory by that name already exists.
'); } else { - my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); + my $result=&Apache::lonnet::mkdiruserfile($uname,$udom, + $port_path.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { $r->print(' An errror occured ('.$result. ') while trying to create a new directory '.&display_file().'
'); } } - if ($newdir ne $ENV{'form.newdir'}) { - $r->print("The new directory name was changed from:
".$ENV{'form.newdir'}." to $newdir "); + if ($newdir ne $env{'form.newdir'}) { + $r->print("The new directory name was changed from:
".$env{'form.newdir'}." to $newdir "); } - $r->print(&done()); + $r->print(&done(undef,$url,$group)); +} + +sub get_portfolio_root { + my ($group) = @_; + my ($portfolio_root,$udom,$uname,$path); + ($uname,$udom) = &get_name_dom($group); + if (defined($group)) { + $path = '/userfiles/groups/'.$group.'/portfolio'; + } else { + $path = '/userfiles/portfolio'; + } + return (&Apache::loncommon::propath($udom,$uname).$path); +} + +sub get_dir_list { + my ($portfolio_root,$group) = @_; + my ($uname,$udom) = &get_name_dom($group); + return &Apache::lonnet::dirlist($env{'form.currentpath'}, + $udom,$uname,$portfolio_root); +} + +sub get_name_dom { + my ($group) = @_; + my ($uname,$udom); + if (defined($group)) { + $udom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $uname = $env{'course.'.$env{'request.course.id'}.'.num'}; + } else { + $udom = $env{'user.domain'}; + $uname = $env{'user.name'}; + } + return ($uname,$udom); +} + +sub get_namespace { + my ($group) = @_; + my $namespace = 'portfolio'; + if (defined($group)) { + my ($uname,$udom) = &get_name_dom($group); + $namespace .= '_'.$udom.'_'.$uname.'_'.$group; + } + return $namespace; +} + +sub get_port_path { + my ($group) = @_; + my $port_path; + if (defined($group)) { + $port_path = "groups/$group/portfolio"; + } else { + $port_path = 'portfolio'; + } + return $port_path; } sub handler { # this handles file management my $r = shift; - my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selectfile','currentpath','meta', - 'currentfile','action','fieldname','mode','rename']); + ['selectfile','currentpath','meta','lockinfo','currentfile', + 'action','fieldname','mode','rename','continue','group']); + my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title); + if ($r->uri =~ m|^(/adm/)([^/]+)|) { + $url = $1.$2; + $caller = $2; + } + if ($caller eq 'coursegrp_portfolio') { + # Needs to be in a course + if (! ($env{'request.course.fn'})) { + # Not in a course + $env{'user.error.msg'}= + "/adm/coursegrp_portfolio:rgf:0:0:Cannot view group portfolio"; + 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; + if ($group) { + my %curr_groups = (); + ($uname,$udom) = &get_name_dom($group); + if (&Apache::loncommon::coursegroups(\%curr_groups,$udom,$uname, + $group)) { + if (($view_permission) || (&Apache::lonnet::allowed('rgf', + $env{'request.course.id'}.'/'.$group))) { + $portfolio_root = &get_portfolio_root($group); + } else { + $r->print('You do not have the privileges required to access the shared files space for this group'); + $earlyout = 1; + } + } else { + $r->print('Not a valid group for this course'); + $earlyout = 1; + } + $title = &mt('Group files').' for '.$group; + } else { + $r->print('Invalid group'); + $earlyout = 1; + } + if ($earlyout) { return OK; } + } else { + ($uname,$udom) = &get_name_dom(); + $portfolio_root = &get_portfolio_root(); + $title = &mt('Portfolio Manager'); + } + &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header - $r->print(''. - &mt('Portfolio Manager'). - "\n"); - if ($ENV{"form.mode"} eq 'selectfile'){ - $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1)); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.&Apache::loncommon::head($title)."\n"); + if ($env{"form.mode"} eq 'selectfile'){ + $r->print(&Apache::loncommon::bodytag($title,undef,undef,1)); } else { - $r->print(&Apache::loncommon::bodytag('Portfolio Manager')); + $r->print(&Apache::loncommon::bodytag($title)); } $r->rflush(); - if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ + if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ $r->print(' No file was selected to upload.'. 'To upload a file, click Browse...'. ', select a file, then click Upload,'); } - if ($ENV{'form.meta'}) { - &open_form($r); -# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'})); + if ($env{'form.meta'}) { + &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); + &close_form($r,$url,$group); } - if ($ENV{'form.store'}) { + if ($env{'form.store'}) { } - if ($ENV{'form.uploaddoc.filename'}) { - &upload($r); - } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) { - &delete_confirmed($r); - } elsif ($ENV{'form.action'} eq 'delete') { - &delete($r); - } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) { - &delete_dir_confirmed($r); - } elsif ($ENV{'form.action'} eq 'deletedir'){ - &delete_dir($r); - } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) { - &rename_confirmed($r); - } elsif ($ENV{'form.rename'}) { - $ENV{'form.selectfile'} = $ENV{'form.rename'}; - $ENV{'form.action'} = 'rename'; - &rename($r); - } elsif ($ENV{'form.createdir'}) { - &createdir($r); + if ($env{'form.uploaddoc.filename'}) { + &upload($r,$url,$group); + } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { + &delete_confirmed($r,$url,$group); + } elsif ($env{'form.action'} eq 'delete') { + &delete($r,$url,$group); + } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { + &delete_dir_confirmed($r,$url,$group); + } elsif ($env{'form.action'} eq 'deletedir'){ + &delete_dir($r,$url,$group); + } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { + &rename_confirmed($r,$url,$group); + } elsif ($env{'form.rename'}) { + $env{'form.selectfile'} = $env{'form.rename'}; + $env{'form.action'} = 'rename'; + &rename($r,$url,$group); + } elsif ($env{'form.createdir'}) { + &createdir($r,$url,$group); + } elsif ($env{'form.lockinfo'}) { + &lock_info($r,$url,$group); } else { my $current_path='/'; - if ($ENV{'form.currentpath'}) { - $current_path = $ENV{'form.currentpath'}; + if ($env{'form.currentpath'}) { + $current_path = $env{'form.currentpath'}; } - my @dir_list=&Apache::lonnet::dirlist($current_path, - $ENV{'user.domain'}, - $ENV{'user.name'},$portfolio_root); + my @dir_list=&get_dir_list($portfolio_root,$group); if ($dir_list[0] eq 'no_such_dir'){ # two main reasons for this: # 1) never been here, so directory structure not created # 2) back-button navigation after deleting a directory if ($current_path eq '/'){ - &Apache::lonnet::mkdiruserfile($ENV{'user.name'}, - $ENV{'user.domain'},'portfolio'); + &Apache::lonnet::mkdiruserfile($uname,$udom,'portfolio'); } else { # some directory that snuck in get rid of the directory # from the recent pulldown, just in case @@ -574,21 +743,15 @@ sub handler { } # now grab the directory list again, for the first time @dir_list=&Apache::lonnet::dirlist($current_path, - $ENV{'user.domain'}, - $ENV{'user.name'},$portfolio_root); + $udom,$uname,$portfolio_root); } # need to know if directory is empty so it can be removed if desired my $is_empty=(@dir_list == 2); - &display_common($r,$current_path,$is_empty,\@dir_list); - if ($ENV{"form.mode"} eq 'selectfile'){ - &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("\n\n"); - return OK; + &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group); + &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group); + $r->print(&Apache::loncommon::end_page()); } + return OK; } 1; __END__