--- loncom/xml/lonxml.pm 2001/08/15 15:49:14 1.114
+++ loncom/xml/lonxml.pm 2001/08/23 22:12:24 1.126
@@ -13,7 +13,7 @@
# 6/12,6/13 H. K. Ng
# 6/16 Gerd Kortemeyer
# 7/27 H. K. Ng
-# 8/7,8/9,8/10,8/11,8/15 Gerd Kortemeyer
+# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23 Gerd Kortemeyer
package Apache::lonxml;
use vars
@@ -152,8 +152,57 @@ sub xmlend {
return $discussion.'</html>';
}
-sub checkout {
- my ($target,$symb,$tuname,$tudom,$tcrsid)=@_;
+sub tokeninputfield {
+ my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
+ $defhost=~tr/a-z/A-Z/;
+ return (<<ENDINPUTFIELD)
+<script>
+ function updatetoken() {
+ var comp=new Array;
+ var barcode=unescape(document.tokeninput.barcode.value);
+ comp=barcode.split('*');
+ if (typeof(comp[0])!="undefined") {
+ document.tokeninput.codeone.value=comp[0];
+ }
+ if (typeof(comp[1])!="undefined") {
+ document.tokeninput.codetwo.value=comp[1];
+ }
+ if (typeof(comp[2])!="undefined") {
+ comp[2]=comp[2].toUpperCase();
+ document.tokeninput.codethree.value=comp[2];
+ }
+ document.tokeninput.barcode.value='';
+ }
+</script>
+<form method="post" name="tokeninput">
+<table border="2" bgcolor="#FFFFBB">
+<tr><th>DocID Checkin</th></tr>
+<tr><td>
+<table>
+<tr>
+<td>Scan in Barcode</td>
+<td><input type="text" size="22" name="barcode"
+onChange="updatetoken()"/></td>
+</tr>
+<tr><td><i>or</i> Type in DocID</td>
+<td>
+<input type="text" size="5" name="codeone" />
+<b><font size="+2">*</font></b>
+<input type="text" size="5" name="codetwo" />
+<b><font size="+2">*</font></b>
+<input type="text" size="10" name="codethree" value="$defhost"
+onChange="this.value=this.value.toUpperCase()" />
+</td></tr>
+</table>
+</td></tr>
+<tr><td><input type="submit" value="Check in DocID" /></td></tr>
+</table>
+</form>
+ENDINPUTFIELD
+}
+
+sub maketoken {
+ my ($symb,$tuname,$tudom,$tcrsid)=@_;
unless ($symb) {
$symb=&Apache::lonnet::symbread();
}
@@ -162,33 +211,21 @@ sub checkout {
$tudom=$ENV{'user.domain'};
$tcrsid=$ENV{'request.course.id'};
}
- my $now=time;
- my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
- my $infostr=&Apache::lonnet::escape(
- $tuname.'&'.
- $tudom.'&'.
- $tcrsid.'&'.
- $symb.'&'.
- $now.'&'.$ENV{'REMOTE_ADDR'});
- my $token=Apache::lonnet::reply('tmpput:'.$infostr,$lonhost);
- if ($token=~/^error\:/) { return ''; }
- $token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/;
- $token=~tr/a-z/A-Z/;
-
- my %infohash=('token' => $token,
- 'checktime' => $now,
- 'remote' => $ENV{'REMOTE_ADDR'});
-
- unless (
- &Apache::lonnet::cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
- return '';
- }
-
- if (&Apache::lonnet::log($tudom,$tuname,
- &Apache::lonnet::homeserver($tuname,$tudom),
- &Apache::lonnet::escape('Checkout '.$infostr.' - '.
- $token)) ne 'ok') {
- return '';
+
+ return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
+}
+
+sub printtokenheader {
+ my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;
+ unless ($token) { return ''; }
+
+ unless ($symb) {
+ $symb=&Apache::lonnet::symbread();
+ }
+ unless ($tuname) {
+ $tuname=$ENV{'user.name'};
+ $tudom=$ENV{'user.domain'};
+ $tcrsid=$ENV{'request.course.id'};
}
my %reply=&Apache::lonnet::get('environment',
@@ -200,14 +237,15 @@ sub checkout {
$reply{'generation'};
if ($target eq 'web') {
- return 'Checked out for '.$plainname.
+ return
+ '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
+ 'Checked out for '.$plainname.
'<br />User: '.$tuname.' at '.$tudom.
- '<br />CourseID: '.$tcrsid.')'.
+ '<br />CourseID: '.$tcrsid.
'<br />DocID: '.$token.
- '<br />Time: '.localtime($now).
- '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" /><hr />';
+ '<br />Time: '.localtime().'<hr />';
} else {
- return $token;
+ return $token;
}
}
@@ -284,11 +322,9 @@ ENDPARM
function LONCAPAstale() {
menu=window.open("","LONCAPAmenu");
menu.currentStale=1;
- menu.switchbutton
- (3,1,'reload.gif','return','location','go(currentURL)');
- menu.clearbut(7,1);
- menu.clearbut(7,2);
- menu.clearbut(7,3);
+ //menu.clearbut(7,1);
+ //menu.clearbut(7,2);
+ //menu.clearbut(7,3);
menu.menucltim=menu.setTimeout(
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
@@ -370,7 +406,9 @@ sub xmlparse {
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
$safeeval,\%style_for_target);
-
+ if ($ENV{'request.uri'}) {
+ &writeallows($ENV{'request.uri'});
+ }
return $finaloutput;
}
@@ -397,7 +435,6 @@ sub htmlclean {
sub inner_xmlparse {
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
- &Apache::lonxml::debug('Reentrant parser starting, again?');
my $finaloutput = '';
my $result;
my $token;
@@ -619,6 +656,7 @@ sub setup_globals {
my ($target)=@_;
$Apache::lonxml::registered = 0;
@Apache::lonxml::pwd=();
+ @Apache::lonxml::extlinks=();
if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
@@ -700,7 +738,10 @@ sub init_safespace {
#need to inspect this class of ops
# $safeeval->deny(":base_orig");
$safeinit .= ';$external::target="'.$target.'";';
- $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
+ my $rndseed;
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+ $safeinit .= ';$external::randomseed='.$rndseed.';';
&Apache::run::run($safeinit,$safeeval);
}
@@ -835,6 +876,7 @@ sub parstring {
}
sub writeallows {
+ unless ($#extlinks>=0) { return; }
my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
if ($ENV{'httpref.'.$thisurl}) {
$thisurl=$ENV{'httpref.'.$thisurl};
@@ -844,7 +886,9 @@ sub writeallows {
my %httpref=();
map {
$httpref{'httpref.'.
- &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; } @extlinks;
+ &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
+ } @extlinks;
+ @extlinks=();
&Apache::lonnet::appenv(%httpref);
}
@@ -993,10 +1037,11 @@ ENDNOTFOUND
unless ($ENV{'request.state'} eq 'published') {
$result=&inserteditinfo($result,$filecontents);
}
+
+ writeallows($request->uri);
$request->print($result);
- writeallows($request->uri);
return OK;
}
@@ -1081,6 +1126,29 @@ sub description {
my ($token)=@_;
return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
}
+
+# ----------------------------------------------------------------- whichuser
+# returns a list of $symb, $courseid, $domain, $name that is correct for
+# calls to lonnet functions for this setup.
+# - looks for form.grade_ parameters
+sub whichuser {
+ my $symb=&Apache::lonnet::symbread();
+ my $courseid=$ENV{'request.course.id'};
+ my $domain=$ENV{'user.domain'};
+ my $name=$ENV{'user.name'};
+ if (defined($ENV{'form.grade_symb'})) {
+ my $tmp_courseid=$ENV{'form.grade_courseid'};
+ my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
+ if ($allowed) {
+ $symb=$ENV{'form.grade_symb'};
+ $courseid=$ENV{'form.grade_courseid'};
+ $domain=$ENV{'form.grade_domain'};
+ $name=$ENV{'form.grade_username'};
+ }
+ }
+ return ($symb,$courseid,$domain,$name);
+}
+
1;
__END__