--- loncom/interface/portfolio.pm 2013/04/30 14:27:51 1.244
+++ loncom/interface/portfolio.pm 2024/12/29 21:44:16 1.254.2.7
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.244 2013/04/30 14:27:51 raeburn Exp $
+# $Id: portfolio.pm,v 1.254.2.7 2024/12/29 21:44:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -98,7 +98,7 @@ sub display_common {
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
- $r->print(&display_usage($group));
+ $r->print(&display_portfolio_usage($group,$help_portfolio));
my $parse_check;
if (!&suppress_embed_prompt()) {
$parse_check = <<"END";
@@ -112,14 +112,17 @@ sub display_common {
END
}
- $r->print('<div>'.$help_portfolio);
+ # 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" />'
+ .'<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"}.'" />'
@@ -149,7 +152,6 @@ END
.'</form>'
.'</div>'
);
- $r->print('</div>');
} # end "if can_upload"
my @tree = split (/\//,$current_path);
@@ -188,46 +190,22 @@ END
$r->print("</form>");
}
-sub display_usage {
- my ($group) = @_;
+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);
- my $usage = $current_disk_usage/1000;
- my $quota = $disk_quota/1000;
- my $percent;
- if ($disk_quota == 0) {
- $percent = 100.0;
- } else {
- $percent = 100*($current_disk_usage/$disk_quota);
- }
- $usage = sprintf("%.2f",$usage);
- $quota = sprintf("%.2f",$quota);
- $percent = sprintf("%.0f",$percent);
- my ($color,$cssclass);
- if ($percent <= 60) {
- $color = '#00A000';
- } elsif ($percent > 60 && $percent < 90) {
- $color = '#FFD300';
- $cssclass = 'class="LC_warning"';
- } elsif( $percent >= 90) {
- $color = '#FF0000';
- $cssclass = 'class="LC_error"';
- }
- my $prog_width = $percent;
- if ($prog_width > 100) {
- $prog_width = 100;
- }
- my $disk_meter = '
- <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
-' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
-' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
-' </div>'."\n".
-' </div>';
- return &Apache::loncommon::head_subbox($disk_meter);
+ 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 {
@@ -289,7 +267,7 @@ sub display_directory_line {
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,$caller)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my $select_mode;
my $checked_files;
@@ -333,6 +311,15 @@ sub display_directory {
&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';
+ }
+ 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>'
@@ -342,7 +329,7 @@ sub display_directory {
.'<th>'.&mt('Size').'</th>'
.'<th>'.&mt('Last Modified').'</th>'
.'<th> </th>'
- .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
+ .'<th>'.&mt('Current Access Status').$acl_helplink.'</th>'
.&Apache::loncommon::end_data_table_header_row());
}
@@ -563,7 +550,7 @@ sub display_directory {
<input type="hidden" name="mode" value="selectfile" />
<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').'" />
+ <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>');
@@ -931,15 +918,15 @@ sub display_access {
$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>'.
- &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
+ &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url()."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
if ($group eq '') {
$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=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
+ $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url()."/adm/$udom/$uname/aboutme</a><br />";
if ($group ne '') {
- $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
+ $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>'.
@@ -969,9 +956,11 @@ sub display_access {
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 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.');
+ &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 {
@@ -1012,8 +1001,9 @@ sub build_access_summary {
domains => 'Conditional: domain-based',
users => 'Conditional: user-based',
course => 'Conditional: course/community-based',
+ ip => 'Conditional: IP-based',
);
- my @allscopes = ('public','guest','domains','users','course');
+ my @allscopes = ('public','guest','domains','users','course','ip');
foreach my $scope (@allscopes) {
if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
next;
@@ -1090,6 +1080,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 'ip') {
+ my $curr_ips_list = &sort_ips($content->{'ip'});
+ $r->print(&mt('IP(s):').' '.$curr_ips_list);
} else {
$r->print(' ');
}
@@ -1198,7 +1191,7 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- my @types = ('course','domains','users');
+ my @types = ('course','domains','users','ip');
foreach my $newitem (@types) {
$allnew += $env{'form.new'.$newitem};
}
@@ -1206,24 +1199,30 @@ sub update_access {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
&open_form($r,$url);
- my %showtypes = &Apache::lonlocal::texthash (
+ my %showtypes = (
course => 'course/community',
domains => 'domain',
users => 'user',
+ ip => 'IP',
);
foreach my $newitem (@types) {
- if ($env{'form.new'.$newitem} > 0) {
- $r->print('<br />'.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]','<b>'.$showtypes{$newitem},'</b>','<b>'.$env{'form.currentpath'}.$env{'form.selectfile'}.'</b>').'<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);
+ 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 {
@@ -1308,6 +1307,13 @@ sub build_access_record {
'udom' => $udom
});
}
+ } elsif ($scope eq 'ip') {
+ 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;
}
@@ -1333,6 +1339,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);
@@ -1342,6 +1355,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);
@@ -1364,6 +1378,8 @@ sub access_setting_table {
push(@domains,$key);
} elsif ($scope eq 'users') {
push(@users,$key);
+ } elsif ($scope eq 'ip') {
+ push(@ips,$key);
}
}
$acl_count{$scope} ++;
@@ -1375,7 +1391,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>');
}
@@ -1420,14 +1436,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','ip') {
$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') {
@@ -1458,24 +1474,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/community 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,'ip',$acl_count,$ips,$access_controls,$now,$then);
$r->print('</td></tr></table>');
}
@@ -1492,19 +1504,15 @@ sub acl_status {
sub access_element {
my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
- my %typetext = &Apache::lonlocal::texthash(
+ my %typetext = (
domains => 'Domain',
users => 'User',
- course => 'Course/Community'
+ course => 'Course/Community',
+ ip => 'IP',
);
- $r->print('<h3>'.&mt('[_1]-based conditional access: ',$typetext{$type}));
+ $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'));
}
@@ -1515,13 +1523,19 @@ sub access_element {
sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
- my $showtype;
+ 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 'ip') {
+ $showtype = &mt('IP-based');
+ $infotype = 'IP';
}
if (@{$items} > 0) {
my @all_doms;
@@ -1531,7 +1545,6 @@ sub display_access_row {
$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 course/community affiliations').
'</th>');
$colspan ++;
@@ -1548,6 +1561,8 @@ sub display_access_row {
$then);
} elsif ($type eq 'users') {
&users_row($r,$status,$key,$access_controls,$now,$then);
+ } elsif ($type eq 'ip') {
+ &ips_row($r,$status,$key,$access_controls,$now,$then);
}
$r->print(&Apache::loncommon::end_data_table_row());
}
@@ -1559,8 +1574,12 @@ sub display_access_row {
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No [_1]-based conditions defined.',$showtype).'<br />'.
- &additional_item($type));
+ $r->print(
+ '<p class="LC_info">'
+ .&mt('No '.$infotype.'-based conditions defined')
+ .'</p>'
+ .&additional_item($type)
+ );
}
return;
}
@@ -1568,6 +1587,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;
@@ -1607,6 +1627,7 @@ function getIndexByValue(name,value) {
return -1;
}
+// ]]>
</script>
|;
}
@@ -1659,7 +1680,7 @@ sub course_row {
}
$r->print('<br />'.&mt('Add a roles-based condition').
' <input type="checkbox" name="add_role_'.
- $num.'" onClick="javascript:setRoleOptions('."'$num',
+ $num.'" onclick="javascript:setRoleOptions('."'$num',
'$max_id','$content->{'domain'}','$content->{'number'}',
'$showtype'".')" value="" />');
$newrole_id = $max_id;
@@ -1720,18 +1741,39 @@ 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,
+ 'ip');
+ my $curr_ips_list;
+ if ($status eq 'old') {
+ my $content = $$access_controls{$item};
+ $curr_ips_list = &sort_ips($content->{'ip'});
+ }
+ $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 $showtype;
if ($type eq 'course') {
- $showtype = &mt('course/community');
+ $showtype = 'course/community';
} elsif ($type eq 'domains') {
- $showtype = &mt('domains');
+ $showtype = 'domain';
} elsif ($type eq 'users') {
- $showtype = &mt('users');
+ $showtype = 'user';
+ } elsif ($type eq 'ip') {
+ $showtype = 'IP';
}
- my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
- return $output;
+ return
+ &mt('Add new '.$showtype.'-based condition(s)?')
+ .' '.&mt('Number to add: ')
+ .'<input type="text" name="new'.$type.'" size="3" value="0" />';
}
sub actionbox {
@@ -1739,7 +1781,7 @@ sub actionbox {
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 'ip') {
$checkstate = 'checked="checked"';
}
$output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
@@ -1751,7 +1793,7 @@ sub actionbox {
'<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;
}
@@ -2101,21 +2143,24 @@ function confirmOverwrite() {
}
// ]]>
</script>
+<p>
$msg
-<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
-<span class="LC_nobreak">$lt{'over'}
+</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></span>
+<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
-<br /><br />
<input type="submit" name="process" value="$lt{'cont'}" />
-</form></div>
+</p>
+</form>
END
} else {
$r->print(
@@ -2213,10 +2258,13 @@ sub overwrite {
}
}
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $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>');
- $r->print($msg.&done(undef,$url));
+ '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
+ $r->print(&done(undef,$url));
return;
}
$env{'form.'.$formname.'.filename'} = $fname;
@@ -2227,9 +2275,11 @@ sub overwrite {
\%allfiles,\%codebase,undef,undef,undef,
undef,undef,undef,\$mimetype);
if ($result !~ m|^/uploaded/|) {
- $r->print('<p class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
- ,$result,&display_file(undef,$fname)).'</p>');
- $r->print(&after_overwrite(&mt('Back'),$url));
+ $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') {
@@ -2237,18 +2287,21 @@ sub overwrite {
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('<p>'.&mt('Overwriting completed.').'<br />'.
- &mt('No embedded items identified.').'</p>');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .'<br />'.&mt('No embedded items identified.')));
}
}
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
- $r->print(&after_overwrite(undef,$url));
}
- return;
-}
-sub after_overwrite {
- my ($text,$url) = @_;
my $group_elem;
if (defined($env{'form.group'})) {
$group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
@@ -2256,18 +2309,18 @@ sub after_overwrite {
$group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
}
}
- if ($text eq '') {
- $text = &mt('Done');
- }
my $hidden = &hidden_elems();
- return <<END;
-
-<h3><a href="javascript:document.overwritedone.submit();">$text</a></h3>
-<form name="overwritedone" method="post" action="$url" />
-$hidden
-$group_elem
-</form>
-END
+ $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 {
@@ -2405,7 +2458,7 @@ 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
}
@@ -2505,13 +2558,15 @@ 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;
}
@@ -2527,8 +2582,8 @@ sub get_quota {
}
} else {
$disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
- $env{'user.domain'}); #expressed in Mb
- $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+ $env{'user.domain'}); #expressed in MB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
}
return $disk_quota;
}
@@ -2558,6 +2613,58 @@ STATE
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
my $r = shift;
@@ -2631,7 +2738,7 @@ sub handler {
} else {
($uname,$udom) = &get_name_dom();
$portfolio_root = &get_portfolio_root();
- $title = &mt('My Space');
+ $title = 'My Space';
$can_modify = 1;
$can_delete = 1;
$can_upload = 1;
@@ -2645,16 +2752,19 @@ sub handler {
# 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));
+ $r->print(&Apache::loncommon::start_page($title, $js));
} else {
- $r->print(&Apache::loncommon::start_page($title,undef,
+ $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>'.
@@ -2668,8 +2778,9 @@ sub handler {
}
$r->rflush();
# 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',$uname,$udom);
+ &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"
@@ -2704,6 +2815,21 @@ sub handler {
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">'
@@ -2716,7 +2842,7 @@ sub handler {
}
if ($env{'form.meta'}) {
&open_form($r,$url);
- $r->print(&mt('Edit the meta data').'<br />');
+ $r->print(&mt('Edit Metadata').'<br />');
&close_form($r,$url);
}
if ($env{'form.uploaddoc.filename'}) {
@@ -2874,7 +3000,8 @@ sub handler {
&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_upload,$can_modify,$can_delete,$can_setacl,
+ $caller);
}
$r->print(&Apache::loncommon::end_page());
return OK;