--- loncom/lonnet/perl/lonnet.pm	2004/09/27 19:00:16	1.548
+++ loncom/lonnet/perl/lonnet.pm	2004/11/08 19:19:12	1.564
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.548 2004/09/27 19:00:16 albertel Exp $
+# $Id: lonnet.pm,v 1.564 2004/11/08 19:19:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,19 +39,19 @@ qw(%perlvar %hostname %homecache %badSer
    %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache
    %courselogs %accesshash %userrolehash $processmarker $dumpcount 
    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache 
-   %userresdatacache %usectioncache %domaindescription %domain_auth_def %domain_auth_arg_def 
-   %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir);
+   %userresdatacache %getsectioncache %domaindescription %domain_auth_def %domain_auth_arg_def 
+   %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.
 
 =pod
 
@@ -116,14 +116,40 @@ sub logperm {
 sub subreply {
     my ($cmd,$server)=@_;
     my $peerfile="$perlvar{'lonSockDir'}/$server";
-    my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-                                     Type    => SOCK_STREAM,
-                                     Timeout => 10)
-       or return "con_lost";
-    print $client "$cmd\n";
-    my $answer=<$client>;
-    if (!$answer) { $answer="con_lost"; }
-    chomp($answer);
+    #
+    #  With loncnew process trimming, there's a timing hole between lonc server
+    #  process exit and the master server picking up the listen on the AF_UNIX
+    #  socket.  In that time interval, a lock file will exist:
+
+    my $lockfile=$peerfile.".lock";
+    while (-e $lockfile) {	# Need to wait for the lockfile to disappear.
+	sleep(1);
+    }
+    # At this point, either a loncnew parent is listening or an old lonc
+    # or loncnew child is listening so we can connect or everything's dead.
+    #
+    #   We'll give the connection a few tries before abandoning it.  If
+    #   connection is not possible, we'll con_lost back to the client.
+    #   
+    my $client;
+    for (my $retries = 0; $retries < $max_connection_retries; $retries++) {
+	$client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+				      Type    => SOCK_STREAM,
+				      Timeout => 10);
+	if($client) {
+	    last;		# Connected!
+	}
+	sleep(1);		# Try again later if failed connection.
+    }
+    my $answer;
+    if ($client) {
+	print $client "$cmd\n";
+	$answer=<$client>;
+	if (!$answer) { $answer="con_lost"; }
+	chomp($answer);
+    } else {
+	$answer = 'con_lost';	# Failed connection.
+    }
     return $answer;
 }
 
@@ -434,7 +460,7 @@ sub overloaderror {
     if ($overload>0) {
 	$r->err_headers_out->{'Retry-After'}=$overload;
         $r->log_error('Overload of '.$overload.' on '.$checkserver);
-        return 409;
+        return 413;
     }    
     return '';
 }
@@ -771,6 +797,11 @@ sub getsection {
     my ($udom,$unam,$courseid)=@_;
     $courseid=~s/\_/\//g;
     $courseid=~s/^(\w)/\/$1/;
+
+    my $hashid="$udom:$unam:$courseid";
+    my ($result,$cached)=&is_cached(\%getsectioncache,$hashid,'getsection');
+    if (defined($cached)) { return $result; }
+
     my %Pending; 
     my %Expired;
     #
@@ -803,25 +834,25 @@ sub getsection {
             $Pending{$start}=$section;
             next;
         }
-        return $section;
+        return &do_cache(\%getsectioncache,$hashid,$section,'getsection');
     }
     #
     # Presumedly there will be few matching roles from the above
     # loop and the sorting time will be negligible.
     if (scalar(keys(%Pending))) {
         my ($time) = sort {$a <=> $b} keys(%Pending);
-        return $Pending{$time};
+        return &do_cache(\%getsectioncache,$hashid,$Pending{$time},'getsection');
     } 
     if (scalar(keys(%Expired))) {
         my @sorted = sort {$a <=> $b} keys(%Expired);
         my $time = pop(@sorted);
-        return $Expired{$time};
+        return &do_cache(\%getsectioncache,$hashid,$Expired{$time},'getsection');
     }
