--- loncom/interface/portfolio.pm 2004/07/29 17:04:21 1.20
+++ loncom/interface/portfolio.pm 2004/08/24 06:16:55 1.24
@@ -32,27 +32,27 @@ use Apache::lonlocal;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
-sub makeAnchor{
- my ($fileName, $currentPath) = @_;
- my $anchor = ''.$fileName.'';
+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 {
+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;
}
@@ -63,20 +63,22 @@ sub displayDirectory {
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.'/', $fileName.'/').' '."\n");
- }else{
- $displayOut.= (makeAnchor($fileName.'/', $fileName.'/').' '."\n");
+ 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).' '."\n");
- }else{
- $displayOut.=(makeAnchor($fileName, $currentPath).' '."\n");
+ } else {
+ if ($filename eq $currentFile) {
+ #checks to bold the selected file
+ $displayOut.=''.(&make_anchor($filename, $currentPath).' '."\n");
+ } else {
+ $displayOut.=(&make_anchor($filename, $currentPath).' '."\n");
}
}
@@ -85,12 +87,13 @@ sub displayDirectory {
}
return $displayOut;
}
+
sub displayActions {
# returns html to offer user appropriate actions depending on selected file/directory
my $displayOut;
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.'');
+}
+
+sub open_form {
+ my ($r)=@_;
+ $r->print('
');
+ &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)=@_;
+ 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 handler {
+ # this handles file management
+ my $r = shift;
+ my @dir_list; # will hold directory listing as array
+ my $udir; # returned from home server
+ 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;
+ &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']);
+
+ # 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'}) {
+ &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);
+ } else {
+ 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);
+
+ }
+
$r->print("\n\n");
$r->rflush();
return OK;