--- loncom/interface/portfolio.pm 2004/06/25 20:50:05 1.7
+++ loncom/interface/portfolio.pm 2004/10/12 00:44:05 1.48
@@ -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,491 @@ 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 = '<a href="/adm/portfolio?selectfile='.$fileName.'¤tpath='.$currentPath.'">'.$fileName.'</a>';
-# my $button = '
-# <form method="POST" action="/adm/portfolio">
-# <input type="hidden" name="selectfile" value="'.$fileName.'">
-# <input type="submit" value="'.$fileName.'" name="storeupl">
-# </form>
-# ';
- return $anchor;
-}
-sub displayDirectory {
- # returns html with <br /> separated contents of the directory
- # returns a <strong>currentFile</strong> (bolds the selected file/dir)
-
- my ($currentPath, $currentFile, $isDir, @dirList,) = @_;
- my $displayOut='';
- my $fileName;
- my $upPath;
- if ($currentPath ne '/'){
- $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.
- # 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.'<a href="/adm/portfolio?selectfile=updir¤tpath='.$upPath.'">..</a><br />';
+
+# 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 = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$filename.'</a>';
+ return $anchor;
+}
+my $dirptr=16384;
+sub display_common {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
+ $r->print('<td bgcolor="#ccddaa" align="center">');
+ my $displayOut = '<form method="post" enctype="multipart/form-data">';
+ $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="submit" name="storeupl" value="Upload" />'.
+ '</form>';
+ $r->print($displayOut);
+ $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
+ $displayOut = '<form method="post">';
+ $displayOut .= '<input name="newdir" type="input" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
+ '</form>';
+ $r->print($displayOut);
+ $r->print('</td></tr></table>');
+ my @tree = split (/\//,$current_path);
+ $r->print('<font size="+2">'.&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('</font>');
+ &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
+ #Fixme -- remove from recent those paths that are deleted
+ $r->print('<br /><form method=post action="/adm/portfolio">'.
+ &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+ 'this.form.submit();'));
+ $r->print("</form>");
+}
+sub display_directory {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my $display_out;
+ if ($is_empty && ($current_path ne '/')) {
+ $display_out = '<form method="post" action="/adm/portfolio">'.
+ '<input type="hidden" name="action" value="deletedir" />'.
+ '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '</form>';
+
+ $r->print($display_out);
+ return;
+ }
+ $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+ '<tr><th>Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ 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('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ $r->print('<td>Go to ...</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');
+ $r->print('</tr>');
+ } else {
+ $r->print('<tr bgcolor="#CCCCFF">');
+ $r->print('<td>
+ <form method="post" action="/adm/portfolio">
+ <select name="action">
+ <option value=""></option>
+ <option value="delete">'.&mt("Delete").'</option>
+ <option value="rename">'.&mt("Rename").'</option>
+ </select>
+ <input type="submit" name="doit" value="Go" />
+ <input type="hidden" name="selectfile" value="'.$filename.'" />
+ <input type="hidden" name="currentpath" value="'.$current_path.'" />
+ </form>
+ </td>');
+ $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+ $r->print('<td><a href="'.$href_location.$filename.'">'.
+ $filename.'</a></td>');
+ $r->print('<td>'.$size.'</td>');
+ $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+ $r->print('</tr>');
+ }
+ }
+ }
+# <tr bgcolor="#FFAA99"> pink bg
+# <tr bgcolor="#CCCCFF"> blue bg
+# $r->print(&display_directory($current_path, $currentFile, @dir_list));
+# $r->print('</td>><td>');
+# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
+ $r->print('</table></form>');
+}
+sub display_file_select {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my $display_out;
+ if ($is_empty && ($current_path ne '/')) {
+ $display_out = '<form method="post" action="/adm/portfolio">'.
+ '<input type="hidden" name="action" value="deletedir" />'.
+ '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+
+ '</form>';
+
+ $r->print($display_out);
+ return;
+ }
+ $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+ '<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+ 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('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ $r->print('<td>Go to ...</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');
+ $r->print('</tr>');
+ } else {
+ $r->print('<tr bgcolor="#CCCCFF">');
+ $r->print('<td>
+ <input type="checkbox" name="selectedfile" value="'.$filename.'" >
+ </td>');
+ $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+ $r->print('<td><a href="'.$href_location.$filename.'">'.
+ $filename.'</a></td>');
+ $r->print('<td>'.$size.'</td>');
+ $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+ $r->print('</tr>');
+ }
+ }
+ }
+ $r->print('</table>
+ <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+ <input type="hidden" name="currentpath" value="'.$current_path.'" />
+ </form>');
+}
+
+sub open_form {
+ my ($r)=@_;
+ $r->print('<form method="post" action="/adm/portfolio">');
+ $r->print('<input type="hidden" name="action" value="'.
+ $ENV{'form.action'}.'" />');
+ $r->print('<input type="hidden" name="confirmed" value="1" />');
+ $r->print('<input type="hidden" name="selectfile" value="'.
+ $ENV{'form.selectfile'}.'" />');
+ $r->print('<input type="hidden" name="currentpath" value="'.
+ $ENV{'form.currentpath'}.'" />');
+}
+
+sub close_form {
+ my ($r)=@_;
+ $r->print('<p><input type="submit" value="'.&mt('Continue').
+ '" /></p></form>');
+ $r->print('<form action="/adm/portfolio" method="POST">
+ <p>
+ <input type="hidden" name="currentpath" value="'.
+ $ENV{'form.currentpath'}.'" />
+ <input type="submit" value="'.&mt('Cancel').'" />
+ </p></form>');
+
+}
+
+sub display_file {
+ my ($path,$filename)=@_;
+ if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
+ if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
+ return '<tt>'.$path.$filename.'</tt>';
+}
+
+sub done {
+ return ('<h3><a href="/adm/portfolio?currentpath='.
+ $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+}
+
+sub delete {
+ my ($r)=@_;
+ &open_form($r);
+ $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ &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('<font color="red"> An error occured ('.$result.
+ ') while trying to delete '.&display_file().'</font><br />');
+ }
+ $r->print(&done());
+}
+
+sub delete_dir {
+ my ($r)=@_;
+ &open_form($r);
+ $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ &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('<font color="red"> An error occured (dir) ('.$result.
+ ') while trying to delete '.$directory_name.'</font><br />');
+ } else {
+ # now remove from recent
+# $r->print('<br /> removing '.$directory_name.'<br /');
+ &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
+ 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('<p>'.&mt('Rename').' '.&display_file().' to
+ <input name="filenewname" type="input" size="50" />?</p>');
+ &close_form($r);
+}
+
+sub rename_confirmed {
+ my ($r)=@_;
+ my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ if ($filenewname eq '') {
+ $r->print('<font color="red">'.
+ &mt("Error: no valid filename was provided to rename to.").
+ '</font><br />');
+ $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('<font color="red"> An errror occured ('.$result.
+ ') while trying to rename '.&display_file().' to '.
+ &display_file(undef,$filenewname).'</font><br />');
+ }
+ $r->print(&done());
+}
+sub select_files {
+ my ($r)=@_;
+ my $java_script =(<<ENDSMP);
+ <script language='javascript'>
+ function finishSelect() {
+ opener.document.forms.lonhomework.selectedfiles.value='files were selected';
+
+ self.close();
+ }
+ </script>
+ENDSMP
+ $r->print($java_script);
+ $r->print("<h1>Select portfolio files</h1>
+ Check as many as you wish in response to the essay problem.<br />");
+ my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+ $ENV{'user.name'}).
+ '/userfiles/portfolio';
+ 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);
+ 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 {
- $displayOut = $displayOut.'at root '.$currentPath.'<br />';
- }
- 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.'<strong>'.(makeAnchor($fileName, $currentPath.$fileName).'</strong><br />');
- }else{
- $displayOut = $displayOut.(makeAnchor($fileName, $currentPath.$fileName).'<br />');
- }
- }else{
- if ($fileName eq $currentFile){ #checks to bold the selected file
- $displayOut = $displayOut.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');
- }else{
- $displayOut = $displayOut.(makeAnchor($fileName, $currentPath).'<br />');
- }
- }
- }
+ # 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
}
- $displayOut = $displayOut.
- return $displayOut;
+ # 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);
+ &display_file_select($r,$current_path,$is_empty,\@dir_list);
+ $r->print("</body>\n</html>\n");
+ return OK;
}
-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.'<form method="POST">
- <input type="hidden" name="selectfile"
- value="'.$currentFile.'">
- <input type="hidden" name="fileaction" value="delete">
- <center>
- <input type="submit"
-
- value="Delete '.$currentFile.'">
- </center>
- </form>
- <hr />
- <form method="POST">
- <input type="hidden" name="selectfile"
- value="'.$currentFile.'">
- <input type="hidden" name="fileaction" value="rename">
- <input type="input" name="filenewname" value="Type new name here">
- <input type="submit"
- value="Rename '.$currentFile.'">
- </form>
- <hr>';
- $displayOut = $displayOut.'<hr>Add a file to your portfolio';
- # file upload form
- $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';
- $displayOut = $displayOut.'<input name="uploaddoc" type="file">'.
- '<input type="hidden" name="currentpath" value="'.$currentPath.'">'.
- '<input type="submit" name="storeupl" value="Upload">'.
- '</form><hr>';
- $displayOut = $displayOut.'<form method="POST">
- <input name="subdir" type="text" >
- <input type="submit" value="Create Subdirectory">
- </form>
- ';
- return $displayOut;
+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('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
+ '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
+ }
+ elsif ($found_file){
+ $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
+ '<br />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('<font color="red"> An errror occured ('.$result.
+ ') while trying to upload '.&display_file().'</font><br />');
+ }
+ }
+ $r->print(&done());
}
+
+sub createdir {
+ my ($r)=@_;
+ my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ if ($newdir eq '') {
+ $r->print('<font color="red">'.
+ &mt("Error: no directory name was provided.").
+ '</font><br />');
+ $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('<font color="red"> Unable to create a directory named <strong>'.$newdir.
+ ' </strong>a file or directory by that name already exists.</font><br />');
+ } else {
+ my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+ $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
+ if ($result ne 'ok') {
+ $r->print('<font color="red"> An errror occured ('.$result.
+ ') while trying to create a new directory '.&display_file().'</font><br />');
+ }
+ }
+ $r->print(&done());
+}
+
sub handler {
- # this handles file management
- my ($r)=@_;
- 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('<html><head><title>'.
- 'Portfolio Management'.
- "</title></head>\n");
-
- $r->print ('
- <body bgcolor="dogfood">
- <blockquote>');
- #grab stuff that was sent
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath', 'currentfile']);
- $r->print ('<br />CP= '.$ENV{'form.currentpath'}.'<br />');
- # 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 = '/';
+ # 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('<html><head><title>'.
+ &mt('Portfolio Manager').
+ "</title></head>\n".
+ &Apache::loncommon::bodytag('Portfolio Manager'));
+ $r->rflush();
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectfile','currentpath',
+ 'currentfile','action']);
+ if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
+ $r->print('<font color="red"> No file was selected to upload.'.
+ 'To upload a file, click <strong>Browse...</strong>'.
+ ', select a file, then click <strong>Upload</strong>,</font>');
}
- if ($ENV{'form.selectfile'}){
- $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');
- # have to check if the selected file is a subdirectory
- if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
- # $currentPath =~ /\-\(Dir\)/;
- $currentPath = $`.'/';
- $r->print('<br />'.$currentPath.'<br />');
- }
- $currentFile = $ENV{'form.selectfile'};
- }else{
- $currentFile = '';
+ if ($ENV{'form.uploaddoc.filename'}) {
+ &upload($r);
+ } elsif ($ENV{'form.action'} eq 'selectfile') {
+ &select_files($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'};
}
- # 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'}.'<br />');
- $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');
- }
- # 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');
- }
- }
- # 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 /<br\s\/>/, (&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 ('<br />udir '.$londcall.'<br />');
- $udir = pop @dirList;
- $r->print ('<br />path returned '.$udir.'<br />');
- $isFile = pop @dirList;
-# $r->print ('<br />isfile '.$isFile.'<br />');
- $isDir = pop @dirList;
-# $r->print ('<br />isdir '.$isDir.'<br />');
-# 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';
- }
- }
- ##############################
- #
- # Display begins here
- #
- ##############################
- $r->print ('<hr /> start ');
- $r->print ($udir);
- $r->print ('<table border=1><tr><td>');
- $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));
- $r->print ('</td>><td>');
- $r->print (displayActions ($currentPath, $currentFile, $isDir, $isFile));
- $r->print ('</td>></tr></table>');
- $r->print ('<br />end display<br /><hr />');
- $r->print ('</blockquote></body>');
+ 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);
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
+ $r->print("</body>\n</html>\n");
return OK;
+ }
}
-
1;
__END__