--- loncom/interface/portfolio.pm 2013/07/03 16:00:03 1.247
+++ loncom/interface/portfolio.pm 2016/08/07 23:14:30 1.254.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.247 2013/07/03 16:00:03 raeburn Exp $
+# $Id: portfolio.pm,v 1.254.2.1 2016/08/07 23:14:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -199,7 +199,8 @@ sub display_portfolio_usage {
.$helpitem
.'</div>'
.'<div>'
- .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+ $disk_quota,'portfolio')
.'</div>');
}
@@ -536,7 +537,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>');
@@ -912,7 +913,7 @@ sub display_access {
}
$info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/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>'.
@@ -942,9 +943,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 {
@@ -985,8 +988,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;
@@ -1063,6 +1067,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(' ');
}
@@ -1171,7 +1178,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};
}
@@ -1179,24 +1186,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 {
@@ -1281,6 +1294,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;
}
@@ -1306,6 +1326,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);
@@ -1315,6 +1342,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);
@@ -1337,6 +1365,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} ++;
@@ -1348,7 +1378,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>');
}
@@ -1393,14 +1423,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') {
@@ -1431,24 +1461,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>');
}
@@ -1465,19 +1491,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'));
}
@@ -1488,13 +1510,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;
@@ -1504,7 +1532,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 ++;
@@ -1521,6 +1548,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());
}
@@ -1532,8 +1561,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;
}
@@ -1541,6 +1574,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;
@@ -1580,6 +1614,7 @@ function getIndexByValue(name,value) {
return -1;
}
+// ]]>
</script>
|;
}
@@ -1632,7 +1667,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;
@@ -1693,18 +1728,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 {
@@ -1712,7 +1768,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.'" '.
@@ -1724,7 +1780,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;
}
@@ -2389,7 +2445,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
}
@@ -2511,8 +2567,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;
}
@@ -2615,7 +2671,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;
@@ -2700,7 +2756,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'}) {