--- loncom/interface/portfolio.pm 2006/11/09 22:33:32 1.172
+++ loncom/interface/portfolio.pm 2024/09/07 19:13:00 1.271
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.172 2006/11/09 22:33:32 raeburn Exp $
+# $Id: portfolio.pm,v 1.271 2024/09/07 19:13:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,7 @@ use Apache::lonnet;
use Apache::longroup;
use Apache::lonhtmlcommon;
use HTML::Entities;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
sub group_args {
my $output;
@@ -63,7 +63,7 @@ sub group_form_data {
return $output;
}
-# receives a file name and path stub from username/userfiles/portfolio/
+# receives a filename and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
my ($url, $anchor_fields, $inner_text) = @_;
@@ -80,81 +80,100 @@ sub make_anchor {
my $dirptr=16384;
sub display_common {
- my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_;
my $namespace = &get_namespace();
my $port_path = &get_port_path();
if ($can_upload) {
my $groupitem = &group_form_data();
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- my %text=&Apache::lonlocal::texthash(
- 'upload' => 'Upload',
- 'upload_label' =>
- 'Upload file to current directory:',
- 'createdir' => 'Create Subdirectory',
- 'createdir_label' =>
- 'Create subdirectory in current directory:');
+ my %lt=&Apache::lonlocal::texthash(
+ 'upload' => 'Upload',
+ 'upload_label' => 'Upload file to current directory',
+ 'createdir' => 'Create Subdirectory',
+ 'createdir_label' => 'Create subdirectory in current directory',
+ 'parse' => 'Upload embedded images/multimedia/css/linked files if HTML file',
+ );
my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
-
- # FIXME: This line should be deleted once Portfolio uses breadcrumbs
- $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));
+ my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
+ $r->print(&display_portfolio_usage($group,$help_portfolio));
+ my $parse_check;
+ if (!&suppress_embed_prompt()) {
+ $parse_check = <<"END";
+ <br />
+ <span class="LC_nobreak">
+ <label>
+ <input type="checkbox" name="parserflag" checked="checked" />
+ $lt{'parse'}
+ </label>
+ </span>
+END
+ }
+
+ # Find space available before uploading
+ my $free_space = &free_space($group);
+
+ # Upload File
+ $r->print('<div class="LC_left_float">'
+ .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
+ .'<fieldset>'
+ .'<legend>'.$lt{'upload_label'}.'</legend>'
+ .$groupitem
+ .'<input name="uploaddoc" type="file" class="LC_flUpload" />'
+ .'<input type="hidden" id="LC_free_space" value="'.$free_space.'" />'
+ .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+ .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
+ .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
+ .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
+ .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
+ .$help_fileupload
+ .$parse_check
+ .'</fieldset>'
+ .'</form>'
+ .'</div>'
+ );
+ # Create Subdirectory
+ $r->print('<div class="LC_left_float">'
+ .'<form method="post" action="'.$escuri.'">'
+ .'<fieldset>'
+ .'<legend>'.$lt{'createdir_label'}.'</legend>'
+ .'<input name="newdir" type="text" />'.$groupitem
+ .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
+ .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
+ .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
+ .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
+ .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
+ .$help_createdir
+ .'</fieldset>'
+ .'</form>'
+ .'</div>'
+ );
+ } # end "if can_upload"
-
- $r->print(<<"TABLE");
-<table id="LC_portfolio_actions">
- <tr id="LC_portfolio_upload">
- <td class="LC_label">
- $text{'upload_label'}
- </td>
- <td class="LC_value">
- <form method="post" enctype="multipart/form-data" action="$escuri">
- $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'}" />$help_fileupload
- </form>
- </td>
- </tr>
- <tr id="LC_portfolio_createdir">
- <td class="LC_label">
- $text{'createdir_label'}
- </td>
- <td class="LC_value">
- <form method="post" action="$escuri">
- <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'}" />$help_createdir
- </form>
- </td>
- </tr>
-</table>
-TABLE
- }
my @tree = split (/\//,$current_path);
my %anchor_fields = (
'selectfile' => $port_path,
'currentpath' => '/',
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
+ $r->print('<br clear="all" />');
$r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
if (@tree > 1){
- my $newCurrentPath = '';
+ my $newCurrentPath = '/';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
my %anchor_fields = (
'selectfile' => $tree[$i],
- 'currentpath' => '/',
+ 'currentpath' => $newCurrentPath,
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
@@ -164,27 +183,45 @@ TABLE
$r->print('</span>');
$r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
&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"}.&group_args());
+ $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.'&symb='.$env{'form.symb'}.&group_args());
$r->print('">'.
&Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
'this.form.submit();'));
$r->print("</form>");
}
+sub display_portfolio_usage {
+ my ($group,$helpitem) = @_;
+ my $disk_quota = &get_quota($group);
+ my $getpropath = 1;
+ my $portfolio_root = &get_portfolio_root();
+ my ($uname,$udom) = &get_name_dom($group);
+ my $current_disk_usage =
+ &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ return &Apache::loncommon::head_subbox(
+ '<div style="float:right;padding-top:0;margin-top;0">'
+ .$helpitem
+ .'</div>'
+ .'<div>'
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'portfolio')
+ .'</div>');
+}
+
sub display_directory_line {
my ($r,$select_mode, $filename, $mtime, $size, $css_class,
$line, $access_controls, $curr_access, $now, $version_flag,
$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
my $fullpath = &prepend_group($current_path.$filename);
- $r->print('<tr class="'.$css_class.'">');
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print($line); # contains first two cells of table
my $lock_info;
if ($version_flag) { # versioned can't be versioned, so TRUE when root file
- $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+ $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" class="LC_fileicon" /></td>');
$r->print('<td>'.$version_flag.'</td>');
} else { # this is a graded or handed back file
- my ($user,$domain) = &get_name_dom();
+ my ($user,$domain) = &get_name_dom($env{'form.group'});
my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
if (defined($$permissions_hash{$fullpath})) {
foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
@@ -200,7 +237,7 @@ sub display_directory_line {
if ($lock_info) {
my %anchor_fields = ('lockinfo' => $fullpath);
if ($versions) { # hold the folder open
- my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+ my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath);
$fname =~ s|^/||;
$anchor_fields{'showversions'} = $fname.'.'.$extension;
}
@@ -213,27 +250,33 @@ sub display_directory_line {
$r->print('<td>'.$size.'</td>');
$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
if ($select_mode ne 'true') {
- $r->print('<td><span style="white-space: nowrap">'.
- &mt($curr_access).' ');
+ $r->print('<td class="'.$css_class.'"> </td>'); # Display status
+ $r->print('<td><span class="LC_nobreak">'
+ .&mt($curr_access).' '
+ );
my %anchor_fields = (
'access' => $filename,
'currentpath' => $current_path
);
$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
+ } else {
+ $r->print('<td class="'.$css_class.'"> </td>'); # Display status
}
- $r->print('</tr>'.$/);
+ $r->print(&Apache::loncommon::end_data_table_row().$/);
}
sub display_directory {
my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
- $can_modify,$can_delete,$can_setacl)=@_;
+ $can_modify,$can_delete,$can_setacl,$can_viewacl,$caller)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- my $display_out;
my $select_mode;
my $checked_files;
my $port_path = &get_port_path();
- my ($uname,$udom) = &get_name_dom();
- my $access_admin_text = &mt('View Status');
+ my ($uname,$udom) = &get_name_dom($group);
+ my $access_admin_text;
+ if ($can_viewacl) {
+ $access_admin_text = &mt('View Status');
+ }
if ($can_setacl) {
$access_admin_text = &mt('View/Change Status');
}
@@ -245,67 +288,117 @@ sub display_directory {
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
my $now = time;
if ($env{"form.mode"} eq 'selectfile') {
- &select_files($r);
- $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
- $select_mode = 'true';
- }
- if ($is_empty && ($current_path ne '/') && $can_delete) {
- $display_out = '<form method="post" action="'.$url.'">'.
- &group_form_data().
- '<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;
+ &select_files($r,$dir_list);
+ $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
+ $select_mode = 'true';
}
if ($select_mode eq 'true') {
$r->print('<form method="post" name="checkselect" action="'.$url.'">');
- $r->print('<table id="LC_browser">'.
- '<tr><th>Select</th><th> </th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Select').'</th>'
+ .'<th> </th>'
+ .'<th> </th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Size').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'<th> </th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ );
} else {
$r->print('<form method="post" action="'.$url.'">');
- $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
- 'Using the portfolio file list'));
- $r->print('<table id="LC_browser">'.
- '<tr><th colspan="2">Actions'.
- &Apache::loncommon::help_open_topic('Portfolio FileAction').
- '</th><th> </th><th> </th><th>Name'.
- &Apache::loncommon::help_open_topic('Portfolio OpenFile').
- '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
- &Apache::loncommon::help_open_topic('Portfolio ShareFile').
- '</th></tr>');
+ $r->print(
+ '<p>'
+ .&Apache::loncommon::help_open_topic(
+ 'Portfolio FileList',
+ &mt('Using the portfolio file list'))
+ .'</p>'
+ );
+ my ($acl_helpfile,$acl_helplink);
+ if ($caller eq 'coursegrp_portfolio') {
+ $acl_helpfile = 'Portfolio ShareFile Group';
+ } elsif ($can_setacl) {
+ $acl_helpfile = 'Portfolio ShareFile';
+ }
+ unless ($can_setacl || $can_viewacl) {
+ $acl_helpfile = 'Portfolio ShareFile Off';
+ }
+ if ($acl_helpfile) {
+ $acl_helplink = &Apache::loncommon::help_open_topic($acl_helpfile);
+ }
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
+ .'<th> </th>'
+ .'<th> </th>'
+ .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
+ .'<th>'.&mt('Size').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .'<th> </th>'
+ .'<th>'.&mt('Current Access Status').$acl_helplink.'</th>'
+ .&Apache::loncommon::end_data_table_header_row());
}
+
+ # Empty directory?
+ if ($is_empty && ($current_path ne '/') && $can_delete) {
+ my $cols = ($select_mode eq 'true') ? 7 : 9;
+ # Empty message
+ $r->print(
+ &Apache::loncommon::start_data_table_row()
+ .'<td colspan="'.$cols.'">'
+ .'<p class="LC_info">'
+ .&mt('This directory is empty.')
+ .'</p>'
+ .'</td>'
+ .&Apache::loncommon::end_data_table_row()
+ .&Apache::loncommon::end_data_table()
+ .'</form>'
+ );
+ # Delete button
+ $r->print(
+ '<form method="post" action="'.$url.'">'.
+ &group_form_data().
+ '<input type="hidden" name="action" value="deletedir" />'.
+ '<p>'.
+ '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '</p>'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '</form>'
+ );
+ # Directory is empty, so nothing else to display
+ return;
+ }
+
$r->print("\n".&group_form_data()."\n");
my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
my @dir_lines;
my %versioned;
- foreach my $dir_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(/\&/,$dir_line,16);
- $filename =~ s/\s+$//;
- my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
- if ($version) {
- my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
- push(@{ $versioned{$fullpath} },
- [$filename,$dom,$testdir,$size,$mtime,$obs,]);
- } else {
- push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
- }
+ if (ref($dir_list) eq 'ARRAY') {
+ foreach my $dir_line (sort
+ {
+ my ($afile)=split('&',$a,2);
+ my ($bfile)=split('&',$b,2);
+ return (lc($afile) cmp lc($bfile));
+ } (@{$dir_list})) {
+ my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
+ $filename =~ s/\s+$//;
+ my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename);
+ if ($version) {
+ my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
+ push(@{ $versioned{$fullpath} },
+ [$filename,$dom,$testdir,$size,$mtime,$obs,]);
+ } else {
+ push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
+ }
+ }
}
+ my $zerobyte;
foreach my $dir_line (@dir_lines) {
my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
- my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+ my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
my $version_flag;
my $show_versions;
@@ -336,36 +429,49 @@ sub display_directory {
$version_flag = ' ';
}
if ($dirptr&$testdir) {
- my $colspan='colspan="2"';
+ my $colspan_folder='';
+ my $colspan_fill='';
if ($select_mode eq 'true'){
- undef($colspan);
+ $colspan_fill=' colspan="3"';
+ } else {
+ $colspan_folder=' colspan="2"';
+ $colspan_fill=' colspan="4"';
}
- $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
- $r->print('<td>Go to ...</td>');
+ $r->print('<tr class="LC_browser_folder">');
+ $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'navmap.folder.closed.gif" class="LC_fileicon" /></td>'
+ .'<td>'.&mt('Go to ...').'</td>');
my %anchor_fields = (
'selectfile' => $filename.'/',
'currentpath' => $current_path.$filename.'/',
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
- $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
+ $r->print('<td>'.$version_flag.'</td>'
+ .'<td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
+ $r->print('<td'.$colspan_fill.'> </td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
my $line;
if ($select_mode eq 'true') {
- $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
- if ($$checked_files{$filename} eq 'selected') {
- $line.=" checked ";
+ if ($size > 0) {
+ $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
+ if ($$checked_files{$filename} eq 'selected') {
+ $line.=' checked="checked" ';
+ }
+ $line.=' /></td>';
+ } else {
+ $line = '<td> </td>';
+ $zerobyte ++;
}
- $line.=' /></td>';
} else {
if (exists $locked_files{$fullpath}) {
my %anchor_fields = (
'lockinfo' => $fullpath
);
- $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
+ $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,&mt('Locked')).'</td>';
$css_class= 'LC_browser_file_locked';
} else {
if (!$can_modify) {
@@ -377,13 +483,12 @@ sub display_directory {
$line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
}
if ($can_modify) {
- my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
- '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
+ my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'" title="'.&mt('Metadata').'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').'" />';
my %anchor_fields = (
'rename' => $filename,
currentpath => $current_path
);
- $line .= &make_anchor($url,\%anchor_fields,'Rename');
+ $line .= &make_anchor($url,\%anchor_fields,&mt('Rename'));
$line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
# '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
@@ -397,6 +502,7 @@ sub display_directory {
my $cond_access = 0;
foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ next if ($scope eq 'ip');
if (($now > $start) && (!$end || $end > $now)) {
if ($scope eq 'public') {
$pub_access = 1;
@@ -424,7 +530,7 @@ sub display_directory {
}
}
&display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line,
- \%access_controls, $curr_access,$now, $version_flag, $href_location,
+ \%access_controls, $curr_access, $now, $version_flag, $href_location,
$url, $current_path, $access_admin_text);
if ($show_versions) {
foreach my $dir_line (@{ $versioned{$fullpath} }) {
@@ -440,20 +546,29 @@ sub display_directory {
}
}
if ($select_mode eq 'true') {
- $r->print('</table>
+ $r->print(&Apache::loncommon::end_data_table());
+ if ($zerobyte) {
+ $r->print('<p class="LC_warning">'.&mt('[quant,_1,file] in list not selectable as file size is 0 bytes.',$zerobyte).'</p>');
+ }
+ $r->print('
<input type="hidden" name="continue" value="true" />
<input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+ <input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />
<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" />
+ <p>
+ <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
+ <input type="button" name="doit" onclick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+ </p>
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');
} else {
- $r->print('</table>');
+ $r->print(&Apache::loncommon::end_data_table());
if ($can_delete) {
$r->print('
- <input type="submit" name="doit" value="Delete Checked Files" />'.
+ <p>
+ <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
+ </p>
<input type="hidden" name="action" value="delete" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>'
@@ -518,37 +633,43 @@ sub display_file {
}
sub done {
- my ($message,$url)=@_;
- unless (defined $message) {
- $message='Done';
+ my ($linktext,$url)=@_;
+ unless (defined($linktext)) {
+ $linktext='Return to directory';
}
my %anchor_fields = (
'showversions' => $env{'form.showversions'},
'currentpath' => $env{'form.currentpath'},
'fieldname' => $env{'form.fieldname'},
+ 'symb' => $env{'form.symb'},
'mode' => $env{'form.mode'}
);
- my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
+ my $result = &Apache::lonhtmlcommon::actionbox(
+ [&make_anchor($url,\%anchor_fields,&mt($linktext))]);
return $result;
}
sub delete {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$file_name = &prepend_group($file_name);
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- my ($uname,$udom) = &get_name_dom();
+ 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',$url));
+ $r->print(
+ '<p class="LC_warning">'
+ .&mt('The file is locked and cannot be deleted.')
+ .'</p>'
+ .&done(undef,$url)
+ );
} else {
if (scalar(@files)) {
&open_form($r,$url);
- $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
+ $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
&close_form($r,$url);
} else {
- $r->print("No file was checked to delete.<br />");
+ $r->print('<p class="LC_warning">'.&mt('No file was checked to delete.').'</p>');
$r->print(&done(undef,$url));
}
}
@@ -558,22 +679,25 @@ sub delete_confirmed {
my ($r,$url,$group)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
+ my @msg;
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
- $env{'form.currentpath'}.
- $delete_file);
+ $result =
+ &Apache::lonnet::removeuserfile(
+ $uname,$udom,$port_path.
+ $env{'form.currentpath'}.
+ $delete_file);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'.
- &mt('An error occured ([_1]) while trying to delete
- [_2].',$result,&display_file(undef, $delete_file)).
- '</span><br /><br />');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to delete [_2].'
+ ,$result,&display_file(undef, $delete_file)),1));
} else {
- $r->print(&mt('File: [_1] deleted.',
- &display_file(undef,$delete_file)));
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('File: [_1] deleted.'
+ ,&display_file(undef,$delete_file))));
my $file_name = $env{'form.currentpath'}.$delete_file;
$file_name = &prepend_group($file_name);
my %access_controls =
@@ -589,74 +713,85 @@ sub delete_confirmed {
&Apache::lonnet::modify_access_controls($file_name,\%changes,
$udom,$uname);
if ($outcome ne 'ok') {
- $r->print('<br />'.&mt("An error occured ([_1]) while ".
- "trying to delete access controls for the file.",$outcome).
- '</span><br /><br />');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.',$outcome),1));
} else {
if ($deloutcome eq 'ok') {
- $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
+ push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message?
} else {
- $r->print('<span class="LC_error">'.'<br />'.
- &mt("An error occured ([_1]) while ".
- "trying to delete access controls for the file.",$deloutcome).
- '</span><br /><br />');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.'
+ ,$deloutcome),1));
}
}
}
}
}
}
+ $r->print(&Apache::loncommon::confirmwrapper(join('<br />',@msg)));
$r->print(&done(undef,$url));
}
sub delete_dir {
my ($r,$url)=@_;
&open_form($r,$url);
- $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ $r->print('<p>'.&mt('Delete [_1]?',&display_file()).'</p>');
&close_form($r,$url);
}
sub delete_dir_confirmed {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $namespace = &get_namespace();
my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
-
+
if ($result ne 'ok') {
- $r->print('<span class="LC_error"> An error occured (dir) ('.$result.
- ') while trying to delete '.$directory_name.'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+ ,$result,$directory_name),1)));
+ $r->print(&done(undef,$url));
+ return;
} else {
# now remove from recent
-# $r->print('<br /> removing '.$directory_name.'<br /');
&Apache::lonhtmlcommon::remove_recent($namespace,[$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(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully deleted'))));
$r->print(&done(undef,$url));
}
sub rename {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print("The file is locked and cannot be renamed.<br />");
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('The file is locked and cannot be renamed.')
+ .'</p>'
+ );
$r->print(&done(undef,$url));
} else {
&open_form($r,$url);
- $r->print('<p>'.&mt('Rename').' '.&display_file().' to
- <input name="filenewname" type="input" size="50" />?</p>');
+ $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()
+ , '<input name="filenewname" type="text" size="50" />').'</p>');
&close_form($r,$url);
}
}
@@ -664,15 +799,34 @@ sub rename {
sub rename_confirmed {
my ($r,$url,$group)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
+
+ # Display warning in case of filename cleaning has changed the filename
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('Invalid characters')
+ .'</span><br />'
+ .&mt('The new filename was changed from [_1] to [_2].'
+ ,'<span class="LC_filename">'.&display_file('',$env{'form.filenewname'}).'</span>'
+ ,'<span class="LC_filename">'.&display_file('',$filenewname).'</span>')
+ .'</p>'
+ );
+
+ }
+
+ # Filename empty?
if ($filenewname eq '') {
- $r->print('<span class="LC_error">'.
- &mt("Error: no valid filename was provided to rename to.").
- '</span><br />');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no valid filename was provided to rename to.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
+ # Rename the file
my $chg_access;
my $result=
&Apache::lonnet::renameuserfile($uname,$udom,
@@ -681,18 +835,20 @@ sub rename_confirmed {
if ($result eq 'ok') {
$chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
} else {
- $r->print('<span class="LC_error">'.
- &mt('An error occured ([_1]) while trying to rename [_2]'
- .' to [_3]',$result,&display_file(),
- &display_file('',$filenewname)).'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+ ,$result,&display_file(),&display_file('',$filenewname))
+ ,1)));
+ $r->print(&done(undef,$url));
return;
}
- if ($filenewname ne $env{'form.filenewname'}) {
- $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
- '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
- '<strong>'.&display_file('',$filenewname).'</strong>'));
- }
$r->print($chg_access);
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully renamed'))));
$r->print(&done(undef,$url));
}
@@ -719,13 +875,13 @@ sub access_for_renamed {
&Apache::lonnet::modify_access_controls($oldfile,\%change_old,
$udom,$uname);
if ($outcome ne 'ok') {
- $chg_text ='<br /><br />'.&mt("An error occured ([_1]) while ".
+ $chg_text ='<br /><br />'.&mt("An error occurred ([_1]) while ".
"trying to delete access control records for the old name.",$outcome).
'</span><br />';
} else {
if ($deloutcome ne 'ok') {
$chg_text = '<br /><br /><span class="LC_error"><br />'.
- &mt("An error occured ([_1]) while ".
+ &mt("An error occurred ([_1]) while ".
"trying to delete access control records for the old name.",$deloutcome).
'</span><br />';
}
@@ -735,7 +891,7 @@ sub access_for_renamed {
$udom,$uname);
if ($outcome ne 'ok') {
$chg_text .= '<br /><br />'.
- &mt("An error occured ([_1]) while ".
+ &mt("An error occurred ([_1]) while ".
"trying to update access control records for the new name.",$outcome).
'</span><br />';
}
@@ -747,8 +903,8 @@ sub access_for_renamed {
}
sub display_access {
- my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($r,$url,$group,$can_setacl,$can_viewacl,$port_path,$action) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
@@ -757,14 +913,29 @@ sub display_access {
my $aclcount = keys(%access_controls);
my ($header,$info);
if ($action eq 'chgaccess') {
- $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+ my $uhome = &Apache::lonnet::homeserver($uname,$udom);
+ my $prefix = &Apache::lonnet::url_prefix($r,$udom,$uhome,'web');
+ $header =
+ '<h2>'
+ .&mt('Allowing others to retrieve file: [_1]'
+ ,'<span class="LC_filename">'
+ .$port_path.$env{'form.currentpath'}.$env{'form.access'}
+ .'</span>')
+ .'</h2>';
$info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
$info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
$info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
$info .= '</li><li>'.&explain_conditionals();
- $info .= '</li></ul>';
+ $info .= '</li></ul>'.
+ &mt('A listing of files viewable without log-in is available at: ')."<a href=\"$prefix/adm/$udom/$uname/aboutme/portfolio\">$prefix/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
if ($group eq '') {
- $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
+ $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
+ } else {
+ $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
+ }
+ $info .= "<br /><a href=\"$prefix/adm/$udom/$uname/aboutme\">$prefix/adm/$udom/$uname/aboutme</a><br />";
+ if ($group ne '') {
+ $info .= &mt("Users with course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'<br />';
}
} else {
$header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
@@ -773,30 +944,40 @@ sub display_access {
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
- $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
- $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
- $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
+ $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
&access_setting_table($r,$url,$file_name,$access_controls{$file_name},
$action);
my $button_text = {
'continue' => &mt('Proceed'),
- 'cancel' => &mt('Back to directory listing'),
+ 'cancel' => &mt('Return to directory'),
};
&close_form($r,$url,$button_text);
- } else {
+ } elsif ($can_viewacl) {
$r->print($header);
if ($aclcount) {
$r->print($info);
}
&view_access_settings($r,$url,$access_controls{$file_name},$aclcount);
+ } else {
+ $r->print($header);
+ $r->print(&mt('You do not have sufficient privileges to view access controls').'<br />');
}
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'}
+ );
+ $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
+ return;
}
sub explain_conditionals {
return
- &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".
- &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n".
- &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+ &mt('Conditional files are accessible to users who satisfy the conditions you set.').'<br /><ul>'.
+ '<li>'.&mt('Conditions can be IP-based, in which case no log-in is required').'</li>'.
+ '<li>'.&mt("Conditions can also be based on a user's status, in which case the user needs an account in the LON-CAPA network, and needs to be logged in.").'<br />'."\n".
+ &mt('The status-based conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'<br />'."\n".
+ &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
}
sub view_access_settings {
@@ -808,7 +989,7 @@ sub view_access_settings {
$todisplay{$scope}{$key} = $$access_controls{$key};
}
if ($aclcount) {
- $r->print(&mt('<h4>Current access controls defined for this file:</h4>'));
+ $r->print('<h4>'.&mt('Current access controls defined for this file:').'</h4>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
@@ -819,12 +1000,12 @@ sub view_access_settings {
&build_access_summary($r,$count,$chg,%todisplay);
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No access control settings currently exist for this file.<br />' ));
+ $r->print(&mt('No access control settings currently exist for this file.').'<br />');
}
my %anchor_fields = (
'currentpath' => $env{'form.currentpath'}
);
- $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
+ $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
return;
}
@@ -836,9 +1017,10 @@ sub build_access_summary {
guest => 'Passphrase-protected',
domains => 'Conditional: domain-based',
users => 'Conditional: user-based',
- course => 'Conditional: course-based',
+ course => 'Conditional: course/community-based',
+ userip => 'Conditional: IP-based',
);
- my @allscopes = ('public','guest','domains','users','course');
+ my @allscopes = ('public','guest','domains','users','course','userip');
foreach my $scope (@allscopes) {
if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
next;
@@ -853,19 +1035,24 @@ sub build_access_summary {
$showstart = &mt('Deleted');
$showend = $showstart;
} else {
- $showstart = localtime($start);
+ $showstart = &Apache::lonlocal::locallocaltime($start);
if ($end == 0) {
$showend = &mt('No end date');
} else {
- $showend = localtime($end);
+ $showend = &Apache::lonlocal::locallocaltime($end);
}
}
$r->print('<td>'.&mt($scope_desc{$scope}));
+ my $crstype;
if ($scope eq 'course') {
if ($chg ne 'delete') {
my $cid = $content->{'domain'}.'_'.$content->{'number'};
my %course_description = &Apache::lonnet::coursedescription($cid);
$r->print('<br />('.$course_description{'description'}.')');
+ $crstype = 'Course';
+ if ($course_description{'type'} ne '') {
+ $crstype = $course_description{'type'};
+ }
}
}
$r->print('</td><td>'.&mt('Start: ').$showstart.
@@ -885,8 +1072,6 @@ sub build_access_summary {
foreach my $item ('role','access','section','group') {
$r->print('<td>');
if ($item eq 'role') {
- my $ucscope = $scope;
- $ucscope =~ s/^(\w)/uc($1)/e;
my $role_output;
foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
if ($role eq 'all') {
@@ -894,7 +1079,7 @@ sub build_access_summary {
} elsif ($role =~ /^cr/) {
$role_output .= (split('/',$role))[3].',';
} else {
- $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
+ $role_output .= &Apache::lonnet::plaintext($role,$crstype).',';
}
}
$role_output =~ s/,$//;
@@ -912,6 +1097,9 @@ sub build_access_summary {
} elsif ($scope eq 'users') {
my $curr_user_list = &sort_users($content->{'users'});
$r->print(&mt('Users: ').$curr_user_list);
+ } elsif ($scope eq 'userip') {
+ my $curr_ips_list = &sort_ips($content->{'userip'});
+ $r->print(&mt('IP(s):').' '.$curr_ips_list);
} else {
$r->print(' ');
}
@@ -952,10 +1140,10 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
- $port_path.$file_name).'</h3>'."\n");
+ $r->print('<h2>'.&mt('Allowing others to retrieve file: [_1]',
+ '<span class="LC_filename">'.$port_path.$file_name.'</span>').'</h2>'."\n");
$file_name = &prepend_group($file_name);
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
if ($totalprocessed) {
($outcome,$deloutcome,$new_values,$translation) =
@@ -1008,7 +1196,7 @@ sub update_access {
} else {
if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
$errors .= '<span class="LC_error">'.
- &mt('A problem occurred storing access control settings: [_1]',$outcome).
+ &mt('A problem occurred saving access control settings: [_1]',$outcome).
'</span>';
}
}
@@ -1020,26 +1208,38 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- foreach my $newitem ('course','domains','users') {
+ my @types = ('course','domains','users','userip');
+ foreach my $newitem (@types) {
$allnew += $env{'form.new'.$newitem};
}
if ($allnew > 0) {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
&open_form($r,$url);
- foreach my $newitem ('course','domains','users') {
- if ($env{'form.new'.$newitem} > 0) {
- $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
- $firstitem = $totalnew;
- $lastitem = $totalnew + $env{'form.new'.$newitem};
- $totalnew = $lastitem;
- my @numbers;
- for (my $i=$firstitem; $i<$lastitem; $i++) {
- push (@numbers,$i);
- }
- &display_access_row($r,$status,$newitem,\@numbers,
- $access_controls{$file_name},$now,$then);
+ my %showtypes = (
+ course => 'course/community',
+ domains => 'domain',
+ users => 'user',
+ userip => 'IP',
+ );
+ foreach my $newitem (@types) {
+ next if ($env{'form.new'.$newitem} <= 0);
+ $r->print(
+ '<p>'
+ .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]',
+ '<b>','</b>',
+ '<span class="LC_filename"><b>'
+ .$env{'form.currentpath'}.$env{'form.selectfile'}.'</b></span>')
+ .'</p>');
+ $firstitem = $totalnew;
+ $lastitem = $totalnew + $env{'form.new'.$newitem};
+ $totalnew = $lastitem;
+ my @numbers;
+ for (my $i=$firstitem; $i<$lastitem; $i++) {
+ push(@numbers,$i);
}
+ &display_access_row($r,$status,$newitem,\@numbers,
+ $access_controls{$file_name},$now,$then);
}
&close_form($r,$url);
} else {
@@ -1047,9 +1247,11 @@ sub update_access {
'currentpath' => $env{'form.currentpath'},
'access' => $env{'form.selectfile'}
);
- $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+ my @actions;
+ push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
delete $anchor_fields{'access'};
- $r->print(' '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
+ push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory')));
+ $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
}
return;
}
@@ -1122,6 +1324,13 @@ sub build_access_record {
'udom' => $udom
});
}
+ } elsif ($scope eq 'userip') {
+ my $ipslist = $env{'form.ips_'.$num};
+ $ipslist =~ s/\s+//sg;
+ my %ipshash = map { ($_,1) } (split(/,/,$ipslist));
+ foreach my $ip (keys(%ipshash)) {
+ push(@{$record->{'ip'}},$ip);
+ }
}
return $record;
}
@@ -1147,6 +1356,13 @@ sub sort_users {
return $curr_user_list;
}
+sub sort_ips {
+ my ($ips) = @_;
+ if (ref($ips) eq 'ARRAY') {
+ return join(",\n",sort(@{$ips}));
+ }
+}
+
sub access_setting_table {
my ($r,$url,$filename,$access_controls,$action) = @_;
my ($public,$publictext);
@@ -1156,6 +1372,7 @@ sub access_setting_table {
my @courses = ();
my @domains = ();
my @users = ();
+ my @ips = ();
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
my ($num,$scope,$publicnum,$guestnum);
@@ -1178,6 +1395,8 @@ sub access_setting_table {
push(@domains,$key);
} elsif ($scope eq 'users') {
push(@users,$key);
+ } elsif ($scope eq 'userip') {
+ push(@ips,$key);
}
}
$acl_count{$scope} ++;
@@ -1189,7 +1408,7 @@ sub access_setting_table {
$guesttext,$access_controls,%conditionals);
} else {
&condition_setting($r,$access_controls,$now,$then,\%acl_count,
- \@domains,\@users,\@courses);
+ \@domains,\@users,\@courses,\@ips);
}
$r->print('</td></tr></table>');
}
@@ -1197,7 +1416,7 @@ sub access_setting_table {
sub standard_settings {
my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
$publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
- $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');
+ $r->print('<h3>'.&mt('Public access: [_1]',&mt($publictext)).'</h3>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
@@ -1213,7 +1432,7 @@ sub standard_settings {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print('</td><td width="40"> </td><td valign="top">');
- $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');
+ $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'</h3>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
@@ -1234,14 +1453,14 @@ sub standard_settings {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print('</td></tr><tr><td colspan="3"> </td></tr>'.
- '<tr><td colspan="3">');
+ '<tr><td colspan="3" valign="top">');
my $numconditionals = 0;
my $conditionstext;
my %cond_status;
- foreach my $scope ('domains','users','course') {
+ foreach my $scope ('domains','users','course','userip') {
$numconditionals += $acl_count->{$scope};
if ($acl_count->{$scope} > 0) {
- if ($conditionstext ne 'Active') {
+ if ($conditionstext ne 'Active') {
foreach my $key (keys(%{$conditionals{$scope}})) {
$conditionstext = &acl_status($start->{$key},$end->{$key},$now);
if ($conditionstext eq 'Active') {
@@ -1259,7 +1478,7 @@ sub standard_settings {
'action' => 'chgconditions',
'currentpath' => $env{'form.currentpath'},
);
- $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');
+ $r->print('<h3>'.&mt('Conditional access: [_1]',&mt($conditionstext)).'</h3>');
if ($numconditionals > 0) {
my $count = 1;
my $chg = 'none';
@@ -1272,24 +1491,20 @@ sub standard_settings {
&build_access_summary($r,$count,$chg,%conditionals);
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+ $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt("based on domain, username, course/community affiliation or user's IP address."));
}
}
sub condition_setting {
- my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+ my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses,$ips) = @_;
$r->print('<tr><td valign="top">');
&access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then);
$r->print('</td><td> </td><td valign="top">');
&access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
- $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
- if ($acl_count->{course} > 0) {
- $r->print('<td colspan="3" valign="top">');
- } else {
- $r->print('<td valign="top">');
- }
+ $r->print('</td></tr><tr><td colspan="3"></td></tr><tr><td valign="top">');
&access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
- $r->print('</td>');
+ $r->print('</td><td> </td><td valign="top">');
+ &access_element($r,'userip',$acl_count,$ips,$access_controls,$now,$then);
$r->print('</td></tr></table>');
}
@@ -1306,17 +1521,15 @@ sub acl_status {
sub access_element {
my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
- my $title = $type;
- $title =~ s/s$//;
- $title =~ s/^(\w)/uc($1)/e;
- $r->print('<h3>'.&mt('[_1]-based conditional access: ',$title));
+ my %typetext = (
+ domains => 'Domain',
+ users => 'User',
+ course => 'Course/Community',
+ userip => 'IP',
+ );
+ $r->print('<h3>'.&mt($typetext{$type}.'-based conditional access:').' ');
if ($$acl_count{$type}) {
- $r->print($$acl_count{$type}.' ');
- if ($$acl_count{$type} > 1) {
- $r->print(&mt('conditions'));
- } else {
- $r->print(&mt('condition'));
- }
+ $r->print(&mt('[quant,_1,condition]',$$acl_count{$type}));
} else {
$r->print(&mt('Off'));
}
@@ -1327,21 +1540,33 @@ sub access_element {
sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
+ my ($showtype, $infotype);
+ if ($type eq 'course') {
+ $showtype = &mt('Courses/Communities');
+ $infotype = 'Course/Community';
+ } elsif ($type eq 'domains') {
+ $showtype = &mt('Domains');
+ $infotype = 'Domain';
+ } elsif ($type eq 'users') {
+ $showtype = &mt('Users');
+ $infotype = 'User';
+ } elsif ($type eq 'userip') {
+ $showtype = &mt('IP-based');
+ $infotype = 'IP';
+ }
if (@{$items} > 0) {
my @all_doms;
my $colspan = 3;
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
- $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
+ $r->print('<th>'.&mt('Action?').'</th><th>'.$showtype.'</th><th>'.
&mt('Dates available').'</th>');
if ($type eq 'course' && $status eq 'old') {
- $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
+ $r->print('<th>'.&mt('Allowed course/community affiliations').
'</th>');
$colspan ++;
} elsif ($type eq 'domains') {
- @all_doms = &Apache::loncommon::get_domains();
+ @all_doms = sort(&Apache::lonnet::all_domains());
}
$r->print(&Apache::loncommon::end_data_table_header_row());
foreach my $key (@{$items}) {
@@ -1353,6 +1578,8 @@ sub display_access_row {
$then);
} elsif ($type eq 'users') {
&users_row($r,$status,$key,$access_controls,$now,$then);
+ } elsif ($type eq 'userip') {
+ &ips_row($r,$status,$key,$access_controls,$now,$then);
}
$r->print(&Apache::loncommon::end_data_table_row());
}
@@ -1364,8 +1591,12 @@ sub display_access_row {
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No [_1]-based conditions defined.<br />',$type).
- &additional_item($type));
+ $r->print(
+ '<p class="LC_info">'
+ .&mt('No '.$infotype.'-based conditions defined')
+ .'</p>'
+ .&additional_item($type)
+ );
}
return;
}
@@ -1373,6 +1604,7 @@ sub display_access_row {
sub course_js {
return qq|
<script type="text/javascript">
+// <![CDATA[
function setRoleOptions(num,roleid,cdom,cnum,type) {
updateIndexNum = getIndexByValue('update',num);
var addItem = 'add_role_'+num;
@@ -1412,6 +1644,7 @@ function getIndexByValue(name,value) {
return -1;
}
+// ]]>
</script>
|;
}
@@ -1426,17 +1659,20 @@ sub course_row {
}
my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
.&course_js();
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
+ my $showtype = &mt('Course/Community');
+ my $crstype = 'Course';
my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
$type);
$r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
if ($status eq 'old') {
my $cid = $content->{'domain'}.'_'.$content->{'number'};
my %course_description = &Apache::lonnet::coursedescription($cid);
+ if ($course_description{'type'} ne '') {
+ $crstype = $course_description{'type'};
+ }
$r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
} elsif ($status eq 'new') {
- $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).' <input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
+ $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).' <input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
}
$r->print('<td>'.&dateboxes($num,$start,$end));
my $newrole_id = 1;
@@ -1454,19 +1690,19 @@ sub course_row {
$max_id = $role_id;
}
$max_id ++;
- my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
- $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
+ my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display');
+ $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
}
$r->print('</table>');
}
$r->print('<br />'.&mt('Add a roles-based condition').
- ' <input type="checkbox" name ="add_role_'.
- $num.'" onClick="javascript:setRoleOptions('."'$num',
+ ' <input type="checkbox" name="add_role_'.
+ $num.'" onclick="javascript:setRoleOptions('."'$num',
'$max_id','$content->{'domain'}','$content->{'number'}',
- '$uctype'".')" value="" />');
+ '$showtype'".')" value="" />');
$newrole_id = $max_id;
} else {
- $r->print('<input type="hidden" name ="add_role_'.$num.'" value="" />');
+ $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />');
}
$r->print(&add_course_role($num,$newrole_id));
$r->print('</td>');
@@ -1487,14 +1723,14 @@ sub domains_row {
my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
'domains');
- my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'.
+ my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="multiple">'.
' <option value="">'.&mt('Please select').'</option>';
if ($status eq 'old') {
my $content = $$access_controls{$item};
foreach my $dom (@{$all_doms}) {
if ((@{$content->{'dom'}} > 0)
&& (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {
- $dom_select .= '<option value="'.$dom.'" selected>'.
+ $dom_select .= '<option value="'.$dom.'" selected="selected">'.
$dom.'</option>';
} else {
$dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
@@ -1522,18 +1758,47 @@ sub users_row {
$r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30" rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');
}
+sub ips_row {
+ my ($r,$status,$item,$access_controls,$now,$then) = @_;
+ my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
+ 'userip');
+ my $curr_ips_list;
+ if ($status eq 'old') {
+ my $content = $$access_controls{$item};
+ $curr_ips_list = &sort_ips($content->{'userip'});
+ }
+ $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt('Format for IP controls').'<br />'.
+ &mt('[_1] or [_2] or [_3] or [_4] or [_5]','<tt>35.8.*</tt>','<tt>35.8.3.[34-56]</tt>',
+ '<tt>*.msu.edu</tt>','<tt>35.8.3.34</tt>','<tt>somehostname.pa.msu.edu</tt>').'<br />'.
+ &mt('Use a comma to separate different ranges.').'</br/>'.
+ '<textarea name="ips_'.$num.'" cols="30" rows="5">'.$curr_ips_list.'</textarea></td>'.
+ '<td>'.&dateboxes($num,$start,$end).'</td>');
+}
+
sub additional_item {
my ($type) = @_;
- my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
- return $output;
+ my $showtype;
+ if ($type eq 'course') {
+ $showtype = 'course/community';
+ } elsif ($type eq 'domains') {
+ $showtype = 'domain';
+ } elsif ($type eq 'users') {
+ $showtype = 'user';
+ } elsif ($type eq 'userip') {
+ $showtype = 'IP';
+ }
+ return
+ &mt('Add new '.$showtype.'-based condition(s)?')
+ .' '.&mt('Number to add: ')
+ .'<input type="text" name="new'.$type.'" size="3" value="0" />';
}
sub actionbox {
my ($status,$num,$scope) = @_;
- my $output = '<span style="white-space: nowrap"><label>';
+ my $output = '<span class="LC_nobreak"><label>';
if ($status eq 'new') {
my $checkstate;
- if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
+ if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course' || $scope eq 'userip') {
$checkstate = 'checked="checked"';
}
$output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
@@ -1541,11 +1806,11 @@ sub actionbox {
&mt('Activate');
} else {
$output .= '<input type="checkbox" name="delete" value="'.$num.
- '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.
+ '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
'<label><input type="checkbox" name="update" value="'.
$num.'" />'.&mt('Update');
}
- $output .= '</label></span><input type="hidden" name="scope_'.$num. '" value="'.$scope.'" />';
+ $output .= '</label></span><input type="hidden" name="scope_'.$num.'" value="'.$scope.'" />';
return $output;
}
@@ -1560,7 +1825,7 @@ sub dateboxes {
undef,undef,1);
my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
'enddate_'.$num,$end,undef,undef,undef,1,undef,
- undef,undef,1). ' <span style="white-space: nowrap"><label>'.
+ undef,undef,1). ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="noend_'.
$num.'" '.$noend.' />'.&mt('No end date').
'</label></span>';
@@ -1595,10 +1860,12 @@ sub role_selectors {
$cdom = $env{'form.cdom'};
$cnum = $env{'form.cnum'};
}
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
+ my $crstype = 'Course';
+ if ($cnum =~ /^$match_community$/) {
+ $crstype = 'Community'
+ }
my ($sections,$groups,$allroles,$rolehash,$accesshash) =
- &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype);
+ &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$crstype);
if (!@{$sections}) {
@{$sections} = ('none');
} else {
@@ -1631,12 +1898,12 @@ sub role_selectors {
'group' => $groups,
);
foreach my $item ('role','access','section','group') {
- $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";
+ $output .= '<td><select name="'.$item.$longid.'" multiple="multiple" size="4">'."\n";
foreach my $entry (@{$allitems{$item}}) {
if ($caller eq 'display') {
if ((@{$$content{'roles'}{$role_id}{$item}} > 0) &&
(grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {
- $output .= ' <option value="'.$entry.'" selected>'.
+ $output .= ' <option value="'.$entry.'" selected="selected">'.
$lookup{$item}{$entry}.'</option>';
next;
}
@@ -1693,19 +1960,45 @@ function getIndexByName(item) {
</script>
END_SCRIPT
- $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
- $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+ $r->print(
+ '<p>'
+ .&mt('Select roles, '.lc($type).' status, section(s) and group(s) for users'
+ .' who will be able to access the portfolio file.')
+ .'</p>'
+ );
+ $r->print(
+ '<form name="rolepicker" action="/adm/portfolio" method="post">'
+ .'<table><tr>'
+ .'<th>'.&mt('Roles').'</th>'
+ .'<th>'.&mt("$type status").'</th>'
+ .'<th>'.&mt('Sections').'</th>'
+ .'<th>'.&mt('Groups').'</th>'
+ .'</tr><tr>'.$role_selects.'</tr>'
+ .'</table><br />'
+ .'<input type="button" name="rolepickbutton" value="'.&mt('Save').'" onclick="setRoles()" />'
+ );
return;
}
sub select_files {
- my ($r) = @_;
+ my ($r,$dir_list) = @_;
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.checkfile');
if (scalar(@items)){
- &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ my @ok_items;
+ if (ref($dir_list) eq 'ARRAY') {
+ foreach my $dir_line (@{$dir_list}) {
+ my ($filename,undef,undef,undef,undef,undef,undef,undef,$size)=split(/\&/,$dir_line,10);
+ if (grep(/^\Q$filename\E$/,@items)) {
+ if ($size) {
+ push(@ok_items,$filename);
+ }
+ }
+ }
+ }
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @ok_items);
}
} else {
#empty the file for a fresh start
@@ -1727,88 +2020,329 @@ ENDSMP
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
- opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
+ var hwfield = opener.document.getElementsByName('$env{'form.fieldname'}');
+ hwfield[0].value = fileList;
self.close();
}
</script>
ENDSMP
$r->print($javascript);
- $r->print("<h1>Select portfolio files</h1>
- Check as many as you wish in response to the problem.<br />");
+ $r->print("<h1>".&mt('Select portfolio files')."</h1>");
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 />");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Files selected from other directories:')."</th>"
+ .&Apache::loncommon::end_data_table_header_row()
+ );
foreach my $file (@otherfiles) {
- $r->print($file."<br />");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td>'.$file."</td>"
+ .&Apache::loncommon::end_data_table_row()
+ );
}
+ $r->print(&Apache::loncommon::end_data_table()
+ .'<br />'
+ );
}
+ $r->print('<div>'
+ .&mt('Check as many files as you wish in response to the problem:')
+ .'</div>'
+ );
}
sub upload {
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
- if (defined($group)) {
- my $grp_quota = &get_group_quota($group); # quota expressed in k
- if ($grp_quota ne '') {
- $disk_quota = $grp_quota;
+ my $formname = 'uploaddoc';
+ my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
+ my ($state,$msg);
+ if ($fname eq '') {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ 'so after eliminating special characters there was nothing left.',
+ '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>'),1)));
+
+ $r->print(&done(undef,$url));
+ return;
+ }
+ my $disk_quota = &get_quota($group);
+ my $portfolio_root = &get_portfolio_root();
+ my $port_path = &get_port_path();
+ my ($uname,$udom) = &get_name_dom($group);
+ my $getpropath = 1;
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ ($state,$msg) =
+ &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
+ $group,$formname,$portfolio_root,
+ $port_path,$disk_quota,
+ $current_disk_usage,$uname,$udom);
+ if ($state eq 'will_exceed_quota'
+ || $state eq 'file_locked'
+ || $state eq 'zero_bytes') {
+ $r->print($msg.&done(undef,$url));
+ return;
+ }
+
+ my (%allfiles,%codebase,$mode,$mimetype);
+ if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
+ if ($env{'form.parserflag'}) {
+ $mode = 'parse';
+ }
+ }
+ my $context;
+ if ($state eq 'existingfile') {
+ $context = $state;
+ }
+ my $subdir = $port_path.$env{'form.currentpath'};
+ $subdir =~ s{(/)$}{};
+ my ($result,$timestamp) =
+ &Apache::lonnet::userfileupload($formname,$context,$subdir,
+ $mode,\%allfiles,\%codebase,undef,undef,
+ undef,undef,undef,undef,\$mimetype);
+ if ($state eq 'existingfile') {
+ my $group_elem;
+ my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites';
+ if ($group eq '') {
+ $rootdir .= '/'.$env{'user.domain'}.'/'.$env{'user.name'};
} else {
- $disk_quota = 0;
+ $rootdir .= '/'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
+ '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
+ $group_elem = '<input type="hidden" name="group" value="'.$group.'" />';
+ }
+ if (($result eq $rootdir.'/'.$port_path.$env{'form.currentpath'}.$fname) && ($timestamp =~ /^\d+$/)) {
+ my $showfname = &HTML::Entities::encode($fname,'&<>"');
+ my %lt = &Apache::lonlocal::texthash (
+ over => 'Overwrite existing file?',
+ yes => 'Yes',
+ no => 'No',
+ undo => 'This action can not be undone.',
+ conf => 'Are you sure you want to overwrite an existing file?',
+ cont => 'Continue',
+ );
+ my $parserflag;
+ my $hidden = &hidden_elems();
+ if ($mode eq 'parse') {
+ $parserflag = '<input type="hidden" name="parserflag" value="1" />';
+ }
+ $r->print(<<"END");
+<script type="text/javascript">
+// <![CDATA[
+function confirmOverwrite() {
+ var chosen;
+ if (document.existingfile.overwrite.length) {
+ for (var i=0; i<document.existingfile.overwrite.length; i++) {
+ if (document.existingfile.overwrite[i].checked) {
+ chosen = document.existingfile.overwrite[i].value;
+ }
+ }
+ }
+ if (chosen == 1) {
+ if (confirm('$lt{'conf'}')) {
+ document.existingfile.action.value = "process_overwrite";
+ return true;
+ } else {
+ document.existingfile.action.value = "cancel_overwrite";
+ if (document.existingfile.overwrite.length) {
+ for (var i=0; i<document.existingfile.overwrite.length; i++) {
+ if (document.existingfile.overwrite[i].value == "0") {
+ document.existingfile.overwrite[i].checked = true;
+ }
+ }
+ }
+ return false;
+ }
+ } else {
+ document.existingfile.action.value = "cancel_overwrite";
+ return true;
+ }
+}
+// ]]>
+</script>
+<p>
+$msg
+</p>
+<form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
+<p class="LC_nobreak">$lt{'over'}
+<label><input type="radio" name="overwrite" value="1" />
+$lt{'yes'}</label>
+<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></p>
+<p>
+<input type="hidden" name="action" value="cancel_overwrite" />
+<input type="hidden" name="filename" value="$showfname" />
+<input type="hidden" name="timestamp" value="$timestamp" />
+$hidden
+$parserflag
+$group_elem
+<input type="submit" name="process" value="$lt{'cont'}" />
+</p>
+</form>
+END
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
}
+ } elsif ($result !~ m|^/uploaded/|) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
+ } else {
+ if (!&suppress_embed_prompt()) {
+ if ($mimetype eq 'text/html') {
+ if (keys(%allfiles) > 0) {
+ &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+ return;
+ } else {
+ $r->print('<p class="LC_warning">'.&mt('No embedded items identified.').'</p>');
+ }
+ }
+ }
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully uploaded'))));
+ $r->print(&done(undef,$url));
}
- $fname=&Apache::lonnet::clean_filename($fname);
+ return;
+}
- my $portfolio_root=&get_portfolio_root();
- my ($uname,$udom) = &get_name_dom();
+sub hidden_elems {
+ my $contelem;
+ if ($env{'form.mode'} eq 'selectfile') {
+ $contelem = '<input type="hidden" name="continue" value="true" />';
+ }
+ return <<END;
+<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
+<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
+<input type="hidden" name="showversions" value="$env{'form.showversions'}" />
+$contelem
+END
+}
+
+sub print_dependency_form {
+ my ($r,$url,$allfiles,$codebase,$result) = @_;
+ my $container = &HTML::Entities::encode($result,'<>"&');
+ my $state = &embedded_form_elems($container);
+ my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
+ {'error_on_invalid_names' => 1,
+ 'ignore_remote_references' => 1,});
+ if ($embedded) {
+ if ($num || $pathchg) {
+ $r->print('<h3>'.&mt("Reference Warning").'</h3>');
+ } else {
+ $r->print('<h3>'.&mt("Reference Information").'</h3>');
+ }
+ if ($num) {
+ $r->print('<p>'.&mt('Completed upload of the file.').' '.
+ &mt('This file contained references to other files.').' '.
+ &mt('You must upload the referenced files or else the uploaded file may not work properly.').
+ '</p>'.
+ '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
+ $embedded.
+ '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
+ } else {
+ $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files.").'</p>'.
+ $embedded.
+ '<p>'.&done('Return to directory',$url).'</p>');
+ }
+ } else {
+ $r->print(&done(undef,$url));
+ }
+ return;
+}
+
+sub overwrite {
+ my ($r,$url,$group)=@_;
+ my $formname = 'existingfile';
my $port_path = &get_port_path();
- # Fixme --- Move the checking for existing file to LOND error return
- my @dir_list=&get_dir_list($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){
- $file_name = $env{'form.currentpath'}.$file_name;
- $file_name = &prepend_group($file_name);
- $found_file = 1;
- if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $locked_file = 1;
- }
+ my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+ my (%allfiles,%codebase,$mode,$mimetype);
+ unless (&suppress_embed_prompt()) {
+ if ($env{'form.parserflag'}) {
+ if ($fname =~ /\.s?html?$/i) {
+ $mode = 'parse';
+ }
}
}
- my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
- if (($current_disk_usage + $filesize) > $disk_quota){
- $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
- '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
- $r->print(&done('Back',$url));
- }
- elsif ($found_file){
- if ($locked_file){
- $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
- '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
- $r->print(&done('Back',$url));
- } else {
- $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
- '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
- $r->print(&done('Back',$url));
- }
- } else {
- my $result=&Apache::lonnet::userfileupload('uploaddoc','',
- $port_path.$env{'form.currentpath'});
- if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.'An errror occured ('.$result.
- ') while trying to upload '.&display_file().'</span><br />');
- $r->print(&done('Back',$url));
+ if ($fname eq '') {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ 'so after eliminating special characters there was nothing left.',
+ '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
+ $r->print(&done(undef,$url));
+ return;
+ }
+ $env{'form.'.$formname.'.filename'} = $fname;
+ my $subdir = $port_path.$env{'form.currentpath'};
+ $subdir =~ s{(/)$}{};
+ my $result=
+ &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode,
+ \%allfiles,\%codebase,undef,undef,undef,
+ undef,undef,undef,\$mimetype);
+ if ($result !~ m|^/uploaded/|) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ } else {
+ if ($mode eq 'parse') {
+ if ($mimetype eq 'text/html') {
+ if (keys(%allfiles) > 0) {
+ &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+ return;
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .'<br />'.&mt('No embedded items identified.')));
+ }
+ }
} else {
- $r->print(&done(undef,$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
}
+
+ my $group_elem;
+ if (defined($env{'form.group'})) {
+ $group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
+ if (defined($env{'form.ref'})) {
+ $group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
+ }
+ }
+ my $hidden = &hidden_elems();
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ ['<a href="javascript:document.overwritedone.submit();">'
+ .&mt('Return to directory')
+ .'</a>'])
+ .'<form name="overwritedone" method="post" action="'.$url.'">'
+ .$hidden
+ .$group_elem
+ .'</form>'
+ );
+ return;
}
sub lock_info {
my ($r,$url,$group) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my $file_name = $env{'form.lockinfo'};
@@ -1822,7 +2356,7 @@ sub lock_info {
$filetext = '<strong>'.$env{'form.lockinfo'}.
'</strong> (group: '.$group.')';
} else {
- $filetext = '<strong>'.$file_name.'</strong>';
+ $filetext = '<span class="LC_filename">'.$file_name.'</span>';
}
my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
@@ -1841,57 +2375,84 @@ sub lock_info {
my %course_description =
&Apache::lonnet::coursedescription($$array_item[1]);
if ( $course_description{'description'} ne '') {
- $r->print(&mt('In the course: <strong>[_1]</strong><br />',
- $course_description{'description'}));
+ $r->print(&mt('In the course:').' <strong>'.$course_description{'description'}.'</strong><br />');
}
}
}
- $r->print(&done('Back',$url));
+ $r->print(&done(undef,$url));
return 'ok';
}
sub createdir {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
+ # Display warning in case of directory name cleaning has changed the directory name
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('Invalid characters')
+ .'</span><br />'
+ .&mt('The new directory name was changed from [_1] to [_2].'
+ ,'<span class="LC_filename">'.$env{'form.newdir'}.'</span>'
+ ,'<span class="LC_filename">'.$newdir.'</span>')
+ .'</p>'
+ );
+ }
+
+ # Directory name empty?
if ($newdir eq '') {
- $r->print('<span class="LC_error">'.
- &mt("Error: no directory name was provided.").
- '</span><br />');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no directory name was provided.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
my $portfolio_root = &get_portfolio_root();
- my @dir_list=&get_dir_list($portfolio_root);
+ my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
my $found_file = 0;
- foreach my $line (@dir_list) {
- my ($filename)=split(/\&/,$line,2);
- if ($filename eq $newdir){
- $found_file = 1;
+ if (ref($dirlistref) eq 'ARRAY') {
+ foreach my $line (@{$dirlistref}) {
+ my ($filename)=split(/\&/,$line,2);
+ if ($filename eq $newdir){
+ $found_file = 1;
+ }
}
}
- if ($found_file){
- $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
- ' </strong>a file or directory by that name already exists.</span><br />');
+ if ($found_file) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Unable to create a directory named [_1].'
+ ,'<span class="LC_filename">'.$newdir.'</span>'),1)
+ .'<br />'.&mt('A file or directory by that name already exists.')));
} else {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'.'An errror occured ('.$result.
- ') while trying to create a new directory '.&display_file().'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+ ,$result,&display_file()),1)));
+
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully created'))));
}
}
- 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(undef,$url));
}
sub get_portfolio_root {
my ($udom,$uname,$group) = @_;
if (!(defined($udom)) || !(defined($uname))) {
- ($uname,$udom) = &get_name_dom();
+ ($uname,$udom) = &get_name_dom($group);
}
my $path = '/userfiles/portfolio';
if (!defined($group)) {
@@ -1902,7 +2463,7 @@ sub get_portfolio_root {
if (defined($group)) {
$path = '/userfiles/groups/'.$group.'/portfolio';
}
- return (&Apache::loncommon::propath($udom,$uname).$path);
+ return $path;
}
sub get_group_quota {
@@ -1914,24 +2475,26 @@ sub get_group_quota {
if (%curr_groups) {
my %group_info = &Apache::longroup::get_group_settings(
$curr_groups{$group});
- $group_quota = $group_info{'quota'}; #expressed in Mb
+ $group_quota = $group_info{'quota'}; #expressed in MB
if ($group_quota) {
$group_quota = 1000 * $group_quota; #expressed in k
- }
+ }
}
return $group_quota;
-}
+}
sub get_dir_list {
- my ($portfolio_root) = @_;
- my ($uname,$udom) = &get_name_dom();
- return &Apache::lonnet::dirlist($env{'form.currentpath'},
- $udom,$uname,$portfolio_root);
+ my ($portfolio_root,$path,$group) = @_;
+ $path ||= $env{'form.currentpath'};
+ my ($uname,$udom) = &get_name_dom($group);
+ my $getpropath = 1;
+ return &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
}
sub get_name_dom {
+ my ($group) = @_;
my ($uname,$udom);
- if (defined($env{'form.group'})) {
+ if (defined($group)) {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
} else {
@@ -1952,7 +2515,7 @@ sub prepend_group {
sub get_namespace {
my $namespace = 'portfolio';
if (defined($env{'form.group'})) {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($env{'form.group'});
$namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
}
return $namespace;
@@ -1970,12 +2533,14 @@ sub get_port_path {
sub missing_priv {
my ($r,$url,$priv) = @_;
- my $longtext = {
+ my %longtext =
+ &Apache::lonlocal::texthash(
upload => 'upload files',
delete => 'delete files',
rename => 'rename files',
setacl => 'set access controls for files',
- };
+ viewacl => 'view access controls for files',
+ );
my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
my $rtnlink = '<a href="'.$url;
if ($url =~ /\?/) {
@@ -1984,18 +2549,17 @@ sub missing_priv {
$rtnlink .= '?';
}
$rtnlink .= 'currentpath='.$escpath;
- $r->print(&mt('<h3>Action disallowed</h3>'));
- $r->print(&mt('You do not have sufficient privileges to [_1] ',
- $longtext->{$priv}));
+ $r->print('<h3>'.&mt('Action disallowed').'</h3>');
+ $r->print(&mt('You do not have sufficient privileges to [_1]',
+ $longtext{$priv}));
if (defined($env{'form.group'})) {
- $r->print(&mt("in the group's file repository."));
+ $r->print(' '.&mt("in the group's group portfolio."));
$rtnlink .= &group_args()
} else {
- $r->print(&mt('in this portfolio.'));
+ $r->print(' '.&mt('in this portfolio.'));
}
- $rtnlink .= '">'.&mt('Return to directory listing page').'</a>';
+ $rtnlink .= '">'.&mt('Return to directory').'</a>';
$r->print('<br />'.$rtnlink);
- $r->print(&Apache::loncommon::end_page());
return;
}
@@ -2012,16 +2576,112 @@ sub coursegrp_portfolio_header {
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
- text=>"$ucgpterm: $grp_desc",
- title=>"Go to group's home page"},
+ text=>&mt('Group').": $grp_desc",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1},
{href=>"/adm/coursegrp_portfolio?".&group_args(),
text=>"Group Portfolio",
title=>"Display group portfolio"});
my $output = &Apache::lonhtmlcommon::breadcrumbs(
- &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
+ &mt('Group portfolio files - [_1]',$grp_desc),
+ undef,undef,undef,undef,1);
return $output;
}
+sub get_quota {
+ my ($group) = @_;
+ my $disk_quota;
+ if (defined($group)) {
+ my $grp_quota = &get_group_quota($group); # quota expressed in k
+ if ($grp_quota ne '') {
+ $disk_quota = $grp_quota;
+ } else {
+ $disk_quota = 0;
+ }
+ } else {
+ $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
+ $env{'user.domain'}); #expressed in MB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
+ }
+ return $disk_quota;
+}
+
+sub suppress_embed_prompt {
+ my $suppress_prompt = 0;
+ if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
+ if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
+ $suppress_prompt = 1;
+ }
+ }
+ return $suppress_prompt;
+}
+
+sub embedded_form_elems {
+ my ($container) = @_;
+ my $state = <<STATE;
+ <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+ <input type="hidden" name="symb" value="$env{'form.symb'}" />
+ <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+ <input type="hidden" name="mode" value="$env{'form.mode'}" />
+ <input type="hidden" name="container" value="$container" />
+STATE
+ if ($env{'form.group'} ne '') {
+ $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+ }
+ return $state;
+}
+
+# Find space available in a user's portfolio (convert to bytes)
+sub free_space {
+ my ($group) = @_;
+ my $disk_quota = &get_quota($group); # Expressed in kB
+ my ($uname,$udom) = &get_name_dom($group);
+ my $portfolio_root = &get_portfolio_root();
+ my $getpropath = 1;
+ my $current_disk_usage = &Apache::lonnet::diskusage($udom, $uname,
+ $portfolio_root, $getpropath); # Expressed in kB
+ my $free_space = 1024 * ($disk_quota - $current_disk_usage);
+ return $free_space;
+}
+
+sub valid_container {
+ my ($uname,$udom,$group) = @_;
+ my $container_prefix;
+ if ($group ne '') {
+ $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio";
+ } else {
+ $container_prefix = "/uploaded/$udom/$uname/portfolio";
+ }
+ if ($env{'form.currentpath'}) {
+ $container_prefix .= $env{'form.currentpath'};
+ } else {
+ $container_prefix .= '/';
+ }
+ if ($env{'form.container'} =~ m{^\Q$container_prefix\E(.+)$}) {
+ my $filename = $1;
+ if ($filename eq &Apache::lonnet::clean_filename($filename)) {
+ return 1;
+ }
+ }
+ return;
+}
+
+sub invalid_parms {
+ my ($r,$url,$currentpath) = @_;
+ my $escpath = &HTML::Entities::encode($currentpath,'&<>"');
+ my $rtnlink = '<a href="'.$url;
+ if ($url =~ /\?/) {
+ $rtnlink .= '&';
+ } else {
+ $rtnlink .= '?';
+ }
+ $rtnlink .= 'currentpath='.$escpath;
+ $rtnlink .= '">'.&mt('Return to directory').'</a>';
+ $r->print('<h3>'.&mt('Action disallowed').'</h3>');
+ $r->print(&mt('Some of the data included with this request were invalid'));
+ $r->print('<br />'.$rtnlink);
+ return;
+}
sub handler {
# this handles file management
@@ -2029,13 +2689,13 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
- 'cnum','cdom','type','setroles','showversions','ref']);
+ 'cnum','cdom','type','setroles','showversions','ref','symb']);
my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
$caller = $2;
}
- my ($can_modify,$can_delete,$can_upload,$can_setacl);
+ my ($can_modify,$can_delete,$can_upload,$can_setacl,$can_viewacl);
if ($caller eq 'coursegrp_portfolio') {
# Needs to be in a course
if (! ($env{'request.course.fn'})) {
@@ -2049,8 +2709,8 @@ sub handler {
&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
$env{'form.group'} =~ s/\W//g;
$group = $env{'form.group'};
- if ($group) {
- ($uname,$udom) = &get_name_dom();
+ if ($group ne '') {
+ ($uname,$udom) = &get_name_dom($group);
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
@@ -2061,16 +2721,16 @@ sub handler {
$env{'request.course.id'}.'/'.$group))) {
$portfolio_root = &get_portfolio_root();
} else {
- $r->print('You do not have the privileges required to access the shared files space for this group.');
+ $r->print(&mt('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');
+ $r->print(&mt('Not a valid group for this course'));
$earlyout = 1;
}
- $title = &mt('Group files').' for '.$group;
+ $title = &mt('Group portfolio for [_1]', $group);
} else {
- $r->print('Invalid group');
+ $r->print(&mt('Invalid group'));
$earlyout = 1;
}
if ($earlyout) { return OK; }
@@ -2079,6 +2739,7 @@ sub handler {
$can_delete = 1;
$can_upload = 1;
$can_setacl = 1;
+ $can_viewacl = 1;
} else {
if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
$can_setacl = 1;
@@ -2092,15 +2753,22 @@ sub handler {
if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
$can_delete = 1;
}
+ if (&Apache::lonnet::allowed('rgf',$env{'request.course.id'}.'/'.$group)) {
+ $can_viewacl = 1;
+ }
}
} else {
($uname,$udom) = &get_name_dom();
$portfolio_root = &get_portfolio_root();
- $title = &mt('Portfolio Manager');
+ $title = 'My Space';
$can_modify = 1;
$can_delete = 1;
$can_upload = 1;
- $can_setacl = 1;
+ if (&Apache::lonnet::usertools_access($uname,$udom,'portaccess',
+ undef,'tools')) {
+ $can_viewacl = 1;
+ $can_setacl = 1;
+ }
}
my $port_path = &get_port_path();
@@ -2108,38 +2776,139 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
+ my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
+
+ my $js = '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+
if ($env{"form.mode"} eq 'selectfile'){
- $r->print(&Apache::loncommon::start_page($title,undef,
+ $r->print(&Apache::loncommon::start_page($title, $js,
{'only_body' => 1}));
} elsif ($env{'form.action'} eq 'rolepicker') {
- $r->print(&Apache::loncommon::start_page('New role-based condition',undef,
+ $r->print(&Apache::loncommon::start_page('New role-based condition', $js,
{'no_nav_bar' => 1, }));
+ } elsif ($caller eq 'coursegrp_portfolio') {
+ $r->print(&Apache::loncommon::start_page($title, $js));
} else {
- $r->print(&Apache::loncommon::start_page($title));
+ $r->print(&Apache::loncommon::start_page($title, $js,
+ {'bread_crumbs' => $brcrum}));
+ if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
+ $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
+ &mt('This is a result of one of the following:').'<ul>'.
+ '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+ '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+ '</ul>');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
}
$r->rflush();
- if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
- $r->print('<span class="LC_error">'.
- 'No file was selected to upload.'.
- 'To upload a file, click <strong>Browse...</strong>'.
- ', select a file, then click <strong>Upload</strong>.'.
- '</span>');
- }
+ # Check if access to portfolio is blocked by one or more blocking events in courses.
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('port',$clientip,$uname,$udom);
+ if ($blocked) {
+ my $evade_block;
+ # If portfolio display is in a window popped up from a "Select Portfolio Files"
+ # link in a .task resource, check if access to the task included proctor validation
+ # of check-in to a slot limited by IP.
+ # If so, and the slot is between its open and close dates, override the block.
+ if ($env{'request.course.id'} && $env{'form.symb'}) {
+ (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+ if ($res =~ /\.task$/i) {
+ my %history =
+ &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
+ $env{'user.domain'},$env{'user.name'});
+ my $version = $history{'resource.0.version'};
+ if ($history{'resource.'.$version.'.0.checkedin'}) {
+ if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
+ my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
+ if ($slot{'ip'}) {
+ if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
+ my $now = time;
+ if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
+ $evade_block = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ unless ($evade_block) {
+ $r->print($blocktext);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+ if (($env{'form.currentpath'}) && ($env{'form.currentpath'} ne '/')) {
+ my $clean_currentpath = '/'.&Apache::loncommon::clean_path($env{'form.currentpath'}).'/';
+ unless ($env{'form.currentpath'} eq $clean_currentpath) {
+ &invalid_parms($r,$url);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+ if ($env{'form.container'}) {
+ unless (&valid_container($uname,$udom,$group)) {
+ &invalid_parms($r,$url,$env{'form.currentpath'});
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+ if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('No file was selected to upload.')
+ .'</span><br />'
+ .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
+ ,'<strong>','</strong>')
+ .'</p>'
+ );
+ }
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 />');
+ $r->print(&mt('Edit Metadata').'<br />');
&close_form($r,$url);
}
- if ($env{'form.store'}) {
- }
-
if ($env{'form.uploaddoc.filename'}) {
if ($can_upload) {
&upload($r,$url,$group);
} else {
&missing_priv($r,$url,'upload');
}
+ } elsif ($env{'form.action'} eq 'process_overwrite') {
+ if ($can_upload) {
+ &overwrite($r,$url,$group);
+ } else {
+ &missing_priv($r,$url,'existingfile');
+ }
+ } elsif ($env{'form.action'} eq 'upload_embedded') {
+ if ($can_upload) {
+ my $disk_quota = &get_quota($group);
+ my $getpropath = 1;
+ my $current_disk_usage =
+ &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ my $container = &HTML::Entities::encode($env{'form.container'},'<>&"');
+ my $state = &embedded_form_elems($container).
+ '<input type="hidden" name="action" value="modify_orightml" />';
+ my ($result,$flag) =
+ &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
+ $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url);
+ $r->print($result.&done('Return to directory',$url));
+ } else {
+ &missing_priv($r,$url,'upload');
+ }
+ } elsif ($env{'form.action'} eq 'modify_orightml') {
+ if ($can_upload) {
+ my $result =
+ &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+ $udom,$portfolio_root);
+ $r->print($result.
+ &done('Return to directory',$url));
+ } else {
+ &missing_priv($r,$url,'upload');
+ }
} elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
if ($can_delete) {
&delete_confirmed($r,$url,$group);
@@ -2148,13 +2917,13 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url);
+ &delete($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url);
+ &delete_dir_confirmed($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
@@ -2174,16 +2943,20 @@ sub handler {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url);
+ &rename($r,$url,$group);
} else {
&missing_priv($r,$url,'rename');
}
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
- if (!defined($env{'form.action'})) {
+ if (!defined($env{'form.action'})) {
$env{'form.action'} = 'chgaccess';
}
- &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
+ if (($can_viewacl) || ($can_setacl)) {
+ &display_access($r,$url,$group,$can_setacl,$can_viewacl,$port_path,$env{'form.action'});
+ } else {
+ &missing_priv($r,$url,'viewacl');
+ }
} elsif (($env{'form.action'} eq 'chgaccess') ||
($env{'form.action'} eq 'chgconditions')) {
if ($can_setacl) {
@@ -2199,13 +2972,23 @@ sub handler {
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url);
+ &createdir($r,$url,$group);
} else {
&missing_priv($r,$url,'upload');
}
} elsif ($env{'form.lockinfo'}) {
&lock_info($r,$url,$group);
} else {
+ if ($env{'form.action'} eq 'cancel_overwrite') {
+ if ($can_upload) {
+ my $formname = 'existingfile';
+ my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+ $env{'form.'.$formname.'.filename'} = $fname;
+ my $subdir = $port_path.$env{'form.currentpath'};
+ $subdir =~ s{(/)$}{};
+ &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir);
+ }
+ }
my $current_path='/';
if ($env{'form.currentpath'}) {
$current_path = $env{'form.currentpath'};
@@ -2214,8 +2997,9 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
$r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
}
- my @dir_list=&get_dir_list($portfolio_root);
- if ($dir_list[0] eq 'no_such_dir'){
+ my ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
+ if ($listerror 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
@@ -2230,17 +3014,26 @@ sub handler {
$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,
- $udom,$uname,$portfolio_root);
+ ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
}
# need to know if directory is empty so it can be removed if desired
- my $is_empty=(@dir_list == 2);
- &display_common($r,$url,$current_path,$is_empty,\@dir_list,
- $can_upload);
- &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
- $can_upload,$can_modify,$can_delete,$can_setacl);
- $r->print(&Apache::loncommon::end_page());
+ my $is_empty;
+ if ($listerror eq 'empty') {
+ $is_empty = 1;
+ } elsif (ref($dirlistref) eq 'ARRAY') {
+ if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/)
+ && ($dirlistref->[1] =~ /^\.+\&/)) {
+ $is_empty = 1;
+ }
+ }
+ &display_common($r,$url,$current_path,$is_empty,$dirlistref,
+ $can_upload,$group);
+ &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
+ $can_upload,$can_modify,$can_delete,$can_setacl,
+ $can_viewacl,$caller);
}
+ $r->print(&Apache::loncommon::end_page());
return OK;
}