--- loncom/interface/portfolio.pm 2004/06/25 18:47:18 1.6
+++ loncom/interface/portfolio.pm 2004/12/04 19:08:42 1.62
@@ -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,222 +29,531 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
-sub makeAnchor{
- # receives a file name assumed to reside in username/userfiles/portfolio/
- # returns a form consisting of a single submit button labeled with the file name
- my ($fileName, $currentPath) = @_;
- my $anchor = ''.$fileName.'';
-# my $button = '
-#
-# ';
- 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.' ';
- }
- while ($fileName = shift @dirList){
- if (($fileName ne './') && ($fileName ne '../')){
- if ($fileName =~ m:/$:){
- # 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){ #checks to bold the selected file
- $displayOut = $displayOut.''.(makeAnchor($fileName, $currentPath).' ');
- }else{
- $displayOut = $displayOut.(makeAnchor($fileName, $currentPath).' ');
- }
- }
- }
- }
- $displayOut = $displayOut.
- return $displayOut;
+
+# 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.'';
+ return $anchor;
}
-sub displayActions {
- # returns html to offer user appropriate actions depending on selected file/directory
- my $displayOut;
- my ($currentPath, $currentFile, $isDir, $isFile) = @_;
-# $displayOut = 'here are actions for '.$currentFile;
- if ($isDir){
- $displayOut = 'Directory';
- }
- if ($isFile){
- $displayOut = 'File';
- }
-
- $displayOut = $displayOut.'
-
-
- ';
- $displayOut = $displayOut.'Add a file to your portfolio';
- # file upload form
- $displayOut = $displayOut.'';
- $displayOut = $displayOut.'
- ';
- return $displayOut;
+my $dirptr=16384;
+sub display_common {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ $r->print('
');
+ $r->print('
');
+ my $displayOut = '';
+ $r->print($displayOut);
+ $r->print('
');
+}
+
+sub delete {
+ my ($r)=@_;
+ my @check;
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+ $r->print ("The file is locked and cannot be deleted. ");
+ $r->print(&done());
+ } else {
+ &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 {
+ # now remove from recent
+# $r->print(' removing '.$directory_name.' print(&done());
+}
+
+sub rename {
+ my ($r)=@_;
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+ $r->print ("The file is locked and cannot be renamed. ");
+ $r->print(&done());
+ } else {
+ &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'}.$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 select_files {
+ my ($r)=@_;
+ 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.selectedfile');
+ &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'});
+ }
+ }
+ my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+ my $java_files = join ",", @files;
+ if ($java_files) {
+ $java_files.=',';
+ }
+ my $java_script =(<
+ function finishSelect() {
+ENDSMP
+ $java_script .= 'fileList = "'.$java_files.'";';
+ $java_script .= (<
+ENDSMP
+ $r->print($java_script);
+ $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($_." ");
+ }
+}
+sub upload {
+ my ($r)=@_;
+ 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';
+ # 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 $found_file = 0;
+ foreach my $line (@dir_list) {
+ my ($filename)=split(/\&/,$line,2);
+ if ($filename eq $fname){
+ $found_file = 1;
+ }
+ }
+ my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$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.');
+ }
+ 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'});
+ } else {
+ 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)=@_;
+ my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ if ($newdir eq '') {
+ $r->print(''.
+ &mt("Error: no directory name was provided.").
+ ' ');
+ $r->print(&done());
+ 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 $found_file = 0;
+ foreach my $line (@dir_list) {
+ my ($filename)=split(/\&/,$line,2);
+ if ($filename eq $newdir){
+ $found_file = 1;
+ }
+ }
+ if ($found_file){
+ $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);
+ 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=@_[0];
- 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');
- $r->send_http_header;
- $r->print(''.
- 'Portfolio Management'.
- "\n");
-
- $r->print ('
-
-
');
- #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).' ');
+ # this handles file management
+ my $r = shift;
+ my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+ $ENV{'user.name'}).
+ '/userfiles/portfolio';
+ &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".
+ &Apache::loncommon::bodytag('Portfolio Manager'));
+ $r->rflush();
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectfile','currentpath',
+ 'currentfile','action','fieldname','mode']);
+ if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
+ $r->print(' No file was selected to upload.'.
+ 'To upload a file, click Browse...'.
+ ', select a file, then click Upload,');
}
- # 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');
- }
+ 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.action'} eq 'rename') {
+ &rename($r);
+ } elsif ($ENV{'form.createdir'}) {
+ &createdir($r);
+ } else {
+ my $current_path='/';
+ if ($ENV{'form.currentpath'}) {
+ $current_path = $ENV{'form.currentpath'};
}
- # 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
- }
- }else{
- unless ($ENV{'portfolio.file'}){
- $ENV{'portfolio.file'} = 'No File Selected';
- }
+ my @dir_list=&Apache::lonnet::dirlist($current_path,
+ $ENV{'user.domain'},
+ $ENV{'user.name'},$portfolio_root);
+ 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');
+ } else {
+ # some directory that snuck in get rid of the directory
+ # from the recent pulldown, just in case
+ &Apache::lonhtmlcommon::remove_recent('portfolio',
+ [$current_path]);
+ $current_path = '/'; # force it back to the root
+ }
+ # 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);
+ }
+ # 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);
}
- ##############################
- #
- # Display begins here
- #
- ##############################
- $r->print (' start ');
- $r->print ($udir);
- $r->print ('