--- loncom/interface/portfolio.pm 2004/08/24 20:57:12 1.30
+++ loncom/interface/portfolio.pm 2004/09/10 21:33:48 1.46
@@ -38,127 +38,6 @@ sub make_anchor {
return $anchor;
}
-# returns html with <br /> separated contents of the directory
-# returns a <strong>currentFile</strong> (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.'<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='.$upPath.'¤tpath='.$upPath.'">..</a><br />';
- } else {
- # $displayOut = $displayOut.'at root '.$currentPath.'<br />';
- }
- 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.= '<strong>'.(&make_anchor($filename.'/', $filename.'/').'</strong><br />'."\n");
- } else {
- $displayOut.= (&make_anchor($filename.'/', $filename.'/').'<br />'."\n");
- }
- } else {
- if ($filename eq $currentFile) {
- #checks to bold the selected file
- $displayOut.='<strong>'.(&make_anchor($filename, $currentPath).'</strong><br />'."\n");
- } else {
- $displayOut.=(&make_anchor($filename, $currentPath).'<br />'."\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.'<form method="POST">
- <input type="hidden" name="selectfile"
- value="'.$currentFile.'" />
- <input type="hidden" name="fileaction" value="delete" />
- <input type="hidden" name="currentpath" value="'.$currentPath.'" />
- <center>
- <input type="submit"
- value="Delete '.$currentFile.'" />
- </center>
- </form>';
- }
- if ($currentPath ne '/') {
- $displayOut = $displayOut.'<hr />
- <form method="POST">
- <input type="hidden" name="selectfile"
- value="'.$currentFile.'" />
- <input type="hidden" name="fileaction" value="rename" />
- <input type="hidden" name="currentpath" value="'.$currentPath.'" />
- <input type="input" name="filenewname" value="Type new name here" />
- <input type="submit"
- value="Rename '.$currentFile.'" />
- </form>';
- }
- } else { #action options offered for files
- $displayOut = $displayOut.'<form method="POST">';
- $displayOut = $displayOut.'<input type="hidden" name="selectfile"';
- $displayOut = $displayOut.'value="'.$currentFile;
- $displayOut = $displayOut.'" /><input type="hidden" name="fileaction" value="delete" />
- <input type="hidden" name="currentpath" value="'.$currentPath.'" />
- <center>
- <input type="submit"
- value="Delete '.$currentFile.'" />
- </center>
- </form>';
-
- $displayOut = $displayOut.'<hr />
- <form method="POST">
- <input type="hidden" name="selectfile"
- value="'.$currentFile.'" />
- <input type="hidden" name="fileaction" value="rename" />
- <input type="hidden" name="currentpath" value="'.$currentPath.'" />
- <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 '.$currentPath;
- # 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;
-}
-
my $dirptr=16384;
sub display_directory {
my ($r,$current_path,$is_empty,$dir_list)=@_;
@@ -190,11 +69,12 @@ sub display_directory {
}
$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>");
- if ($is_empty){
+ if ($is_empty && ($current_path ne '/')) {
$displayOut = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
@@ -203,10 +83,11 @@ sub display_directory {
'</form>';
$r->print($displayOut);
- }else{
+ 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/";
+ my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
@@ -225,20 +106,20 @@ sub display_directory {
} 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>');
+ <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>');
+ $filename.'</a></td>');
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
$r->print('</tr>');
@@ -251,7 +132,6 @@ sub display_directory {
# $r->print('</td>><td>');
# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
$r->print('</table></form>');
- }
}
sub open_form {
@@ -321,16 +201,27 @@ sub delete_dir {
sub delete_dir_confirmed {
my ($r)=@_;
my $directory_name = $ENV{'form.currentpath'};
- $r->print('<br />'.$directory_name.'<br />');
$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 '.&display_file().'</font><br />');
') 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());
}
@@ -367,33 +258,76 @@ sub rename_confirmed {
sub upload {
my ($r)=@_;
- #FIXME if the file already exists we need to do a confirmation pass
- #before overwriting
- 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 />');
+ 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)=@_;
- #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('<font color="red">'.
- &mt("Error: no valid directory name was provided.").
- '</font><br />');
- $r->print(&done());
- return;
+ $r->print('<font color="red">'.
+ &mt("Error: no directory name was provided.").
+ '</font><br />');
+ $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('<font color="red"> An errror occured ('.$result.
- ') while trying to create a new directory '.&display_file().'</font><br />');
+ 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());
}
@@ -401,6 +335,9 @@ sub createdir {
sub handler {
# 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;
@@ -413,7 +350,11 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
'currentfile']);
-
+ 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.uploaddoc.filename'}) {
&upload($r);
} elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
@@ -421,9 +362,9 @@ sub handler {
} elsif ($ENV{'form.action'} eq 'delete') {
&delete($r);
} elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
- &delete_dir_confirmed($r);
+ &delete_dir_confirmed($r);
} elsif ($ENV{'form.action'} eq 'deletedir'){
- &delete_dir($r);
+ &delete_dir($r);
} elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
&rename_confirmed($r);
} elsif ($ENV{'form.action'} eq 'rename') {
@@ -435,20 +376,33 @@ sub handler {
if ($ENV{'form.currentpath'}) {
$current_path = $ENV{'form.currentpath'};
}
-
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
- '/userfiles/portfolio';
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_directory($r,$current_path,$is_empty,\@dir_list);
- $r->print("</body>\n</html>\n");
- $r->rflush();
- return OK;
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
+ $r->print("</body>\n</html>\n");
+ return OK;
}
}
1;