--- loncom/lonnet/perl/lonnet.pm	2007/11/06 13:05:00	1.922
+++ loncom/lonnet/perl/lonnet.pm	2007/11/10 03:51:10	1.923
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.922 2007/11/06 13:05:00 raeburn Exp $
+# $Id: lonnet.pm,v 1.923 2007/11/10 03:51:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1047,7 +1047,7 @@ sub get_instuser {
 }
 
 sub inst_rulecheck {
-    my ($udom,$uname,$rules) = @_;
+    my ($udom,$uname,$id,$item,$rules) = @_;
     my %returnhash;
     if ($udom ne '') {
         if (ref($rules) eq 'ARRAY') {
@@ -1055,9 +1055,16 @@ sub inst_rulecheck {
             my $rulestr = join(':',@{$rules});
             my $homeserver=&domain($udom,'primary');
             if (($homeserver ne '') && ($homeserver ne 'no_host')) {
-                my $response=&unescape(&reply('instrulecheck:'.&escape($udom).':'.
-                                              &escape($uname).':'.$rulestr,
+                my $response;
+                if ($item eq 'username') {                
+                    $response=&unescape(&reply('instrulecheck:'.&escape($udom).
+                                              ':'.&escape($uname).':'.$rulestr,
                                               $homeserver));
+                } elsif ($item eq 'id') {
+                    $response=&unescape(&reply('instidrulecheck:'.&escape($udom).
+                                              ':'.&escape($id).':'.$rulestr,
+                                              $homeserver));
+                }
                 if ($response ne 'refused') {
                     my @pairs=split(/\&/,$response);
                     foreach my $item (@pairs) {
@@ -1074,14 +1081,21 @@ sub inst_rulecheck {
 }
 
 sub inst_userrules {
-    my ($udom) = @_;
+    my ($udom,$check) = @_;
     my (%ruleshash,@ruleorder);
     if ($udom ne '') {
         my $homeserver=&domain($udom,'primary');
         if (($homeserver ne '') && ($homeserver ne 'no_host')) {
-            my $response=&reply('instuserrules:'.&escape($udom),
+            my $response;
+            if ($check eq 'id') {
+                $response=&reply('instidrules:'.&escape($udom),
                                  $homeserver);
+            } else {
+                $response=&reply('instuserrules:'.&escape($udom),
+                                 $homeserver);
+            }
             if (($response ne 'refused') && ($response ne 'error') && 
+                ($response ne 'unknown_cmd') && 
                 ($response ne 'no_such_host')) {
                 my ($hashitems,$orderitems) = split(/:/,$response);
                 my @pairs=split(/\&/,$hashitems);