--- loncom/homework/bridgetask.pm 2006/04/10 07:30:54 1.137
+++ loncom/homework/bridgetask.pm 2006/04/10 07:37:39 1.138
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.137 2006/04/10 07:30:54 albertel Exp $
+# $Id: bridgetask.pm,v 1.138 2006/04/10 07:37:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@ sub proctor_check_auth {
my @allowed=split(",",$slot->{'proctor'});
foreach my $possible (@allowed) {
- my ($puser,$pdom)=(split('@',$possible));
+ my ($puser,$pdom)=(split(':',$possible));
if ($puser eq $user && $pdom eq $domain) {
my $authenticated=0;
if ( $slot->{'secret'} =~ /\S/ &&
@@ -95,7 +95,7 @@ sub proctor_check_auth {
#setup new version and who did it
$Apache::lonhomework::results{'resource.0.version'}=$version;
$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
$slot_name;
@@ -103,7 +103,7 @@ sub proctor_check_auth {
} elsif ($authenticated && $type eq 'problem') {
&Apache::lonxml::debug("authed $slot_name");
$Apache::lonhomework::results{"resource.0.checkedin"}=
- $user.'@'.$domain;
+ $user.':'.$domain;
$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
$slot_name;
}
@@ -632,7 +632,7 @@ sub get_key_todo {
}
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
#need to try both queues..
if (defined($env{'form.regradeaspecificsubmission'}) &&
@@ -678,7 +678,7 @@ sub get_key_todo {
#otherwise (defined($who) && $who ne $me) some else has it...
return (undef,'not_allowed',
&mt('Another user ([_1]) currently has the record for [_2] locked.',
- $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));
+ $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
}
@@ -906,7 +906,7 @@ DONEBUTTON
}
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
$Apache::lonhomework::results{'resource.0.regrader'}=
- $env{'user.name'}.'@'.$env{'user.domain'};
+ $env{'user.name'}.':'.$env{'user.domain'};
if ($review) {
$Apache::lonhomework::results{"resource.$version.0.status"}='review';
if ($env{'form.queue'} eq 'reviewqueue') {
@@ -1022,11 +1022,11 @@ sub check_queue_unlock {
if ($queue eq 'none') { return 'ok'; }
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
if (!defined($key)) {
- $key="$symb\0queue\0$uname\@$udom";
+ $key="$symb\0queue\0$uname:$udom";
}
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
if ($who eq $me) {
return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
@@ -1089,7 +1089,7 @@ sub get_queue_data {
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $todo="$symb\0queue\0$uname\@$udom";
+ my $todo="$symb\0queue\0$uname:$udom";
my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
if ($key eq $todo && ref($value)) {
return $value;
@@ -1135,7 +1135,7 @@ sub add_to_queue {
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
my %data;
- $data{"$symb\0queue\0$uname\@$udom"}=$user_data;
+ $data{"$symb\0queue\0$uname:$udom"}=$user_data;
return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
}
@@ -1184,7 +1184,7 @@ sub show_queue {
my $ekey=&Apache::lonnet::escape($key);
my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
$status=&mt('Locked by [_1]',$queue{"$key\0locked"});
if ($me eq $queue{"$key\0locked"}) {
($action,$description)=('resume',&mt('Resume'));
@@ -1218,7 +1218,7 @@ FORM
}
}
$result.= "| ".$fullname->{$uname.':'.$udom}.
- " ($uname\@$udom) | ";
+ " ($uname:$udom) ";
$result.='Slot: '.$slot.' End time: '.
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
" | ";
@@ -1265,13 +1265,13 @@ sub get_queue_counts {
sub encode_queue_key {
my ($symb,$udom,$uname)=@_;
- return "$symb\0queue\0$uname\@$udom";
+ return "$symb\0queue\0$uname:$udom";
}
sub decode_queue_key {
my ($key)=@_;
my ($symb,undef,$user) = split("\0",$key);
- my ($uname,$udom) = split('@',$user);
+ my ($uname,$udom) = split(':',$user);
return ($symb,$uname,$udom);
}
@@ -1334,7 +1334,7 @@ sub pick_from_queue_data {
sub find_mid_grade {
my ($queue,$symb,$cdom,$cnum)=@_;
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
if ($todo) {
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
if ($who eq $me) { return $todo; }
@@ -1354,7 +1354,7 @@ sub find_mid_grade {
sub lock_key {
my ($queue,$todo)=@_;
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
my (undef,$cid)=&Apache::lonxml::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
@@ -1848,7 +1848,7 @@ sub grading_history {
foreach my $t (1..$Apache::lonhomework::history{'version'}) {
if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
my ($gname,$gdom) =
- split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});
+ split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
my $fullname = &Apache::loncommon::plainname($gname,$gdom);
$grader = &Apache::loncommon::aboutmewrapper($fullname,
$gname,$gdom);
@@ -1972,7 +1972,7 @@ sub proctor_validation_screen {
| Student who should be logged in is: |
| Name: | $name |
| Student ID: | $env{'environment.id'} |
- | Usename | $user\@$domain |
+ | Usename | $user:$domain |
 |