--- loncom/lond 2014/01/03 18:39:43 1.506 +++ loncom/lond 2014/04/30 17:17:14 1.509 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.506 2014/01/03 18:39:43 raeburn Exp $ +# $Id: lond,v 1.509 2014/04/30 17:17:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.506 $'; #' stupid emacs +my $VERSION='$Revision: 1.509 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -5263,7 +5263,7 @@ sub crsreq_checks_handler { my $userinput = "$cmd:$tail"; my $dom = $tail; my $result; - my @reqtypes = ('official','unofficial','community'); + my @reqtypes = ('official','unofficial','community','textbook'); eval { local($SIG{__DIE__})='DEFAULT'; my %validations; @@ -5290,19 +5290,20 @@ sub crsreq_checks_handler { 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); @@ -5316,7 +5317,8 @@ sub validate_crsreq_handler { sub crsreq_update_handler { my ($cmd, $tail, $client) = @_; my $userinput = "$cmd:$tail"; - my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,$code,$infohashref) = + my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,$code, + $accessstart,$accessend,$infohashref) = split(/:/, $tail); $crstype = &unescape($crstype); $action = &unescape($action); @@ -5325,6 +5327,8 @@ sub crsreq_update_handler { $fullname = &unescape($fullname); $title = &unescape($title); $code = &unescape($code); + $accessstart = &unescape($accessstart); + $accessend = &unescape($accessend); my $incoming = &Apache::lonnet::thaw_unescape($infohashref); my ($result,$outcome); eval { @@ -5332,7 +5336,8 @@ sub crsreq_update_handler { my %rtnhash; $outcome = &localenroll::crsreq_updates($cdom,$cnum,$crstype,$action, $ownername,$ownerdomain,$fullname, - $title,$code,$incoming,\%rtnhash); + $title,$code,$accessstart,$accessend, + $incoming,\%rtnhash); if ($outcome eq 'ok') { my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb); foreach my $key (keys(%rtnhash)) {