--- loncom/interface/portfolio.pm 2004/06/28 16:07:47 1.8 +++ loncom/interface/portfolio.pm 2004/08/25 17:30:49 1.32 @@ -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); @@ -33,228 +30,433 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; -# receives a file name assumed to reside in username/userfiles/portfolio/ -# returns a form consisting of a single submit button labeled with the filename -sub makeAnchor { - my ($fileName, $currentPath) = @_; - my $anchor = ''.$fileName.''; -# my $button = ' -#
-# -# -#
-# '; +# 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) = @_; + my $anchor = ''.$filename.''; return $anchor; } # returns html with
separated contents of the directory # returns a currentFile (bolds the selected file/dir) -sub displayDirectory { - my ($currentPath, $currentFile, $isDir, @dirList,) = @_; - my $displayOut=''; - my $fileName; +sub display_directory_old { + my ($currentPath, $currentFile, @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; - } - - $displayOut = $displayOut.'..
'; + $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; + } + + # $displayOut = $displayOut.'..
'; } else { - $displayOut = $displayOut.'at root '.$currentPath.'
'; + # $displayOut = $displayOut.'at root '.$currentPath.'
'; } - while ($fileName = shift @dirList) { - if (($fileName ne './') && ($fileName ne '../')) { - if ($fileName =~ m:/$:) { - # handle directories different from files - if ($fileName eq $currentFile) { + foreach my $line (@dirList) { + #$strip holds directory/file name + #$dom + my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + if (($filename ne '.') && ($filename ne '..')) { + if ($testdir =~ m:^1:) { + # handle directories different from files + if ($filename eq $currentFile) { #checks to bold the selected file - $displayOut = $displayOut.''.(&makeAnchor($fileName, $currentPath.$fileName).'
'); - } else { - $displayOut = $displayOut.(&makeAnchor($fileName, $currentPath.$fileName).'
'); - } - } else { - if ($fileName eq $currentFile) { + $displayOut.= ''.(&make_anchor($filename.'/', $filename.'/').'
'."\n"); + } else { + $displayOut.= (&make_anchor($filename.'/', $filename.'/').'
'."\n"); + } + } else { + if ($filename eq $currentFile) { #checks to bold the selected file - $displayOut = $displayOut.''.(&makeAnchor($fileName, $currentPath).'
'); - } else { - $displayOut = $displayOut.(&makeAnchor($fileName, $currentPath).'
'); - } - } - } + $displayOut.=''.(&make_anchor($filename, $currentPath).'
'."\n"); + } else { + $displayOut.=(&make_anchor($filename, $currentPath).'
'."\n"); + } + } + + } + } - #$displayOut = $displayOut. return $displayOut; } -# returns html to offer user appropriate actions depending on selected -# file/directory sub displayActions { + # returns html to offer user appropriate actions depending on selected file/directory my $displayOut; - my ($currentPath, $currentFile, $isDir, $isFile) = @_; + my ($currentPath, $currentFile, $isEmpty) = @_; # $displayOut = 'here are actions for '.$currentFile; - if ($isDir){ - $displayOut = 'Directory'; - } - if ($isFile){ - $displayOut = 'File'; - } + 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.'
+
+ + + + + +
'; + } + } else { #action options offered for files + $displayOut = $displayOut.'
'; + $displayOut = $displayOut.' + +
+ +
+
'; - $displayOut = $displayOut.'
- - -
- -
-
-
-
- - - - -
-
'; - $displayOut = $displayOut.'
Add a file to your portfolio'; + $displayOut = $displayOut.'
+
+ + + + + +
+
'; + } + $displayOut = $displayOut.'
Add a file to '.$currentPath; # file upload form $displayOut = $displayOut.'
'; - $displayOut = $displayOut.''. - ''. - ''. - '
'; + $displayOut = $displayOut.''. + ''. + ''. + '
'; $displayOut = $displayOut.'
- - -
- '; + + + + '; return $displayOut; } +my $dirptr=16384; +sub display_directory { + my ($r,$current_path,$is_empty,$dir_list)=@_; + my $iconpath= $r->dir_config('lonIconsURL') . "/"; + $r->print(''); + $r->print('
'); + my $displayOut = '
'; + $displayOut = $displayOut.''. + ''. + ''. + '
'; + $r->print($displayOut); + $r->print('
'); + $displayOut = '
'; + $displayOut .= ''. + ''. + ''. + '
'; + $r->print($displayOut); + $r->print('
'); + my @tree = split (/\//,$current_path); + $r->print(''.&make_anchor('portfolio','/').'/'); + if (@tree > 1){ + my $newCurrentPath = ''; + for (my $i = 1; $i< @tree; $i++){ + $newCurrentPath .= $tree[$i].'/'; + $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/'); + } + } + $r->print(''); + &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path); + $r->print('
'. + &Apache::lonhtmlcommon::select_recent('portfolio','currentpath', + 'this.form.submit();')); + $r->print("
"); + if ($is_empty) { + $displayOut = '
'. + ''. + ''. + ''. + ''. + '
'; + + $r->print($displayOut); + return; + } + $r->print(''. + ''); + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/"; + 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(''); + $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.'/').'
+
+ + + + +
+		'. + $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).'
'); +# $r->print(&display_actions($current_path, $currentFile, $isEmpty)); + $r->print('
'); +} + +sub open_form { + my ($r)=@_; + $r->print('
'); + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); +} + +sub close_form { + my ($r)=@_; + $r->print('

'); + $r->print('
+

+ + +

'); + +} + +sub display_file { + my ($path,$filename)=@_; + if (!defined($path)) { $path=$ENV{'form.currentpath'}; } + if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; } + return ''.$path.$filename.''; +} + +sub done { + return ('

'.&mt('Done').'

'); +} + +sub delete { + my ($r)=@_; + &open_form($r); + $r->print('

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

'); + &close_form($r); +} + +sub delete_confirmed { + my ($r)=@_; + my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'. + $ENV{'form.currentpath'}. + $ENV{'form.selectfile'}); + if ($result ne 'ok') { + $r->print(' An error occured ('.$result. + ') while trying to delete '.&display_file().'
'); + } + $r->print(&done()); +} + +sub delete_dir { + my ($r)=@_; + &open_form($r); + $r->print('

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

'); + &close_form($r); +} + +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'. + $directory_name); + + if ($result ne 'ok') { + $r->print(' An error occured (dir) ('.$result. + ') while trying to delete '.$directory_name.'
'); + } else { + my @dirs = split m!/!, $directory_name; + +# $directory_name =~ m/^(\/*\/)(\/*.)$/; + $directory_name='/'; + for (my $i=1; $i < (@dirs - 1); $i ++){ + $directory_name .= $dirs[$i].'/'; + } + $ENV{'form.currentpath'} = $directory_name; + } + $r->print(&done()); +} + +sub rename { + my ($r)=@_; + &open_form($r); + $r->print('

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

'); + &close_form($r); +} + +sub rename_confirmed { + my ($r)=@_; + my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'}); + if ($filenewname eq '') { + $r->print(''. + &mt("Error: no valid filename was provided to rename to."). + '
'); + $r->print(&done()); + return; + } + my $result= + &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'}, + 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'}, + 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'}); + if ($result ne 'ok') { + $r->print(' An errror occured ('.$result. + ') while trying to rename '.&display_file().' to '. + &display_file(undef,$filenewname).'
'); + } + $r->print(&done()); +} + +sub upload { + my ($r)=@_; + #FIXME if the file already exists we need to do a confirmation pass + #before overwriting + my $result=&Apache::lonnet::userfileupload('uploaddoc','', + 'portfolio'.$ENV{'form.currentpath'}); + if ($result !~ m|^/uploaded/|) { + $r->print(' An errror occured ('.$result. + ') while trying to upload '.&display_file().'
'); + } + $r->print(&done()); +} + +sub createdir { + my ($r)=@_; + #FIXME 1) file exists in place of dir (errormessage needs improvement) + my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'}); + if ($newdir eq '') { + $r->print(''. + &mt("Error: no valid directory name was provided."). + '
'); + $r->print(&done()); + return; + } + my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir); + if ($result ne 'ok') { + $r->print(' An errror occured ('.$result. + ') while trying to create a new directory '.&display_file().'
'); + } + $r->print(&done()); +} + sub handler { # this handles file management - my ($r)=@_; - my @dirList; # will hold directory listing as array - my $udir; # returned from home server - my $currentPath; # path assuming /userfiles/portfolio/ as root - my $currentFile; # directory or file contained in $pathToRoot.$currentPath - my $action; # delete, rename, makedirectory, removedirectory, - my $filenewname; # for rename action (guess what we do with it!) - my $isFile; - my $isDir; - # send header - $r->content_type('text/html'); + my $r = shift; + &Apache::loncommon::no_cache($r); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + # Give the LON-CAPA page header $r->print(''. - 'Portfolio Management'. - "\n"); - - $r->print(' - -
'); - #grab stuff that was sent + &mt('Portfolio Manager'). + "\n". + &Apache::loncommon::bodytag('Portfolio Manager')); + $r->rflush(); &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') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef ); - $currentFile = ''; - } elsif($ENV{'form.fileaction'} eq 'rename') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $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. - @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 - 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); -# $r->print('
isdir '.$isDir.'
'); -# 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 - } + &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.action'} eq 'rename') { + &rename($r); + } elsif ($ENV{'form.createdir'}) { + &createdir($r); } else { - unless ($ENV{'portfolio.file'}) { - $ENV{'portfolio.file'} = 'No File Selected'; + my $current_path='/'; + if ($ENV{'form.currentpath'}) { + $current_path = $ENV{'form.currentpath'}; } + + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + $ENV{'user.name'}). + '/userfiles/portfolio'; + my @dir_list=&Apache::lonnet::dirlist($current_path, + $ENV{'user.domain'}, + $ENV{'user.name'},$portfolio_root); + + # need to know if directory is empty so it can be removed if desired + my $is_empty=(@dir_list == 2); + &display_directory($r,$current_path,$is_empty,\@dir_list); + $r->print("\n\n"); + return OK; } - ############################## - # - # Display begins here - # - ############################## - $r->print('
start '); - $r->print($udir); - $r->print('>>
'); - $r->print(&displayDirectory($currentPath, $currentFile, $isDir, @dirList)); - $r->print(''); - $r->print(&displayActions($currentPath, $currentFile, $isDir, $isFile)); - $r->print('
'); - $r->print('
end display
'); - $r->print('
'); - return OK; } - 1; __END__