--- loncom/lonnet/perl/lonnet.pm 2004/06/12 22:09:32 1.510
+++ loncom/lonnet/perl/lonnet.pm 2004/06/18 20:35:18 1.512
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.510 2004/06/12 22:09:32 www Exp $
+# $Id: lonnet.pm,v 1.512 2004/06/18 20:35:18 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1615,11 +1615,11 @@ sub courseidput {
}
sub courseiddump {
- my ($domfilter,$descfilter,$sincefilter,$hostid)=@_;
+ my ($domfilter,$descfilter,$sincefilter,$hostidflag,$hostidref)=@_;
my %returnhash=();
unless ($domfilter) { $domfilter=''; }
foreach my $tryserver (keys %libserv) {
- if (($hostid && $tryserver eq $hostid) || (!$hostid)) {
+ if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) {
if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
foreach (
split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
@@ -3057,7 +3057,7 @@ sub log_query {
# ------- Request retrieval of institutional classlists for course(s)
sub fetch_enrollment_query {
- my ($context,$affiliatesref,$replyref,$cnum,$dom) = @_;
+ my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_;
my $homeserver;
if ($context eq 'automated') {
$homeserver = $perlvar{'lonHostID'};
@@ -3151,7 +3151,7 @@ sub userlog_query {
sub auto_run {
my ($cnum,$cdom) = @_;
my $homeserver = &homeserver($cnum,$cdom);
- my $response = &reply('autorun',$homeserver);
+ my $response = &reply('autorun:'.$cdom,$homeserver);
return $response;
}
@@ -3159,7 +3159,7 @@ sub auto_get_sections {
my ($cnum,$cdom,$inst_coursecode) = @_;
my $homeserver = &homeserver($cnum,$cdom);
my @secs = ();
- my $response=&unescape(&reply('autogetsections:'.$inst_coursecode,$homeserver));
+ my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver));
unless ($response eq 'refused') {
@secs = split/:/,$response;
}
@@ -3169,14 +3169,14 @@ sub auto_get_sections {
sub auto_new_course {
my ($cnum,$cdom,$inst_course_id,$owner) = @_;
my $homeserver = &homeserver($cnum,$cdom);
- my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner,$homeserver));
+ my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner,':'.$cdom,$homeserver));
return $response;
}
sub auto_validate_courseID {
my ($cnum,$cdom,$inst_course_id) = @_;
my $homeserver = &homeserver($cnum,$cdom);
- my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id,$homeserver));
+ my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver));
return $response;
}
@@ -3185,7 +3185,7 @@ sub auto_create_password {
my $homeserver = &homeserver($cnum,$cdom);
my $create_passwd = 0;
my $authchk = '';
- my $response=&unescape(&reply('autocreatepassword:'.$authparam,$homeserver));
+ my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
if ($response eq 'refused') {
$authchk = 'refused';
} else {
@@ -3575,6 +3575,20 @@ sub revokecustomrole {
$deleteflag);
}
+
+# ------------------------------------------------------------ Portfolio Director Lister
+sub portfoliolist {
+ # returns listing of contents of user's /userfiles/portfolio/ directory
+ #
+ my ($udom, $uname, $uhome);
+ $uname=$ENV{'user.name'};
+ $udom=$ENV{'user.domain'};
+ $uhome=$ENV{'user.home'};
+ my $listing = reply('portls:'.$uname.':'.$udom, $uhome);
+ return ''.$listing.'
';
+}
+
+
# ------------------------------------------------------------ Directory lister
sub dirlist {