--- loncom/interface/portfolio.pm 2004/07/27 05:29:00 1.17
+++ loncom/interface/portfolio.pm 2004/08/24 06:51:11 1.26
@@ -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 = '<a href="/adm/portfolio?selectfile='.$fileName.'¤tpath='.$currentPath.'">'.$fileName.'</a>';
+sub make_anchor {
+ my ($filename, $current_path) = @_;
+ my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$filename.'</a>';
return $anchor;
}
# returns html with <br /> separated contents of the directory
# returns a <strong>currentFile</strong> (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.'<br /><hr />'.
+ 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 '/'){
+ 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.='<blockquote>';
- }
- 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.'<strong>'.(makeAnchor($fileName.'/', $path.$fileName.'/').'</strong><br />'."\n");
- }else{
- $displayOut.= $debug.(makeAnchor($fileName.'/', $path.$fileName.'/').'<br />'."\n");
+ 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.=$debug.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");
- }else{
- $displayOut.=$debug.(makeAnchor($fileName, $currentPath).'<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");
}
}
- for (my $i = 0; $i <= $dirDepth; $i += 1){
- $displayOut.='</blockquote>';
- }
}
}
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.'" />
</form>';
}
- }else{ #action options offered for files
+ } else { #action options offered for files
$displayOut = $displayOut.'<form method="POST">';
$displayOut = $displayOut.'<input type="hidden" name="selectfile"';
$displayOut = $displayOut.'value="'.$currentFile;
@@ -163,17 +158,192 @@ sub displayActions {
';
return $displayOut;
}
+
+my $dirptr=16384;
+sub display_directory {
+ my ($r,$current_path,$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('/','/'));
+ 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);
+ $r->print('<br /><form method=post action="/adm/portfolio">'.
+ &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+ 'this.form.submit();'));
+ $r->print("</form>");
+ $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 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 {
+ return $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+}
+
+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 errror occured ('.$result.
+ ') while trying to delete '.&display_file().'</font><br />');
+ }
+ $r->print(&done());
+}
+
+sub rename {
+ my ($r)=@_;
+ &open_form($r);
+ $r->print('<p>'.&mt('Rename').' '.&display_file().'?</p>');
+ &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)=@_;
+ #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 />');
+ }
+ $r->print(&done());
+}
+
+sub createdir {
+ my ($r)=@_;
+ #FIXME 1) bad dirnames ( '/' etc)
+ # 2) file exists in place of dir (errormessage needs improvement)
+ my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+ $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.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 = shift;
- my @dirList; # will hold directory listing as array
+ my @dir_list; # 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 $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;
- my $isEmpty;
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -184,133 +354,45 @@ 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('<br />'.$currentPath.'<br />');
- }
- $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 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') {
- $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');
- $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('<br />stop runaway');
- return OK;
- }
- # ---
- if ($readDirectory){ # is true the first time through, then true if dirlist line is a subdir
- # $r->print('<br />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('<br />'.$line); #for debugging
- unshift @workinglist, $line; # add the line to the working list array
-
- }else{
- $r->print('<br /> parent or current '.$line); #for debugging
- }
- }
- }
- $r->print('<br />'.@workinglist.' lines in workinglist');
- my $line = shift @workinglist; #take one off the working list
- $r->print('<br />'.@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('<br />'.$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('<br />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') {
+ 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);
+ } elsif ($ENV{'form.createdir'}) {
+ &createdir($r);
} else {
- $isEmpty = 0;
- }
+ 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);
- 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';
- }
+ &display_directory($r,$current_path,\@dir_list);
+
}
- ##############################
- #
- # Display begins here
- #
- ##############################
- $r->print('<table border=1><tr><td>');
- $r->print(displayDirectory($currentPath, $currentFile, @dirList));
- $r->print('</td>><td>');
- $r->print(displayActions($currentPath, $currentFile, $isEmpty));
- $r->print('</td>></tr></table>');
- $r->print('</blockquote>');
+
$r->print("</body>\n</html>\n");
$r->rflush();
return OK;