[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / lond

[raeburn]

raeburn		Wed Apr 16 16:18:25 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	lond 
  Log:
  - For 2.11
    - Backport 1.508
  
  
Index: loncom/lond
diff -u loncom/lond:1.489.2.12 loncom/lond:1.489.2.13
--- loncom/lond:1.489.2.12	Mon Apr  7 23:39:21 2014
+++ loncom/lond	Wed Apr 16 16:18:24 2014
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.12 2014/04/07 23:39:21 raeburn Exp $
+# $Id: lond,v 1.489.2.13 2014/04/16 16:18:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.12 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.13 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -5272,19 +5272,20 @@
 sub validate_crsreq_handler {
     my ($cmd, $tail, $client) = @_;
     my $userinput = "$cmd:$tail";
-    my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = split(/:/, $tail);
+    my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$customdata) = split(/:/, $tail);
     $instcode = &unescape($instcode);
     $owner = &unescape($owner);
     $crstype = &unescape($crstype);
     $inststatuslist = &unescape($inststatuslist);
     $instcode = &unescape($instcode);
     $instseclist = &unescape($instseclist);
+    my $custominfo = &Apache::lonnet::thaw_unescape($customdata);
     my $outcome;
     eval {
         local($SIG{__DIE__})='DEFAULT';
         $outcome = &localenroll::validate_crsreq($dom,$owner,$crstype,
                                                  $inststatuslist,$instcode,
-                                                 $instseclist);
+                                                 $instseclist,$custominfo);
     };
     if (!$@) {
         &Reply($client, \$outcome, $userinput);