--- loncom/interface/portfolio.pm 2014/01/14 18:54:56 1.252 +++ loncom/interface/portfolio.pm 2014/12/07 19:45:19 1.255 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.252 2014/01/14 18:54:56 bisitz Exp $ +# $Id: portfolio.pm,v 1.255 2014/12/07 19:45:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -232,7 +232,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; } @@ -365,7 +365,7 @@ sub display_directory { } (@{$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::grades::file_name_version_ext($filename); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename); if ($version) { my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); push(@{ $versioned{$fullpath} }, @@ -378,7 +378,7 @@ sub display_directory { 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; @@ -912,7 +912,7 @@ sub display_access { } $info .= "
".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme
"; 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").'
'; + $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.").'
'; } } else { $header = '

'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'. @@ -942,9 +942,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.').'
'."\n". - &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'
'."\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.').'
'; } sub view_access_settings { @@ -985,8 +987,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 +1066,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 +1177,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}; } @@ -1183,6 +1189,7 @@ sub update_access { course => 'course/community', domains => 'domain', users => 'user', + ip => 'IP', ); foreach my $newitem (@types) { next if ($env{'form.new'.$newitem} <= 0); @@ -1286,6 +1293,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; } @@ -1311,6 +1325,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); @@ -1320,6 +1341,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); @@ -1342,6 +1364,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} ++; @@ -1353,7 +1377,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(''); } @@ -1398,14 +1422,14 @@ sub standard_settings { $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); $r->print(' '. - ''); + ''); 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') { @@ -1436,24 +1460,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(''); &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then); $r->print(' '); &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then); - $r->print(''); - if ($acl_count->{course} > 0) { - $r->print(''); - } else { - $r->print(''); - } + $r->print(''); &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then); - $r->print(''); + $r->print(' '); + &access_element($r,'ip',$acl_count,$ips,$access_controls,$now,$then); $r->print(''); } @@ -1473,7 +1493,8 @@ sub access_element { my %typetext = ( domains => 'Domain', users => 'User', - course => 'Course/Community' + course => 'Course/Community', + ip => 'IP', ); $r->print('

'.&mt($typetext{$type}.'-based conditional access:').' '); if ($$acl_count{$type}) { @@ -1498,6 +1519,9 @@ sub display_access_row { } 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; @@ -1507,7 +1531,6 @@ sub display_access_row { $r->print(''.&mt('Action?').''.$showtype.''. &mt('Dates available').''); if ($type eq 'course' && $status eq 'old') { - $r->print(''.&mt('Allowed course/community affiliations'). ''); $colspan ++; @@ -1524,6 +1547,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()); } @@ -1702,6 +1727,23 @@ sub users_row { $r->print(''.&actionbox($status,$num,$scope).''.&mt("Format for users' username:domain information:").'
sparty:msu,illini:uiuc ... etc.
'.&dateboxes($num,$start,$end).''); } +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(''.&actionbox($status,$num,$scope).''.&mt('Format for IP controls').'
'. + &mt('[_1] or [_2] or [_3] or [_4] or [_5]','35.8.*','35.8.3.[34-56]', + '*.msu.edu','35.8.3.34','somehostname.pa.msu.edu').'
'. + &mt('Use a comma to separate different ranges.').'
'. + ''. + ''.&dateboxes($num,$start,$end).''); +} + sub additional_item { my ($type) = @_; my $showtype; @@ -1711,6 +1753,8 @@ sub additional_item { $showtype = 'domain'; } elsif ($type eq 'users') { $showtype = 'user'; + } elsif ($type eq 'ip') { + $showtype = 'IP'; } return &mt('Add new '.$showtype.'-based condition(s)?') @@ -1723,7 +1767,7 @@ sub actionbox { my $output = ''; + $output .= ''; return $output; }