[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm loncreateuser.pm londropadd.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Thu, 08 Aug 2002 19:27:36 -0000
matthew Thu Aug 8 15:27:36 2002 EDT
Modified files:
/loncom/interface loncommon.pm loncreateuser.pm londropadd.pm
Log:
Changed loncommon::get_home_servers to get_library_servers.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.51 loncom/interface/loncommon.pm:1.52
--- loncom/interface/loncommon.pm:1.51 Thu Aug 8 09:43:04 2002
+++ loncom/interface/loncommon.pm Thu Aug 8 15:27:35 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.51 2002/08/08 13:43:04 www Exp $
+# $Id: loncommon.pm,v 1.52 2002/08/08 19:27:35 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -558,7 +558,7 @@
=pod
-=item get_home_servers($domain)
+=item get_library_servers($domain)
Returns a hash which contains keys like '103l3' and values like
'kirk.lite.msu.edu'. All of the keys will be for machines in the
@@ -567,15 +567,15 @@
=cut
#-------------------------------------------
-sub get_home_servers {
+sub get_library_servers {
my $domain = shift;
- my %home_servers;
+ my %library_servers;
foreach (keys(%Apache::lonnet::libserv)) {
if ($Apache::lonnet::hostdom{$_} eq $domain) {
- $home_servers{$_} = $Apache::lonnet::hostname{$_};
+ $library_servers{$_} = $Apache::lonnet::hostname{$_};
}
}
- return %home_servers;
+ return %library_servers;
}
#-------------------------------------------
@@ -592,7 +592,7 @@
#-------------------------------------------
sub home_server_option_list {
my $domain = shift;
- my %servers = &get_home_servers($domain);
+ my %servers = &get_library_servers($domain);
my $result = '';
foreach (sort keys(%servers)) {
$result.=
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.38 loncom/interface/loncreateuser.pm:1.39
--- loncom/interface/loncreateuser.pm:1.38 Wed Aug 7 14:49:36 2002
+++ loncom/interface/loncreateuser.pm Thu Aug 8 15:27:35 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.38 2002/08/07 18:49:36 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@
# 11/12,11/13,11/15 Scott Harrison
# 02/11/02 Matthew Hall
#
-# $Id: loncreateuser.pm,v 1.38 2002/08/07 18:49:36 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
###
package Apache::loncreateuser;
@@ -573,7 +573,7 @@
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_home_servers
+ my %home_servers = &Apache::loncommon::get_library_servers
($ENV{'form.ccdomain'});
if (! exists($home_servers{$desiredhost})) {
$r->print($error.'Invalid home server specified');
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.44 loncom/interface/londropadd.pm:1.45
--- loncom/interface/londropadd.pm:1.44 Thu Aug 1 12:48:21 2002
+++ loncom/interface/londropadd.pm Thu Aug 8 15:27:35 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.44 2002/08/01 16:48:21 bowersj2 Exp $
+# $Id: londropadd.pm,v 1.45 2002/08/08 19:27:35 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -129,7 +129,7 @@
$select_menus{$dom}->{'default'}= 'default';
$select_menus{$dom}->{'select2'}->{'default'} = 'default';
# Now build up the other items in the second menu
- my %servers = &Apache::loncommon::get_home_servers($dom);
+ my %servers = &Apache::loncommon::get_library_servers($dom);
foreach my $server (keys(%servers)) {
$select_menus{$dom}->{'select2'}->{$server}
= "$server $servers{$server}";
@@ -536,7 +536,7 @@
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_home_servers($domain);
+ my %home_servers =&Apache::loncommon::get_library_servers($domain);
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">Error:</font>'.
'Invalid home server specified');
@@ -919,7 +919,7 @@
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_home_servers($domain);
+ my %home_servers = &Apache::loncommon::get_library_servers($domain);
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">Error:</font>'.
'Invalid home server specified');