--- loncom/html/adm/helper/newslot.helper 2011/12/20 22:47:56 1.29 +++ loncom/html/adm/helper/newslot.helper 2017/01/20 06:23:37 1.34 @@ -26,8 +26,32 @@ my $name=$helper->{VARS}{'origname'}; my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum); if (!ref($slot{$name})) { return $default; } - if (!exists($slot{$name}{$which})) { return $default; } - return $slot{$name}{$which}; + if (($which eq 'ipdeny') || ($which eq 'ipallow')) { + if (!exists($slot{$name}{'ip'})) { return $default; } + } else { + if (!exists($slot{$name}{$which})) { return $default; } + } + if (($which eq 'ipdeny') || ($which eq 'ipallow')) { + my @allows; + my @denies; + foreach my $item (split(',',$slot{$name}{'ip'})) { + $item =~ s/^\s*//; + $item =~ s/\s*$//; + if ($item =~ /^\!(.+)$/) { + push(@denies,$1); + } else { + push(@allows,$item); + } + } + if ($which eq 'ipdeny') { + return join(',',@denies); + } + if ($which eq 'ipallow') { + return join(',',@allows); + } + } else { + return $slot{$name}{$which}; + } } @@ -220,25 +244,68 @@ usable for any resource. - restricted to a specific resource. + restricted to resources in specific folder(s)/composite page(s). + restricted to specific resource(s). my $default=&{$helper->{DATA}{origslot}}('symb'); - if ($default) { return 'resource'; } - return 'any'; + if ($default) { + my @symbs; + if ($default =~ /,/) { + @symbs = split(/\s*,\s*/,$default); + } else { + @symbs = ($default); + } + if (grep(/\.(page|sequence)$/,@symbs)) { + return 'map'; + } else { + return 'resource'; + } + } else { + return 'any'; + } + + +

IP restrictions -- allow from all except:
    + + + + + return undef; + + + return &{$helper->{DATA}{origslot}}('ipdeny'); + + -

IP restrictions:
    +

IP restrictions -- deny from all except:
    - + + return undef; - return &{$helper->{DATA}{origslot}}('ip'); + return &{$helper->{DATA}{origslot}}('ipallow'); + + +

Does each student need to use a unique IP address to access a resource with this slot?

+ + + No. The student's IP address is not tied for later access to the same resource. + Yes. The IP address on a student's first access to a resource is tied for later access. + Yes. The IP address on a student's first access to a resource is tied for later access (including post-answer date). + + my $default=&{$helper->{DATA}{origslot}}('iptied'); + if ($default eq 'yes') { return 'yes'; } + if ($default eq 'answer') { return 'answer'; } + return 'no'; + +

@@ -247,15 +314,38 @@ PROCTOR - - return $res->is_problem() + + return $res->is_map() || $res->is_problem() + return $res->is_problem() return $res->symb() - return &{$helper->{DATA}{origslot}}('symb'); + my @defaults; + my $default=&{$helper->{DATA}{origslot}}('symb'); + if ($default) { + @defaults=(split(/\s*,\s*/,$default)); + } + return @defaults; + + + PROCTOR + + + return $res->is_map() + return $res->symb() + + my @defaults; + my $default=&{$helper->{DATA}{origslot}}('symb'); + if ($default) { + @defaults=(split(/\s*,\s*/,$default)); + } + return @defaults; + + + @@ -294,16 +384,16 @@ - Select sections to limit slot availability to:
    +

Select sections to limit slot availability to:

   
- return join('|||', + return join('|||', split(',',&{$helper->{DATA}{origslot}}('allowedsections')));
- Select users to limit slot availability to:
    +

Select users to limit slot availability to:

    @@ -314,7 +404,7 @@ - + Created Slot @@ -326,12 +416,32 @@ $slot{$which} = $helper->{'VARS'}{$which}; } - foreach my $which ('ip','description','maxspace','secret','symb') { + foreach my $which ('description','maxspace','secret') { if ( $helper->{'VARS'}{$which} =~/\S/ ) { $slot{$which} = $helper->{'VARS'}{$which}; } } + if ($helper->{'VARS'}{'ipdeny'} =~/\S/ ) { + foreach my $item (split(',',$helper->{'VARS'}{'ipdeny'})) { + $item =~ s/^\s*//; + $item =~ s/\s*$//; + $slot{'ip'} .= '!'.$item.','; + } + } + + if ($helper->{'VARS'}{'ipallow'} =~/\S/ ) { + foreach my $item (split(',',$helper->{'VARS'}{'ipallow'})) { + $item =~ s/^\s*//; + $item =~ s/\s*$//; + $slot{'ip'} .= $item.','; + } + } + + if ($slot{'ip'} ne '') { + $slot{'ip'} =~s /,$//; + } + if ($helper->{'VARS'}{'type'} eq 'schedulable_student') { if (($helper->{'VARS'}{'reservationmsg'} eq 'only_student') || ($helper->{'VARS'}{'reservationmsg'} eq 'student_and_user_notes_screen')) { @@ -341,6 +451,17 @@ } } + if (($helper->{'VARS'}{'restricttosymb'} =~ /^(map|resource)$/) && + ($helper->{'VARS'}{'symb'} =~ /\S/)) { + my @symbs; + foreach my $symb (split(/\|\|\|/, $helper->{'VARS'}{'symb'})) { + push(@symbs,$symb); + } + # make sure the symbs are unique + my %symbs = map { ($_,1) } @symbs; + $slot{'symb'}=join(',',sort(keys(%symbs))); + } + if ( $helper->{'VARS'}{'startreserve'} > 0) { $slot{'startreserve'} = $helper->{'VARS'}{'startreserve'}; } @@ -355,6 +476,10 @@ $helper->{'VARS'}{'endunique'}]; } + if ( $helper->{'VARS'}{'iptied'} =~ /^(yes|answer)$/ ) { + $slot{'iptied'} = lc($helper->{'VARS'}{'iptied'}); + } + if ( $helper->{'VARS'}{'useproctor'} eq 'yes' && $helper->{'VARS'}{'proctor'} =~/\S/ ) { my @names; @@ -364,7 +489,7 @@ my ($uname,$udomain)=split(/:/,$user); push(@names,"$uname:$udomain"); } - # make sure the usernmaes are unique + # make sure the usernames are unique my %proctors = map { ($_,1) } @names; $slot{'proctor'}=join(',',sort(keys(%proctors))); } @@ -405,13 +530,35 @@ "\n".'
  • Type: '.$slot{'type'}.'
    • '; my %labels = map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields(); - foreach my $which ('ip','description','maxspace','secret','symb', + foreach my $which ('ip','description','maxspace','secret', 'allowedsections','allowedusers') { if (exists($slot{$which})) { $result.="\n".'
  • '.$labels{$which}.': '. &HTML::Entities::encode($slot{$which}).'
    • '; } } + if (exists($slot{'iptied'})) { + $result.="\n".'
  • '.$labels{'iptied'}.': '; + if ($slot{'iptied'} eq 'yes') { + $result.=&Apache::lonlocal::mt('yes'); + } elsif ($slot{'iptied'} eq 'answer') { + $result.=&Apache::lonlocal::mt('yes, including post-answer date'); + } + $result.='
    • '; + } + if (exists($slot{'symb'})) { + $result.="\n".'
  • '.$labels{'symb'}.': '; + if ($slot{'symb'} =~ /,/) { + $result.='
      '; + foreach my $symb (split(/\s*,\s*/,$slot{'symb'})) { + $result.='
    • '.&HTML::Entities::encode($symb).'
      • '; + } + $result.='
    '; + } else { + $result.=&HTML::Entities::encode($slot{'symb'}); + } + $result.='
    • '; + } if (exists($slot{'startreserve'})) { $result.="\n".'
  • '.$labels{'startreserve'}.': '. &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'
    • ';