--- loncom/interface/portfolio.pm 2004/07/27 05:29:00 1.17 +++ loncom/interface/portfolio.pm 2004/08/28 15:57:35 1.35 @@ -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,42 +63,37 @@ 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,$path,$debug)=split(/\&/,$line,18); - $path =~ m:/:; - my $dirDepth = @-; - if (($fileName ne '.') && ($fileName ne '..')){ - for (my $i = 0; $i <= $dirDepth; $i += 1){ - $displayOut.='
'; - } - 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.= $debug.''.(makeAnchor($fileName.'/', $path.$fileName.'/').'
'."\n"); - }else{ - $displayOut.= $debug.(makeAnchor($fileName.'/', $path.$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.=$debug.''.(makeAnchor($fileName, $currentPath).'
'."\n"); - }else{ - $displayOut.=$debug.(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"); } } - for (my $i = 0; $i <= $dirDepth; $i += 1){ - $displayOut.='
'; - } } } 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 '/')) { @@ -125,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('portfolio','/').'/'); + 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("
"); + if ($is_empty) { + $displayOut = '
'. + ''. + ''. + ''. + ''. + '
'; + + $r->print($displayOut); + return; + } + $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 { + my ($path,$filename)=@_; + if (!defined($path)) { $path=$ENV{'form.currentpath'}; } + if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; } + return ''.$path.$filename.''; +} + +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 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 { # this handles file management my $r = shift; - 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 $isEmpty; + 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; @@ -184,137 +441,40 @@ 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 ($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 $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, - $ENV{'user.name'}). - '/userfiles/portfolio'; - my $done = 0; - my $subdir = ''; - my @workinglist; # intermediate array, holds directory listing lines (dirlist), and path information - my $readDirectory = 1; # flag for directory - my $loopCounter = 0; # needed only for development to prevent run away program (or maybe more?) - while (!$done){ - # Needed while developing. Later, too? - $loopCounter += 1; - if ($loopCounter > 50) { - $r->print('
stop runaway'); - return OK; - } - # --- - if ($readDirectory){ # is true the first time through, then true if dirlist line is a subdir - # $r->print('
reading '.$portfolio_root.$subdir); - my @list = &Apache::lonnet::dirlist($currentPath, $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$subdir); - $r->print('value in @list = '.@list); - for (my $i = 0; $i <= @list; $i++ ){ - my $line = pop @list; - $line = $line.'&'.$subdir.'&'.$loopCounter; # append the subdirectory information and loopcounter for debug - my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17); - if (($fileName ne '.') && ($fileName ne '..')){ # we throw away the current and parent directories - $r->print('
'.$line); #for debugging - unshift @workinglist, $line; # add the line to the working list array - - }else{ - $r->print('
parent or current '.$line); #for debugging - } - } - } - $r->print('
'.@workinglist.' lines in workinglist'); - my $line = shift @workinglist; #take one off the working list - $r->print('
'.@workinglist.' lines in workinglist'); - if ($line eq '') { # if the working list is empty - $done = 1; - }else{ - my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath,$debug)=split(/\&/,$line,18); - $r->print('
'.$fileName.' is '.$testdir); - push @dirList, $line; # and put it in the display list - if ($testdir =~ m:^1:) { # true if this is a directory - # $r->print('
added subdir '.$fileName); - $subdir = $subpath.'/'.$fileName; - $readDirectory = 1; - }else{ - $readDirectory = 0; - } - } - } - # if item is directory { get the next level down - # my @list = &Apache::lonnet::dirlist($currentPath, $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$); - - 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' && $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 { - $isEmpty = 0; - } - - 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 @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\n"); + return OK; } - ############################## - # - # Display begins here - # - ############################## - $r->print('>>
'); - $r->print(displayDirectory($currentPath, $currentFile, @dirList)); - $r->print(''); - $r->print(displayActions($currentPath, $currentFile, $isEmpty)); - $r->print('
'); - $r->print(''); - $r->print("\n\n"); - $r->rflush(); - return OK; } - 1; __END__