--- loncom/interface/portfolio.pm 2005/02/20 20:39:30 1.76
+++ loncom/interface/portfolio.pm 2005/05/02 19:08:16 1.85
@@ -29,12 +29,14 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+use Apache::lonnet;
# 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, $current_mode, $field_name) = @_;
- my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
+ my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;
+ if ($continue_select ne 'true') {$continue_select = 'false'};
+ my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>';
return $anchor;
}
my $dirptr=16384;
@@ -46,9 +48,9 @@ sub display_common {
my $displayOut = '<form method="post" enctype="multipart/form-data">';
$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="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);
@@ -56,25 +58,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="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','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
+ $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
+ $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
}
}
$r->print('</font>');
&Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
- $r->print('<br /><form method=post action="/adm/portfolio?mode='.$ENV{"form.mode"}.'&fieldname='.$ENV{"form.fieldname"}.'">'.
+ $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>");
@@ -83,7 +85,14 @@ 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::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
+ my $select_mode;
+ my $checked_files;
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($env{'user.domain'},$env{'user.name'});
+ if ($env{"form.mode"} eq 'selectfile'){
+ &select_files($r);
+ $checked_files =&Apache::lonnet::files_in_path($env{'user.name'},$env{'form.currentpath'});
+ $select_mode = 'true';
+ }
if ($is_empty && ($current_path ne '/')) {
$display_out = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
@@ -95,76 +104,17 @@ sub display_directory {
$r->print($display_out);
return;
}
- $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+ if ($select_mode eq 'true') {
+ $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>');
+ $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+ } else {
+ $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
'<tr><th colspan="2">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";
- $r->print('<form method="post" 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 colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
- $r->print('<td>Go to ...</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">');
- if (exists $locked_files{$current_path.$filename}){
- $r->print('<td colspan="2">Locked</td>');
- } else {
- $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
- <a href="/adm/portfolio?rename='.$filename.'&currentpath='.$current_path.'">Rename</a></td>
- <td><a href="/adm/portfolio'.$current_path.$filename.'.meta">Meta</a>
- </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>
- <input type="submit" name="doit" value="Delete Checked Files" />
- <input type="hidden" name="action" value="delete" />
- <input type="hidden" name="currentpath" value="'.$current_path.'" />
- </form>');
-}
-sub display_file_select {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
- my $iconpath= $r->dir_config('lonIconsURL') . "/";
- my $display_out;
- my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
- 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('<form method="post" action="/adm/portfolio">');
}
- $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">');
+ my $href_location="/uploaded/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
+ my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
@@ -175,19 +125,34 @@ sub display_file_select {
#$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
$filename =~ s/\s+$//;
- if (($filename ne '.') && ($filename ne '..')) {
+ if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) {
if ($dirptr&$testdir) {
- $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ if ($select_mode eq 'true'){
+ $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ } else {
+ $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
+ }
$r->print('<td>Go to ...</td>');
- $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
- $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"');
- if ($$checked_files{$filename} eq 'selected') {
- $r->print("CHECKED");
+ if ($select_mode eq 'true'){
+ $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"');
+ if ($$checked_files{$filename} eq 'selected') {
+ $r->print("CHECKED");
+ }
+ $r->print('></td>');
+ } else {
+ if (exists $locked_files{$current_path.$filename}){
+ $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
+ } else {
+ $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
+ <a href="/adm/portfolio?rename='.$filename.'&currentpath='.$current_path.'">Rename</a></td>
+ <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
+ </td>');
+ }
}
- $r->print('></td>');
$r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
$r->print('<td><a href="'.$href_location.$filename.'">'.
$filename.'</a></td>');
@@ -197,14 +162,22 @@ sub display_file_select {
}
}
}
- $r->print('</table>
+ if ($select_mode eq 'true') {
+ $r->print('</table>
<input type="hidden" name="continue" value="true">
- <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
+ <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">
<input type="hidden" name="mode" value="selectfile">
<input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
<input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
- </form>');
+ </form>');
+ } else {
+ $r->print('</table>
+ <input type="submit" name="doit" value="Delete Checked Files" />
+ <input type="hidden" name="action" value="delete" />
+ <input type="hidden" name="currentpath" value="'.$current_path.'" />
+ </form>');
+ }
}
sub open_form {
@@ -212,14 +185,14 @@ sub open_form {
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
$r->print('<form method="post" action="/adm/portfolio">');
$r->print('<input type="hidden" name="action" value="'.
- $ENV{'form.action'}.'" />');
+ $env{'form.action'}.'" />');
$r->print('<input type="hidden" name="confirmed" value="1" />');
foreach (@files) {
$r->print('<input type="hidden" name="selectfile" value="'.
$_.'" />');
}
$r->print('<input type="hidden" name="currentpath" value="'.
- $ENV{'form.currentpath'}.'" />');
+ $env{'form.currentpath'}.'" />');
}
sub close_form {
@@ -229,7 +202,7 @@ sub close_form {
$r->print('<form action="/adm/portfolio" method="POST">
<p>
<input type="hidden" name="currentpath" value="'.
- $ENV{'form.currentpath'}.'" />
+ $env{'form.currentpath'}.'" />
<input type="submit" value="'.&mt('Cancel').'" />
</p></form>');
@@ -238,9 +211,9 @@ sub close_form {
sub display_file {
my ($path,$filename)=@_;
my $display_file_text;
- if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
+ if (!defined($path)) { $path=$env{'form.currentpath'}; }
if (!defined($filename)) {
- $filename=$ENV{'form.selectfile'};
+ $filename=$env{'form.selectfile'};
$display_file_text = '<tt>'.$path.$filename.'</tt>';
} elsif (ref($filename) eq "ARRAY") {
foreach (@$filename) {
@@ -258,19 +231,19 @@ sub done {
$message='Done';
}
return ('<h3><a href="/adm/portfolio?currentpath='.
- $ENV{'form.currentpath'}.
- '&fieldname='.$ENV{'form.fieldname'}.
- '&mode='.$ENV{'form.mode'}.
+ $env{'form.currentpath'}.
+ '&fieldname='.$env{'form.fieldname'}.
+ '&mode='.$env{'form.mode'}.
'">'.&mt($message).'</a></h3>');
}
sub delete {
my ($r)=@_;
my @check;
- my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+ my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+ 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('Back'));
} else {
@@ -290,9 +263,9 @@ sub delete_confirmed {
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
- $ENV{'form.currentpath'}.
+ $result=&Apache::lonnet::removeuserfile($env{'user.name'},
+ $env{'user.domain'},'portfolio'.
+ $env{'form.currentpath'}.
$delete_file);
if ($result ne 'ok') {
$r->print('<font color="red"> An error occured ('.$result.
@@ -311,11 +284,10 @@ sub delete_dir {
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'.
+ my $directory_name = $env{'form.currentpath'};
+ $directory_name =~ s|/$||; # remove any trailing slash
+ my $result=&Apache::lonnet::removeuserfile($env{'user.name'},
+ $env{'user.domain'},'portfolio'.
$directory_name);
if ($result ne 'ok') {
@@ -332,15 +304,15 @@ sub delete_dir_confirmed {
for (my $i=1; $i < (@dirs - 1); $i ++){
$directory_name .= $dirs[$i].'/';
}
- $ENV{'form.currentpath'} = $directory_name;
+ $env{'form.currentpath'} = $directory_name;
}
$r->print(&done());
}
sub rename {
my ($r)=@_;
- my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
- if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+ my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
+ 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 {
@@ -353,7 +325,7 @@ sub rename {
sub rename_confirmed {
my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ 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.").
@@ -362,33 +334,33 @@ sub rename_confirmed {
return;
}
my $result=
- &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
- 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
- 'portfolio'.$ENV{'form.currentpath'}.$filenewname);
+ &Apache::lonnet::renameuserfile($env{'user.name'},$env{'user.domain'},
+ 'portfolio'.$env{'form.currentpath'}.$env{'form.selectfile'},
+ 'portfolio'.$env{'form.currentpath'}.$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 />');
}
- if ($filenewname ne $ENV{'form.filenewname'}) {
- $r->print("The new file name was changed from:<br /><strong>".$ENV{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
}
$r->print(&done());
}
sub select_files {
my ($r)=@_;
- if ($ENV{'form.continue'} eq 'true') {
+ if ($env{'form.continue'} eq 'true') {
# here we update the selections for the currentpath
# eventually, have to handle removing those not checked, but . . .
- my @items=&Apache::loncommon::get_env_multiple('form.selectfile');
- &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
+ my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+ if (scalar(@items)){
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ }
} else {
- if ($ENV{'form.currentpath'} eq '/') {
#empty the file for a fresh start
- # &Apache::lonnet::clear_selected_files($ENV{'user.name'});
- }
+ &Apache::lonnet::clear_selected_files($env{'user.name'});
}
- my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+ my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
my $java_files = join ",", @files;
if ($java_files) {
$java_files.=',';
@@ -406,7 +378,7 @@ ENDSMP
}
opener.document.forms.lonhomework.
ENDSMP
- $javascript .= $ENV{'form.fieldname'};
+ $javascript .= $env{'form.fieldname'};
$javascript .= (<<ENDSMP);
.value=fileList;
self.close();
@@ -417,35 +389,35 @@ ENDSMP
$r->print("<h1>Select portfolio files</h1>
Check as many as you wish in response to the essay problem.<br />");
$r->print("<strong>Files selected from other directories:</strong><br />");
- foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
+ foreach (&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'})) {
$r->print($_."<br />");
}
}
sub upload {
my ($r)=@_;
- my $fname=$ENV{'form.uploaddoc.filename'};
- my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
+ 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'}).
+ 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 @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'},
+ $env{'user.domain'},
+ $env{'user.name'},$portfolio_root);
my $found_file = 0;
my $locked_file = 0;
foreach my $line (@dir_list) {
my ($file_name)=split(/\&/,$line,2);
if ($file_name eq $fname){
$found_file = 1;
- if (&Apache::lonnet::is_locked($ENV{'form.currentpath'}.$file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+ if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$env{'user.domain'},$env{'user.name'} ) eq 'true') {
$locked_file = 1;
}
}
}
- my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
+ my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root);
if ((($current_disk_usage/1000) + $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.');
@@ -453,17 +425,17 @@ sub upload {
}
elsif ($found_file){
if ($locked_file){
- $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
+ $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'.
'<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
$r->print(&done('Back'));
} else {
- $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$ENV{'form.currentpath'}.'</strong></font>'.
- '<br />To upload, rename or delete existing '.$fname.' in portfolio'.$ENV{'form.currentpath'});
+ $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'.
+ '<br />To upload, rename or delete existing '.$fname.' in portfolio'.$env{'form.currentpath'});
$r->print(&done('Back'));
}
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$ENV{'form.currentpath'});
+ '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 />');
@@ -473,10 +445,30 @@ sub upload {
}
}
}
-
+sub lock_info {
+ my ($r) = @_;
+ my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'});
+ my $file_name = $env{'form.lockinfo'};
+ foreach my $key(keys(%current_permissions)) {
+ if ($file_name eq $key) {
+ foreach my $array_item (@{$current_permissions{$key}}) {
+ if (ref($array_item)) {
+ $r->print('<strong>'.$key.'</strong> was submitted in response to problem: <strong>'.
+ &Apache::lonnet::gettitle($$array_item[0]).'</strong><br />');
+ my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+ $r->print('In the course: <strong>'.$course_description{'description'}.'</strong><br />');
+ # $r->print('the third is '.$$array_item[2].'<br>');
+ # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
+ }
+ }
+ }
+ }
+ $r->print(&done('Back'));
+ return 'ok';
+}
sub createdir {
my ($r)=@_;
- my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
if ($newdir eq '') {
$r->print('<font color="red">'.
&mt("Error: no directory name was provided.").
@@ -484,12 +476,12 @@ sub createdir {
$r->print(&done());
return;
}
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
+ 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 @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);
@@ -501,15 +493,15 @@ sub createdir {
$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);
+ 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 />');
}
}
- if ($newdir ne $ENV{'form.newdir'}) {
- $r->print("The new directory name was changed from:<br /><strong>".$ENV{'form.newdir'}."</strong> to <strong>$newdir </strong>");
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");
}
$r->print(&done());
}
@@ -517,12 +509,12 @@ sub createdir {
sub handler {
# this handles file management
my $r = shift;
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
+ my $portfolio_root = &Apache::loncommon::propath($env{'user.domain'},
+ $env{'user.name'}).
'/userfiles/portfolio';
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath','meta',
- 'currentfile','action','fieldname','mode','rename']);
+ ['selectfile','currentpath','meta','lockinfo',
+ 'currentfile','action','fieldname','mode','rename','continue']);
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -531,59 +523,61 @@ sub handler {
$r->print($html.'<head><title>'.
&mt('Portfolio Manager').
"</title></head>\n");
- if ($ENV{"form.mode"} eq 'selectfile'){
+ if ($env{"form.mode"} eq 'selectfile'){
$r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
} else {
$r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
}
$r->rflush();
- if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
+ 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.meta'}) {
+ if ($env{'form.meta'}) {
&open_form($r);
-# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
+# $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
$r->print('Edit the meta data<br />');
&close_form($r);
}
- if ($ENV{'form.store'}) {
+ if ($env{'form.store'}) {
}
- if ($ENV{'form.uploaddoc.filename'}) {
+ if ($env{'form.uploaddoc.filename'}) {
&upload($r);
- } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
+ } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
&delete_confirmed($r);
- } elsif ($ENV{'form.action'} eq 'delete') {
+ } elsif ($env{'form.action'} eq 'delete') {
&delete($r);
- } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
+ } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
&delete_dir_confirmed($r);
- } elsif ($ENV{'form.action'} eq 'deletedir'){
+ } elsif ($env{'form.action'} eq 'deletedir'){
&delete_dir($r);
- } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
+ } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
&rename_confirmed($r);
- } elsif ($ENV{'form.rename'}) {
- $ENV{'form.selectfile'} = $ENV{'form.rename'};
- $ENV{'form.action'} = 'rename';
+ } elsif ($env{'form.rename'}) {
+ $env{'form.selectfile'} = $env{'form.rename'};
+ $env{'form.action'} = 'rename';
&rename($r);
- } elsif ($ENV{'form.createdir'}) {
+ } elsif ($env{'form.createdir'}) {
&createdir($r);
+ } elsif ($env{'form.lockinfo'}) {
+ &lock_info($r);
} else {
my $current_path='/';
- if ($ENV{'form.currentpath'}) {
- $current_path = $ENV{'form.currentpath'};
+ 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);
+ $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');
+ &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
@@ -593,18 +587,13 @@ sub handler {
}
# 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);
+ $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);
- 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);
- }
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
$r->print("</body>\n</html>\n");
return OK;
}