--- loncom/interface/portfolio.pm 2004/07/01 18:59:33 1.10
+++ loncom/interface/portfolio.pm 2006/06/16 22:37:10 1.104
@@ -18,12 +18,9 @@
#
# /home/httpd/html/adm/gpl.txt
#
-
-
# http://www.lon-capa.org/
#
-
package Apache::portfolio;
use strict;
use Apache::Constants qw(:common :http);
@@ -32,276 +29,993 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
-sub makeAnchor{
- # receives a file name and path stub from username/userfiles/portfolio/
- # returns an anchor tag consisting encoding filename and currentpath
- my ($fileName, $currentPath) = @_;
- my $anchor = ''.$fileName.'';
+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
+sub make_anchor {
+ 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;
}
-sub displayDirectory {
- # returns html with separated contents of the directory
- # returns a currentFile (bolds the selected file/dir)
- my ($currentPath, $currentFile, $isDir, @dirList,) = @_;
- my $displayOut='';
- my $fileName;
- my $upPath;
- if ($currentPath ne '/'){
- $displayOut = 'Listing of '.$currentPath.'
'.
- # provides the "up one directory level" function
- # it means shortening the currentpath to the parent directory
- $currentPath =~ m:(^/.*)(/.*/$):;
- if ($1 ne '/'){
- $upPath = $1.'/';
- }else{
- $upPath = $1;
+my $dirptr=16384;
+sub display_common {
+ 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') . "/";
+ 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");
+
+
+
+
+TABLE
+ my @tree = split (/\//,$current_path);
+ $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($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
}
+ }
+ $r->print('');
+ &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
+ $r->print(' ");
+}
+sub display_directory {
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my ($groupitem,$groupecho);
+ my $display_out;
+ my $select_mode;
+ my $checked_files;
+ my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom($group);
+ if (defined($group)) {
+ $groupitem = '';
+ $groupecho = '&group='.$group;
+ }
+ 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'});
+ $select_mode = 'true';
+ }
+ if ($is_empty && ($current_path ne '/')) {
+ $display_out = '';
- $displayOut = $displayOut.'.. ';
+ $r->print($display_out);
+ return;
+ }
+ if ($select_mode eq 'true') {
+ $r->print('
'.
+ '
Select
Name
Size
Last Modified
');
+ $r->print('');
+ } else {
+ $r->print('
+
+
+
+ ');
+ }
}
-sub displayActions {
- # returns html to offer user appropriate actions depending on selected file/directory
- my $displayOut;
- my ($currentPath, $currentFile, $isDir, $isEmpty) = @_;
-# $displayOut = 'here are actions for '.$currentFile;
- if ($currentFile =~ m:/$:){
- # if the selected file is a directory, these are the options
- # offer the chance to delete the directory only if it is empty
- if ($isEmpty && ($currentPath ne '/')) {
- $displayOut = $displayOut.'
-
-
-
-
-
-
-
';
- }
- if ($currentPath ne '/') {
- $displayOut = $displayOut.'
-
');
- #grab stuff that was sent
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath', 'currentfile']);
-# $r->print (' CP= '.$ENV{'form.currentpath'}.' ');
- # currentPath and currentFile need to be set for the rest of things to happen
- # sometimes, currentFile will be passed by a form field, selectedfile
- # if there is no 'form.selectedfile' then the current directory is
- # considered as selected
- if ($ENV{'form.currentpath'}){
- $currentPath = $ENV{'form.currentpath'};
- }else{
- $currentPath = '/';
- }
- if ($ENV{'form.selectfile'}){
- $r->print(' found selectfile'.$ENV{'form.selectfile'} .' ');
- # have to check if the selected file is a subdirectory
- if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
- # $currentPath =~ /\-\(Dir\)/;
- $currentPath = $`.'/';
- $r->print(' '.$currentPath.' ');
- }
- $currentFile = $ENV{'form.selectfile'};
- }else{
- $currentFile = '';
- }
- # if we're uploading a file, we need to do it early so it will show in the directory list
- if ($ENV{'form.uploaddoc.filename'}){
- $r->print ($ENV{'form.storeupl'}.' ');
- $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).' ');
- }
- # similarly, we need to delete or rename files before getting directory list
- if ($ENV{'form.selectfile'}){
- if ($ENV{'form.fileaction'} eq 'delete'){
- $r->print(' trying to delete '.$currentPath.$ENV{'form.selectfile'}.' ');
- $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
- $currentFile = '';
- }elsif($ENV{'form.fileaction'} eq 'rename') {
- &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} );
- # $r->print ('We will rename your file');
- }
- }
- # we always need $dirList, plus this will return information about the current file
- # as well as information about he home server directory structure, specifically
- # the path to the users userfiles directory.
-# $r->print('dir list follows '.&Apache::lonnet::portfoliolist($currentPath, $currentFile).' ');
- my $list = &Apache::lonnet::portfoliolist($currentPath, $currentFile);
- @dirList = split(/:/,$list);
-# foreach my $line (@dirlist) {
-#
-# #$strip holds directory/file name
-# #$dom
-# my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
-# $r->print ($strip.' '.$testdir.' ');
-# }
-# @dirList = split / /, (&Apache::lonnet::portfoliolist($currentPath, $currentFile));
-
- # portfoliolist returns isdir, isfile and udir as the final array elements
- # we'll pop them off the bottom of the array, and put them where they belong
-
- # $londcall added to help debug, contains the command sent to lond
- # my $londcall = pop @dirList;
- # $r->print (' udir '.$londcall.' ');
- # $udir = pop @dirList;
- # $r->print (' path returned '.$udir.' ');
- # $isFile = pop @dirList;
-# $r->print (' isfile '.$isFile.' ');
-# $isDir = pop @dirList;
- if (@dirList == 2){ # need to know if directory is empty to it can be removed if desired
- $isEmpty = 1;
- }else{
- $isEmpty = 0;
- }
-# $r->print (' lines left ind dirlist '.@dirList.' ');
-# return OK if $r->header_only;
- # Stuff to maintain proper setting for selected file
- if ($ENV{'form.selectfile'}){
- if ($ENV{'form.fileaction'} eq 'delete'){
- &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );
- $ENV{'portfolio.file'} = 'Selected File Deleted';
- }elsif($ENV{'form.fileaction'} eq 'rename') {
- &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );
-# $r->print ('We will rename your file');
- }else{
-
- # Remember user's file selection for later
- $ENV{'portfolio.file'} = $ENV{'form.selectfile'};
- # offer things user can do with selected file
- }
- }else{
- unless ($ENV{'portfolio.file'}){
- $ENV{'portfolio.file'} = 'No File Selected';
- }
- }
- ##############################
- #
- # Display begins here
- #
- ##############################
- $r->print (' start ');
- $r->print ($udir);
- $r->print ('