--- loncom/lond 2018/04/29 00:45:43 1.489.2.28.2.2 +++ loncom/lond 2020/04/07 19:10:31 1.489.2.28.4.1 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.489.2.28.2.2 2018/04/29 00:45:43 raeburn Exp $ +# $Id: lond,v 1.489.2.28.4.1 2020/04/07 19:10:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,7 +64,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.489.2.28.2.2 $'; #' stupid emacs +my $VERSION='$Revision: 1.489.2.28.4.1 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -1497,7 +1497,7 @@ sub ls_handler { } } else { unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) || - ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) { + ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) { &Failure($client,"refused\n",$userinput); return 1; } @@ -5435,10 +5435,9 @@ sub validate_course_section_handler { # Formal Parameters: # $cmd - The command request that got us dispatched. # $tail - The tail of the command. In this case this is a colon separated -# set of values that will be split into: +# set of words that will be split into: # $inst_class - Institutional code for the specific class section -# $ownerlist - An escaped comma-separated list of username:domain -# of the course owner, and co-owner(s). +# $courseowner - The escaped username:domain of the course owner # $cdom - The domain of the course from the institution's # point of view. # $client - The socket open on the client. @@ -5463,56 +5462,6 @@ sub validate_class_access_handler { ®ister_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0); # -# Validate course owner or co-owners(s) access to enrollment data for all sections -# and crosslistings for a particular course. -# -# -# Formal Parameters: -# $cmd - The command request that got us dispatched. -# $tail - The tail of the command. In this case this is a colon separated -# set of values that will be split into: -# $ownerlist - An escaped comma-separated list of username:domain -# of the course owner, and co-owner(s). -# $cdom - The domain of the course from the institution's -# point of view. -# $classes - Frozen hash of institutional course sections and -# crosslistings. -# $client - The socket open on the client. -# Returns: -# 1 - continue processing. -# - -sub validate_classes_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($ownerlist,$cdom,$classes) = split(/:/, $tail); - my $classesref = &Apache::lonnet::thaw_unescape($classes); - my $owners = &unescape($ownerlist); - my $result; - eval { - local($SIG{__DIE__})='DEFAULT'; - my %validations; - my $response = &localenroll::check_instclasses($owners,$cdom,$classesref, - \%validations); - if ($response eq 'ok') { - foreach my $key (keys(%validations)) { - $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($validations{$key}).'&'; - } - $result =~ s/\&$//; - } else { - $result = 'error'; - } - }; - if (!$@) { - &Reply($client, \$result, $userinput); - } else { - &Failure($client,"unknown_cmd\n",$userinput); - } - return 1; -} -®ister_handler("autovalidateinstclasses", \&validate_classes_handler, 0, 1, 0); - -# # Create a password for a new LON-CAPA user added by auto-enrollment. # Only used for case where authentication method for new user is localauth #