version 1.125, 2015/09/23 20:09:07
|
version 1.126, 2015/09/23 23:04:53
|
Line 1000 sub allowed_slot {
|
Line 1000 sub allowed_slot {
|
return 0 if (!$userallowed); |
return 0 if (!$userallowed); |
|
|
# not allowed for this resource |
# not allowed for this resource |
if (defined($slot->{'symb'}) |
if (defined($slot->{'symb'})) { |
&& $slot->{'symb'} ne $symb) { |
my $exclude = 1; |
unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { |
my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'}); |
return 0; |
if ($sloturl=~/\.(page|sequence)$/) { |
|
my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb); |
|
if (($map ne '') && ($map eq $slotmap)) { |
|
$exclude = 0; |
|
} |
|
} elsif ($slot->{'symb'} eq $symb) { |
|
$exclude = 0; |
|
} |
|
if ($exclude) { |
|
unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { |
|
return 0; |
|
} |
} |
} |
} |
} |
|
|
Line 1349 sub show_table {
|
Line 1360 sub show_table {
|
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'space' => '# of students/max', |
'space' => '# of students/max', |
'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
'symb' => 'Resource slot is restricted to.', |
'symb' => 'Resource/Map slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
'allowedusers' => 'Users slot is restricted to.', |
'allowedusers' => 'Users slot is restricted to.', |
'uniqueperiod' => 'Period of time slot is unique', |
'uniqueperiod' => 'Period of time slot is unique', |
Line 2672 sub csvupload_fields {
|
Line 2683 sub csvupload_fields {
|
['proctor','List of proctor ids'], |
['proctor','List of proctor ids'], |
['description','Slot Description'], |
['description','Slot Description'], |
['maxspace','Maximum number of reservations'], |
['maxspace','Maximum number of reservations'], |
['symb','Resource Restriction'], |
['symb','Resource/Map Restriction'], |
['uniqueperiod','Date range of slot exclusion'], |
['uniqueperiod','Date range of slot exclusion'], |
['secret','Secret word proctor uses to validate'], |
['secret','Secret word proctor uses to validate'], |
['allowedsections','Sections slot is restricted to'], |
['allowedsections','Sections slot is restricted to'], |