--- loncom/interface/portfolio.pm 2004/07/09 17:12:38 1.14 +++ loncom/interface/portfolio.pm 2004/08/24 06:51:11 1.26 @@ -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,65 +29,71 @@ 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.''; + +# 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; } -sub displayDirectory { - # returns html with
separated contents of the directory - # returns a currentFile (bolds the selected file/dir) - my ($currentPath, $currentFile, $isDir, @dirList,) = @_; + +# returns html with
separated contents of the directory +# returns a currentFile (bolds the selected file/dir) +sub display_directory_old { + my ($currentPath, $currentFile, @dirList,) = @_; my $displayOut=''; - my $fileName; + my $filename; my $upPath; - if ($currentPath ne '/'){ - $displayOut = 'Listing of '.$currentPath.'

'. + 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 '/'){ + if ($1 ne '/') { $upPath = $1.'/'; - }else{ + } else { $upPath = $1; } - $displayOut = $displayOut.'..
'; + # $displayOut = $displayOut.'..
'; } else { - $displayOut = $displayOut.'at root '.$currentPath.'
'; + # $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:){ + 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.'/').'
'); + if ($filename eq $currentFile) { + #checks to bold the selected file + $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.=''.(makeAnchor($fileName, $currentPath).'
'); - }else{ - $displayOut.=(makeAnchor($fileName, $currentPath).'
'); + } else { + if ($filename eq $currentFile) { + #checks to bold the selected file + $displayOut.=''.(&make_anchor($filename, $currentPath).'
'."\n"); + } else { + $displayOut.=(&make_anchor($filename, $currentPath).'
'."\n"); } } + } } return $displayOut; } + sub displayActions { # returns html to offer user appropriate actions depending on selected file/directory my $displayOut; - my ($currentPath, $currentFile, $isDir, $isEmpty) = @_; + my ($currentPath, $currentFile, $isEmpty) = @_; # $displayOut = 'here are actions for '.$currentFile; - if ($currentFile =~ m:/$:){ + 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 '/')) { @@ -117,7 +120,7 @@ sub displayActions { value="Rename '.$currentFile.'" /> '; } - }else{ #action options offered for files + } else { #action options offered for files $displayOut = $displayOut.'
'; $displayOut = $displayOut.'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('/','/')); + 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("
"); + $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 { + return $ENV{'form.currentpath'}.$ENV{'form.selectfile'}; +} + +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 errror occured ('.$result. + ') while trying to delete '.&display_file().'
'); + } + $r->print(&done()); +} + +sub rename { + my ($r)=@_; + &open_form($r); + $r->print('

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

'); + &close_form($r); +} + +sub rename_confirmed { + my ($r)=@_; + &Apache::lonnet::renameuserfile($ENV{'form.currentpath'}.$ENV{'form.selectfile'}, 'rename', $ENV{'form.currentpath'}.$ENV{'form.filenewname'} ); +} + +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) bad dirnames ( '/' etc) + # 2) file exists in place of dir (errormessage needs improvement) + my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'}, + $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.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 = shift; - my @dirList; # will hold directory listing as array + my @dir_list; # 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 $currentFile; # directory or file contained in $pathToRoot.$current_path my $action; # delete, rename, makedirectory, removedirectory, my $filenewname; # for rename action (guess what we do with it!) my $isFile; - my $isDir; - my $isEmpty; &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -177,83 +354,45 @@ sub handler { &Apache::loncommon::bodytag('Portfolio Manager')); $r->rflush(); &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 + ['selectfile','currentpath', + '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; + &upload($r); + } elsif ($ENV{'form.action'} eq 'delete') { + if ($ENV{'form.confirmed'}) { + &delete_confirmed($r); + } else { + &delete($r); + } + } elsif ($ENV{'form.action'} eq 'rename') { + # similarly, we need to delete or rename files before getting + # directory list + &rename($r); + } elsif ($ENV{'form.createdir'}) { + &createdir($r); } 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'; - } + 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'; + @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,\@dir_list); + } - ############################## - # - # 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(''); + $r->print("\n\n"); $r->rflush(); return OK;