-    return '-1';
+    return &do_cache(\%getsectioncache,$hashid,'-1','getsection');
 }
 
 
-my $disk_caching_disabled=0;
+my $disk_caching_disabled=1;
 
 sub devalidate_cache {
     my ($cache,$id,$name) = @_;
@@ -1008,38 +1039,6 @@ EVALBLOCK
 #    &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime));
 }
 
-sub usection {
-    my ($udom,$unam,$courseid)=@_;
-    my $hashid="$udom:$unam:$courseid";
-    
-    my ($result,$cached)=&is_cached(\%usectioncache,$hashid,'usection');
-    if (defined($cached)) { return $result; }
-    $courseid=~s/\_/\//g;
-    $courseid=~s/^(\w)/\/$1/;
-    foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
-                        &homeserver($unam,$udom)))) {
-        my ($key,$value)=split(/\=/,$_);
-        $key=&unescape($key);
-        if ($key=~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/) {
-            my $section=$1;
-            if ($key eq $courseid.'_st') { $section=''; }
-	    my ($dummy,$end,$start)=split(/\_/,&unescape($value));
-            my $now=time;
-            my $notactive=0;
-            if ($start) {
-		if ($now<$start) { $notactive=1; }
-            }
-            if ($end) {
-                if ($now>$end) { $notactive=1; }
-            } 
-            unless ($notactive) {
-		return &do_cache(\%usectioncache,$hashid,$section,'usection');
-	    }
-        }
-    }
-    return &do_cache(\%usectioncache,$hashid,'-1','usection');
-}
-
 # ------------------------------------- Read an entry from a user's environment
 
 sub userenvironment {
@@ -1873,6 +1872,7 @@ sub devalidate {
         # - the student level sheet of this user in course's homespace
         # - the assessment level sheet for this resource 
         #   for this user in user's homespace
+	# - current conditional state info
 	my $key=$uname.':'.$udom.':';
         my $status=
 	    &del('nohist_calculatedsheets',
@@ -1887,6 +1887,7 @@ sub devalidate {
                     $uname.' at '.$udom.' for '.
 		    $symb.': '.$status);
         }
+	&delenv('user.state.'.$cid);
     }
 }
 
