loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.262 and 1.277

version 1.262, 2004/10/19 10:57:06	version 1.277, 2005/02/06 07:39:49
Line 46 use Authen::Krb5;	Line 46 use Authen::Krb5;
use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use localauth;	use localauth;
use localenroll;	use localenroll;
	use localstudentphoto;
use File::Copy;	use File::Copy;
use LONCAPA::ConfigFileEdit;	use LONCAPA::ConfigFileEdit;
use LONCAPA::lonlocal;	use LONCAPA::lonlocal;
Line 64 my $currentdomainid;	Line 65 my $currentdomainid;

my $client;	my $client;
my $clientip; # IP address of client.	my $clientip; # IP address of client.
my $clientdns; # DNS name of client.
my $clientname; # LonCAPA name of client.	my $clientname; # LonCAPA name of client.

my $server;	my $server;
Line 177 sub ResetStatistics {	Line 177 sub ResetStatistics {
# $initcmd - The full text of the init command.	# $initcmd - The full text of the init command.
#	#
# Implicit inputs:	# Implicit inputs:
# $clientdns - The DNS name of the remote client.
# $thisserver - Our DNS name.	# $thisserver - Our DNS name.
#	#
# Returns:	# Returns:
Line 186 sub ResetStatistics {	Line 185 sub ResetStatistics {
#	#
sub LocalConnection {	sub LocalConnection {
my ($Socket, $initcmd) = @_;	my ($Socket, $initcmd) = @_;
Debug("Attempting local connection: $initcmd client: $clientdns me: $thisserver");	Debug("Attempting local connection: $initcmd client: $clientip me: $thisserver");
if($clientdns ne $thisserver) {	if($clientip ne "127.0.0.1") {
&logthis('<font color="red"> LocalConnection rejecting non local: '	&logthis('<font color="red"> LocalConnection rejecting non local: '
."$clientdns ne $thisserver </font>");	."$clientip ne $thisserver </font>");
close $Socket;	close $Socket;
return undef;	return undef;
} else {	} else {
Line 1130 sub read_profile {	Line 1129 sub read_profile {
# 0 - Program should exit.	# 0 - Program should exit.
# Side effects:	# Side effects:
# Reply information is sent to the client.	# Reply information is sent to the client.

sub ping_handler {	sub ping_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;
Debug("$cmd $tail $client .. $currenthostid:");	Debug("$cmd $tail $client .. $currenthostid:");
Line 1158 sub ping_handler {	Line 1156 sub ping_handler {
# 0 - Program should exit.	# 0 - Program should exit.
# Side effects:	# Side effects:
# Reply information is sent to the client.	# Reply information is sent to the client.

sub pong_handler {	sub pong_handler {
my ($cmd, $tail, $replyfd) = @_;	my ($cmd, $tail, $replyfd) = @_;

Line 1213 sub establish_key_handler {	Line 1210 sub establish_key_handler {
}	}
&register_handler("ekey", \&establish_key_handler, 0, 1,1);	&register_handler("ekey", \&establish_key_handler, 0, 1,1);


# Handler for the load command. Returns the current system load average	# Handler for the load command. Returns the current system load average
# to the requestor.	# to the requestor.
#	#
Line 1248 sub load_handler {	Line 1244 sub load_handler {

return 1;	return 1;
}	}
register_handler("load", \&load_handler, 0, 1, 0);	&register_handler("load", \&load_handler, 0, 1, 0);

#	#
# Process the userload request. This sub returns to the client the current	# Process the userload request. This sub returns to the client the current
Line 1278 sub user_load_handler {	Line 1274 sub user_load_handler {

return 1;	return 1;
}	}
register_handler("userload", \&user_load_handler, 0, 1, 0);	&register_handler("userload", \&user_load_handler, 0, 1, 0);

# Process a request for the authorization type of a user:	# Process a request for the authorization type of a user:
# (userauth).	# (userauth).
Line 1314 sub user_authorization_type {	Line 1310 sub user_authorization_type {
my ($type,$otherinfo) = split(/:/,$result);	my ($type,$otherinfo) = split(/:/,$result);
if($type =~ /^krb/) {	if($type =~ /^krb/) {
$type = $result;	$type = $result;
}	} else {
&Reply( $replyfd, "$type:\n", $userinput);	$type .= ':';
	}
	&Reply( $replyfd, "$type\n", $userinput);
}	}

return 1;	return 1;
Line 1335 sub user_authorization_type {	Line 1333 sub user_authorization_type {
# 0 - Program should exit	# 0 - Program should exit
# Implicit Output:	# Implicit Output:
# a reply is written to the client.	# a reply is written to the client.

sub push_file_handler {	sub push_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 1378 sub push_file_handler {	Line 1375 sub push_file_handler {
# Side Effects:	# Side Effects:
# The reply is written to $client.	# The reply is written to $client.
#	#

sub du_handler {	sub du_handler {
my ($cmd, $ududir, $client) = @_;	my ($cmd, $ududir, $client) = @_;
my ($ududir) = split(/:/,$ududir); # Make 'telnet' testing easier.	my ($ududir) = split(/:/,$ududir); # Make 'telnet' testing easier.
Line 1412 sub du_handler {	Line 1408 sub du_handler {
}	}
&register_handler("du", \&du_handler, 0, 1, 0);	&register_handler("du", \&du_handler, 0, 1, 0);


#	#
# ls - list the contents of a directory. For each file in the	# ls - list the contents of a directory. For each file in the
# selected directory the filename followed by the full output of	# selected directory the filename followed by the full output of
Line 1476 sub ls_handler {	Line 1471 sub ls_handler {
}	}
&register_handler("ls", \&ls_handler, 0, 1, 0);	&register_handler("ls", \&ls_handler, 0, 1, 0);




# Process a reinit request. Reinit requests that either	# Process a reinit request. Reinit requests that either
# lonc or lond be reinitialized so that an updated	# lonc or lond be reinitialized so that an updated
# host.tab or domain.tab can be processed.	# host.tab or domain.tab can be processed.
Line 1508 sub reinit_process_handler {	Line 1500 sub reinit_process_handler {
}	}
return 1;	return 1;
}	}

&register_handler("reinit", \&reinit_process_handler, 1, 0, 1);	&register_handler("reinit", \&reinit_process_handler, 1, 0, 1);

# Process the editing script for a table edit operation.	# Process the editing script for a table edit operation.
Line 1550 sub edit_table_handler {	Line 1541 sub edit_table_handler {
}	}
return 1;	return 1;
}	}
register_handler("edit", \&edit_table_handler, 1, 0, 1);	&register_handler("edit", \&edit_table_handler, 1, 0, 1);


#	#
# Authenticate a user against the LonCAPA authentication	# Authenticate a user against the LonCAPA authentication
Line 1606 sub authenticate_handler {	Line 1596 sub authenticate_handler {

return 1;	return 1;
}	}
	&register_handler("auth", \&authenticate_handler, 1, 1, 0);
register_handler("auth", \&authenticate_handler, 1, 1, 0);

#	#
# Change a user's password. Note that this function is complicated by	# Change a user's password. Note that this function is complicated by
Line 1698 sub change_password_handler {	Line 1687 sub change_password_handler {

return 1;	return 1;
}	}
register_handler("passwd", \&change_password_handler, 1, 1, 0);	&register_handler("passwd", \&change_password_handler, 1, 1, 0);


#	#
# Create a new user. User in this case means a lon-capa user.	# Create a new user. User in this case means a lon-capa user.
Line 1738 sub add_user_handler {	Line 1726 sub add_user_handler {
if (-e $passfilename) {	if (-e $passfilename) {
&Failure( $client, "already_exists\n", $userinput);	&Failure( $client, "already_exists\n", $userinput);
} else {	} else {
my @fpparts=split(/\//,$passfilename);
my $fpnow=$fpparts[0].'/'.$fpparts[1].'/'.$fpparts[2];
my $fperror='';	my $fperror='';
for (my $i=3;$i<= ($#fpparts-1);$i++) {	if (!&mkpath($passfilename)) {
$fpnow.='/'.$fpparts[$i];	$fperror="error: ".($!+0)." mkdir failed while attempting "
unless (-e $fpnow) {	."makeuser";
&logthis("mkdir $fpnow");
unless (mkdir($fpnow,0777)) {
$fperror="error: ".($!+0)." mkdir failed while attempting "
."makeuser";
}
}
}	}
unless ($fperror) {	unless ($fperror) {
my $result=&make_passwd_file($uname, $umode,$npass, $passfilename);	my $result=&make_passwd_file($uname, $umode,$npass, $passfilename);
Line 1817 sub change_authentication_handler {	Line 1797 sub change_authentication_handler {
# to take ownership of the construction space back to www:www	# to take ownership of the construction space back to www:www
#	#

if( ($oldauth =~ /^unix/) && ($umode eq "internal")) { # unix -> internal	if( (($oldauth =~ /^unix/) && ($umode eq "internal")) \|\|
	(($oldauth =~ /^internal/) && ($umode eq "unix")) ) {
if(&is_author($udom, $uname)) {	if(&is_author($udom, $uname)) {
&Debug(" Need to manage author permissions...");	&Debug(" Need to manage author permissions...");
&manage_permissions("/$udom/_au", $udom, $uname, "internal:");	&manage_permissions("/$udom/_au", $udom, $uname, "$umode:");
}	}
}	}

Line 1980 sub fetch_user_file_handler {	Line 1961 sub fetch_user_file_handler {
# Note that any regular files in the way of this path are	# Note that any regular files in the way of this path are
# wiped out to deal with some earlier folly of mine.	# wiped out to deal with some earlier folly of mine.

my $path = $udir;	if (!&mkpath($udir.'/'.$ufile)) {
if ($ufile =~m\|(.+)/([^/]+)$\|) {	&Failure($client, "unable_to_create\n", $userinput);
my @parts=split('/',$1);
foreach my $part (@parts) {
$path .= '/'.$part;
if( -f $path) {
unlink($path);
}
if ((-e $path)!=1) {
mkdir($path,0770);
}
}
}	}


my $destname=$udir.'/'.$ufile;	my $destname=$udir.'/'.$ufile;
my $transname=$udir.'/'.$ufile.'.in.transit';	my $transname=$udir.'/'.$ufile.'.in.transit';
my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;	my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
Line 2038 sub fetch_user_file_handler {	Line 2008 sub fetch_user_file_handler {
#	#
# Returns:	# Returns:
# 1 - Continue processing.	# 1 - Continue processing.

sub remove_user_file_handler {	sub remove_user_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 2091 sub remove_user_file_handler {	Line 2060 sub remove_user_file_handler {
#	#
# Returns:	# Returns:
# 1 - Continue processing.	# 1 - Continue processing.

sub mkdir_user_file_handler {	sub mkdir_user_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 2105 sub mkdir_user_file_handler {	Line 2073 sub mkdir_user_file_handler {
} else {	} else {
my $udir = &propath($udom,$uname);	my $udir = &propath($udom,$uname);
if (-e $udir) {	if (-e $udir) {
my $newdir=$udir.'/userfiles/'.$ufile;	my $newdir=$udir.'/userfiles/'.$ufile.'/';
if (!-e $newdir) {	if (!&mkpath($newdir)) {
my @parts=split('/',$newdir);	&Failure($client, "failed\n", "$cmd:$tail");
my $path;
foreach my $part (@parts) {
$path .= '/'.$part;
if (!-e $path) {
mkdir($path,0770);
}
}
if (!-e $newdir) {
&Failure($client, "failed\n", "$cmd:$tail");
} else {
&Reply($client, "ok\n", "$cmd:$tail");
}
} else {
&Failure($client, "not_found\n", "$cmd:$tail");
}	}
	&Reply($client, "ok\n", "$cmd:$tail");
} else {	} else {
&Failure($client, "not_home\n", "$cmd:$tail");	&Failure($client, "not_home\n", "$cmd:$tail");
}	}
Line 2140 sub mkdir_user_file_handler {	Line 2095 sub mkdir_user_file_handler {
#	#
# Returns:	# Returns:
# 1 - Continue processing.	# 1 - Continue processing.

sub rename_user_file_handler {	sub rename_user_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 2174 sub rename_user_file_handler {	Line 2128 sub rename_user_file_handler {
}	}
&register_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);	&register_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);


#	#
# Authenticate access to a user file by checking the user's	# Authenticate access to a user file by checking that the token the user's
# session token(?)	# passed also exists in their session file
#	#
# Parameters:	# Parameters:
# cmd - The request keyword that dispatched to tus.	# cmd - The request keyword that dispatched to tus.
Line 2185 sub rename_user_file_handler {	Line 2138 sub rename_user_file_handler {
# client - Filehandle open on the client.	# client - Filehandle open on the client.
# Return:	# Return:
# 1.	# 1.

sub token_auth_user_file_handler {	sub token_auth_user_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 2206 sub token_auth_user_file_handler {	Line 2158 sub token_auth_user_file_handler {
return 1;	return 1;

}	}

&register_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);	&register_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);


#	#
# Unsubscribe from a resource.	# Unsubscribe from a resource.
#	#
Line 2238 sub unsubscribe_handler {	Line 2188 sub unsubscribe_handler {
return 1;	return 1;
}	}
&register_handler("unsub", \&unsubscribe_handler, 0, 1, 0);	&register_handler("unsub", \&unsubscribe_handler, 0, 1, 0);

# Subscribe to a resource	# Subscribe to a resource
#	#
# Parameters:	# Parameters:
Line 2316 sub activity_log_handler {	Line 2267 sub activity_log_handler {

return 1;	return 1;
}	}
register_handler("log", \&activity_log_handler, 0, 1, 0);	&register_handler("log", \&activity_log_handler, 0, 1, 0);

#	#
# Put a namespace entry in a user profile hash.	# Put a namespace entry in a user profile hash.
Line 2421 sub increment_user_value_handler {	Line 2372 sub increment_user_value_handler {
}	}
&register_handler("inc", \&increment_user_value_handler, 0, 1, 0);	&register_handler("inc", \&increment_user_value_handler, 0, 1, 0);


#	#
# Put a new role for a user. Roles are LonCAPA's packaging of permissions.	# Put a new role for a user. Roles are LonCAPA's packaging of permissions.
# Each 'role' a user has implies a set of permissions. Adding a new role	# Each 'role' a user has implies a set of permissions. Adding a new role
Line 2629 sub get_profile_entry_encrypted {	Line 2579 sub get_profile_entry_encrypted {
return 1;	return 1;
}	}
&register_handler("eget", \&get_profile_entry_encrypted, 0, 1, 0);	&register_handler("eget", \&get_profile_entry_encrypted, 0, 1, 0);

#	#
# Deletes a key in a user profile database.	# Deletes a key in a user profile database.
#	#
Line 2647 sub get_profile_entry_encrypted {	Line 2598 sub get_profile_entry_encrypted {
# 0 - Exit server.	# 0 - Exit server.
#	#
#	#

sub delete_profile_entry {	sub delete_profile_entry {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

Line 2676 sub delete_profile_entry {	Line 2626 sub delete_profile_entry {
return 1;	return 1;
}	}
&register_handler("del", \&delete_profile_entry, 0, 1, 0);	&register_handler("del", \&delete_profile_entry, 0, 1, 0);

#	#
# List the set of keys that are defined in a profile database file.	# List the set of keys that are defined in a profile database file.
# A successful reply from this will contain an & separated list of	# A successful reply from this will contain an & separated list of
Line 2854 sub dump_with_regexp {	Line 2805 sub dump_with_regexp {

return 1;	return 1;
}	}

&register_handler("dump", \&dump_with_regexp, 0, 1, 0);	&register_handler("dump", \&dump_with_regexp, 0, 1, 0);

# Store a set of key=value pairs associated with a versioned name.	# Store a set of key=value pairs associated with a versioned name.
Line 2886 sub store_handler {	Line 2836 sub store_handler {
chomp($what);	chomp($what);
my @pairs=split(/\&/,$what);	my @pairs=split(/\&/,$what);
my $hashref = &tie_user_hash($udom, $uname, $namespace,	my $hashref = &tie_user_hash($udom, $uname, $namespace,
&GDBM_WRCREAT(), "P",	&GDBM_WRCREAT(), "S",
"$rid:$what");	"$rid:$what");
if ($hashref) {	if ($hashref) {
my $now = time;	my $now = time;
Line 2920 sub store_handler {	Line 2870 sub store_handler {
return 1;	return 1;
}	}
&register_handler("store", \&store_handler, 0, 1, 0);	&register_handler("store", \&store_handler, 0, 1, 0);

#	#
# Dump out all versions of a resource that has key=value pairs associated	# Dump out all versions of a resource that has key=value pairs associated
# with it for each version. These resources are built up via the store	# with it for each version. These resources are built up via the store
Line 3020 sub send_chat_handler {	Line 2971 sub send_chat_handler {
return 1;	return 1;
}	}
&register_handler("chatsend", \&send_chat_handler, 0, 1, 0);	&register_handler("chatsend", \&send_chat_handler, 0, 1, 0);

#	#
# Retrieve the set of chat messagss from a discussion board.	# Retrieve the set of chat messagss from a discussion board.
#	#
Line 3155 sub reply_query_handler {	Line 3107 sub reply_query_handler {
# $tail - Tail of the command. In this case consists of a colon	# $tail - Tail of the command. In this case consists of a colon
# separated list contaning the domain to apply this to and	# separated list contaning the domain to apply this to and
# an ampersand separated list of keyword=value pairs.	# an ampersand separated list of keyword=value pairs.
	# Each value is a colon separated list that includes:
	# description, institutional code and course owner.
	# For backward compatibility with versions included
	# in LON-CAPA 1.1.X (and earlier) and 1.2.X, institutional
	# code and/or course owner are preserved from the existing
	# record when writing a new record in response to 1.1 or
	# 1.2 implementations of lonnet::flushcourselogs().
	#
# $client - Socket open on the client.	# $client - Socket open on the client.
# Returns:	# Returns:
# 1 - indicating that processing should continue	# 1 - indicating that processing should continue
Line 3168 sub put_course_id_handler {	Line 3128 sub put_course_id_handler {

my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom, $what) = split(/:/, $tail);	my ($udom, $what) = split(/:/, $tail,2);
chomp($what);	chomp($what);
my $now=time;	my $now=time;
my @pairs=split(/\&/,$what);	my @pairs=split(/\&/,$what);
Line 3176 sub put_course_id_handler {	Line 3136 sub put_course_id_handler {
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());	my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {	if ($hashref) {
foreach my $pair (@pairs) {	foreach my $pair (@pairs) {
my ($key,$descr,$inst_code)=split(/=/,$pair);	my ($key,$courseinfo) = split(/=/,$pair,2);
$hashref->{$key}=$descr.':'.$inst_code.':'.$now;	$courseinfo =~ s/=/:/g;

	my @current_items = split(/:/,$hashref->{$key});
	shift(@current_items); # remove description
	pop(@current_items); # remove last access
	my $numcurrent = scalar(@current_items);

	my @new_items = split(/:/,$courseinfo);
	my $numnew = scalar(@new_items);
	if ($numcurrent > 0) {
	if ($numnew == 1) { # flushcourselogs() from 1.1 or earlier
	$courseinfo .= ':'.join(':',@current_items);
	} elsif ($numnew == 2) { # flushcourselogs() from 1.2.X
	$courseinfo .= ':'.$current_items[$numcurrent-1];
	}
	}
	$hashref->{$key}=$courseinfo.':'.$now;
}	}
if (untie(%$hashref)) {	if (untie(%$hashref)) {
&Reply( $client, "ok\n", $userinput);	&Reply( $client, "ok\n", $userinput);
Line 3215 sub put_course_id_handler {	Line 3191 sub put_course_id_handler {
# description - regular expression that is used to filter	# description - regular expression that is used to filter
# the dump. Only keywords matching this regexp	# the dump. Only keywords matching this regexp
# will be used.	# will be used.
	# institutional code - optional supplied code to filter
	# the dump. Only courses with an institutional code
	# that match the supplied code will be returned.
	# owner - optional supplied username of owner to filter
	# the dump. Only courses for which the course
	# owner matches the supplied username will be
	# returned. Implicit assumption that owner
	# is a user in the domain in which the
	# course database is defined.
# $client - The socket open on the client.	# $client - The socket open on the client.
# Returns:	# Returns:
# 1 - Continue processing.	# 1 - Continue processing.
Line 3225 sub dump_course_id_handler {	Line 3210 sub dump_course_id_handler {

my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom,$since,$description) =split(/:/,$tail);	my ($udom,$since,$description,$instcodefilter,$ownerfilter) =split(/:/,$tail);
if (defined($description)) {	if (defined($description)) {
$description=&unescape($description);	$description=&unescape($description);
} else {	} else {
$description='.';	$description='.';
}	}
	if (defined($instcodefilter)) {
	$instcodefilter=&unescape($instcodefilter);
	} else {
	$instcodefilter='.';
	}
	if (defined($ownerfilter)) {
	$ownerfilter=&unescape($ownerfilter);
	} else {
	$ownerfilter='.';
	}

unless (defined($since)) { $since=0; }	unless (defined($since)) { $since=0; }
my $qresult='';	my $qresult='';
my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());	my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
if ($hashref) {	if ($hashref) {
while (my ($key,$value) = each(%$hashref)) {	while (my ($key,$value) = each(%$hashref)) {
my ($descr,$lasttime,$inst_code);	my ($descr,$lasttime,$inst_code,$owner);
if ($value =~ m/^([^\:]):([^\:]):(\d+)$/) {	my @courseitems = split(/:/,$value);
($descr,$inst_code,$lasttime)=($1,$2,$3);	$lasttime = pop(@courseitems);
} else {	($descr,$inst_code,$owner)=@courseitems;
($descr,$lasttime) = split(/\:/,$value);
}
if ($lasttime<$since) { next; }	if ($lasttime<$since) { next; }
if ($description eq '.') {	my $match = 1;
$qresult.=$key.'='.$descr.':'.$inst_code.'&';	unless ($description eq '.') {
} else {	my $unescapeDescr = &unescape($descr);
my $unescapeVal = &unescape($descr);	unless (eval('$unescapeDescr=~/\Q$description\E/i')) {
if (eval('$unescapeVal=~/\Q$description\E/i')) {	$match = 0;
$qresult.=$key.'='.$descr.':'.$inst_code.'&';
}	}
	}
	unless ($instcodefilter eq '.' \|\| !defined($instcodefilter)) {
	my $unescapeInstcode = &unescape($inst_code);
	unless (eval('$unescapeInstcode=~/\Q$instcodefilter\E/i')) {
	$match = 0;
	}
}	}
	unless ($ownerfilter eq '.' \|\| !defined($ownerfilter)) {
	my $unescapeOwner = &unescape($owner);
	unless (eval('$unescapeOwner=~/\Q$ownerfilter\E/i')) {
	$match = 0;
	}
	}
	if ($match == 1) {
	$qresult.=$key.'='.$descr.':'.$inst_code.':'.$owner.'&';
	}
}	}
if (untie(%$hashref)) {	if (untie(%$hashref)) {
chop($qresult);	chop($qresult);
Line 3314 sub put_id_handler {	Line 3322 sub put_id_handler {

return 1;	return 1;
}	}

&register_handler("idput", \&put_id_handler, 0, 1, 0);	&register_handler("idput", \&put_id_handler, 0, 1, 0);

#	#
# Retrieves a set of id values from the id database.	# Retrieves a set of id values from the id database.
# Returns an & separated list of results, one for each requested id to the	# Returns an & separated list of results, one for each requested id to the
Line 3364 sub get_id_handler {	Line 3372 sub get_id_handler {

return 1;	return 1;
}	}
	&register_handler("idget", \&get_id_handler, 0, 1, 0);
register_handler("idget", \&get_id_handler, 0, 1, 0);

#	#
# Process the tmpput command I'm not sure what this does.. Seems to	# Process the tmpput command I'm not sure what this does.. Seems to
Line 3408 sub tmp_put_handler {	Line 3415 sub tmp_put_handler {

}	}
&register_handler("tmpput", \&tmp_put_handler, 0, 1, 0);	&register_handler("tmpput", \&tmp_put_handler, 0, 1, 0);

# Processes the tmpget command. This command returns the contents	# Processes the tmpget command. This command returns the contents
# of a temporary resource file(?) created via tmpput.	# of a temporary resource file(?) created via tmpput.
#	#
Line 3420 sub tmp_put_handler {	Line 3428 sub tmp_put_handler {
# 1 - Inidcating processing can continue.	# 1 - Inidcating processing can continue.
# Side effects:	# Side effects:
# A reply is sent to the client.	# A reply is sent to the client.

#	#
sub tmp_get_handler {	sub tmp_get_handler {
my ($cmd, $id, $client) = @_;	my ($cmd, $id, $client) = @_;
Line 3443 sub tmp_get_handler {	Line 3450 sub tmp_get_handler {
return 1;	return 1;
}	}
&register_handler("tmpget", \&tmp_get_handler, 0, 1, 0);	&register_handler("tmpget", \&tmp_get_handler, 0, 1, 0);

#	#
# Process the tmpdel command. This command deletes a temp resource	# Process the tmpdel command. This command deletes a temp resource
# created by the tmpput command.	# created by the tmpput command.
Line 3476 sub tmp_del_handler {	Line 3484 sub tmp_del_handler {

}	}
&register_handler("tmpdel", \&tmp_del_handler, 0, 1, 0);	&register_handler("tmpdel", \&tmp_del_handler, 0, 1, 0);

#	#
# Processes the setannounce command. This command	# Processes the setannounce command. This command
# creates a file named announce.txt in the top directory of	# creates a file named announce.txt in the top directory of
Line 3514 sub set_announce_handler {	Line 3523 sub set_announce_handler {
return 1;	return 1;
}	}
&register_handler("setannounce", \&set_announce_handler, 0, 1, 0);	&register_handler("setannounce", \&set_announce_handler, 0, 1, 0);

#	#
# Return the version of the daemon. This can be used to determine	# Return the version of the daemon. This can be used to determine
# the compatibility of cross version installations or, alternatively to	# the compatibility of cross version installations or, alternatively to
Line 3538 sub get_version_handler {	Line 3548 sub get_version_handler {
return 1;	return 1;
}	}
&register_handler("version", \&get_version_handler, 0, 1, 0);	&register_handler("version", \&get_version_handler, 0, 1, 0);

# Set the current host and domain. This is used to support	# Set the current host and domain. This is used to support
# multihomed systems. Each IP of the system, or even separate daemons	# multihomed systems. Each IP of the system, or even separate daemons
# on the same IP can be treated as handling a separate lonCAPA virtual	# on the same IP can be treated as handling a separate lonCAPA virtual
Line 3674 sub validate_course_owner_handler {	Line 3685 sub validate_course_owner_handler {
return 1;	return 1;
}	}
&register_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);	&register_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);

#	#
# Validate a course section in the official schedule of classes	# Validate a course section in the official schedule of classes
# from the institutions point of view (part of autoenrollment).	# from the institutions point of view (part of autoenrollment).
Line 3754 sub create_auto_enroll_password_handler	Line 3766 sub create_auto_enroll_password_handler
#	#
# Returns:	# Returns:
# 1 - Continue processing.	# 1 - Continue processing.

sub retrieve_auto_file_handler {	sub retrieve_auto_file_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;
my $userinput = "cmd:$tail";	my $userinput = "cmd:$tail";
Line 3839 sub get_institutional_code_format_handle	Line 3850 sub get_institutional_code_format_handle

return 1;	return 1;
}	}
	&register_handler("autoinstcodeformat",
&register_handler("autoinstcodeformat", \&get_institutional_code_format_handler,	\&get_institutional_code_format_handler,0,1,0);
0,1,0);

#	#
#	# Gets a student's photo to exist (in the correct image type) in the user's
#	# directory.
#	# Formal Parameters:
#	# $cmd - The command request that got us dispatched.
	# $tail - A colon separated set of words that will be split into:
	# $domain - student's domain
	# $uname - student username
	# $type - image type desired
	# $client - The socket open on the client.
	# Returns:
	# 1 - continue processing.
	sub student_photo_handler {
	my ($cmd, $tail, $client) = @_;
	my ($domain,$uname,$type) = split(/:/, $tail);

	my $path=&propath($domain,$uname).
	'/userfiles/internal/studentphoto.'.$type;
	if (-e $path) {
	&Reply($client,"ok\n","$cmd:$tail");
	return 1;
	}
	&mkpath($path);
	my $file=&localstudentphoto::fetch($domain,$uname);
	if (!$file) {
	&Failure($client,"unavailable\n","$cmd:$tail");
	return 1;
	}
	if (!-e $path) { &convert_photo($file,$path); }
	if (-e $path) {
	&Reply($client,"ok\n","$cmd:$tail");
	return 1;
	}
	&Failure($client,"unable_to_convert\n","$cmd:$tail");
	return 1;
	}
	&register_handler("studentphoto", \&student_photo_handler, 0, 1, 0);

	# mkpath makes all directories for a file, expects an absolute path with a
	# file or a trailing / if just a dir is passed
	# returns 1 on success 0 on failure
	sub mkpath {
	my ($file)=@_;
	my @parts=split(/\//,$file,-1);
	my $now=$parts[0].'/'.$parts[1].'/'.$parts[2];
	for (my $i=3;$i<= ($#parts-1);$i++) {
	$now.='/'.$parts[$i];
	if (!-e $now) {
	if (!mkdir($now,0770)) { return 0; }
	}
	}
	return 1;
	}

#---------------------------------------------------------------	#---------------------------------------------------------------
#	#
# Getting, decoding and dispatching requests:	# Getting, decoding and dispatching requests:
#	#

#	#
# Get a Request:	# Get a Request:
# Gets a Request message from the client. The transaction	# Gets a Request message from the client. The transaction
Line 4221 sub ReadHostTable {	Line 4279 sub ReadHostTable {
my $myloncapaname = $perlvar{'lonHostID'};	my $myloncapaname = $perlvar{'lonHostID'};
Debug("My loncapa name is : $myloncapaname");	Debug("My loncapa name is : $myloncapaname");
while (my $configline=<CONFIG>) {	while (my $configline=<CONFIG>) {
if (!($configline =~ /^\s*\#/)) {	if ($configline !~ /^\s\#/ && $configline !~ /^\s$/ ) {
my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);	my ($id,$domain,$role,$name)=split(/:/,$configline);
chomp($ip); $ip=~s/\D+$//;	$name=~s/\s//g;
	my (undef,undef,undef,undef,$ip) = gethostbyname($name);
	if (length($ip) ne 4) {
	&logthis("Skipping host $id name $name no IP $ip found\n");
	next;
	}
	$ip=inet_ntoa($ip);
$hostid{$ip}=$id; # LonCAPA name of host by IP.	$hostid{$ip}=$id; # LonCAPA name of host by IP.
$hostdom{$id}=$domain; # LonCAPA domain name of host.	$hostdom{$id}=$domain; # LonCAPA domain name of host.
$hostip{$id}=$ip; # IP address of host.	$hostip{$id}=$ip; # IP address of host.
$hostdns{$name} = $id; # LonCAPA name of host by DNS.	$hostdns{$name} = $id; # LonCAPA name of host by DNS.

if ($id eq $perlvar{'lonHostID'}) {	if ($id eq $perlvar{'lonHostID'}) {
Line 4407 sub logstatus {	Line 4471 sub logstatus {
flock(LOG,LOCK_EX);	flock(LOG,LOCK_EX);
print LOG $$."\t".$clientname."\t".$currenthostid."\t"	print LOG $$."\t".$clientname."\t".$currenthostid."\t"
.$status."\t".$lastlog."\t $keymode\n";	.$status."\t".$lastlog."\t $keymode\n";
flock(DB,LOCK_UN);	flock(LOG,LOCK_UN);
close(LOG);	close(LOG);
}	}
&status("Finished logging");	&status("Finished logging");
Line 4638 sub make_new_child {	Line 4702 sub make_new_child {
if (defined($iaddr)) {	if (defined($iaddr)) {
$clientip = inet_ntoa($iaddr);	$clientip = inet_ntoa($iaddr);
Debug("Connected with $clientip");	Debug("Connected with $clientip");
$clientdns = gethostbyaddr($iaddr, AF_INET);
Debug("Connected with $clientdns by name");
} else {	} else {
&logthis("Unable to determine clientip");	&logthis("Unable to determine clientip");
$clientip='Unavailable';	$clientip='Unavailable';
Line 4903 sub manage_permissions	Line 4965 sub manage_permissions
#	#
sub password_path {	sub password_path {
my ($domain, $user) = @_;	my ($domain, $user) = @_;
	return &propath($domain, $user).'/passwd';

my $path = &propath($domain, $user);
$path .= "/passwd";

return $path;
}	}

# Password Filename	# Password Filename
Line 5081 sub validate_user {	Line 5138 sub validate_user {
my $krbserver = &Authen::Krb5::parse_name($krbservice);	my $krbserver = &Authen::Krb5::parse_name($krbservice);
my $credentials= &Authen::Krb5::cc_default();	my $credentials= &Authen::Krb5::cc_default();
$credentials->initialize($krbclient);	$credentials->initialize($krbclient);
my $krbreturn = &Authen::KRb5::get_in_tkt_with_password($krbclient,	my $krbreturn = &Authen::Krb5::get_in_tkt_with_password($krbclient,
$krbserver,	$krbserver,
$password,	$password,
$credentials);	$credentials);
Line 5419 sub make_passwd_file {	Line 5476 sub make_passwd_file {
return $result;	return $result;
}	}

	sub convert_photo {
	my ($start,$dest)=@_;
	system("convert $start $dest");
	}

sub sethost {	sub sethost {
my ($remotereq) = @_;	my ($remotereq) = @_;
my (undef,$hostid)=split(/:/,$remotereq);	my (undef,$hostid)=split(/:/,$remotereq);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.262
changed lines
	Added in v.1.277