--- loncom/lonnet/perl/lonnet.pm	2004/10/26 17:20:09	1.554
+++ loncom/lonnet/perl/lonnet.pm	2004/11/27 17:23:08	1.571
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.554 2004/10/26 17:20:09 www Exp $
+# $Id: lonnet.pm,v 1.571 2004/11/27 17:23:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,18 +38,17 @@ use vars
 qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom 
    %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache
    %courselogs %accesshash %userrolehash $processmarker $dumpcount 
-   %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache 
+   %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %courseresdatacache 
    %userresdatacache %getsectioncache %domaindescription %domain_auth_def %domain_auth_arg_def 
-   %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir);
+   %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit);
 
 use IO::Socket;
 use GDBM_File;
 use Apache::Constants qw(:common :http);
 use HTML::LCParser;
 use Fcntl qw(:flock);
-use Apache::loncoursedata;
 use Apache::lonlocal;
-use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw);
+use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze);
 use Time::HiRes qw( gettimeofday tv_interval );
 my $readit;
 my $max_connection_retries = 10;     # Or some such value.
@@ -1189,8 +1188,7 @@ sub ssi_body {
     my ($filelink,%form)=@_;
     my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                      &ssi($filelink,%form));
-    $output=~
-            s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
+    $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
     $output=~s/^.*?\<body[^\>]*\>//si;
     $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
     return $output;
@@ -1409,9 +1407,9 @@ sub finishuserfileupload {
 # Save the file
     {
 	#&Apache::lonnet::logthis("Saving to $filepath $file");
-       open(my $fh,'>'.$filepath.'/'.$file);
-       print $fh $ENV{'form.'.$formname};
-       close($fh);
+	open(FH,'>'.$filepath.'/'.$file);
+	print FH $ENV{'form.'.$formname};
+	close(FH);
     }
 # Notify homeserver to grep it
 #
@@ -1492,12 +1490,12 @@ sub flushcourselogs {
         if ($courseidbuffer{$coursehombuf{$crsid}}) {
            $courseidbuffer{$coursehombuf{$crsid}}.='&'.
 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                         '='.&escape($courseinstcodebuf{$crsid});
+                         ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
         } else {
            $courseidbuffer{$coursehombuf{$crsid}}=
 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                         '='.&escape($courseinstcodebuf{$crsid});
-        }    
+                         ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+        }
     }
 #
 # Write course id database (reverse lookup) to homeserver of courses 