@@ -2468,7 +2469,6 @@ sub rolesinit {
         my $author=0;
         foreach (keys %allroles) {
             %thesepriv=();
-            if (($_!~/^st/) && ($_!~/^ta/) && ($_!~/^cm/)) { $adv=1; }
             if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
             foreach (split(/:/,$allroles{$_})) {
                 if ($_ ne '') {
@@ -2480,6 +2480,7 @@ sub rolesinit {
 			    $thesepriv{$privilege}.=$restrictions;
                         }
                     }
+		    if ($thesepriv{'adv'} eq 'F') { $adv=1; }
                 }
             }
             $thesestr='';
@@ -2514,7 +2515,7 @@ sub get {
    my %returnhash=();
    my $i=0;
    foreach (@$storearr) {
-      $returnhash{$_}=unescape($pairs[$i]);
+      $returnhash{$_}=&thaw_unescape($pairs[$i]);
       $i++;
    }
    return %returnhash;
@@ -2553,7 +2554,7 @@ sub dump {
    my %returnhash=();
    foreach (@pairs) {
       my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
+      $returnhash{unescape($key)}=&thaw_unescape($value);
    }
    return %returnhash;
 }
@@ -2599,7 +2600,7 @@ sub currentdump {
            my ($key,$value)=split(/=/,$_);
            my ($symb,$param) = split(/:/,$key);
            $returnhash{&unescape($symb)}->{&unescape($param)} = 
-                                                          &unescape($value);
+                                                        &thaw_unescape($value);
        }
    }
    return %returnhash;
@@ -2665,7 +2666,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);
@@ -2704,7 +2705,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);
@@ -2727,7 +2728,7 @@ sub eget {
    my %returnhash=();
    my $i=0;
    foreach (@$storearr) {
-      $returnhash{$_}=unescape($pairs[$i]);
+      $returnhash{$_}=&thaw_unescape($pairs[$i]);
       $i++;
    }
    return %returnhash;
@@ -3626,8 +3627,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) },
@@ -3644,6 +3644,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 {
@@ -3762,6 +3781,72 @@ sub diskusage {
     return $listing;
 }
 
+# ------------------------------------------------------------- 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)) {
+        &logthis("found $file_name");
+        if (ref($value) eq "ARRAY"){
+            &logthis("found array");
+            foreach my $stored_what (@{$value}) {
+                if ($stored_what eq $what) {
+                    push(@readonly_files, $file_name);
+                    &logthis("defined pushed $file_name");
+                } elsif (!defined($what)) {
+                    push(@readonly_files, $file_name);
+                    &logthis("undef pushed $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
 
@@ -3871,6 +3956,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 {
@@ -4115,7 +4203,7 @@ sub EXT {
 		$section=$ENV{'request.course.sec'};
 	    } else {
 		if (! defined($usection)) {
-		    $section=&usection($udom,$uname,$courseid);
+		    $section=&getsection($udom,$uname,$courseid);
 		} else {
 		    $section = $usection;
 		}
@@ -4770,6 +4858,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);
 }
 
@@ -4785,6 +4874,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);
 }
 
@@ -4801,10 +4891,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;
@@ -4846,6 +4942,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;
     }
 }
@@ -4866,6 +4963,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";
     }
 }
@@ -4909,7 +5008,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";
     }
 }
@@ -4927,6 +5028,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";
     }
 }
@@ -5091,13 +5194,15 @@ sub repcopy_userfile {
 
 sub tokenwrapper {
     my $uri=shift;
-    $uri=~s/^http\:\/\/([^\/]+)//;
-    $uri=~s/^\///;
+    $uri=~s|^http\://([^/]+)||;
+    $uri=~s|^/||;
     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
     my $token=$1;
-    if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
-        &appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
-        return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
+    my (undef,$udom,$uname,$file)=split('/',$uri,4);
+    if ($udom && $uname && $file) {
+	$file=~s|(\?\.*)*$||;
+        &appenv("userfile.$udom/$uname/$file" => $ENV{'request.course.id'});
+        return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri.
                (($uri=~/\?/)?'&':'?').'token='.$token.
                                '&tokenissued='.$perlvar{'lonHostID'};
     } else {
@@ -5230,6 +5335,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 {
@@ -5246,6 +5360,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;
@@ -5271,7 +5395,7 @@ sub goodbye {
    &logthis(sprintf("%-20s is %s",'%courseresdatacache',scalar(%courseresdatacache)));
 #1.1 only
    &logthis(sprintf("%-20s is %s",'%userresdatacache',scalar(%userresdatacache)));
-   &logthis(sprintf("%-20s is %s",'%usectioncache',scalar(%usectioncache)));
+   &logthis(sprintf("%-20s is %s",'%getsectioncache',scalar(%getsectioncache)));
    &logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache)));
    &logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache)));
    &flushcourselogs();
@@ -5426,6 +5550,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; }
+	&logthis(" Detected 64bit platform ($_64bit)");
+    }
 }
 }
 
@@ -5653,8 +5783,8 @@ X<rolesinit()>
 B<rolesinit($udom,$username,$authhost)>: get user privileges
 
 =item *
-X<usection()>
-B<usection($udom,$uname,$cname)>: finds the section of student in the
+X<getsection()>
+B<getsection($udom,$uname,$cname)>: finds the section of student in the
 course $cname, return section name/number or '' for "not in course"
 and '-1' for "no section"