version 1.87, 2008/02/01 22:05:45
|
version 1.88, 2008/08/28 00:14:42
|
Line 31 use strict;
|
Line 31 use strict;
|
use Apache::lonxml(); |
use Apache::lonxml(); |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
|
|
|
|
BEGIN { |
BEGIN { |
Line 70 sub start_essayresponse {
|
Line 70 sub start_essayresponse {
|
|
|
if ($ncol > 0) { |
if ($ncol > 0) { |
$result .='<tr><td>'.'<label>'. |
$result .='<tr><td>'.'<label>'. |
'Collaborators: <input type="text" size="70" max="80" name="HWCOL'. |
&mt('Collaborators:').' <input type="text" size="70" max="80" name="HWCOL'. |
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}). |
&mt('(Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].)',$ncol,$env{'user.domain'}); |
'</label><br />'; |
if ($ncol > 1) { |
|
$result .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.'); |
|
} |
|
$result .= '</label><br />'; |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .='</td></tr>'; |
$result .='</td></tr>'; |
} |
} |
Line 286 sub check_collaborators {
|
Line 289 sub check_collaborators {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
my (@badcollaborators,$result); |
my (@badcollaborators,$result); |
my (@collaborators) = split(/\,?\s+/,$coll); |
|
foreach (@collaborators) { |
my (@collaborators) = split(/,?\s+/,$coll); |
my $collaborator = $_; |
foreach my $entry (@collaborators) { |
if (/@/) { |
my $collaborator; |
$collaborator =~ s/@/:/; |
if ($entry =~ /:/) { |
|
$collaborator = $entry; |
} else { |
} else { |
$collaborator = $_.':'.$env{'user.domain'}; |
$collaborator = $entry.':'.$env{'user.domain'}; |
} |
} |
push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); |
if ($collaborator !~ /^$match_username:$match_domain$/) { |
|
if (!grep(/^\Q$entry\E$/,@badcollaborators)) { |
|
push(@badcollaborators,$entry); |
|
} |
|
} elsif (!grep(/^\Q$collaborator\E$/i,keys(%classlist))) { |
|
if (!grep(/^\Q$entry\E$/,@badcollaborators)) { |
|
push(@badcollaborators,$entry); |
|
} |
|
} |
} |
} |
|
|
if (scalar(@badcollaborators)) { |
my $numbad = scalar(@badcollaborators); |
$result = '<table border="0"><tr bgcolor="#ffbbbb"><td> The following user'. |
if ($numbad) { |
(scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. |
$result = '<table border="0"><tr bgcolor="#ffbbbb"><td>'; |
join(', ',@badcollaborators).'. Please correct.</td></tr></table>'; |
if ($numbad == 1) { |
|
$result .= &mt('The following user is invalid:'); |
|
} else { |
|
$result .= &mt('The following [_1] users are invalid:',$numbad); |
|
} |
|
$result .= ' '.join(', ',@badcollaborators).'. '.&mt('Please correct.'). |
|
'</td></tr></table>'; |
} |
} |
my $toomany = scalar(@collaborators) - $ncol; |
my $toomany = scalar(@collaborators) - $ncol; |
if ($toomany > 0) { |
if ($toomany > 0) { |
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'. |
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'. |
'You have too many collaborators. Please remove '.$toomany.' collaborator'. |
&mt('You have too many collaborators.').' '. |
($toomany > 1 ? 's' :'').'.</td></tr></table>'; |
&mt('Please remove [quant,_1,collaborator].',$toomany). |
|
'</td></tr></table>'; |
} |
} |
return $result; |
return $result; |
} |
} |