--- loncom/interface/portfolio.pm 2004/10/18 20:37:30 1.49
+++ loncom/interface/portfolio.pm 2004/11/25 23:56:19 1.58
@@ -33,8 +33,8 @@ 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 = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$filename.'</a>';
+ my ($filename, $current_path, $current_mode, $field_name) = @_;
+ my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
return $anchor;
}
my $dirptr=16384;
@@ -44,8 +44,11 @@ sub display_common {
$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" />'.
+ $displayOut .= '<input name="uploaddoc" type="file" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+ '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
+ '<input type="hidden" name="mode" value="'.$ENV{"form.mode"}.'" />'.
'<input type="submit" name="storeupl" value="Upload" />'.
'</form>';
$r->print($displayOut);
@@ -53,23 +56,25 @@ sub display_common {
$displayOut = '<form method="post">';
$displayOut .= '<input name="newdir" type="input" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+ '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
+ '<input type="hidden" name="mode" value="'.$ENV{"form.mode"}.'" />'.
'<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','/').'/');
+ $r->print('<font size="+2">'.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+ $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
}
}
$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">'.
+ $r->print('<br /><form method=post action="/adm/portfolio?mode='.$ENV{"form.mode"}.'&fieldname='.$ENV{"form.fieldname"}.'">'.
&Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
'this.form.submit();'));
$r->print("</form>");
@@ -78,6 +83,12 @@ sub display_directory {
my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $display_out;
+ my %locked_files=&Apache::lonnet::dump('file_permissions',
+ $ENV{'user.domain'},$ENV{'user.name'});
+ my $locked_file;
+ foreach my $key (keys %locked_files) {
+ $locked_file .= $locked_files{$key}.':';
+ }
if ($is_empty && ($current_path ne '/')) {
$display_out = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
@@ -101,11 +112,18 @@ sub display_directory {
#$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 ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){
+ &Apache::lonnet::logthis("found submitted file");
+ &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+ } else {
+ &Apache::lonnet::logthis("$filename not found submitted file");
+ &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+ }
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('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
@@ -170,7 +188,7 @@ sub display_file_select {
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('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
@@ -226,14 +244,24 @@ sub display_file {
sub done {
return ('<h3><a href="/adm/portfolio?currentpath='.
- $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+ $ENV{'form.currentpath'}.
+ '&fieldname='.$ENV{'form.fieldname'}.
+ '&mode='.$ENV{'form.mode'}.
+ '">'.&mt('Done').'</a></h3>');
}
sub delete {
my ($r)=@_;
- &open_form($r);
- $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
- &close_form($r);
+ my @check;
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+ $r->print ("The file is locked and cannot be deleted.<br />");
+ $r->print(&done());
+ } else {
+ &open_form($r);
+ $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ &close_form($r);
+ }
}
sub delete_confirmed {
@@ -286,10 +314,16 @@ sub delete_dir_confirmed {
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);
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+ $r->print ("The file is locked and cannot be renamed.<br />");
+ $r->print(&done());
+ } else {
+ &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 {
@@ -321,7 +355,7 @@ sub select_files {
fileList = "";
for (i=0;i<document.forms.checkselect.length;i++) {
if (document.forms.checkselect[i].checked){
- fileList = fileList + document.forms.checkselect[i].value + "," ;
+ fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
opener.document.forms.lonhomework.
@@ -336,41 +370,6 @@ 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 {
- # 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_file_select($r,$current_path,$is_empty,\@dir_list);
- $r->print("</body>\n</html>\n");
- return OK;
}
sub upload {
my ($r)=@_;
@@ -465,7 +464,7 @@ sub handler {
$r->rflush();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
- 'currentfile','action','fieldname']);
+ 'currentfile','action','fieldname','mode']);
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>'.
@@ -473,8 +472,6 @@ sub handler {
}
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') {
@@ -519,7 +516,12 @@ sub handler {
# 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);
+ if ($ENV{"form.mode"} eq 'selectfile'){
+ &select_files($r);
+ &display_file_select($r,$current_path,$is_empty,\@dir_list);
+ } else {
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
+ }
$r->print("</body>\n</html>\n");
return OK;
}