--- doc/loncapafiles/updatequery.piml	2016/08/03 15:04:59	1.85
+++ doc/loncapafiles/updatequery.piml	2017/02/25 20:31:03	1.86
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.85 2016/08/03 15:04:59 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.86 2017/02/25 20:31:03 raeburn Exp $ -->
 
 <!--
 
@@ -83,7 +83,7 @@ sub get_static_config {
 }
 
 sub get_domain_config {
-    my ($dom,$isprimary,$url,$perlvarref) = @_;
+    my ($dom,$primaryserver,$isprimary,$url,$perlvarref) = @_;
     my %confhash;
     if ($isprimary) {
         if (ref($perlvarref) eq 'HASH') {
@@ -106,9 +106,9 @@ sub get_domain_config {
             }
         }
     } else {
-        if (open(PIPE,"wget --no-check-certificate '$url?domain=$dom&format=raw' |")) {
+        if (open(PIPE,"wget --no-check-certificate '$url?primary=$primaryserver&format=raw' |")) {
             my $config = '';
-            while (<PIPE>) {
+            while (&lt;PIPE&gt;) {
                 $config .= $_;
             }
             close(PIPE);
@@ -227,10 +227,10 @@ if (-l "<TARGET />") {
       $currCluster = $1;
   }
   my %clustertypes = (
-                       production  => 'PRODUCTION',
-                       standalone  => 'STAND-ALONE',
-                       development => 'DEVELOPMENT',
-                       existing    => 'RUNNING YOUR OWN CLUSTER',
+                       production  =&gt; 'PRODUCTION',
+                       standalone  =&gt; 'STAND-ALONE',
+                       development =&gt; 'DEVELOPMENT',
+                       existing    =&gt; 'RUNNING YOUR OWN CLUSTER',
                      );
   if (($currCluster) && (exists($clustertypes{$currCluster}))) {
       print(&lt;&lt;END);
@@ -455,9 +455,9 @@ END
     close(OUT);
     $lonDefDomain=$choice;
     $flag=1;
-  } elsif (length($choice)>35) {
+  } elsif (length($choice)&gt;35) {
     print "Name too long\n";
-  } elsif (length($choice)<2) {
+  } elsif (length($choice)&lt;2) {
     print "Name too short\n";
   } elsif ($bad_domain_flag) {
     print "Invalid input ('$choice' conflicts with LON-CAPA namespace).\n";
@@ -542,9 +542,9 @@ END
     close(OUT);
     $lonHostID=$choice;
     $flag=1;
-  } elsif (length($choice)>45) {
+  } elsif (length($choice)&gt;45) {
     print "Name too long\n";
-  } elsif (length($choice)<4) {
+  } elsif (length($choice)&lt;4) {
     print "Name too short\n";
   } elsif ($choice!~/\_/ and $choice=~/^[\w\-.]+$/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
@@ -582,7 +582,7 @@ END
         print(&lt;&lt;END);
 ENTER DOMAIN'S PRIMARY LIBRARY SERVER ID [$primaryLibServer]:
 END
-    } elsif (@libservers > 0) {
+    } elsif (@libservers &gt; 0) {
         print(&lt;&lt;END);
 ENTER DOMAIN'S PRIMARY LIBRARY SERVER ID [$libservers[0]]
 END
@@ -600,9 +600,9 @@ END
         print(OUT 'primaryLibServer'."\t".$choice."\n");
         close(OUT);
         $flag=1;
-    } elsif (length($choice)>35) {
+    } elsif (length($choice)&gt;35) {
         print "Name too long\n";
-    } elsif (length($choice)<4) {
+    } elsif (length($choice)&lt;4) {
         print "Name too short\n";
     } elsif ($choice!~/\_/ and $choice=~/^[\w\-.]+$/) {
         open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
@@ -958,11 +958,11 @@ END
 my $perlvarref = &get_static_config();
 if (ref($perlvarref) eq 'HASH') {
   my ($certsdir,$privkey,$connectcsr,$replicatecsr);
-  $certsdir = $perlvarref->{'lonCertificateDirectory'};
-  $privkey = $perlvarref->{'lonnetPrivateKey'};  
-  $connectcsr = $perlvarref->{'lonnetCertificate'};
+  $certsdir = $perlvarref-&gt;{'lonCertificateDirectory'};
+  $privkey = $perlvarref-&gt;{'lonnetPrivateKey'};  
+  $connectcsr = $perlvarref-&gt;{'lonnetCertificate'};
   $connectcsr =~ s/\.pem$/.csr/;
-  $replicatecsr = $perlvarref->{'lonnetHostnameCertificate'};
+  $replicatecsr = $perlvarref-&gt;{'lonnetHostnameCertificate'};
   $replicatecsr =~ s/\.pem$/.csr/;
 
   print(&lt;&lt;END);
@@ -1027,7 +1027,7 @@ END
 
   my $camail;
   if ($lonCluster eq 'production' || $lonCluster eq 'development') {
-    $camail = $perlvarref->{'SSLEmail'};
+    $camail = $perlvarref-&gtl{'SSLEmail'};
   } else {
     $flag=0;
 # get Certificate Authority E-mail 
@@ -1282,7 +1282,7 @@ my %perlvarstatic;
 	    }
 	}
 	# make list unique
-	@libservers = keys(%{{ map { $_ => 1 } (@libservers) }});
+	@libservers = keys(%{{ map { $_ =&gt; 1 } (@libservers) }});
 	close(IN);
 	if (@libservers == 1) {
 	    $primaryLibServer = $libservers[0];
@@ -1333,47 +1333,54 @@ if ($primaryLibServer eq $perlvar{'lonHo
     } 
     $url = $primary_protocol.'://'.$primary_hostname.'/cgi-bin/listdomconfig.pl';
 }
-my $domconf = &get_domain_config($perlvar{'lonDefDomain'},$isprimary,$url,\%perlvarstatic);
+my $domconf = &get_domain_config($perlvar{'lonDefDomain'},$primaryLibServer,$isprimary,
+                                 $url,\%perlvarstatic);
 if (ref($domconf)) {
     $gotdomconf = 1;
-    if (ref($domconf->{'contacts'}) eq 'HASH') {
-        if (exists($domconf->{'contacts'}->{'adminemail'})) {
-            $adminmail = $domconf->{'contacts'}->{'adminemail'};
+    if (ref($domconf-&gt;{'contacts'}) eq 'HASH') {
+        if (exists($domconf-&gt;{'contacts'}-&gt;{'adminemail'})) {
+            $adminmail = $domconf-&gt;{'contacts'}-&gt;{'adminemail'};
         }
         if (exists($domconf->{'contacts'}->{'supportemail'})) {
-            $supportmail = $domconf->{'contacts'}->{'supportemail'};
+            $supportmail = $domconf-&gt;{'contacts'}-&gt;{'supportemail'};
         }
     }
-    if (ref($domconf->{'ssl'}) eq 'HASH') {
-        if (ref($domconf->{'ssl'}->{'connect'}) eq 'HASH') {       
-            my ($sslreq,$sslnoreq);
-            my %contypes; 
-            foreach my $type ('dom','intdom','other') {
-                my $key;
-                if ($domconf->{'ssl'}->{'connect'}->{$type} eq 'req') {
-                    $key = 'yes';
-                } else {
-                    $key = 'no';
+    if (ref($domconf-&gt;{'ssl'}) eq 'HASH') {
+        foreach my $connect ('connto','connfrom') { 
+            if (ref($domconf-&gt;{'ssl'}-&gt;{$connect}) eq 'HASH') {       
+                my ($sslreq,$sslnoreq,$currsetting);
+                my %contypes; 
+                foreach my $type ('dom','intdom','other') {
+                    my $key;
+                    if ($domconf-&gt;{'ssl'}-&gt;{'connect'}-&gt;{$type} eq 'req') {
+                        $key = 'yes';
+                    } else {
+                        $key = 'no';
+                    }
+                    if ($type eq 'dom') {
+                        $contypes{$key} .= ' own domain,';
+                    } elsif ($type eq 'intdom') {
+                        $contypes{$key} .= ' own institution,';
+                    } elsif ($type eq 'other') { 
+                        $contypes{$key} .= ' other domains,';
+                    }
                 }
-                if ($type eq 'dom') {
-                    $contypes{$key} .= ' own domain,';
-                } elsif ($type eq 'intdom') {
-                    $contypes{$key} .= ' own institution,';
-                } elsif ($type eq 'other') { 
-                    $contypes{$key} .= ' other domains,';
+                foreach my $key (sort(keys(%contypes))) {
+                    $contypes{$key} =~ s/^\s//;
+                    $contypes{$key} =~ s/,$//;
+                    if ($key eq 'yes') {
+                        $currsetting .= ' Yes ('.$contypes{$key}.'),';
+                    } elsif ($key eq 'no') {
+                        $currsetting .= ' No ('.$contypes{$key}.')';
+                    }
+                    $currsetting =~ s/,$//;
                 }
-            }
-            foreach my $key (sort(keys(%contypes))) {
-                $contypes{$key} =~ s/^\s//;
-                $contypes{$key} =~ s/,$//;
-                if ($key eq 'yes') {
-                    $connectssl .= ' Yes ('.$contypes{$key}.'),';
-                } elsif ($key eq 'no') {
-                    $connectssl = ' No ('.$contypes{$key}.')';
+                if ($currsetting ne '') {
+                    $connectssl = $sslname{$connect}.' -- '.$currsetting.' | '; 
                 }
-                $connectssl =~ s/,$//;
             }
         }
+        $connectssl =~ s/\s\|\s$//; 
     }
 }
 if ($connectssl) {
@@ -1395,7 +1402,7 @@ if ($supportmail) {
 
 print "\nRetrieving status information for SSL key and certificates ...\n\n";
 my ($lonhostcertstatus,$lonhostnamecertstatus,$lonkeystatus);
-my $currcerts = &LONCAPA::SSL::print_certstatus({$perlvar{'lonHostID'} => 1,},'text','cgi');
+my $currcerts = &LONCAPA::SSL::print_certstatus({$perlvar{'lonHostID'} =&gt; 1,},'text','cgi');
 chomp($currcerts);
 my %sslstatus;
 
@@ -1410,16 +1417,16 @@ if ($currcerts eq "$perlvar{'lonHostID'}
     $lonhostnamecertstatus = 'unknown status';
 } else {
     my %sslnames = (
-                      key      => 'lonnetPrivateKey',
-                      host     => 'lonnetCertificate',
-                      hostname => 'lonnetHostnameCertificate',
-                      ca       => 'lonnetCertificateAuthority',
+                      key      =&gt; 'lonnetPrivateKey',
+                      host     =&gt; 'lonnetCertificate',
+                      hostname =&gt; 'lonnetHostnameCertificate',
+                      ca       =&gt; 'lonnetCertificateAuthority',
                    );
     my %ssldesc = (
-                    key      => 'Private Key',
-                    host     => 'Connections Certificate',
-                    hostname => 'Replication Certificate',
-                    ca       => 'LON-CAPA CA Certificate',
+                    key      =&gt; 'Private Key',
+                    host     =&gt; 'Connections Certificate',
+                    hostname =&gt; 'Replication Certificate',
+                    ca       =&gt; 'LON-CAPA CA Certificate',
                   );
     my ($lonhost,$info) = split(/\:/,$currcerts,2);
     if ($lonhost eq $perlvar{'lonHostID'}) {
@@ -1513,8 +1520,8 @@ END
 
 my @error;
 foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {
-   if (length($v)>35) { push(@error,"Name $v too long"); }		
-   if (length($v)<2) { push(@error,"Name $v too short"); }
+   if (length($v)&gt;35) { push(@error,"Name $v too long"); }		
+   if (length($v)&lt;2) { push(@error,"Name $v too short"); }
    if ($v=~/capa/i) {
 	if ($v!~/^oucapa\d+$/ && 
 	    ($v!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
@@ -1550,14 +1557,14 @@ if (!defined($intdom)) {
 }
 
 if (!defined($primaryLibServer)) {
-   if (@libservers > 0) {
+   if (@libservers &gt; 0) {
        push(@error,"No primary library server ID designated. Choose from: ".join(',',sort(@libservers)));
    } else {
        push(@error,"No library servers in this domain (including current server)");
    }
 } else {
-   if (length($primaryLibServer)>35) { push(@error,"Primary Library Server ID:  $primaryLibServer too long"); }
-   if (length($primaryLibServer)<2) { push(@error,"Primary Library Server ID:  $primaryLibServer too short"); }
+   if (length($primaryLibServer)&gt;35) { push(@error,"Primary Library Server ID:  $primaryLibServer too long"); }
+   if (length($primaryLibServer)&lt;2) { push(@error,"Primary Library Server ID:  $primaryLibServer too short"); }
    if ($primaryLibServer =~/capa/i) {
         if ($primaryLibServer!~/^oucapa\d+$/ &&
             ($primaryLibServer!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
@@ -1771,8 +1778,8 @@ END
       ($securestatus,$securenum)=&securesetting(%perlvar);
     }
   } elsif ($choice==15) {
-      #$sslstatus{'key'};
-      print(&lt;&lt;END);
+      if (($sslstatus{'key'} == 1) || ($sslstatus{'key'} == 2)) {
+          print(&lt;&lt;END);
 15) Private Key for SSL: $lonkeystatus
 
 POSSIBLE CHOICES:
@@ -1781,9 +1788,11 @@ POSSIBLE CHOICES:
 3) make no change
 ENTER NEW VALUE
 END
+      } elsif ($sslstatus{'key'} == ) {
       my $choice2=&lt;&gt;;
       chomp($choice2);
   } elsif ($choice==16) {
+      if ($sslstatus{'key'} == 1) || ($sslstatus{'key'} == 2)) {
       #$sslstatus{'host'};
       print(&lt;&lt;END);
 16) SSL Certificate for LON-CAPA server connections: $lonhostcertstatus