--- loncom/xml/lonxml.pm	2012/04/11 15:58:07	1.529
+++ loncom/xml/lonxml.pm	2012/08/01 05:17:02	1.531.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.529 2012/04/11 15:58:07 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.4 2012/08/01 05:17:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -228,6 +228,100 @@ sub xmlend {
     return $discussion;
 }
 
+sub tokeninputfield {
+    my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
+    $defhost=~tr/a-z/A-Z/;
+    return (<<ENDINPUTFIELD)
+<script type="text/javascript">
+    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" action="">
+<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();
+    }
+    unless ($tuname) {
+        $tuname=$env{'user.name'};
+        $tudom=$env{'user.domain'};
+        $tcrsid=$env{'request.course.id'};
+    }
+    return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
+}
+
+sub printtokenheader {
+    my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
+    unless ($token) { return ''; }
+
+    my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
+    unless ($tsymb) {
+        $tsymb=$symb;
+    }
+    unless ($tuname) {
+        $tuname=$name;
+        $tudom=$domain;
+        $tcrsid=$courseid;
+    }
+
+    my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
+
+    if ($target eq 'web') {
+        my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
+        return
+ '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
+               &mt('Checked out for').' '.$plainname.
+               '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
+               '<br />'.&mt('ID').': '.$idhash{$tuname}.
+               '<br />'.&mt('CourseID').': '.$tcrsid.
+               '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
+               '<br />'.&mt('DocID').': '.$token.
+               '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
+    } else {
+        return $token;
+    }
+}
+
 sub printalltags {
   my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {
@@ -1510,12 +1604,12 @@ sub renderingoptions {
 }
 
 sub inserteditinfo {
-      my ($filecontents, $filetype, $filename)=@_;
+      my ($filecontents,$filetype,$filename,$symb,$itemtitle) = @_;
       $filecontents = &HTML::Entities::encode($filecontents,'<>&"');
       my $xml_help = '';
       my $initialize='';
       my $textarea_id = 'filecont';
-      my $dragmath_button;
+      my ($dragmath_button,$deps_button);
       my ($add_to_onload, $add_to_onresize);
       $initialize=&Apache::lonhtmlcommon::spellheader();
       if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
@@ -1536,6 +1630,11 @@ sub inserteditinfo {
 </script>
 FULLPAGE
       if ($filetype eq 'html') {
+          if ($symb) {
+              $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+              $initialize .= 
+                  &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle)."\n";
+          }
           $dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
           $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
       }
@@ -1580,7 +1679,7 @@ $initialize
     <div class="LC_edit_problem_discards">
       <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
       <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
-      $htmlerror $dragmath_button
+      $htmlerror $deps_button $dragmath_button
     </div>
     <div class="LC_edit_problem_saves">
       <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
@@ -1789,26 +1888,17 @@ ENDNOTFOUND
     unless ($env{'request.state'} eq 'published') {
 	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
 	{
-	    my $displayfile=$request->uri;
-            if ($displayfile =~ m{^/uploaded/}) {
-                if ($env{'request.course.id'}) {
-                    my $symb = &Apache::lonnet::symbread();
-                    my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
-                    my $navmap=Apache::lonnavmaps::navmap->new;
-                    if (ref($navmap)) {
-                        my $res = $navmap->getBySymb($symb);
-                        my @pathitems = 
-                            &Apache::loncommon::get_folder_hierarchy($navmap,$map,1);
-                        push(@pathitems,$res->compTitle());
-                        $displayfile = join(' &raquo; ',@pathitems);
-                    }
-                }
+            my ($displayfile,$url,$symb,$itemtitle);
+	    $displayfile=$request->uri;
+            if ($request->uri =~ m{^/uploaded/}) {
+                ($symb,$itemtitle,$displayfile) = 
+                    &get_courseupload_hierarchy($request->uri);
             } else {
 	        $displayfile=~s/^\/[^\/]*//;
             }
 
 	    my ($edit_info, $add_to_onload, $add_to_onresize)=
-		&inserteditinfo($filecontents,$filetype,$displayfile);
+		&inserteditinfo($filecontents,$filetype,$displayfile,$symb,$itemtitle);
 
 	    my %options = 
 		('add_entries' =>
@@ -1858,6 +1948,27 @@ sub display_title {
     return $result;
 }
 
+sub get_courseupload_hierarchy {
+    my ($url) = @_;
+    my ($symb,$itemtitle,$displaypath);
+    if ($env{'request.course.id'}) {
+        $symb = &Apache::lonnet::symbread($url);
+        my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
+        my $navmap=Apache::lonnavmaps::navmap->new;
+        if (ref($navmap)) {
+            my $res = $navmap->getBySymb($symb);
+            if (ref($res)) {
+                my @pathitems =
+                    &Apache::loncommon::get_folder_hierarchy($navmap,$map,1);
+                $itemtitle = $res->compTitle();
+                push(@pathitems,$itemtitle);
+                $displaypath = join(' &raquo; ',@pathitems);
+            }
+        }
+    }
+    return ($symb,$itemtitle,$displaypath);
+}
+
 sub debug {
     if ($Apache::lonxml::debug eq "1") {
 	$|=1;
@@ -1940,7 +2051,7 @@ sub error {
 	    my @userlist;
 	    foreach (keys %users) {
 		my ($user,$domain) = split(/:/, $_);
-		push(@userlist,"$user\@$domain");
+		push(@userlist,"$user:$domain");
 		my $key=$declutter.'_'.$user.'_'.$domain;
 		my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
 						      [$key],
@@ -1963,7 +2074,7 @@ sub error {
 		$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
 	    }
 	}
-	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
+	push(@Apache::lonxml::error_messages,"<span class=\"LC_warning\">$errormsg</span><br />");
     }
 }