--- loncom/interface/Attic/londropadd.pm 2007/01/10 21:37:50 1.155
+++ loncom/interface/Attic/londropadd.pm 2007/07/02 21:12:06 1.162
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.155 2007/01/10 21:37:50 www Exp $
+# $Id: londropadd.pm,v 1.162 2007/07/02 21:12:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -106,7 +106,7 @@ sub domain_form {
# Set up domain and server selection forms
#
# Get the domains
- my @domains = &Apache::loncommon::get_domains();
+ my @domains = &Apache::lonnet::all_domains();
# build up the menu information to be passed to
# &Apache::loncommon::linked_select_forms
my %select_menus;
@@ -117,7 +117,7 @@ sub domain_form {
$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_library_servers($dom);
+ my %servers = &Apache::lonnet::get_servers($dom,'library');
foreach my $server (keys(%servers)) {
$select_menus{$dom}->{'select2'}->{$server}
= "$server $servers{$server}";
@@ -752,8 +752,8 @@ sub enroll_single_student {
}
$r->print('
'.&mt('Enrolling Student').' ');
- $r->print(''.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".
- $env{'form.lcdomain'}.'
');
+ $r->print(''.&mt('Enrolling [_1] : [_2]',$env{'form.cuname'},
+ $env{'form.lcdomain'}).'
');
if (($env{'form.cuname'})
&& ($env{'form.cuname'}
eq &LONCAPA::clean_username($env{'form.cuname'}))
@@ -766,7 +766,7 @@ sub enroll_single_student {
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers =&Apache::loncommon::get_library_servers($domain);
+ my %home_servers =&Apache::lonnet::get_servers($domain,'library');
if (! exists($home_servers{$desiredhost})) {
$r->print(''.&mt('Error').': '.
&mt('Invalid home server specified'));
@@ -886,7 +886,8 @@ sub date_setting_table {
my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
my $dateDefault = ''.
' '.
- &mt('make these dates the default for future enrollment').' ';
+ &mt('make these dates the default for future enrollment').
+ ' ';
if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
$dateDefault = ' ';
}
@@ -949,11 +950,11 @@ sub get_student_username_domain_form {
$lt{'eos'}
-$lt{'usr'}:
+$lt{'usr'} :
-$lt{'dom'}:
+$lt{'dom'} :
$domform
-
+
@@ -997,7 +998,7 @@ sub print_enroll_single_student_form {
#
# Set up domain selection form
my $homeserver_form = '';
- my %servers = &Apache::loncommon::get_library_servers($domain);
+ my %servers = &Apache::lonnet::get_servers($domain,'library');
$homeserver_form = ''."\n".
'default '."\n";
while (my ($servername,$serverdescription) = each (%servers)) {
@@ -1020,19 +1021,19 @@ sub print_enroll_single_student_form {
);
my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
$user_data_html = <$lt{'udf'} $username\@$domain
+$lt{'udf'} $username:$domain
$lt{'pswd'}
@@ -1059,29 +1060,19 @@ END
'mail' => "Email Address",
);
$user_data_html = <$lt{'udf'} $username\@$domain
+$lt{'udf'} $username:$domain
END
}
@@ -1143,20 +1134,19 @@ $user_data_html
$lt{'cd'}
-$lt{'gs'}:
-
-$date_table
+
$lt{'gs'} :
+$date_table
$lt{'idsn'}
-$lt{'idsn'}:
+$lt{'idsn'} :
-
+
$lt{'disn'}
-
+
END
return;
@@ -1234,9 +1224,9 @@ sub print_html_classlist {
$output_selector .= "\n".$option;
}
$output_selector .= ' ';
- $r->print(&mt('Output Format: [_1]',$output_selector).(' 'x3));
+ $r->print(''.&mt('Output Format: [_1]',$output_selector).' '.(' 'x3));
}
- $r->print(&mt('Student Status: [_1]',$status_select)."\n");
+ $r->print(''.&mt('Student Status: [_1]',$status_select)." \n");
$r->print(' '.
"\n\n");
#
@@ -1698,7 +1688,7 @@ $lt{'odcc'}
$lt{'mef'} $info{'firstname'} $info{'middlename'}
-$info{'lastname'} $info{'generation'}, $sname\@$sdom
+$info{'lastname'} $info{'generation'}, $sname:$sdom
$lt{'sn'}
-$lt{'sid'} :
+$lt{'sid'} :
-
+
$lt{'disn'}
-$lt{'sec'} :
+$lt{'sec'} :
$current_date_description
$date_table
@@ -1759,7 +1749,7 @@ sub modify_single_student {
$env{'request.course.id'});
my ($tmp) = keys(%old);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");
+ $r->print(&mt('There was an error determining the environment values for')." $slogin : $sdom.");
return;
}
undef $tmp;
@@ -1799,7 +1789,7 @@ sub modify_single_student {
'et' => "End Time",
);
$r->print(<$lt{'mdu'} $slogin \@ $sdom
+ $lt{'mdu'} $slogin : $sdom
$lt{'si'}
@@ -1859,8 +1849,8 @@ END
&mt('The error reported was')." ".
$roleresults);
&Apache::lonnet::logthis("londropadd:failed attempt to modify student".
- " data for ".$slogin." \@ ".$sdom." by ".
- $env{'user.name'}." \@ ".$env{'user.domain'}.
+ " data for ".$slogin." : ".$sdom." by ".
+ $env{'user.name'}." : ".$env{'user.domain'}.
":".$roleresults);
} else { # everything is okay!
$r->print(&mt('Student information updated successfully.')." ".
@@ -2171,7 +2161,7 @@ sub upfile_drop_add {
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_library_servers($domain);
+ my %home_servers = &Apache::lonnet::get_servers($domain,'library');
if (! exists($home_servers{$desiredhost})) {
$r->print(''.&mt('Error').' '.
&mt('Invalid home server specified'));