--- loncom/interface/portfolio.pm 2004/06/18 23:59:55 1.3
+++ loncom/interface/portfolio.pm 2004/07/09 16:36:09 1.12
@@ -32,37 +32,226 @@ 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.'';
+ 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;
+ }
+
+ $displayOut = $displayOut.'..
';
+ } else {
+ $displayOut = $displayOut.'at root '.$currentPath.'
';
+ }
+ 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.= ''.(makeAnchor($fileName.'/', $currentPath.$fileName.'/').'
');
+ }else{
+ $displayOut.= (makeAnchor($fileName.'/', $currentPath.$fileName.'/').'
');
+ }
+ }else{
+ if ($fileName eq $currentFile){ #checks to bold the selected file
+ $displayOut.=''.(makeAnchor($fileName, $currentPath).'
');
+ }else{
+ $displayOut.=(makeAnchor($fileName, $currentPath).'
');
+ }
+ }
+ }
+
+ }
+ return $displayOut;
+}
+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.'
+ ';
+ }
+ }else{ #action options offered for files
+ $displayOut = $displayOut.'';
+
+ $displayOut = $displayOut.'
+
+
';
+ }
+ $displayOut = $displayOut.'
Add a file to '.$currentPath;
+ # file upload form
+ $displayOut = $displayOut.'
';
+ $displayOut = $displayOut.'
+ ';
+ return $displayOut;
+}
sub handler {
- my $r=@_[0];
- $r->content_type('text/html');
- $r->send_http_header;
- return OK if $r->header_only;
- my $file=&Apache::lonnet::filelocation("",$r->uri);
- my $contents=&Apache::lonnet::getfile($file);
- $r->print ('
Current contents of your portfolio directory:
');
- $r->print (&Apache::lonnet::portfoliolist($r->uri, $ENV{'user.domain'}, $ENV{'user.name'}, udef ));
- $r->print ('
call to dirlist precedes
');
- if ($ENV{'form.uploaddoc.filename'}){
- $r->print ('
call to userfileupload follows
');
- $r->print (&Apache::lonnet::userfileupload('uploaddoc',undef,'portfolio').'
');
- $r->print ('
call to userfileupload precedes
');
- }
-
- $r->print ($ENV{'form.uploaddoc.filename'}.'
');
- $r->print ($ENV{'form.storeupl'}.'
');
- $r->print ($ENV{'form.saywhat'}.'
');
-
- $r->print("here's the form
");
- # file upload form
- $r->print('');
- return OK;
-
+ # this handles file management
+ my $r = shift;
+ 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;
+ my $isEmpty;
+ # send header
+ # FIXME need to start using
+ &Apache::loncommon::no_cache($r);
+ &Apache::loncommon::content_type($r, 'text/html');
+ &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
+ $r->send_http_header;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectfile','currentpath', 'currentfile']);
+ # 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'}) {
+ # 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'} );
+ }
+ }
+ # 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.
+ my $portfolioRoot = '/home/httpd/lonUsers/'.$ENV{'user.domain'}.'/';
+ $ENV{'user.name'} =~ /^(.?)(.?)(.?)/;
+ $portfolioRoot = $portfolioRoot.$1.'/'.$2.'/'.$3.'/'.$ENV{'user.name'}.'/userfiles/portfolio';
+ my @list = &Apache::lonnet::dirlist($currentPath, $ENV{'user.domain'}, $ENV{'user.name'}, $portfolioRoot);
+ @dirList = @list;
+ if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired
+ $isEmpty = 1;
+ }else{
+ $isEmpty = 0;
+ }
+ # 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'});
+ } 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('');
+ $r->print(displayDirectory($currentPath, $currentFile, $isDir, @dirList));
+ $r->print(' | >');
+ $r->print(displayActions($currentPath, $currentFile, $isDir, $isEmpty));
+ $r->print(' | >
');
+ $r->print('