--- loncom/interface/portfolio.pm 2004/06/21 14:10:05 1.5
+++ loncom/interface/portfolio.pm 2004/08/28 15:57:35 1.35
@@ -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);
@@ -33,41 +30,451 @@ use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+# 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;
+}
+
+# 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 $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.= ''.(&make_anchor($filename.'/', $filename.'/').' '."\n");
+ } else {
+ $displayOut.= (&make_anchor($filename.'/', $filename.'/').' '."\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");
+ }
+ }
+
+ }
+
+ }
+ 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 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;
+}
+
+my $dirptr=16384;
+sub display_directory {
+ 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('
');
+ &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 {
+ 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;
+ }
+ $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;
+ }
+ }
+ $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 {
+ 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) file exists in place of dir (errormessage needs improvement)
+ my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ if ($newdir eq '') {
+ $r->print(''.
+ &mt("Error: no valid directory name was provided.").
+ ' ');
+ $r->print(&done());
+ return;
+ }
+ 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 {
- my ($r)=@_;
- $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);
-# upload a file if we enter with a filename set
- $r->print ('
-
- ');
-
+ my @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,$is_empty,\@dir_list);
+ $r->print("\n