--- loncom/lond	2004/06/17 18:48:05	1.197
+++ loncom/lond	2004/06/29 15:31:32	1.204
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.197 2004/06/17 18:48:05 raeburn Exp $
+# $Id: lond,v 1.204 2004/06/29 15:31:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,12 +51,12 @@ use LONCAPA::ConfigFileEdit;
 use LONCAPA::lonlocal;
 use LONCAPA::lonssl;
 
-my $DEBUG = 11;		       # Non zero to enable debug log entries.
+my $DEBUG = 0;		       # Non zero to enable debug log entries.
 
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.197 $'; #' stupid emacs
+my $VERSION='$Revision: 1.204 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -69,6 +69,8 @@ my $clientname;			# LonCAPA name of clie
 my $server;
 my $thisserver;			# DNS of us.
 
+my $keymode;
+
 # 
 #   Connection type is:
 #      client                   - All client actions are allowed
@@ -352,7 +354,6 @@ sub ReadManagerTable {
    while(my $host = <MANAGERS>) {
       chomp($host);
       if ($host =~ "^#") {                  # Comment line.
-         logthis('<font color="green"> Skipping line: '. "$host</font>\n");
          next;
       }
       if (!defined $hostip{$host}) { # This is a non cluster member
@@ -1218,13 +1219,13 @@ sub logstatus {
     {
     my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
     print $fh $$."\t".$clientname."\t".$currenthostid."\t"
-	.$status."\t".$lastlog."\n";
+	.$status."\t".$lastlog."\t $keymode\n";
     $fh->close();
     }
     &status("Finished londstatus.txt");
     {
 	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
-        print $fh $status."\n".$lastlog."\n".time;
+        print $fh $status."\n".$lastlog."\n".time."\n$keymode";
         $fh->close();
     }
     &status("Finished logging");
@@ -1556,6 +1557,7 @@ sub make_new_child {
 			print $client "ok:local\n";
 			&logthis('<font color="green"'
 				 . "Successful local authentication </font>");
+			$keymode = "local"
 		    } else {
 			Debug("Failed to get local key");
 			$clientok = 0;
@@ -1570,6 +1572,7 @@ sub make_new_child {
 			$cipher       = new IDEA($cipherkey);
 			&logthis('<font color="green">'
 				 ."Successfull ssl authentication with $clientname </font>");
+			$keymode = "ssl";
 	     
 		    } else {
 			$clientok = 0;
@@ -1583,6 +1586,7 @@ sub make_new_child {
 			&logthis('<font color="green">'
 				 ."Successful insecure authentication with $clientname </font>");
 			print $client "ok\n";
+			$keymode = "insecure";
 		    } else {
 			&logthis('<font color="yellow">'
 				  ."Attempted insecure connection disallowed </font>");
@@ -2831,8 +2835,8 @@ sub make_new_child {
 			my %hash;
 			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
 			    foreach my $pair (@pairs) {
-				my ($key,$value)=split(/=/,$pair);
-				$hash{$key}=$value.':'.$now;
+				my ($key,$descr,$inst_code)=split(/=/,$pair);
+				$hash{$key}=$descr.':'.$inst_code.':'.$now;
 			    }
 			    if (untie(%hash)) {
 				print $client "ok\n";
@@ -2867,14 +2871,19 @@ sub make_new_child {
 			my %hash;
 			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
 			    while (my ($key,$value) = each(%hash)) {
-				my ($descr,$lasttime)=split(/\:/,$value);
+                                my ($descr,$lasttime,$inst_code);
+                                if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
+				    ($descr,$inst_code,$lasttime)=($1,$2,$3);
+                                } else {
+                                    ($descr,$lasttime) = split(/\:/,$value);
+                                }
 				if ($lasttime<$since) { next; }
 				if ($description eq '.') {
-				    $qresult.=$key.'='.$descr.'&';
+				    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
 				} else {
 				    my $unescapeVal = &unescape($descr);
 				    if (eval('$unescapeVal=~/\Q$description\E/i')) {
-					$qresult.="$key=$descr&";
+					$qresult.=$key.'='.$descr.':'.$inst_code.'&';
 				    }
 				}
 			    }
@@ -3028,6 +3037,24 @@ sub make_new_child {
 			Reply($client, "refused\n", $userinput);
 		     
 		    }
+# ----------------------------------------- portfolio directory list (portls)
+                } elsif ($userinput =~ /^portls/) {
+                    if(isClient) {
+                        my ($cmd,$uname,$udom)=split(/:/,$userinput);
+                        my $udir=propath($udom,$uname).'/userfiles/portfolio';
+                        my $dirLine='';
+                        my $dirContents='';
+                        if (opendir(LSDIR,$udir.'/')){
+                            while ($dirLine = readdir(LSDIR)){
+                                $dirContents = $dirContents.$dirLine.'<br />';
+                            }
+                        } else {
+                            $dirContents = "No directory found\n";
+                        }
+                        print $client $dirContents."\n";
+                    } else {
+                        Reply($client, "refused\n", $userinput);
+                    }
 # -------------------------------------------------------------------------- ls
 		} elsif ($userinput =~ /^ls/) {
 		    if(isClient) {
@@ -3195,7 +3222,7 @@ sub make_new_child {
 		}
 # -------------------------------------------------------------------- complete
 		alarm(0);
-		&status('Listening to '.$clientname);
+		&status('Listening to '.$clientname." ($keymode)");
 	    }
 # --------------------------------------------- client unknown or fishy, refuse
 	} else {