--- loncom/interface/lonuserutils.pm 2010/02/02 06:05:03 1.97.2.15
+++ loncom/interface/lonuserutils.pm 2009/11/04 15:35:56 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.97.2.15 2010/02/02 06:05:03 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.103 2009/11/04 15:35:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -386,7 +386,7 @@ sub javascript_validations {
if (($context eq 'course') || ($context eq 'domain')) {
if ($context eq 'course') {
if ($env{'request.course.sec'} eq '') {
- $setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
+ $setsection_call = 'setSections(document.'.$param{'formname'}."'$crstype'".');';
$setsections_js =
&setsections_javascript($param{'formname'},$groupslist,
$mode,'',$crstype);
@@ -1176,7 +1176,7 @@ sub default_role_selector {
my %customroles;
my ($options,$coursepick,$cb_jscript);
if ($context ne 'author') {
- %customroles = &my_custom_roles($crstype);
+ %customroles = &my_custom_roles();
}
my %lt=&Apache::lonlocal::texthash(
@@ -1350,14 +1350,10 @@ sub curr_role_permissions {
# ======================================================= Existing Custom Roles
sub my_custom_roles {
- my ($crstype) = @_;
my %returnhash=();
my %rolehash=&Apache::lonnet::dump('roles');
- foreach my $key (keys(%rolehash)) {
+ foreach my $key (keys %rolehash) {
if ($key=~/^rolesdef\_(\w+)$/) {
- if ($crstype eq 'Community') {
- next if ($rolehash{$key} =~ /bre\&S/);
- }
$returnhash{$1}=$1;
}
}
@@ -1446,19 +1442,14 @@ sub print_userlist {
'<input type="hidden" name="phase" value="" /></form>');
return;
}
- if (!(($context eq 'domain') &&
- (($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) {
- $r->print(
- "\n</p>\n"
- .'<p>'
- .&list_submit_button(&mt('Update Display'))
- ."</p>\n"
- );
+ if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
+ $r->print(' '.&list_submit_button(&mt('Update Display')).
+ "\n</p>\n");
}
my ($indexhash,$keylist) = &make_keylist_array();
- my (%userlist,%userinfo,$clearcoursepick);
+ my (%userlist,%userinfo);
if (($context eq 'domain') &&
- ($env{'form.roletype'} eq 'course') ||
+ ($env{'form.roletype'} eq 'course') ||
($env{'form.roletype'} eq 'community')) {
my ($crstype,$numcodes,$title,$warning);
if ($env{'form.roletype'} eq 'course') {
@@ -1481,15 +1472,9 @@ sub print_userlist {
$courseform."\n".
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</p>'.
- '<p><input type="hidden" name="origroletype" value="'.$env{'form.roletype'}.'" />'.
- &list_submit_button(&mt('Update Display')).
+ '<p>'.&list_submit_button(&mt('Update Display')).
"\n".'</p><span class="LC_warning">'.$warning.'</span>'."\n");
- $clearcoursepick = 0;
- if (($env{'form.origroletype'} ne '') &&
- ($env{'form.origroletype'} ne $env{'form.roletype'})) {
- $clearcoursepick = 1;
- }
- if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
+ if ($env{'form.coursepick'}) {
$r->print('<hr />'.&mt('Searching').' ...<br /> <br />');
}
} else {
@@ -1562,8 +1547,9 @@ sub print_userlist {
}
}
}
- } elsif ($env{'form.roletype'} eq 'course') {
- if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
+ } elsif (($env{'form.roletype'} eq 'course') ||
+ ($env{'form.roletype'} eq 'community')) {
+ if ($env{'form.coursepick'}) {
my %courses = &process_coursepick();
my %allusers;
my $hidepriv = 1;
@@ -1731,7 +1717,7 @@ sub section_group_filter {
}
if (@options > 0) {
my $currsel;
- $markup = '<select name="'.$name{$item}.'">'."\n";
+ $markup = '<select name="'.$name{$item}.'" />'."\n";
foreach my $option ('all','none',@options) {
$currsel = '';
if ($env{'form.'.$name{$item}} eq $option) {
@@ -1746,9 +1732,7 @@ sub section_group_filter {
$markup .= '</option>'."\n";
}
$markup .= '</select>'."\n";
- $output .= (' 'x3).'<span class="LC_nobreak">'
- .'<label>'.$title{$item}.': '.$markup.'</label>'
- .'</span> ';
+ $output .= (' 'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
}
}
return $output;
@@ -1968,17 +1952,13 @@ sub process_coursepick {
my $coursefilter = $env{'form.coursepick'};
my $cdom = $env{'request.role.domain'};
my %courses;
- my $crssrch = 'Course';
- if ($env{'form.roletype'} eq 'community') {
- $crssrch = 'Community';
- }
if ($coursefilter eq 'all') {
%courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
- undef,undef,$crssrch);
+ undef,undef,'Course');
} elsif ($coursefilter eq 'category') {
my $instcode = &instcode_from_coursefilter();
%courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
- undef,undef,$crssrch);
+ undef,undef,'Course');
} elsif ($coursefilter eq 'specific') {
if ($env{'form.coursetotal'} > 1) {
my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -2163,7 +2143,7 @@ END
} elsif ($context eq 'domain') {
if ($setting eq 'community') {
$crstype = 'Community';
- } elsif ($setting eq 'course') {
+ } elsif ($crstype eq 'course') {
$crstype = 'Course';
}
}
@@ -2276,7 +2256,7 @@ END
push(@cols,'section');
}
if (!($context eq 'domain' && ($env{'form.roletype'} eq 'course')
- && ($env{'form.roletype'} eq 'community'))) {
+ && ($env{'form.roletype'} eq 'community'))) {
push(@cols,('start','end'));
}
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
@@ -2287,7 +2267,7 @@ END
$env{'form.roletype'} eq 'community')) {
push (@cols,'extent');
}
- if (($statusmode eq 'Any') &&
+ if (($statusmode eq 'Any') &&
(!($context eq 'domain' && (($env{'form.roletype'} eq 'course')
|| ($env{'form.roletype'} eq 'community'))))) {
push(@cols,'status');
@@ -2302,24 +2282,19 @@ END
if ($env{'form.showrole'} eq 'cr') {
$rolefilter = &mt('custom');
} elsif ($env{'form.showrole'} ne 'Any') {
- $rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'});
+ $rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'},$crstype);
}
my $results_description;
if ($mode ne 'autoenroll') {
$results_description = &results_header_row($rolefilter,$statusmode,
$context,$permission,$mode,$crstype);
-
$r->print('<b>'.$results_description.'</b><br /><br />');
}
my ($output,$actionselect,%canchange,%canchangesec);
if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
if ($permission->{'cusr'}) {
- unless (($context eq 'domain') &&
- (($setting eq 'course') || ($setting eq 'community'))) {
- $actionselect =
- &select_actions($context,$setting,$statusmode,$formname);
- }
+ $actionselect = &select_actions($context,$setting,$statusmode,$formname);
}
$r->print(<<END);
<input type="hidden" name="srchby" value="uname" />
@@ -2330,7 +2305,7 @@ END
END
if ($actionselect) {
$output .= <<"END";
-<div class="LC_left_float"><fieldset><legend><b>$lt{'ac'}</b></legend>
+<div class="LC_left_float"><fieldset><legend>$lt{'ac'}</legend>
$actionselect
<br/><br /><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.$formname.actionlist)" />
<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.$formname.actionlist)" /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action('actionlist')" /></fieldset></div>
@@ -2375,7 +2350,7 @@ END
}
}
}
- $output .= '<div class="LC_left_float"><fieldset><legend><b>'.$lt{'link'}.'</b></legend>'.
+ $output .= '<div class="LC_left_float"><fieldset><legend>'.$lt{'link'}.'</legend>'.
'<table><tr>';
my @linkdests = ('aboutme');
if ($permission->{'cusr'}) {
@@ -2386,6 +2361,7 @@ END
$env{'request.course.sec'})) {
push(@linkdests,'track');
}
+
$output .= '<td>';
my $usernamelink = $env{'form.usernamelink'};
if ($usernamelink eq '') {
@@ -2412,7 +2388,11 @@ END
<th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th>
";
} else {
- $output .= "\n".'<th> </th>'."\n";
+ if ($mode eq 'pickauthor') {
+ $output .= "\n".'<th> </th>'."\n";
+ } else {
+ $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
+ }
if ($actionselect) {
$output .= '<th>'.&mt('Select').'</th>'."\n";
}
@@ -2467,13 +2447,9 @@ END
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print(
- '<p class="LC_error">'
- .&mt('Problems occurred in writing the CSV file.')
- .' '.&mt('This error has been logged.')
- .' '.&mt('Please alert your LON-CAPA administrator.')
- .'</p>'
- );
+ $r->print(&mt('Problems occurred in writing the CSV file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
}
#
@@ -2655,7 +2631,7 @@ END
if ($clickers!~/\w/) { $clickers='-'; }
$in{'clicker'} = $clickers;
my $role = $in{'role'};
- $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}],$crstype);
+ $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}],$crstype);
if (! defined($in{'start'}) || $in{'start'} == 0) {
$in{'start'} = &mt('none');
} else {
@@ -2942,7 +2918,7 @@ sub print_username_link {
$output = $in->{'username'};
} else {
$output = '<a href="javascript:username_display_launch('.
- "'$in->{'username'}','$in->{'domain'}'".')">'.
+ "'$in->{'username'}','$in->{'domain'}'".')" />'.
$in->{'username'}.'</a>';
}
return $output;
@@ -2954,7 +2930,6 @@ sub role_type_names {
'author' => 'Co-Author Roles',
'course' => 'Course Roles',
'community' => 'Community Roles',
-
);
return %lt;
}
@@ -3409,7 +3384,6 @@ sub results_header_row {
}
} elsif (($env{'form.roletype'} eq 'course') ||
($env{'form.roletype'} eq 'community')) {
-
my $coursefilter = $env{'form.coursepick'};
if ($env{'form.roletype'} eq 'course') {
if ($coursefilter eq 'category') {
@@ -3662,20 +3636,27 @@ sub print_first_users_upload_form {
$str .= '<input type="hidden" name="action" value="upload" />';
$str .= '<input type="hidden" name="state" value="got_file" />';
-
$str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
# Excel and CSV Help
- $str .= '<div class="LC_left_float">'
+ $str .= '<p>'
.&Apache::loncommon::help_open_topic("Course_Create_Class_List",
&mt("How do I create a users list from a spreadsheet"))
- .'</div><div class="LC_left_float">'."\n"
+ ."<br />\n"
.&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet"))
- .'</div><br clear="all" />'."\n";
+ ."</p>\n";
+
$str .= &Apache::lonhtmlcommon::start_pick_box()
- .&Apache::lonhtmlcommon::row_title(&mt('File'))
- .&Apache::loncommon::upfile_select_html()
+ .&Apache::lonhtmlcommon::row_title(&mt('File'));
+ if (&Apache::lonlocal::current_language() ne 'en') {
+ if ($context eq 'course') {
+ $str .= '<p class="LC_info">'."\n"
+ .&mt('Please upload an UTF8 encoded file to ensure a correct character encoding in your classlist.')."\n"
+ .'</p>'."\n";
+ }
+ }
+ $str .= &Apache::loncommon::upfile_select_html()
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(
'<label for="noFirstLine">'
@@ -3689,6 +3670,8 @@ sub print_first_users_upload_form {
.'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
.'</p>';
+ $str .= &Apache::loncommon::end_page();
+
$r->print($str);
return;
}
@@ -3809,7 +3792,7 @@ sub upfile_drop_add {
} elsif ($setting eq 'course') {
$defaultrole = $env{'form.courserole'};
$defaultsec = $env{'form.sections'};
- }
+ }
} elsif ($context eq 'author') {
$defaultrole = $env{'form.defaultrole'};
} elsif ($context eq 'course') {
@@ -3917,7 +3900,7 @@ sub upfile_drop_add {
}
}
my (%curr_rules,%got_rules,%alerts);
- my %customroles = &my_custom_roles($crstype);
+ my %customroles = &my_custom_roles();
my @permitted_roles =
&roles_on_upload($context,$setting,$crstype,%customroles);
# Get new users list
@@ -4161,7 +4144,7 @@ sub upfile_drop_add {
$role = 'cr_'.$env{'user.domain'}.'_'.
$env{'user.name'}.'_'.$role;
}
- if (($role ne 'cc') && ($role ne 'co')) {
+ if (($role ne 'cc') && ($role ne 'co')) {
if (@secs > 1) {
$multiple = 1;
foreach my $sec (@secs) {
@@ -4820,7 +4803,7 @@ sub setsections_javascript {
accr => 'A course coordinator role will be added with access to all sections.',
acor => 'A coordinator role will be added with access to all sections',
inea => 'In each course, each user may only have one student role at a time.',
- inec => 'In each community, each user may only have one member role at a time.',
+ inec => 'In each community, each user may only have on member role at a time.',
youh => 'You had selected ',
secs => 'sections.',
plmo => 'Please modify your selections so they include no more than one section.',
@@ -4828,21 +4811,16 @@ sub setsections_javascript {
plch => 'Please choose a different section name.',
mnot => 'may not be used as a section name, as it is the name of a course group.',
secn => 'Section names and group names must be distinct. Please choose a different section name.',
- nonw => 'Section names may only contain letters or numbers.',
);
$setsection_js .= <<"ENDSECCODE";
function setSections(formname,crstype) {
var re1 = /^currsec_/;
- var re2 =/\\W/;
- var trimleading = /^\\s+/;
- var trimtrailing = /\\s+\$/;
var groups = new Array($groupslist);
for (var i=0;i<formname.elements.length;i++) {
var str = formname.elements[i].name;
var checkcurr = str.match(re1);
if (checkcurr != null) {
- var num = i;
if ($checkincluded) {
$rolecode
if (role == 'cc' || role == 'co') {
@@ -4854,60 +4832,38 @@ function setSections(formname,crstype) {
} else {
var sections = '';
var numsec = 0;
- var fromexisting = new Array();
- for (var j=0; j<formname.elements[num].length; j++) {
- if (formname.elements[num].options[j].selected == true ) {
- var addsec = formname.elements[num].options[j].value;
- if (addsec != "") {
- fromexisting.push(addsec);
+ var sections;
+ for (var j=0; j<formname.elements[i].length; j++) {
+ if (formname.elements[i].options[j].selected == true ) {
+ if (formname.elements[i].options[j].value != "") {
if (numsec == 0) {
- sections = addsec;
- } else {
- sections = sections + "," + addsec;
- }
- numsec ++;
- }
- }
- }
- var newsecs = formname.elements[num+1].value;
- var validsecs = new Array();
- var validsecstr = '';
- var badsecs = new Array();
- if (newsecs != null && newsecs != "") {
- var numsplit;
- if (newsecs.indexOf(',') == -1) {
- numsplit = new Array(newsecs);
- } else {
- numsplit = newsecs.split(/,/g);
- }
- for (var i=0; i<numsplit.length; i++) {
- var newsec = numsplit[i];
- newsec = newsec.replace(trimleading,'');
- newsec = newsec.replace(trimtrailing,'');
- if (re2.test(newsec) == true) {
- badsecs.push(newsec);
- } else {
- if (newsec != '') {
- var isnew = 1;
- if (fromexisting != null) {
- for (var m=0; m<fromexisting.length; m++) {
- if (newsec == fromexisting[m]) {
- isnew = 0;
- }
- }
- }
- if (isnew == 1) {
- validsecs.push(newsec);
+ if (formname.elements[i].options[j].value != "") {
+ sections = formname.elements[i].options[j].value;
+ numsec ++;
}
}
+ else {
+ sections = sections + "," + formname.elements[i].options[j].value
+ numsec ++;
+ }
}
}
- if (badsecs.length > 0) {
- alert("$alerts{'nonw'}\\n$alerts{'plch'}");
- return;
+ }
+ if (numsec > 0) {
+ if (formname.elements[i+1].value != "" && formname.elements[i+1].value != null) {
+ sections = sections + "," + formname.elements[i+1].value;
}
- numsec = numsec + validsecs.length;
}
+ else {
+ sections = formname.elements[i+1].value;
+ }
+ var newsecs = formname.elements[i+1].value;
+ var numsplit;
+ if (newsecs != null && newsecs != "") {
+ numsplit = newsecs.split(/,/g);
+ numsec = numsec + numsplit.length;
+ }
+
if ((role == 'st') && (numsec > 1)) {
if (crstype == 'Community') {
alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
@@ -4915,36 +4871,25 @@ function setSections(formname,crstype) {
alert("$alerts{'inco'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
}
return;
- } else {
- if (validsecs != null) {
- for (var j=0; j<validsecs.length; j++) {
- if (validsecstr == '' || validsecstr == null) {
- validsecstr = validsecs[j];
- } else {
- validsecstr += ','+validsecs[j];
- }
- if ((validsecs[j] == 'all') ||
- (validsecs[j] == 'none')) {
- alert("'"+validsecs[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
+ }
+ else {
+ if (numsplit != null) {
+ for (var j=0; j<numsplit.length; j++) {
+ if ((numsplit[j] == 'all') ||
+ (numsplit[j] == 'none')) {
+ alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
return;
}
for (var k=0; k<groups.length; k++) {
- if (validsecs[j] == groups[k]) {
- alert("'"+validsecs[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
+ if (numsplit[j] == groups[k]) {
+ alert("'"+numsplit[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
return;
}
}
}
}
+ formname.elements[i+2].value = sections;
}
- if ((validsecstr != '') && (validsecstr != null)) {
- if (numsec > 0) {
- sections = sections + "," + validsecstr;
- } else {
- sections = validsecstr;
- }
- }
- formname.elements[num+2].value = sections;
}
}
}
@@ -5400,7 +5345,7 @@ sub sectioncheck_alerts {
my %alerts = &Apache::lonlocal::texthash(
curd => 'You must select a course or community in the current domain',
inea => 'In each course, each user may only have one student role at a time',
- inco => 'In each community, each user may only have one member role at a time',
+ inco => 'In each community, each user may only have one member role at a time',
youh => 'You had selected',
sect => 'sections',
plsm => 'Please modify your selections so they include no more than one section',