@@ -1572,6 +1570,8 @@ sub courselog {
        $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
     $courseinstcodebuf{$ENV{'request.course.id'}}=
        $ENV{'course.'.$ENV{'request.course.id'}.'.internal.coursecode'};
+    $courseownerbuf{$ENV{'request.course.id'}}=
+       $ENV{'course.'.$ENV{'request.course.id'}.'.internal.courseowner'};
     if (defined $courselogs{$ENV{'request.course.id'}}) {
 	$courselogs{$ENV{'request.course.id'}}.='&'.$what;
     } else {
@@ -1715,7 +1715,7 @@ sub courseidput {
 }
 
 sub courseiddump {
-    my ($domfilter,$descfilter,$sincefilter,$hostidflag,$hostidref)=@_;
+    my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$hostidflag,$hostidref)=@_;
     my %returnhash=();
     unless ($domfilter) { $domfilter=''; }
     foreach my $tryserver (keys %libserv) {
@@ -1723,7 +1723,8 @@ sub courseiddump {
 	    if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
 	        foreach (
                  split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
-			       $sincefilter.':'.&escape($descfilter),
+			       $sincefilter.':'.&escape($descfilter).':'.
+                               &escape($instcodefilter).':'.&escape($ownerfilter),
                                $tryserver))) {
 		    my ($key,$value)=split(/\=/,$_);
                     if (($key) && ($value)) {
@@ -2389,10 +2390,8 @@ sub rolesinit {
     my $rolesdump=reply("dump:$domain:$username:roles",$authhost);
     if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
     my %allroles=();
-    my %thesepriv=();
     my $now=time;
     my $userroles="user.login.time=$now\n";
-    my $thesestr;
 
     if ($rolesdump ne '') {
         foreach (split(/&/,$rolesdump)) {
@@ -2400,94 +2399,21 @@ sub rolesinit {
             my ($area,$role)=split(/=/,$_);
             $area=~s/\_\w\w$//;
             my ($trole,$tend,$tstart)=split(/_/,$role);
-            $userroles.='user.role.'.$trole.'.'.$area.'='.
-                        $tstart.'.'.$tend."\n";
-# log the associated role with the area
-            &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
-            if ($tend!=0) {
-	        if ($tend<$now) {
-	            $trole='';
-                } 
-            }
-            if ($tstart!=0) {
-                if ($tstart>$now) {
-                   $trole='';        
-                }
-            }
+            $userroles.=&set_arearole($trole,$area,$tstart,$tend);
+            if (($tend!=0) && ($tend<$now)) { $trole=''; }
+            if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
             if (($area ne '') && ($trole ne '')) {
 		my $spec=$trole.'.'.$area;
 		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
 		if ($trole =~ /^cr\//) {
-		    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
- 		    my $homsvr=homeserver($rauthor,$rdomain);
-		    if ($hostname{$homsvr} ne '') {
-			my ($rdummy,$roledef)=
-			   &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
-				
-			if (($rdummy ne 'con_lost') && ($roledef ne '')) {
-			    my ($syspriv,$dompriv,$coursepriv)=
-				split(/\_/,$roledef);
-			    if (defined($syspriv)) {
-				$allroles{'cm./'}.=':'.$syspriv;
-				$allroles{$spec.'./'}.=':'.$syspriv;
-			    }
-			    if ($tdomain ne '') {
-				if (defined($dompriv)) {
-				    $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
-				    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
-				}
-				if ($trest ne '') {
-				    if (defined($coursepriv)) {
-					$allroles{'cm.'.$area}.=':'.$coursepriv;
-					$allroles{$spec.'.'.$area}.=':'.$coursepriv;
-				    }
-				}
-			    }
-			}
-		    }
+                    &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area);
 		} else {
-		    if (defined($pr{$trole.':s'})) {
-			$allroles{'cm./'}.=':'.$pr{$trole.':s'};
-			$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
-		    }
-		    if ($tdomain ne '') {
-			if (defined($pr{$trole.':d'})) {
-			    $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
-			    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
-			}
-			if ($trest ne '') {
-			    if (defined($pr{$trole.':c'})) {
-				$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
-				$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
-			    }
-			}
-		    }
+                    &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
 		}
             }
           } 
         }
-        my $adv=0;
-        my $author=0;
-        foreach (keys %allroles) {
-            %thesepriv=();
-            if (($_!~/^st/) && ($_!~/^ta/) && ($_!~/^cm/)) { $adv=1; }
-            if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
-            foreach (split(/:/,$allroles{$_})) {
-                if ($_ ne '') {
-		    my ($privilege,$restrictions)=split(/&/,$_);
-                    if ($restrictions eq '') {
-			$thesepriv{$privilege}='F';
-                    } else {
-                        if ($thesepriv{$privilege} ne 'F') {
-			    $thesepriv{$privilege}.=$restrictions;
-                        }
-                    }
-                }
-            }
-            $thesestr='';
-            foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
-            $userroles.='user.priv.'.$_.'='.$thesestr."\n";
-        }
+        my ($author,$adv) = &set_userprivs(\$userroles,\%allroles);
         $userroles.='user.adv='.$adv."\n".
 	            'user.author='.$author."\n";
         $ENV{'user.adv'}=$adv;
@@ -2495,6 +2421,84 @@ sub rolesinit {
     return $userroles;  
 }
 
+sub set_arearole {
+    my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
+# log the associated role with the area
+    &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+    return 'user.role.'.$trole.'.'.$area.'='.$tstart.'.'.$tend."\n";
+}
+
+sub custom_roleprivs {
+    my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_;
+    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+    my $homsvr=homeserver($rauthor,$rdomain);
+    if ($hostname{$homsvr} ne '') {
+        my ($rdummy,$roledef)=
+            &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
+        if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+            my ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+            if (defined($syspriv)) {
+                $$allroles{'cm./'}.=':'.$syspriv;
+                $$allroles{$spec.'./'}.=':'.$syspriv;
+            }
+            if ($tdomain ne '') {
+                if (defined($dompriv)) {
+                    $$allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+                    $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
+                }
+                if (($trest ne '') && (defined($coursepriv))) {
+                    $$allroles{'cm.'.$area}.=':'.$coursepriv;
+                    $$allroles{$spec.'.'.$area}.=':'.$coursepriv;
+                }
+            }
+        }
+    }
+}
+
+
+sub standard_roleprivs {
+    my ($allroles,$trole,$tdomain,$spec,$trest,$area) = @_;
+    if (defined($pr{$trole.':s'})) {
+        $$allroles{'cm./'}.=':'.$pr{$trole.':s'};
+        $$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
+    }
+    if ($tdomain ne '') {
+        if (defined($pr{$trole.':d'})) {
+            $$allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+            $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+        }
+        if (($trest ne '') && (defined($pr{$trole.':c'}))) {
+            $$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+            $$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+        }
+    }
+}
+
+sub set_userprivs {
+    my ($userroles,$allroles) = @_; 
+    my $author=0;
+    my $adv=0;
+    foreach (keys %{$allroles}) {
+        my %thesepriv=();
+        if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
+        foreach (split(/:/,$$allroles{$_})) {
+            if ($_ ne '') {
+                my ($privilege,$restrictions)=split(/&/,$_);
+                if ($restrictions eq '') {
+                    $thesepriv{$privilege}='F';
+                } elsif ($thesepriv{$privilege} ne 'F') {
+                    $thesepriv{$privilege}.=$restrictions;
+                }
+                if ($thesepriv{'adv'} eq 'F') { $adv=1; }
+            }
+        }
+        my $thesestr='';
+        foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
+        $$userroles.='user.priv.'.$_.'='.$thesestr."\n";
+    }
+    return ($author,$adv);
+}
+
 # --------------------------------------------------------------- get interface
 
 sub get {
@@ -2516,7 +2520,7 @@ sub get {
    my %returnhash=();
    my $i=0;
    foreach (@$storearr) {
-      $returnhash{$_}=unescape($pairs[$i]);
+      $returnhash{$_}=&thaw_unescape($pairs[$i]);
       $i++;
    }
    return %returnhash;
@@ -2555,7 +2559,7 @@ sub dump {
    my %returnhash=();
    foreach (@pairs) {
       my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
+      $returnhash{unescape($key)}=&thaw_unescape($value);
    }
    return %returnhash;
 }
@@ -2601,7 +2605,7 @@ sub currentdump {
            my ($key,$value)=split(/=/,$_);
            my ($symb,$param) = split(/:/,$key);
            $returnhash{&unescape($symb)}->{&unescape($param)} = 
-                                                          &unescape($value);
+                                                        &thaw_unescape($value);
        }
    }
    return %returnhash;
@@ -2667,7 +2671,7 @@ sub put {
    my $uhome=&homeserver($uname,$udomain);
    my $items='';
    foreach (keys %$storehash) {
-       $items.=&escape($_).'='.&escape($$storehash{$_}).'&';
+       $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
    }
    $items=~s/\&$//;
    return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
@@ -2706,7 +2710,7 @@ sub cput {
    my $uhome=&homeserver($uname,$udomain);
    my $items='';
    foreach (keys %$storehash) {
-       $items.=escape($_).'='.escape($$storehash{$_}).'&';
+       $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&';
    }
    $items=~s/\&$//;
    return &critical("put:$udomain:$uname:$namespace:$items",$uhome);
@@ -2729,7 +2733,7 @@ sub eget {
    my %returnhash=();
    my $i=0;
    foreach (@$storearr) {
-      $returnhash{$_}=unescape($pairs[$i]);
+      $returnhash{$_}=&thaw_unescape($pairs[$i]);
       $i++;
    }
    return %returnhash;
@@ -3058,9 +3062,6 @@ sub allowed {
             return ''; 
          }
       }
-      if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) {
-	  &Apache::lonuserstate::evalstate();
-      }
       if (&condval($statecond)) {
 	 return '2';
       } else {
@@ -3631,8 +3632,7 @@ sub modify_student_enrollment {
         $gene   = $tmp{'generation'} if (!defined($gene)   || $gene eq '');
         $uid    = $tmp{'id'}         if (!defined($uid)    || $uid  eq '');
     }
-    my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene,
-                                                           $first,$middle);
+    my $fullname = &format_name($first,$middle,$last,$gene,'lastname');
     my $reply=cput('classlist',
 		   {"$uname:$udom" => 
 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
@@ -3649,6 +3649,25 @@ sub modify_student_enrollment {
     return &assignrole($udom,$uname,$uurl,'st',$end,$start);
 }
 
+sub format_name {
+    my ($firstname,$middlename,$lastname,$generation,$first)=@_;
+    my $name;
+    if ($first ne 'lastname') {
+	$name=$firstname.' '.$middlename.' '.$lastname.' '.$generation;
+    } else {
+	if ($lastname=~/\S/) {
+	    $name.= $lastname.' '.$generation.', '.$firstname.' '.$middlename;
+	    $name=~s/\s+,/,/;
+	} else {
+	    $name.= $firstname.' '.$middlename.' '.$generation;
+	}
+    }
+    $name=~s/^\s+//;
+    $name=~s/\s+$//;
+    $name=~s/\s+/ /g;
+    return $name;
+}
+
 # ------------------------------------------------- Write to course preferences
 
 sub writecoursepref {
@@ -3671,7 +3690,7 @@ sub writecoursepref {
 # ---------------------------------------------------------- Make/modify course
 
 sub createcourse {
-    my ($udom,$description,$url,$course_server,$nonstandard,$inst_code)=@_;
+    my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner)=@_;
     $url=&declutter($url);
     my $cid='';
     unless (&allowed('ccc',$udom)) {
@@ -3706,7 +3725,7 @@ sub createcourse {
 # ----------------------------------------------------------------- Course made
 # log existence
     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
-                 '='.&escape($inst_code),$uhome);
+                 ':'.&escape($inst_code).':'.&escape($course_owner),$uhome);
     &flushcourselogs();
 # set toplevel url
     my $topurl=$url;
@@ -3767,6 +3786,82 @@ sub diskusage {
     return $listing;
 }
 
+sub is_locked {
+    my ($file_name, $domain, $user) = @_;
+    my @check;
+    my $is_locked;
+    push @check, $file_name;
+    my %locked = &Apache::lonnet::get('file_permissions',\@check,
+                                        $ENV{'user.domain'},$ENV{'user.name'});
+    if (ref($locked{$file_name}) eq 'ARRAY') {
+        $is_locked = 'true';
+    } else {
+        $is_locked = 'false';
+    }
+}
+
+# ------------------------------------------------------------- Mark as Read Only
+
+sub mark_as_readonly {
+    my ($domain,$user,$files,$what) = @_;
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+    foreach my $file (@{$files}) {
+        push(@{$current_permissions{$file}},$what);
+    }
+    &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+    return;
+}
+
+#--------------------------------------------------------------Get Marked as Read Only
+
+sub get_marked_as_readonly {
+    my ($domain,$user,$what) = @_;
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+    my @readonly_files;
+    while (my ($file_name,$value) = each(%current_permissions)) {
+        if (ref($value) eq "ARRAY"){
+            foreach my $stored_what (@{$value}) {
+                if ($stored_what eq $what) {
+                    push(@readonly_files, $file_name);
+                } elsif (!defined($what)) {
+                    push(@readonly_files, $file_name);
+                }
+            }
+        } 
+    }
+    return @readonly_files;
+}
+
+# ------------------------------------------------------------ Unmark as Read Only
+
+sub unmark_as_readonly {
+    # unmarks all files locked by $what 
+    # for portfolio submissions, $what contains $crsid and $symb
+    my ($domain,$user,$what) = @_;
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+    my @readonly_files = &Apache::lonnet::get_marked_as_readonly($domain,$user,$what);
+    foreach my $file(@readonly_files){
+        my $current_locks = $current_permissions{$file};
+        my @new_locks;
+        my @del_keys;
+        if (ref($current_locks) eq "ARRAY"){
+            foreach my $locker (@{$current_locks}) {
+                unless ($locker eq $what) {
+                    push(@new_locks, $what);
+                }
+            }
+            if (@new_locks > 0) {
+                $current_permissions{$file} = \@new_locks;
+            } else {
+                push(@del_keys, $file);
+                &Apache::lonnet::del('file_permissions',\@del_keys, $domain, $user);
+                delete $current_permissions{$file};
+            }
+        }
+    }
+    &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+    return;
+}
 
 # ------------------------------------------------------------ Directory lister
 
@@ -3876,6 +3971,9 @@ sub GetFileTimestamp {
 
 sub directcondval {
     my $number=shift;
+    if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) {
+	&Apache::lonuserstate::evalstate();
+    }
     if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
        return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
     } else {
@@ -4615,7 +4713,7 @@ sub symbverify {
 
 sub symbclean {
     my $symb=shift;
-
+    if ($symb=~m|^/enc/|) { $symb=&Apache::lonenc::unencrypted($symb); }
 # remove version from map
     $symb=~s/\.(\d+)\.(\w+)\_\_\_/\.$2\_\_\_/;
 
@@ -4636,7 +4734,9 @@ sub encode_symb {
 }
 
 sub decode_symb {
-    my ($map,$resid,$url)=split(/\_\_\_/,shift);
+    my $symb=shift;
+    if ($symb=~m|^/enc/|) { $symb=&Apache::lonenc::unencrypted($symb); }
+    my ($map,$resid,$url)=split(/___/,$symb);
     return (&fixversion($map),$resid,&fixversion($url));
 }
 
@@ -4685,6 +4785,7 @@ sub symbread {
 	}
 	$thisfn=$ENV{'request.filename'};
     }
+    if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
 # is that filename actually a symb? Verify, clean, and return
     if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) {
 	if (&symbverify($thisfn,$1)) {
@@ -4775,6 +4876,7 @@ sub numval {
     $txt=~tr/U-Z/0-5/;
     $txt=~tr/u-z/0-5/;
     $txt=~s/\D//g;
+    if ($_64bit) { if ($txt > 2**32) { return -1; } }
     return int($txt);
 }
 
@@ -4790,6 +4892,7 @@ sub numval2 {
     my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt);
     my $total;
     foreach my $val (@txts) { $total+=$val; }
+    if ($_64bit) { if ($total > 2**32) { return -1; } }
     return int($total);
 }
 
@@ -4806,10 +4909,16 @@ sub get_rand_alg {
     return &latest_rnd_algorithm_id();
 }
 
+sub validCODE {
+    my ($CODE)=@_;
+    if (defined($CODE) && $CODE ne '' && $CODE =~ /^\w+$/) { return 1; }
+    return 0;
+}
+
 sub getCODE {
-    if (defined($ENV{'form.CODE'})) { return $ENV{'form.CODE'}; }
+    if (&validCODE($ENV{'form.CODE'})) { return $ENV{'form.CODE'}; }
     if (defined($Apache::lonhomework::parsing_a_problem) &&
-	defined($Apache::lonhomework::history{'resource.CODE'})) {
+	&validCODE($Apache::lonhomework::history{'resource.CODE'})) {
 	return $Apache::lonhomework::history{'resource.CODE'};
     }
     return undef;
@@ -4851,6 +4960,7 @@ sub rndseed_32bit {
 	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+	if ($_64bit) { $num=(($num<<32)>>32); }
 	return $num;
     }
 }
@@ -4871,6 +4981,8 @@ sub rndseed_64bit {
 	my $num2=$nameseed+$domainseed+$courseseed;
 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
 	return "$num1,$num2";
     }
 }
@@ -4914,7 +5026,9 @@ sub rndseed_64bit3 {
 	my $num1=$symbchck+$symbseed+$namechck;
 	my $num2=$nameseed+$domainseed+$courseseed;
 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
-	#&Apache::lonxml::debug("rndseed :$num:$symb");
+	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+	
 	return "$num1:$num2";
     }
 }
@@ -4932,6 +5046,8 @@ sub rndseed_CODE_64bit {
 	my $num2=$CODEseed+$courseseed+$symbchck;
 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
+	if ($_64bit) { $num1=(($num1<<32)>>32); }
+	if ($_64bit) { $num2=(($num2<<32)>>32); }
 	return "$num1:$num2";
     }
 }
@@ -5220,6 +5336,7 @@ sub current_machine_ids {
 
 sub declutter {
     my $thisfn=shift;
+    if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
     $thisfn=~s/^\///;
     $thisfn=~s/^res\///;
@@ -5237,6 +5354,15 @@ sub clutter {
     return $thisfn;
 }
 
+sub freeze_escape {
+    my ($value)=@_;
+    if (ref($value)) {
+	$value=&nfreeze($value);
+	return '__FROZEN__'.&escape($value);
+    }
+    return &escape($value);
+}
+
 # -------------------------------------------------------- Escape Special Chars
 
 sub escape {
@@ -5253,6 +5379,16 @@ sub unescape {
     return $str;
 }
 
+sub thaw_unescape {
+    my ($value)=@_;
+    if ($value =~ /^__FROZEN__/) {
+	substr($value,0,10,undef);
+	$value=&unescape($value);
+	return &thaw($value);
+    }
+    return &unescape($value);
+}
+
 sub mod_perl_version {
     if (defined($perlvar{'MODPERL2'})) {
 	return 2;
@@ -5433,6 +5569,12 @@ $dumpcount=0;
 &logtouch();
 &logthis('<font color=yellow>INFO: Read configuration</font>');
 $readit=1;
+    {
+	use integer;
+	my $test=(2**32)+1;
+	if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
+	&logthis(" Detected 64bit platform ($_64bit)");
+    }
 }
 }