--- loncom/lonnet/perl/lonnet.pm	2009/06/11 19:19:57	1.1003
+++ loncom/lonnet/perl/lonnet.pm	2009/07/25 14:44:55	1.1006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1003 2009/06/11 19:19:57 raeburn Exp $
+# $Id: lonnet.pm,v 1.1006 2009/07/25 14:44:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1326,7 +1326,7 @@ sub get_domain_defaults {
         }
     }
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-        foreach my $item ('official','unofficial') {
+        foreach my $item ('official','unofficial','community') {
             $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
         }
     }
@@ -1866,6 +1866,8 @@ sub ssi_body {
     if ($filelink=~/^https?\:/) {
        ($output,$response)=&externalssi($filelink);
     } else {
+       $filelink .= $filelink=~/\?/ ? '&' : '?';
+       $filelink .= 'inhibitmenu=yes';
        ($output,$response)=&ssi($filelink,%form);
     }
     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
@@ -4633,6 +4635,7 @@ sub usertools_access {
         %tools = (
                       official   => 1,
                       unofficial => 1,
+                      community  => 1,
                  );
     } else {
         %tools = (
@@ -5701,7 +5704,7 @@ sub auto_instcode_defaults {
 }
 
 sub auto_possible_instcodes {
-    my ($domain,$codetitles,$cat_titles,$cat_order) = @_;
+    my ($domain,$codetitles,$cat_titles,$cat_orders) = @_;
     my (@homeservers,$uhome);
     if (defined(&domain($domain,'primary'))) {
         $uhome=&domain($domain,'primary');
@@ -5721,12 +5724,12 @@ sub auto_possible_instcodes {
         my ($codetitlestr,$cat_title,$cat_order) = split(':',$response);
         @{$codetitles} = map { &unescape($_); } (split('&',$codetitlestr));  
         foreach my $item (split('&',$cat_title)) {   
-            my ($name,$value)=split('&',$item);
-            $cat_titles->{&unescape($name)}=&unescape($value);
+            my ($name,$value)=split('=',$item);
+            $cat_titles->{&unescape($name)}=&thaw_unescape($value);
         }
         foreach my $item (split('&',$cat_order)) {
-            my ($name,$value)=split('&',$item);
-            $cat_order->{&unescape($name)}=&unescape($value);
+            my ($name,$value)=split('=',$item);
+            $cat_orders->{&unescape($name)}=&thaw_unescape($value);
         }
         return 'ok';
     }