--- loncom/lond	2007/10/08 21:13:52	1.387
+++ loncom/lond	2007/11/10 03:38:28	1.389
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.387 2007/10/08 21:13:52 albertel Exp $
+# $Id: lond,v 1.389 2007/11/10 03:38:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.387 $'; #' stupid emacs
+my $VERSION='$Revision: 1.389 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3515,7 +3515,7 @@ sub dump_course_id_handler {
                 }
             } else {
                 $is_hash =  0;
-                my @courseitems = split(/:/,&unescape($value));
+                my @courseitems = split(/:/,$value);
                 $lasttime = pop(@courseitems);
                 next if ($lasttime<$since);
 	        ($val{'descr'},$val{'inst_code'},$val{'owner'},$val{'type'}) = @courseitems;
@@ -3604,10 +3604,10 @@ sub dump_course_id_handler {
                     if ($is_hash) {
                         $qresult.=$key.'='.$value.'&';
                     } else {
-                        my %rtnhash = ( 'description' => &escape($val{'descr'}),
-                                        'inst_code' => &escape($val{'inst_code'}),
-                                        'owner'     => &escape($val{'owner'}),
-                                        'type'      => &escape($val{'type'}),
+                        my %rtnhash = ( 'description' => &unescape($val{'descr'}),
+                                        'inst_code' => &unescape($val{'inst_code'}),
+                                        'owner'     => &unescape($val{'owner'}),
+                                        'type'      => &unescape($val{'type'}),
                                       );
                         my $items = &Apache::lonnet::freeze_escape(\%rtnhash);
                         $qresult.=$key.'='.$items.'&';
@@ -4057,7 +4057,7 @@ sub dump_domainroles_handler {
                 }
             }
             unless (@roles < 1) {
-                unless (grep/^$trole$/,@roles) {
+                unless (grep/^\Q$trole\E$/,@roles) {
                     $match = 0;
                 }
             }
@@ -4666,6 +4666,40 @@ sub get_institutional_user_rules {
 }
 &register_handler("instuserrules",\&get_institutional_user_rules,0,1,0);
 
+sub get_institutional_id_rules {
+    my ($cmd, $tail, $client)   = @_;
+    my $userinput               = "$cmd:$tail";
+    my $dom = &unescape($tail);
+    my (%rules_hash,@rules_order);
+    my $outcome;
+    eval {
+        local($SIG{__DIE__})='DEFAULT';
+        $outcome = &localenroll::id_rules($dom,\%rules_hash,\@rules_order);
+    };
+    if (!$@) {
+        if ($outcome eq 'ok') {
+            my $result;
+            foreach my $key (keys(%rules_hash)) {
+                $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+            }
+            $result =~ s/\&$//;
+            $result .= ':';
+            if (@rules_order > 0) {
+                foreach my $item (@rules_order) {
+                    $result .= &escape($item).'&';
+                }
+            }
+            $result =~ s/\&$//;
+            &Reply($client,\$result,$userinput);
+        } else {
+            &Reply($client,"error\n", $userinput);
+        }
+    } else {
+        &Failure($client,"unknown_cmd\n",$userinput);
+    }
+}
+&register_handler("instidrules",\&get_institutional_id_rules,0,1,0);
+
 
 sub institutional_username_check {
     my ($cmd, $tail, $client)   = @_;
@@ -4696,6 +4730,34 @@ sub institutional_username_check {
 }
 &register_handler("instrulecheck",\&institutional_username_check,0,1,0);
 
+sub institutional_id_check {
+    my ($cmd, $tail, $client)   = @_;
+    my $userinput               = "$cmd:$tail";
+    my %rulecheck;
+    my $outcome;
+    my ($udom,$id,@rules) = split(/:/,$tail);
+    $udom = &unescape($udom);
+    $id = &unescape($id);
+    @rules = map {&unescape($_);} (@rules);
+    eval {
+        local($SIG{__DIE__})='DEFAULT';
+        $outcome = &localenroll::id_check($udom,$id,\@rules,\%rulecheck);
+    };
+    if (!$@) {
+        if ($outcome eq 'ok') {
+            my $result='';
+            foreach my $key (keys(%rulecheck)) {
+                $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+            }
+            &Reply($client,\$result,$userinput);
+        } else {
+            &Reply($client,"error\n", $userinput);
+        }
+    } else {
+        &Failure($client,"unknown_cmd\n",$userinput);
+    }
+}
+&register_handler("instidrulecheck",\&institutional_id_check,0,1,0);
 
 # Get domain specific conditions for import of student photographs to a course
 #