--- loncom/interface/portfolio.pm 2005/03/03 05:47:22 1.79
+++ loncom/interface/portfolio.pm 2006/05/18 20:29:00 1.100
@@ -29,70 +29,114 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::longroup;
# 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 ($url, $filename, $current_path, $current_mode, $field_name,
+ $continue_select,$group) = @_;
+ if ($continue_select ne 'true') {$continue_select = 'false'};
+ my $anchor = '<a href="'.$url.'?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;
+ if (defined($group)) {
+ $anchor .= '&group='.$group;
+ }
+ $anchor .= '">'.$filename.'</a>';
return $anchor;
}
my $dirptr=16384;
sub display_common {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
+ my $groupitem;
+ my $namespace = &get_namespace($group);
+ my $port_path = &get_port_path($group);
+ if (defined($group)) {
+ $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ }
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 .= '<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);
- $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="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 %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+ 'upload_label' =>
+ 'Upload file to current directory:',
+ 'createdir' => 'Create Subdirectory',
+ 'createdir_label' =>
+ 'Create subdirectory in current directory:');
+ $r->print(<<"TABLE");
+<table border="0" cellspacing="2" cellpadding="2">
+ <form method="post" enctype="multipart/form-data">
+ <tr valign="middle">
+ <td bgcolor="#ccddaa" align="right">
+ $text{'upload_label'}
+ </td>
+ <td bgcolor="#ccddaa" align="left">$groupitem
+ <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="$text{'upload'}" />
+ </td>
+ </tr>
+ </form>
+ <form method="post">
+ <tr>
+ <td bgcolor="#ccddaa" align="right">
+ $text{'createdir_label'}
+ </td>
+ <td bgcolor="#ccddaa" align="left">
+ <input name="newdir" type="input" />$groupitem
+ <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="$text{'createdir'}" />
+ </td>
+ </tr>
+ </form>
+</table>
+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($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
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($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
}
}
$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"}.'">'.
- &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+ &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
+ $r->print('<br /><form method=post action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
+ if (defined($group)) {
+ $r->print('&group='.$group);
+ }
+ $r->print('">'.
+ &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
'this.form.submit();'));
$r->print("</form>");
}
sub display_directory {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my ($groupitem,$groupecho);
my $display_out;
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'){
+ my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom($group);
+ my $namespace = &get_namespace($group);
+ if (defined($group)) {
+ $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ $groupecho = '&group='.$group;
+ }
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname);
+ if ($env{"form.mode"} eq 'selectfile'){
&select_files($r);
- $checked_files =&Apache::lonnet::files_in_path($ENV{'user.name'},$ENV{'form.currentpath'});
+ $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
$select_mode = 'true';
}
if ($is_empty && ($current_path ne '/')) {
- $display_out = '<form method="post" action="/adm/portfolio">'.
+ $display_out = '<form method="post" action="'.$url.'">'.$groupitem.
'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
'<input type="hidden" name="selectfile" value="" />'.
@@ -105,13 +149,17 @@ sub display_directory {
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">');
+ $r->print('<form method="post" name="checkselect" action="'.$url.'">');
} 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>');
- $r->print('<form method="post" action="/adm/portfolio">');
+ $r->print('<form method="post" action="'.$url.'">');
+ }
+ if (defined($group)) {
+ $r->print("\n".$groupitem."\n");
}
- my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
+ my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
foreach my $line (sort
{
my ($afile)=split('&',$a,2);
@@ -122,7 +170,7 @@ sub display_directory {
#$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 '..') && ($filename !~ /\.meta$/ )) {
+ if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
if ($dirptr&$testdir) {
if ($select_mode eq 'true'){
$r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
@@ -130,27 +178,29 @@ sub display_directory {
$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($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
if ($select_mode eq 'true'){
- $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"');
+ $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">Locked</td>');
+ $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');
} else {
+ my $cat='<img alt="'.&mt('Catalog Information').
+ '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
$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_location.$filename.'.meta">Meta</a>
+ <a href="'.$url.'?rename='.$filename.'&currentpath='.$current_path.$groupecho.'">Rename</a></td>
+ <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
</td>');
}
}
- $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+ $r->print('<td><img src="'.&Apache::loncommon::icon($filename).'"></td>');
$r->print('<td><a href="'.$href_location.$filename.'">'.
$filename.'</a></td>');
$r->print('<td>'.$size.'</td>');
@@ -162,7 +212,7 @@ sub display_directory {
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" />
@@ -178,39 +228,46 @@ sub display_directory {
}
sub open_form {
- my ($r)=@_;
+ my ($r,$url)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- $r->print('<form method="post" action="/adm/portfolio">');
+ $r->print('<form method="post" action="'.$url.'">');
$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 {
- my ($r)=@_;
- $r->print('<p><input type="submit" value="'.&mt('Continue').
- '" /></p></form>');
- $r->print('<form action="/adm/portfolio" method="POST">
+ my ($r,$url,$group)=@_;
+ $r->print('<p><input type="submit" value="'.&mt('Continue').'" />');
+ if (defined($group)) {
+ $r->print("\n".'<input type="hidden" name="group" value="'.
+ $group.'" />');
+ }
+ $r->print('</p></form>');
+ $r->print('<form action="'.$url.'" method="POST">
<p>
<input type="hidden" name="currentpath" value="'.
- $ENV{'form.currentpath'}.'" />
- <input type="submit" value="'.&mt('Cancel').'" />
- </p></form>');
-
+ $env{'form.currentpath'}.'" />');
+ if (defined($group)) {
+ $r->print("\n".'<input type="hidden" name="group" value="'.
+ $group.'" />');
+ }
+ $r->print("\n".' <input type="submit" value="'.&mt('Cancel').'" />
+ </p></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) {
@@ -223,69 +280,75 @@ sub display_file {
}
sub done {
- my ($message)=@_;
+ my ($message,$url,$group)=@_;
unless (defined $message) {
$message='Done';
}
- return ('<h3><a href="/adm/portfolio?currentpath='.
- $ENV{'form.currentpath'}.
- '&fieldname='.$ENV{'form.fieldname'}.
- '&mode='.$ENV{'form.mode'}.
- '">'.&mt($message).'</a></h3>');
+ my $result = '<h3><a href="'.$url.'?currentpath='.
+ $env{'form.currentpath'}.
+ '&fieldname='.$env{'form.fieldname'}.
+ '&mode='.$env{'form.mode'};
+ if (defined($group)) {
+ $result .= '&group='.$group;
+ }
+ $result .= '">'.&mt($message).'</a></h3>';
+ return $result;
}
sub delete {
- my ($r)=@_;
+ my ($r,$url,$group)=@_;
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') {
+ my ($uname,$udom) = &get_name_dom($group);
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be deleted.<br />");
- $r->print(&done('Back'));
+ $r->print(&done('Back',$url,$group));
} else {
if (scalar(@files)) {
- &open_form($r);
+ &open_form($r,$url);
$r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
- &close_form($r);
+ &close_form($r,$url,$group);
} else {
$r->print("No file was checked to delete.<br />");
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
}
}
sub delete_confirmed {
- my ($r)=@_;
+ my ($r,$url,$group)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
- $ENV{'form.currentpath'}.
+ $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
+ $env{'form.currentpath'}.
$delete_file);
if ($result ne 'ok') {
$r->print('<font color="red"> An error occured ('.$result.
') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
}
}
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
sub delete_dir {
- my ($r)=@_;
- &open_form($r);
+ my ($r,$url,$group)=@_;
+ &open_form($r,$url);
$r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
- &close_form($r);
+ &close_form($r,$url,$group);
}
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 ($r,$url,$group)=@_;
+ my $directory_name = $env{'form.currentpath'};
+ $directory_name =~ s|/$||; # remove any trailing slash
+ my ($uname,$udom) = &get_name_dom($group);
+ my $namespace = &get_namespace($group);
+ my $port_path = &get_port_path($group);
+ my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
if ($result ne 'ok') {
@@ -294,7 +357,7 @@ sub delete_dir_confirmed {
} else {
# now remove from recent
# $r->print('<br /> removing '.$directory_name.'<br /');
- &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
+ &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
my @dirs = split m!/!, $directory_name;
# $directory_name =~ m/^(\/*\/)(\/*.)$/;
@@ -302,63 +365,66 @@ 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());
+ $r->print(&done(undef,$url,$group));
}
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 ($r,$url,$group)=@_;
+ my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
+ my ($uname,$udom) = &get_name_dom($group);
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be renamed.<br />");
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
} else {
- &open_form($r);
+ &open_form($r,$url);
$r->print('<p>'.&mt('Rename').' '.&display_file().' to
<input name="filenewname" type="input" size="50" />?</p>');
- &close_form($r);
+ &close_form($r,$url,$group);
}
}
sub rename_confirmed {
- my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ my ($r,$url,$group)=@_;
+ my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
if ($filenewname eq '') {
$r->print('<font color="red">'.
&mt("Error: no valid filename was provided to rename to.").
'</font><br />');
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
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($uname,$udom,
+ $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
+ $port_path.$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());
+ $r->print(&done(undef,$url,$group));
}
sub select_files {
- my ($r)=@_;
- if ($ENV{'form.continue'} eq 'true') {
+ my ($r,$group)=@_;
+ 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.=',';
@@ -376,7 +442,7 @@ ENDSMP
}
opener.document.forms.lonhomework.
ENDSMP
- $javascript .= $ENV{'form.fieldname'};
+ $javascript .= $env{'form.fieldname'};
$javascript .= (<<ENDSMP);
.value=fileList;
self.close();
@@ -385,81 +451,100 @@ ENDSMP
ENDSMP
$r->print($javascript);
$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'})) {
- $r->print($_."<br />");
+ Check as many as you wish in response to the problem.<br />");
+ my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+ if (@otherfiles) {
+ $r->print("<strong>Files selected from other directories:</strong><br />");
+ foreach my $file (@otherfiles) {
+ $r->print($file."<br />");
+ }
}
}
sub upload {
- my ($r)=@_;
- my $fname=$ENV{'form.uploaddoc.filename'};
- my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
+ my ($r,$url,$group)=@_;
+ 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';
+
+ my $portfolio_root=&get_portfolio_root($group);
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
# 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=&get_dir_list($portfolio_root,$group);
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,$udom,$uname) eq 'true') {
$locked_file = 1;
}
}
}
- 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.'.
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$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.');
- $r->print(&done('Back'));
+ $r->print(&done('Back',$url,$group));
}
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>'.$port_path.$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'));
+ $r->print(&done('Back',$url,$group));
} 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(&done('Back'));
+ $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
+ '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
+ $r->print(&done('Back',$url,$group));
}
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$ENV{'form.currentpath'});
+ $port_path.$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('Back'));
+ $r->print(&done('Back',$url,$group));
} else {
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
}
}
-
+sub lock_info {
+ my ($r,$url,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname);
+ 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',$url,$group));
+ return 'ok';
+}
sub createdir {
- my ($r)=@_;
- my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ my ($r,$url,$group)=@_;
+ 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());
+ $r->print(&done(undef,$url,$group));
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 $portfolio_root = &get_portfolio_root($group);
+ my @dir_list=&get_dir_list($portfolio_root,$group);
my $found_file = 0;
foreach my $line (@dir_list) {
my ($filename)=split(/\&/,$line,2);
@@ -471,89 +556,184 @@ 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 ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
+ my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
+ $port_path.$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());
+ $r->print(&done(undef,$url,$group));
+}
+
+sub get_portfolio_root {
+ my ($group) = @_;
+ my ($portfolio_root,$udom,$uname,$path);
+ ($uname,$udom) = &get_name_dom($group);
+ if (defined($group)) {
+ $path = '/userfiles/groups/'.$group.'/portfolio';
+ } else {
+ $path = '/userfiles/portfolio';
+ }
+ return (&Apache::loncommon::propath($udom,$uname).$path);
+}
+
+sub get_dir_list {
+ my ($portfolio_root,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ return &Apache::lonnet::dirlist($env{'form.currentpath'},
+ $udom,$uname,$portfolio_root);
+}
+
+sub get_name_dom {
+ my ($group) = @_;
+ my ($uname,$udom);
+ if (defined($group)) {
+ $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
+ } else {
+ $udom = $env{'user.domain'};
+ $uname = $env{'user.name'};
+ }
+ return ($uname,$udom);
+}
+
+sub get_namespace {
+ my ($group) = @_;
+ my $namespace = 'portfolio';
+ if (defined($group)) {
+ my ($uname,$udom) = &get_name_dom($group);
+ $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+ }
+ return $namespace;
+}
+
+sub get_port_path {
+ my ($group) = @_;
+ my $port_path;
+ if (defined($group)) {
+ $port_path = "groups/$group/portfolio";
+ } else {
+ $port_path = 'portfolio';
+ }
+ return $port_path;
}
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::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['selectfile','currentpath','meta',
- 'currentfile','action','fieldname','mode','rename']);
+ ['selectfile','currentpath','meta','lockinfo','currentfile',
+ 'action','fieldname','mode','rename','continue','group']);
+ my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
+ if ($r->uri =~ m|^(/adm/)([^/]+)|) {
+ $url = $1.$2;
+ $caller = $2;
+ }
+ if ($caller eq 'coursegrp_portfolio') {
+ # Needs to be in a course
+ if (! ($env{'request.course.fn'})) {
+ # Not in a course
+ $env{'user.error.msg'}=
+ "/adm/coursegrp_portfolio:rgf:0:0:Cannot view group portfolio";
+ return HTTP_NOT_ACCEPTABLE;
+ }
+ my $earlyout = 0;
+ my $view_permission = &Apache::lonnet::allowed('vcg',
+ $env{'request.course.id'});
+ $group = $env{'form.group'};
+ $group =~ s/\W//g;
+ if ($group) {
+ ($uname,$udom) = &get_name_dom($group);
+ my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
+ $group);
+ if (%curr_groups) {
+ if (($view_permission) || (&Apache::lonnet::allowed('rgf',
+ $env{'request.course.id'}.'/'.$group))) {
+ $portfolio_root = &get_portfolio_root($group);
+ } else {
+ $r->print('You do not have the privileges required to access the shared files space for this group');
+ $earlyout = 1;
+ }
+ } else {
+ $r->print('Not a valid group for this course');
+ $earlyout = 1;
+ }
+ $title = &mt('Group files').' for '.$group;
+ } else {
+ $r->print('Invalid group');
+ $earlyout = 1;
+ }
+ if ($earlyout) { return OK; }
+ } else {
+ ($uname,$udom) = &get_name_dom();
+ $portfolio_root = &get_portfolio_root();
+ $title = &mt('Portfolio Manager');
+ }
+
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>'.
- &mt('Portfolio Manager').
- "</title></head>\n");
- if ($ENV{"form.mode"} eq 'selectfile'){
- $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
+ if ($env{"form.mode"} eq 'selectfile'){
+ $r->print(&Apache::loncommon::start_page($title,undef,
+ {'only_body' => 1}));
} else {
- $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
+ $r->print(&Apache::loncommon::start_page($title));
}
$r->rflush();
- if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
+ if (($env{'form.storeupl'}) & (!$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'}) {
- &open_form($r);
-# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
+ if ($env{'form.meta'}) {
+ &open_form($r,$url);
+# $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
$r->print('Edit the meta data<br />');
- &close_form($r);
+ &close_form($r,$url,$group);
}
- if ($ENV{'form.store'}) {
+ if ($env{'form.store'}) {
}
- if ($ENV{'form.uploaddoc.filename'}) {
- &upload($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.rename'}) {
- $ENV{'form.selectfile'} = $ENV{'form.rename'};
- $ENV{'form.action'} = 'rename';
- &rename($r);
- } elsif ($ENV{'form.createdir'}) {
- &createdir($r);
+ if ($env{'form.uploaddoc.filename'}) {
+ &upload($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
+ &delete_confirmed($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'delete') {
+ &delete($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
+ &delete_dir_confirmed($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'deletedir'){
+ &delete_dir($r,$url,$group);
+ } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
+ &rename_confirmed($r,$url,$group);
+ } elsif ($env{'form.rename'}) {
+ $env{'form.selectfile'} = $env{'form.rename'};
+ $env{'form.action'} = 'rename';
+ &rename($r,$url,$group);
+ } elsif ($env{'form.createdir'}) {
+ &createdir($r,$url,$group);
+ } elsif ($env{'form.lockinfo'}) {
+ &lock_info($r,$url,$group);
} 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);
+ my @dir_list=&get_dir_list($portfolio_root,$group);
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($uname,$udom,
+ &get_port_path($group));
} else {
# some directory that snuck in get rid of the directory
# from the recent pulldown, just in case
@@ -563,16 +743,15 @@ 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);
+ $udom,$uname,$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;
+ &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group);
+ &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group);
+ $r->print(&Apache::loncommon::end_page());
}
+ return OK;
}
1;
__END__