--- loncom/interface/portfolio.pm 2004/07/09 16:40:31 1.13
+++ loncom/interface/portfolio.pm 2004/09/06 23:59:05 1.37
@@ -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.'
');
+ &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 {
- $currentPath = '/';
+ 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;
}
- 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.' ');
+ $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)=@_;
+ my $fname=$ENV{'form.uploaddoc.filename'};
+ $fname=&Apache::lonnet::clean_filename($fname);
+ 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 $fname){
+ $found_file = 1;
}
- $currentFile = $ENV{'form.selectfile'};
+ }
+ $r->print(' '.&Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root).' ');
+ if ($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 {
- $currentFile = '';
+ 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().' ');
+ }
}
- # 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).' ');
+ $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;
+ }
}
- # 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;
+ if ($found_file){
+ $r->print(' Unable to create a directory named '.$newdir.
+ ' a file or directory by that name already exists. ');
} else {
- $isEmpty = 0;
+ 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().' ');
+ }
}
- # 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('