--- loncom/interface/loncreateuser.pm 2024/02/29 21:43:33 1.406.2.20.2.5
+++ loncom/interface/loncreateuser.pm 2017/01/24 05:34:37 1.430
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.20.2.5 2024/02/29 21:43:33 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.430 2017/01/24 05:34:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -71,7 +71,6 @@ use Apache::longroup;
use Apache::lonuserutils;
use Apache::loncoursequeueadmin;
use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities;
my $loginscript; # piece of javascript used in two separate instances
my $authformnop;
@@ -81,7 +80,7 @@ my $authformfsys;
my $authformloc;
sub initialize_authen_forms {
- my ($dom,$formname,$curr_authtype,$mode,$readonly) = @_;
+ my ($dom,$formname,$curr_authtype,$mode) = @_;
my ($krbdef,$krbdefdom) = &Apache::loncommon::get_kerberos_defaults($dom);
my %param = ( formname => $formname,
kerb_def_dom => $krbdefdom,
@@ -102,9 +101,6 @@ sub initialize_authen_forms {
$param{'mode'} = $mode;
}
}
- if ($readonly) {
- $param{'readonly'} = 1;
- }
$loginscript = &Apache::loncommon::authform_header(%param);
$authformkrb = &Apache::loncommon::authform_kerberos(%param);
$authformnop = &Apache::loncommon::authform_nochange(%param);
@@ -127,82 +123,14 @@ sub auth_abbrev {
# ====================================================
sub user_quotas {
- my ($ccuname,$ccdomain,$name) = @_;
+ my ($ccuname,$ccdomain) = @_;
my %lt = &Apache::lonlocal::texthash(
+ 'usrt' => "User Tools",
'cust' => "Custom quota",
'chqu' => "Change quota",
);
- my ($output,$longinsttype);
- my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
- my %titles = &Apache::lonlocal::texthash (
- portfolio => "Disk space allocated to user's portfolio files",
- author => "Disk space allocated to user's Authoring Space",
- );
- my ($currquota,$quotatype,$inststatus,$defquota) =
- &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
- if ($longinsttype eq '') {
- if ($inststatus ne '') {
- if ($usertypes->{$inststatus} ne '') {
- $longinsttype = $usertypes->{$inststatus};
- }
- }
- }
- my ($showquota,$custom_on,$custom_off,$defaultinfo,$colspan);
- $custom_on = ' ';
- $custom_off = ' checked="checked" ';
- $colspan = ' colspan="2"';
- if ($quotatype eq 'custom') {
- $custom_on = $custom_off;
- $custom_off = ' ';
- $showquota = $currquota;
- if ($longinsttype eq '') {
- $defaultinfo = &mt('For this user, the default quota would be [_1]'
- .' MB.',$defquota);
- } else {
- $defaultinfo = &mt("For this user, the default quota would be [_1]".
- " MB,[_2]as determined by the user's institutional".
- " affiliation ([_3]).",$defquota,'<br />',$longinsttype);
- }
- } else {
- if ($longinsttype eq '') {
- $defaultinfo = &mt('For this user, the default quota is [_1]'
- .' MB.',$defquota);
- } else {
- $defaultinfo = &mt("For this user, the default quota of [_1]".
- " MB,[_2]is determined by the user's institutional".
- " affiliation ([_3]).",$defquota,'<br />',$longinsttype);
- }
- }
-
- if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
- $output .= '<tr class="LC_info_row">'."\n".
- ' <td'.$colspan.'>'.$titles{$name}.'</td>'."\n".
- ' </tr>'."\n".
- &Apache::loncommon::start_data_table_row()."\n".
- ' <td'.$colspan.'><span class="LC_nobreak">'.
- &mt('Current quota: [_1] MB',$currquota).'</span> '.
- $defaultinfo.'</td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n".
- &Apache::loncommon::start_data_table_row()."\n".
- '<td'.$colspan.'><span class="LC_nobreak">'.$lt{'chqu'}.
- ': <label>'.
- '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
- 'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
- ' /><span class="LC_nobreak">'.
- &mt('Default ([_1] MB)',$defquota).'</span></label> '.
- ' <label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
- 'value="1" '.$custom_on.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
- ' />'.$lt{'cust'}.':</label> '.
- '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
- 'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
- ' /> '.&mt('MB').'</span></td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n";
- }
- return $output;
-}
-
-sub user_quota_js {
- return <<"END_SCRIPT";
+
+ my $quota_javascript = <<"END_SCRIPT";
<script type="text/javascript">
// <![CDATA[
function quota_changes(caller,context) {
@@ -226,61 +154,95 @@ function quota_changes(caller,context) {
// ]]>
</script>
END_SCRIPT
+ my $longinsttype;
+ my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
+ my $output = $quota_javascript."\n".
+ '<h3>'.$lt{'usrt'}.'</h3>'."\n".
+ &Apache::loncommon::start_data_table();
+
+ if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
+ (&Apache::lonnet::allowed('udp',$ccdomain))) {
+ $output .= &build_tools_display($ccuname,$ccdomain,'tools');
+ }
-}
-
-sub set_custom_js {
- return <<"END_SCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-function toggleCustom(form,item,name) {
- if (document.getElementById(item)) {
- var divid = document.getElementById(item);
- var radioname = form.elements[name];
- if (radioname) {
- if (radioname.length > 0) {
- var setvis;
- var RegExp = /^customtext_(aboutme|blog|portfolio|timezone|webdav)\$/;
- for (var i=0; i<radioname.length; i++) {
- if (radioname[i].checked == true) {
- if (radioname[i].value == 1) {
- if (RegExp.test(item)) {
- divid.style.display = 'inline';
- } else {
- divid.style.display = 'block';
- }
- setvis = 1;
- }
- break;
- }
- }
- if (!setvis) {
- divid.style.display = 'none';
+ my %titles = &Apache::lonlocal::texthash (
+ portfolio => "Disk space allocated to user's portfolio files",
+ author => "Disk space allocated to user's Authoring Space (if role assigned)",
+ );
+ foreach my $name ('portfolio','author') {
+ my ($currquota,$quotatype,$inststatus,$defquota) =
+ &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name);
+ if ($longinsttype eq '') {
+ if ($inststatus ne '') {
+ if ($usertypes->{$inststatus} ne '') {
+ $longinsttype = $usertypes->{$inststatus};
}
}
}
- }
- return;
-}
-// ]]>
-</script>
-
-END_SCRIPT
+ my ($showquota,$custom_on,$custom_off,$defaultinfo);
+ $custom_on = ' ';
+ $custom_off = ' checked="checked" ';
+ if ($quotatype eq 'custom') {
+ $custom_on = $custom_off;
+ $custom_off = ' ';
+ $showquota = $currquota;
+ if ($longinsttype eq '') {
+ $defaultinfo = &mt('For this user, the default quota would be [_1]'
+ .' MB.',$defquota);
+ } else {
+ $defaultinfo = &mt("For this user, the default quota would be [_1]".
+ " MB, as determined by the user's institutional".
+ " affiliation ([_2]).",$defquota,$longinsttype);
+ }
+ } else {
+ if ($longinsttype eq '') {
+ $defaultinfo = &mt('For this user, the default quota is [_1]'
+ .' MB.',$defquota);
+ } else {
+ $defaultinfo = &mt("For this user, the default quota of [_1]".
+ " MB, is determined by the user's institutional".
+ " affiliation ([_2]).",$defquota,$longinsttype);
+ }
+ }
+ if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+ $output .= '<tr class="LC_info_row">'."\n".
+ ' <td>'.$titles{$name}.'</td>'."\n".
+ ' </tr>'."\n".
+ &Apache::loncommon::start_data_table_row()."\n".
+ ' <td><span class="LC_nobreak">'.
+ &mt('Current quota: [_1] MB',$currquota).'</span> '.
+ $defaultinfo.'</td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n".
+ &Apache::loncommon::start_data_table_row()."\n".
+ ' <td><span class="LC_nobreak">'.$lt{'chqu'}.
+ ': <label>'.
+ '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '.
+ 'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
+ ' /><span class="LC_nobreak">'.
+ &mt('Default ([_1] MB)',$defquota).'</span></label> '.
+ ' <label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '.
+ 'value="1" '.$custom_on.' onchange="javascript:quota_changes('."'custom','$name'".');"'.
+ ' />'.$lt{'cust'}.':</label> '.
+ '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '.
+ 'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'.
+ ' /> '.&mt('MB').'</span></td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ return $output;
}
sub build_tools_display {
my ($ccuname,$ccdomain,$context) = @_;
my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
- $colspan,$isadv,%domconfig,@defaulteditors,@customeditors);
+ $colspan,$isadv,%domconfig);
my %lt = &Apache::lonlocal::texthash (
'blog' => "Personal User Blog",
'aboutme' => "Personal Information Page",
- 'webdav' => "WebDAV access to Authoring Spaces (https)",
- 'editors' => "Available Editors",
+ 'webdav' => "WebDAV access to Authoring Spaces (if SSL and author/co-author)",
'portfolio' => "Personal User Portfolio",
- 'timezone' => "Can set Time Zone",
'avai' => "Available",
'cusa' => "availability",
'chse' => "Change setting",
@@ -290,73 +252,52 @@ sub build_tools_display {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
'requestauthor' => 'Can request author space',
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
);
- $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial',
- 'requestcourses.community','requestcourses.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
%reqdisplay = &courserequest_display();
+ $colspan = ' colspan="2"';
%domconfig =
&Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
+ $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
} elsif ($context eq 'requestauthor') {
- %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'requestauthor');
+ %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
+ 'requestauthor');
@usertools = ('requestauthor');
@options =('norequest','approval','automatic');
%reqtitles = &requestauthor_titles();
%reqdisplay = &requestauthor_display();
+ $colspan = ' colspan="2"';
%domconfig =
&Apache::lonnet::get_dom('configuration',['requestauthor'],$ccdomain);
- } elsif ($context eq 'authordefaults') {
- %domconfig =
- &Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain);
- %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav',
- 'authoreditors');
- @usertools = ('webdav','editors');
- $colspan = ' colspan="2"';
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'tools.aboutme','tools.portfolio','tools.blog',
- 'tools.timezone');
- @usertools = ('aboutme','blog','portfolio','timezone');
- $colspan = ' colspan="2"';
+ 'tools.webdav');
+ @usertools = ('aboutme','blog','webdav','portfolio');
}
foreach my $item (@usertools) {
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
- $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
+ $currdisp,$custdisp,$custradio);
$cust_off = 'checked="checked" ';
$tool_on = 'checked="checked" ';
- unless (($context eq 'authordefaults') && ($item ne 'webdav')) {
- $curr_access =
- &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
- $context,\%userenv,'',
- {'is_adv' => $isadv});
- }
+ $curr_access =
+ &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+ $context);
if ($context eq 'requestauthor') {
if ($userenv{$context} ne '') {
$cust_on = ' checked="checked" ';
$cust_off = '';
- }
- } elsif ($context eq 'authordefaults') {
- if ($item eq 'editors') {
- if ($userenv{'author'.$item} ne '') {
- $cust_on = ' checked="checked" ';
- $cust_off = '';
- }
- } elsif ($item eq 'webdav') {
- if ($userenv{'tools.'.$item} ne '') {
- $cust_on = ' checked="checked" ';
- $cust_off = '';
- }
- }
+ }
} elsif ($userenv{$context.'.'.$item} ne '') {
$cust_on = ' checked="checked" ';
$cust_off = '';
@@ -364,77 +305,37 @@ sub build_tools_display {
if ($context eq 'requestcourses') {
if ($userenv{$context.'.'.$item} eq '') {
$custom_access = &mt('Currently from default setting.');
- $customsty = ' style="display:none;"';
} else {
$custom_access = &mt('Currently from custom setting.');
- $customsty = ' style="display:block;"';
}
} elsif ($context eq 'requestauthor') {
if ($userenv{$context} eq '') {
$custom_access = &mt('Currently from default setting.');
- $customsty = ' style="display:none;"';
- } else {
- $custom_access = &mt('Currently from custom setting.');
- $customsty = ' style="display:block;"';
- }
- } elsif ($item eq 'editors') {
- if ($userenv{'author'.$item} eq '') {
- if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') {
- @defaulteditors = @{$domconfig{'authordefaults'}{'editors'}};
- } else {
- @defaulteditors = ('edit','xml');
- }
- $custom_access = &mt('Can use: [_1]',
- join(', ', map { $lt{$_} } @defaulteditors));
- $editorsty = ' style="display:none;"';
} else {
$custom_access = &mt('Currently from custom setting.');
- foreach my $editor (split(/,/,$userenv{'author'.$item})) {
- if ($editor =~ /^(edit|daxe|xml)$/) {
- push(@customeditors,$editor);
- }
- }
- if (@customeditors) {
- if (@customeditors > 1) {
- $custom_access .= '<br /><span>';
- } else {
- $custom_access .= ' <span class="LC_nobreak">';
- }
- $custom_access .= &mt('Can use: [_1]',
- join(', ', map { $lt{$_} } @customeditors)).
- '</span>';
- } else {
- $custom_access .= ' '.&mt('No available editors');
- }
- $editorsty = ' style="display:block;"';
}
} else {
- my $current = $userenv{$context.'.'.$item};
- if ($item eq 'webdav') {
- $current = $userenv{'tools.webdav'};
- }
- if ($current eq '') {
+ if ($userenv{$context.'.'.$item} eq '') {
$custom_access =
&mt('Availability determined currently from default setting.');
if (!$curr_access) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
- $customsty = ' style="display:none;"';
} else {
$custom_access =
&mt('Availability determined currently from custom setting.');
- if ($current == 0) {
+ if ($userenv{$context.'.'.$item} == 0) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
- $customsty = ' style="display:inline;"';
}
}
$output .= ' <tr class="LC_info_row">'."\n".
' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
' </tr>'."\n".
&Apache::loncommon::start_data_table_row()."\n";
+
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
my ($curroption,$currlimit);
my $envkey = $context.'.'.$item;
@@ -460,11 +361,6 @@ sub build_tools_display {
if (!$curroption) {
$curroption = 'norequest';
}
- my $name = 'crsreq_'.$item;
- if ($context eq 'requestauthor') {
- $name = $item;
- }
- $onclick = ' onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');"';
if ($curroption =~ /^autolimit=(\d*)$/) {
$currlimit = $1;
if ($currlimit eq '') {
@@ -475,7 +371,7 @@ sub build_tools_display {
} else {
$currdisp = $reqdisplay{$curroption};
}
- $custdisp = '<fieldset id="customtext_'.$item.'"'.$customsty.'>';
+ $custdisp = '<table>';
foreach my $option (@options) {
my $val = $option;
if ($option eq 'norequest') {
@@ -498,87 +394,53 @@ sub build_tools_display {
$checked = ' checked="checked"';
}
}
- if ($option eq 'autolimit') {
- $custdisp .= '<br />';
+ my $name = 'crsreq_'.$item;
+ if ($context eq 'requestauthor') {
+ $name = $item;
}
- $custdisp .= '<span class="LC_nobreak"><label>'.
+ $custdisp .= '<tr><td><span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$name.'" '.
'value="'.$val.'"'.$checked.' />'.
$reqtitles{$option}.'</label> ';
if ($option eq 'autolimit') {
$custdisp .= '<input type="text" name="'.$name.
'_limit" size="1" '.
- 'value="'.$currlimit.'" /> '.
- $reqtitles{'unlimited'}.'</span>';
+ 'value="'.$currlimit.'" /></span><br />'.
+ $reqtitles{'unlimited'};
} else {
$custdisp .= '</span>';
}
- $custdisp .= ' ';
- }
- $custdisp .= '</fieldset>';
- $custradio = '<br />'.$custdisp;
- } elsif ($item eq 'editors') {
- $output .= '<td'.$colspan.'>'.$custom_access.'</td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n";
- unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
- $output .= &Apache::loncommon::start_data_table_row()."\n".
- '<td'.$colspan.'><span class="LC_nobreak">'.
- $lt{'chse'}.': <label>'.
- '<input type="radio" name="custom'.$item.'" value="0" '.
- $cust_off.' onclick="toggleCustom(this.form,'."'customtext_$item','custom$item'".');" />'.
- $lt{'usde'}.'</label>'.(' ' x3).
- '<label><input type="radio" name="custom'.$item.'" value="1" '.
- $cust_on.' onclick="toggleCustom(this.form,'."'customtext_$item','custom$item'".');" />'.
- $lt{'uscu'}.'</label></span><br />'.
- '<fieldset id="customtext_'.$item.'"'.$editorsty.'>';
- foreach my $editor ('edit','xml','daxe') {
- my $checked;
- if ($userenv{'author'.$item} eq '') {
- if (grep(/^\Q$editor\E$/,@defaulteditors)) {
- $checked = ' checked="checked"';
- }
- } elsif (grep(/^\Q$editor\E$/,@customeditors)) {
- $checked = ' checked="checked"';
- }
- $output .= '<span style="LC_nobreak"><label>'.
- '<input type="checkbox" name="custom_editor" '.
- 'value="'.$editor.'"'.$checked.' />'.
- $lt{$editor}.'</label></span> ';
- }
- $output .= '</fieldset></td>'.
- &Apache::loncommon::end_data_table_row()."\n";
+ $custdisp .= '</td></tr>';
}
+ $custdisp .= '</table>';
+ $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
} else {
$currdisp = ($curr_access?&mt('Yes'):&mt('No'));
my $name = $context.'_'.$item;
- $onclick = 'onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');" ';
+ if ($context eq 'requestauthor') {
+ $name = $context;
+ }
$custdisp = '<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$name.'"'.
- ' value="1" '.$tool_on.$onclick.'/>'.&mt('On').'</label> <label>'.
+ ' value="1" '.$tool_on.'/>'.&mt('On').'</label> <label>'.
'<input type="radio" name="'.$name.'" value="0" '.
- $tool_off.$onclick.'/>'.&mt('Off').'</label></span>';
- $custradio = '<span id="customtext_'.$item.'"'.$customsty.' class="LC_nobreak">'.
- '--'.$lt{'cusa'}.': '.$custdisp.'</span>';
- }
- unless ($item eq 'editors') {
- $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
- $lt{'avai'}.': '.$currdisp.'</td>'."\n".
- &Apache::loncommon::end_data_table_row()."\n";
- unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
- $output .=
+ $tool_off.'/>'.&mt('Off').'</label></span>';
+ $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp.
+ '</span>';
+ }
+ $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4).
+ $lt{'avai'}.': '.$currdisp.'</td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n";
+ unless (&Apache::lonnet::allowed('udp',$ccdomain)) {
+ $output .=
&Apache::loncommon::start_data_table_row()."\n".
- '<td><span class="LC_nobreak">'.
+ ' <td style="vertical-align:top;"><span class="LC_nobreak">'.
$lt{'chse'}.': <label>'.
'<input type="radio" name="custom'.$item.'" value="0" '.
- $cust_off.$onclick.'/>'.$lt{'usde'}.'</label>'.(' ' x3).
+ $cust_off.'/>'.$lt{'usde'}.'</label>'.(' ' x3).
'<label><input type="radio" name="custom'.$item.'" value="1" '.
- $cust_on.$onclick.'/>'.$lt{'uscu'}.'</label></span>';
- if ($colspan) {
- $output .= '</td><td>';
- }
- $output .= $custradio.'</td>'.
- &Apache::loncommon::end_data_table_row()."\n";
- }
+ $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
}
}
return $output;
@@ -592,12 +454,14 @@ sub coursereq_externaluser {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
);
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
- 'reqcrsotherdom.community','reqcrsotherdom.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
+ 'reqcrsotherdom.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options = ('approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
my $optregex = join('|',@options);
@@ -664,7 +528,7 @@ sub coursereq_externaluser {
sub domainrole_req {
my ($ccuname,$ccdomain) = @_;
return '<br /><h3>'.
- &mt('Can Request Assignment of Domain Roles?').
+ &mt('User Can Request Assignment of Domain Roles?').
'</h3>'."\n".
&Apache::loncommon::start_data_table().
&build_tools_display($ccuname,$ccdomain,
@@ -672,24 +536,13 @@ sub domainrole_req {
&Apache::loncommon::end_data_table();
}
-sub authoring_defaults {
- my ($ccuname,$ccdomain) = @_;
- return '<br /><h3>'.
- &mt('Authoring Space defaults (if role assigned)').
- '</h3>'."\n".
- &Apache::loncommon::start_data_table().
- &build_tools_display($ccuname,$ccdomain,
- 'authordefaults').
- &user_quotas($ccuname,$ccdomain,'author').
- &Apache::loncommon::end_data_table();
-}
-
sub courserequest_titles {
my %titles = &Apache::lonlocal::texthash (
official => 'Official',
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
+ placement => 'Placement Tests',
norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',
validate => 'With validation',
@@ -794,8 +647,7 @@ sub curr_requestauthor {
# =================================================================== Phase one
sub print_username_entry_form {
- my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum,
- $permission) = @_;
+ my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_;
my $defdom=$env{'request.role.domain'};
my $formtoset = 'crtuser';
if (exists($env{'form.startrolename'})) {
@@ -821,25 +673,11 @@ sub print_username_entry_form {
}
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'custom') {
- if ($context eq 'course') {
- $helpitem = 'Course_Editing_Custom_Roles';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Editing_Custom_Roles';
- }
+ $helpitem = 'Course_Editing_Custom_Roles';
} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
} elsif ($env{'form.action'} eq 'accesslogs') {
$helpitem = 'Domain_User_Access_Logs';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- if ($permission->{'cusr'}) {
- $helpitem = 'Domain_Change_Privileges';
- } elsif ($permission->{'view'}) {
- $helpitem = 'Domain_View_Privileges';
- } else {
- undef($helpitem);
- }
}
my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom);
if ($env{'form.action'} eq 'custom') {
@@ -917,7 +755,6 @@ sub print_username_entry_form {
}
} else {
my $actiontext = $lt{'srad'};
- my $fixeddom;
if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {
$actiontext = $lt{'srme'};
@@ -926,11 +763,9 @@ sub print_username_entry_form {
}
} elsif ($env{'form.action'} eq 'accesslogs') {
$actiontext = $lt{'srva'};
- $fixeddom = 1;
} elsif (($env{'form.action'} eq 'singleuser') &&
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
$actiontext = $lt{'srvu'};
- $fixeddom = 1;
}
$r->print("<h3>$actiontext</h3>");
if ($env{'form.origform'} ne 'crtusername') {
@@ -939,7 +774,7 @@ sub print_username_entry_form {
'<br clear="all" />');
}
}
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
}
}
@@ -998,16 +833,11 @@ sub entry_form {
$inexact = 1;
}
}
- my ($cancreate,$noinstd);
- if ($env{'form.action'} eq 'accesslogs') {
- $noinstd = 1;
- } else {
- $cancreate =
- &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
- }
+ my $cancreate =
+ &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
my ($userpicker,$cansearch) =
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
- 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd);
+ 'document.crtuser',$cancreate,$usertype,$context,$fixeddom);
my $srchbutton = &mt('Search');
if ($env{'form.action'} eq 'singlestudent') {
$srchbutton = &mt('Search and Enroll');
@@ -1169,10 +999,6 @@ ENDSCRIPT
$helpitem = 'Course_Change_Privileges';
} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push (@{$brcrum},
{href => "javascript:backPage(document.usersrchform,'','')",
@@ -1218,7 +1044,7 @@ ENDSCRIPT
$r->print('</h3>');
} elsif ($env{'form.action'} eq 'accesslogs') {
$r->print("<b>$lt{'srcva'}</b><br />");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1));
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1));
$r->print('<h3>'.$lt{'vacsel'}.'</h3>');
}
}
@@ -1299,8 +1125,7 @@ sub print_user_modification_page {
if (($ccuname eq '') || ($ccdomain eq '')) {
my $usermsg = &mt('No username and/or domain provided.');
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum);
return;
}
my ($form,$formname);
@@ -1349,8 +1174,7 @@ sub print_user_modification_page {
}
$response .= '</p><br />';
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum);
return;
}
$newuser = 1;
@@ -1374,8 +1198,7 @@ sub print_user_modification_page {
'username');
}
$env{'form.phase'} = '';
- &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum);
return;
}
}
@@ -1394,18 +1217,12 @@ sub print_user_modification_page {
my $groupslist = &Apache::lonuserutils::get_groupslist();
- my $js = &validation_javascript($context,$ccdomain,$pjump_def,
- $crstype,$groupslist,$newuser,
- $formname,\%loaditem,$permission);
+ my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype,
+ $groupslist,$newuser,$formname,\%loaditem);
my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain);
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
- $js .= &set_custom_js();
}
push (@{$brcrum},
{href => "javascript:backPage($form)",
@@ -1431,32 +1248,6 @@ sub print_user_modification_page {
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
}
- if (($context eq 'domain') && ($env{'request.role.domain'} eq $ccdomain)) {
- my @toggles;
- if (&Apache::lonnet::allowed('cau',$ccdomain)) {
- my ($isadv,$isauthor) =
- &Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
- unless ($isauthor) {
- push(@toggles,'requestauthor');
- }
- push(@toggles,('webdav','editors'));
- }
- if (&Apache::lonnet::allowed('mut',$ccdomain)) {
- push(@toggles,('aboutme','blog','portfolio','timezone'));
- }
- if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
- push(@toggles,('official','unofficial','community','textbook'));
- }
- if (@toggles) {
- my $onload;
- foreach my $item (@toggles) {
- $onload .= "toggleCustom(document.cu,'customtext_$item','custom$item');";
- }
- $args->{'add_entries'} = {
- 'onload' => $onload,
- };
- }
- }
my $start_page =
&Apache::loncommon::start_page('User Management',$js,$args);
@@ -1493,36 +1284,18 @@ ENDFORMINFO
}
}
my $title = '';
- my $need_quota_js;
if ($newuser) {
my ($portfolioform,$domroleform);
if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) {
# Current user has quota or user tools modification privileges
- $portfolioform = '<br /><h3>'.
- &mt('User Tools').
- '</h3>'."\n".
- &Apache::loncommon::start_data_table();
- if (&Apache::lonnet::allowed('mut',$ccdomain)) {
- $portfolioform .= &build_tools_display($ccuname,$ccdomain,'tools');
- }
- if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
- $portfolioform .= &user_quotas($ccuname,$ccdomain,'portfolio');
- $need_quota_js = 1;
- }
- $portfolioform .= &Apache::loncommon::end_data_table();
+ $portfolioform = '<br />'.&user_quotas($ccuname,$ccdomain);
}
if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) &&
($ccdomain eq $env{'request.role.domain'})) {
- $domroleform = &domainrole_req($ccuname,$ccdomain).
- &authoring_defaults($ccuname,$ccdomain);
- $need_quota_js = 1;
- }
- my $readonly;
- unless ($permission->{'cusr'}) {
- $readonly = 1;
+ $domroleform = '<br />'.&domainrole_req($ccuname,$ccdomain);
}
- &initialize_authen_forms($ccdomain,$formname,'','',$readonly);
+ &initialize_authen_forms($ccdomain,$formname);
my %lt=&Apache::lonlocal::texthash(
'lg' => 'Login Data',
'hs' => "Home Server",
@@ -1553,7 +1326,7 @@ ENDTITLE
$r->print('<h2>'.$title.'</h2>'."\n");
$r->print('<div class="LC_left_float">');
$r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
- $inst_results{$ccuname.':'.$ccdomain},$readonly));
+ $inst_results{$ccuname.':'.$ccdomain}));
# Option to disable student/employee ID conflict checking not offerred for new users.
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1568,7 +1341,7 @@ $lt{'hs'}: $home_server_pick
}
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('<br /><h3>'.
- &mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+ &mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table().
&build_tools_display($ccuname,$ccdomain,
'requestcourses').
@@ -1664,7 +1437,7 @@ ENDAUTH
$inst_results{$ccuname.':'.$ccdomain}));
if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
- $r->print('<br /><h3>'.&mt('Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n".
+ $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
&Apache::loncommon::start_data_table());
if ($env{'request.role.domain'} eq $ccdomain) {
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
@@ -1675,44 +1448,28 @@ ENDAUTH
$r->print(&Apache::loncommon::end_data_table());
}
$r->print('</div>');
- my @order = ('auth','quota','tools','requestauthor','authordefaults');
+ my @order = ('auth','quota','tools','requestauthor');
my %user_text;
my ($isadv,$isauthor) =
&Apache::lonnet::is_advanced_user($ccdomain,$ccuname);
- if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+ if ((!$isauthor) &&
+ ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
- ($env{'request.role.domain'} eq $ccdomain)) {
- if (!$isauthor) {
- $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
- }
- $user_text{'authordefaults'} = &authoring_defaults($ccuname,$ccdomain);
- if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
- $need_quota_js = 1;
- }
+ ($env{'request.role.domain'} eq $ccdomain)) {
+ $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
}
- $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
+ $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname);
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
(&Apache::lonnet::allowed('mut',$ccdomain)) ||
(&Apache::lonnet::allowed('udp',$ccdomain))) {
- $user_text{'quota'} = '<br /><h3>'.&mt('User Tools').'</h3>'."\n".
- &Apache::loncommon::start_data_table();
- if ((&Apache::lonnet::allowed('mut',$ccdomain)) ||
- (&Apache::lonnet::allowed('udp',$ccdomain))) {
- $user_text{'quota'} .= &build_tools_display($ccuname,$ccdomain,'tools');
- }
# Current user has quota modification privileges
- if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
- (&Apache::lonnet::allowed('udp',$ccdomain))) {
- $user_text{'quota'} .= &user_quotas($ccuname,$ccdomain,'portfolio');
- $need_quota_js = 1;
- }
- $user_text{'quota'} .= &Apache::loncommon::end_data_table();
+ $user_text{'quota'} = &user_quotas($ccuname,$ccdomain);
}
if (!&Apache::lonnet::allowed('mpq',$ccdomain)) {
if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(
- 'dska' => "Disk quotas for user's portfolio",
- 'youd' => "You do not have privileges to modify the portfolio quota for this user.",
+ 'dska' => "Disk quotas for user's portfolio and Authoring Space",
+ 'youd' => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.",
'ichr' => "If a change is required, contact a domain coordinator for the domain",
);
$user_text{'quota'} = <<ENDNOPORTPRIV;
@@ -1725,7 +1482,7 @@ ENDNOPORTPRIV
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(
'utav' => "User Tools Availability",
- 'yodo' => "You do not have privileges to modify Portfolio, Blog, Personal Information Page, or Time Zone settings for this user.",
+ 'yodo' => "You do not have privileges to modify Portfolio, Blog, WebDAV, or Personal Information Page settings for this user.",
'ifch' => "If a change is required, contact a domain coordinator for the domain",
);
$user_text{'tools'} = <<ENDNOTOOLSPRIV;
@@ -1806,7 +1563,7 @@ ENDNOTOOLSPRIV
if ($newuser) {
$r->print(' onclick="auth_check()" \>'."\n");
} else {
- $r->print(' onclick="this.form.submit()" \>'."\n");
+ $r->print('onclick="this.form.submit()" \>'."\n");
}
} else {
$r->print('</fieldset></div>'.
@@ -1823,9 +1580,6 @@ ENDNOTOOLSPRIV
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
$r->print('<input type="hidden" name="currstate" value="" />');
$r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />');
- if ($need_quota_js) {
- $r->print(&user_quota_js());
- }
return;
}
@@ -1884,16 +1638,14 @@ sub date_sections_select {
sub validation_javascript {
my ($context,$ccdomain,$pjump_def,$crstype,$groupslist,$newuser,$formname,
- $loaditem,$permission) = @_;
+ $loaditem) = @_;
my $dc_setcourse_code = '';
my $nondc_setsection_code = '';
if ($context eq 'domain') {
- if ((ref($permission) eq 'HASH') && ($permission->{'cusr'})) {
- my $dcdom = $env{'request.role.domain'};
- $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
- $dc_setcourse_code =
- &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
- }
+ my $dcdom = $env{'request.role.domain'};
+ $loaditem->{'onload'} = "document.cu.coursedesc.value='';";
+ $dc_setcourse_code =
+ &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context);
} else {
my $checkauth;
if (($newuser) || (&Apache::lonnet::allowed('mau',$ccdomain))) {
@@ -2384,7 +2136,7 @@ sub new_domain_roles {
}
sub user_authentication {
- my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
+ my ($ccuname,$ccdomain,$formname) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
my $outcome;
my %lt=&Apache::lonlocal::texthash(
@@ -2422,6 +2174,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH
}
} else { # Authentication type is valid
+
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);
@@ -2456,43 +2209,6 @@ ENDBADAUTH
}
$outcome .= &Apache::loncommon::end_data_table();
} else {
- if (($currentauth =~ /^internal:/) &&
- (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
- $outcome = <<"ENDJS";
-<script type="text/javascript">
-// <![CDATA[
-function togglePwd(form) {
- if (form.newintpwd.length) {
- if (document.getElementById('LC_ownersetpwd')) {
- for (var i=0; i<form.newintpwd.length; i++) {
- if (form.newintpwd[i].checked) {
- if (form.newintpwd[i].value == 1) {
- document.getElementById('LC_ownersetpwd').style.display = 'inline-block';
- } else {
- document.getElementById('LC_ownersetpwd').style.display = 'none';
- }
- }
- }
- }
- }
-}
-// ]]>
-</script>
-ENDJS
-
- $outcome .= '<h3>'.$lt{'ld'}.'</h3>'.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_row().
- '<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?").
- '<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'.
- &mt('No').'</label>'.(' 'x2).
- '<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'.
- '<div id="LC_ownersetpwd" style="display:none">'.
- ' '.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'.
- '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'.
- &Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
- }
if (&Apache::lonnet::allowed('udp',$ccdomain)) {
# Current user has rights to view domain preferences for user's domain
my $result;
@@ -2601,8 +2317,8 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now,
- $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
+ $now,$captchaform,$emailusername,$usertype) = @_;
my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
@@ -2629,7 +2345,6 @@ sub personal_data_display {
'inststatus' => "Affiliation",
'email' => 'E-mail address',
'valid' => 'Validation',
- 'username' => 'Username',
);
%canmodify_status =
@@ -2648,7 +2363,7 @@ sub personal_data_display {
if (ref($emailusername) eq 'HASH') {
if (ref($emailusername->{$usertype}) eq 'HASH') {
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
- @userinfo = ();
+ @userinfo = ();
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
foreach my $field (@{$infofields}) {
if ($emailusername->{$usertype}->{$field}) {
@@ -2678,42 +2393,13 @@ sub personal_data_display {
$output = '<h3>'.$lt{'pd'}.'</h3>'.
&Apache::lonhtmlcommon::start_pick_box();
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
- my $size = 25;
- if ($condition) {
- if ($condition =~ /^\@[^\@]+$/) {
- $size = 10;
- } else {
- undef($condition);
- }
- }
- if ($excluded) {
- unless ($excluded =~ /^\@[^\@]+$/) {
- undef($condition);
- }
- }
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
'LC_oddrow_value')."\n".
- '<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />';
- if ($condition) {
- $output .= $condition;
- } elsif ($excluded) {
- $output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]',
- $excluded).'</span>';
- }
- if ($usernameset eq 'first') {
- $output .= '<br /><span style="font-size: smaller">';
- if ($condition) {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
- $condition);
- } else {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
- }
- $output .= '</span>';
- }
+ '<input type="text" name="uname" size="25" value="" autocomplete="off" />';
$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);
- my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="new-password" />';
- my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="new-password" />';
+ my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
+ my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />';
$output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
@@ -2724,20 +2410,6 @@ sub personal_data_display {
'LC_oddrow_value')."\n".
$upasstwo.
&Apache::lonhtmlcommon::row_closure()."\n";
- if ($usernameset eq 'free') {
- my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
- $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
- '<span class="LC_nobreak">'.&mt('Use e-mail address: ').
- '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.
- &mt('Yes').'</label>'.(' 'x2).
- '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.
- &mt('No').'</label></span>'."\n".
- '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
- '<br /><span class="LC_nobreak">'.&mt('Preferred username').
- ' <input type="text" name="username" value="" size="20" autocomplete="off"/>'.
- '</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
- $rowcount ++;
- }
}
foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};
@@ -2839,17 +2511,12 @@ sub personal_data_display {
&Apache::lonhtmlcommon::row_closure(1);
$rowcount ++;
}
- if ($showsubmit) {
- my $submit_text = &mt('Create account');
- $output .= &Apache::lonhtmlcommon::row_title()."\n".
- '<br /><input type="submit" name="createaccount" value="'.
- $submit_text.'" />';
- if ($usertype ne '') {
- $output .= '<input type="hidden" name="type" value="'.
- &HTML::Entities::encode($usertype,'\'<>"&').'" />';
- }
- $output .= &Apache::lonhtmlcommon::row_closure(1);
- }
+ my $submit_text = &mt('Create account');
+ $output .= &Apache::lonhtmlcommon::row_title()."\n".
+ '<br /><input type="submit" name="createaccount" value="'.
+ $submit_text.'" />'.
+ '<input type="hidden" name="type" value="'.$usertype.'" />'.
+ &Apache::lonhtmlcommon::row_closure(1);
}
$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {
@@ -2933,7 +2600,7 @@ sub get_inststatuses {
# ================================================================= Phase Three
sub update_user_data {
- my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_;
+ my ($r,$context,$crstype,$brcrum,$showcredits) = @_;
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
$env{'form.ccdomain'});
# Error messages
@@ -2974,10 +2641,6 @@ sub update_user_data {
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push(@{$brcrum},
{href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
@@ -3069,10 +2732,9 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
- my @usertools = ('aboutme','blog','portfolio','timezone');
- my @requestcourses = ('official','unofficial','community','textbook');
+ my @usertools = ('aboutme','blog','webdav','portfolio');
+ my @requestcourses = ('official','unofficial','community','textbook','placement');
my @requestauthor = ('requestauthor');
- my @authordefaults = ('webdav','editors');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
my %canmodify_status =
@@ -3181,29 +2843,6 @@ sub update_user_data {
$newcustom{'requestauthor'},
\%changeHash,'requestauthor');
}
- if ($env{'form.customeditors'} == 1) {
- my @editors;
- my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
- if (@posseditors) {
- foreach my $editor (@posseditors) {
- if (grep(/^\Q$editor\E$/,@posseditors)) {
- unless (grep(/^\Q$editor\E$/,@editors)) {
- push(@editors,$editor);
- }
- }
- }
- }
- if (@editors) {
- @editors = sort(@editors);
- $changed{'editors'} = &tool_admin('editors',join(',',@editors),
- \%changeHash,'authordefaults');
- }
- }
- if ($env{'form.customwebdav'} == 1) {
- $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
- $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
- \%changeHash,'authordefaults');
- }
}
if ($canmodify_status{'inststatus'}) {
if (exists($env{'form.inststatus'})) {
@@ -3223,7 +2862,7 @@ sub update_user_data {
$env{'form.ccdomain'},$env{'form.ccuname'});
}
}
- $r->print('<br />'.&mt('Home Server').': '.$uhome.' '.
+ $r->print('<br />'.&mt('Home server').': '.$uhome.' '.
&Apache::lonnet::hostname($uhome));
} elsif (($env{'form.login'} ne 'nochange') &&
($env{'form.login'} ne '' )) {
@@ -3238,19 +2877,12 @@ sub update_user_data {
&Apache::lonnet::modifyuserauth(
$env{'form.ccdomain'},$env{'form.ccuname'},
$amode,$genpwd));
- $r->print('<br />'.&mt('Home Server').': '.&Apache::lonnet::homeserver
+ $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
- $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);
+ $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);
}
- } elsif (($env{'form.intarg'} ne '') &&
- (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
- (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
- $r->print('Modifying authentication: '.
- &Apache::lonnet::modifyuserauth(
- $env{'form.ccdomain'},$env{'form.ccuname'},
- 'internal',$env{'form.intarg'}));
}
$r->rflush(); # Finish display of header before time consuming actions start
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
@@ -3269,13 +2901,12 @@ sub update_user_data {
my %userenv = &Apache::lonnet::get
('environment',['firstname','middlename','lastname','generation',
'id','permanentemail','portfolioquota','authorquota','inststatus',
- 'tools.aboutme','tools.blog','tools.webdav',
- 'tools.portfolio','tools.timezone',
- 'authoreditors','requestauthor',
+ 'tools.aboutme','tools.blog','tools.webdav','tools.portfolio',
'requestcourses.official','requestcourses.unofficial',
'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
- 'reqcrsotherdom.community','reqcrsotherdom.textbook'],
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
+ 'reqcrsotherdom.placement','requestauthor'],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -3403,7 +3034,7 @@ sub update_user_data {
%oldsettingstatus,%newsettingstatus);
@disporder = ('inststatus');
if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
- push(@disporder,('requestcourses','requestauthor','authordefaults'));
+ push(@disporder,'requestcourses','requestauthor');
} else {
push(@disporder,'reqcrsotherdom');
}
@@ -3431,7 +3062,6 @@ sub update_user_data {
}
if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
$canshow{'requestauthor'} = 1;
- $canshow{'authordefaults'} = 1;
}
my (%changeHash,%changed);
if ($oldinststatus eq '') {
@@ -3540,14 +3170,8 @@ sub update_user_data {
if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
- my ($isadv,$isauthor) =
- &Apache::lonnet::is_advanced_user($env{'form.ccdomain'},$env{'form.ccuname'});
- unless ($isauthor) {
- &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
- \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
- }
- &tool_changes('authordefaults',\@authordefaults,\%oldsettings,\%oldsettingstext,
- \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
+ &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext,
+ \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
} else {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
@@ -3571,68 +3195,28 @@ sub update_user_data {
if ($chgresult eq 'ok') {
if (($env{'user.name'} eq $env{'form.ccuname'}) &&
($env{'user.domain'} eq $env{'form.ccdomain'})) {
- my (%newenvhash,$got_domdefs,%domdefaults,$got_userenv,
- %userenv);
- my @fromenv = keys(%changed);
- push(@fromenv,'inststatus');
+ my %newenvhash;
foreach my $key (keys(%changed)) {
- if (($key eq 'official') || ($key eq 'unofficial')
- || ($key eq 'community') || ($key eq 'textbook')) {
+ if (($key eq 'official') || ($key eq 'unofficial') ||
+ ($key eq 'community') || ($key eq 'textbook') ||
+ ($key eq 'placement')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
$newenvhash{'environment.canrequest.'.$key} = 1;
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.canrequest.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','requestcourses',\%userenv,\%domdefaults);
+ $key,'reload','requestcourses');
}
} elsif ($key eq 'requestauthor') {
$newenvhash{'environment.'.$key} = $changeHash{$key};
if ($changeHash{$key}) {
$newenvhash{'environment.canrequest.author'} = 1;
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.canrequest.author'} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','requestauthor',\%userenv,\%domdefaults);
- }
- } elsif ($key eq 'editors') {
- $newenvhash{'environment.author'.$key} = $changeHash{'author'.$key};
- if ($env{'form.customeditors'}) {
- $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
- } else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- if ($domdefaults{'editors'} ne '') {
- $newenvhash{'environment.editors'} = $domdefaults{'editors'};
- } else {
- $newenvhash{'environment.editors'} = 'edit,xml';
- }
+ $key,'reload','requestauthor');
}
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
@@ -3641,20 +3225,9 @@ sub update_user_data {
$newenvhash{'environment.availabletools.'.$key} =
$changeHash{'tools.'.$key};
} else {
- unless ($got_domdefs) {
- %domdefaults =
- &Apache::lonnet::get_domain_defaults($env{'user.domain'});
- $got_domdefs = 1;
- }
- unless ($got_userenv) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},@fromenv);
- $got_userenv = 1;
- }
$newenvhash{'environment.availabletools.'.$key} =
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
- $key,'reload','tools',\%userenv,\%domdefaults);
+ $key,'reload','tools');
}
}
}
@@ -3662,10 +3235,6 @@ sub update_user_data {
&Apache::lonnet::appenv(\%newenvhash);
}
}
- if ($changed{'aboutme'}) {
- &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'},
- $env{'form.ccdomain'});
- }
}
}
if (keys(%namechanged) > 0) {
@@ -3696,7 +3265,7 @@ sub update_user_data {
\%newsettingstext);
if ($env{'form.cid'} ne $userenv{'id'}) {
&Apache::lonnet::idput($env{'form.ccdomain'},
- {$env{'form.ccuname'} => $env{'form.cid'}});
+ {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =
@@ -3835,19 +3404,15 @@ sub display_userinfo {
'webdav' => 'WebDAV Availability',
'aboutme' => 'Personal Information Page Availability',
'portfolio' => 'Portfolio Availability',
- 'timezone' => 'Can set own Time Zone',
'official' => 'Can Request Official Courses',
'unofficial' => 'Can Request Unofficial Courses',
'community' => 'Can Request Communities',
'textbook' => 'Can Request Textbook Courses',
+ 'placement' => 'Can Request Placement Tests',
'requestauthor' => 'Can Request Author Role',
'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',
- 'chto' => 'Changed To:',
- 'editors' => "Available Editors in Authoring Space",
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
+ 'chto' => 'Changed To:'
);
if ($changed) {
$r->print('<h3>'.$lt{'uic'}.'</h3>'.
@@ -3872,13 +3437,10 @@ sub display_userinfo {
}
foreach my $entry (@{$order}) {
if ($canshow->{$entry}) {
- if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
- ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
+ if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
my @items;
if ($entry eq 'requestauthor') {
@items = ($entry);
- } elsif ($entry eq 'authordefaults') {
- @items = ('webdav','editors');
} else {
@items = @{$requestcourses};
}
@@ -4059,11 +3621,6 @@ sub tool_changes {
}
return;
}
- my %tooldesc = &Apache::lonlocal::texthash(
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
- );
foreach my $tool (@{$usertools}) {
my ($newval,$limit,$envkey);
$envkey = $context.'.'.$tool;
@@ -4077,29 +3634,6 @@ sub tool_changes {
} elsif ($context eq 'requestauthor') {
$newval = $env{'form.'.$context};
$envkey = $context;
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $envkey = 'authoreditors';
- if ($env{'form.customeditors'} == 1) {
- my @editors;
- my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
- if (@posseditors) {
- foreach my $editor (@posseditors) {
- if (grep(/^\Q$editor\E$/,@posseditors)) {
- unless (grep(/^\Q$editor\E$/,@editors)) {
- push(@editors,$editor);
- }
- }
- }
- }
- if (@editors) {
- $newval = join(',',(sort(@editors)));
- }
- }
- } elsif ($tool eq 'webdav') {
- $envkey = 'tools.webdav';
- $newval = $env{'form.'.$context.'_'.$tool};
- }
} else {
$newval = $env{'form.'.$context.'_'.$tool};
}
@@ -4118,17 +3652,6 @@ sub tool_changes {
} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $oldaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif ($tool eq 'webdav') {
- if ($userenv->{$envkey}) {
- $oldaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $oldaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$envkey}) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4155,17 +3678,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey})));
- } elsif ($tool eq 'webdav') {
- if ($newval) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4176,28 +3688,17 @@ sub tool_changes {
} else {
$newaccess->{$tool} = $oldaccess->{$tool};
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
- if ($userenv->{$envkey} =~ /^autolimit/) {
+ if ($newval =~ /^autolimit/) {
if ($limit) {
$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
} else {
$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
}
- } elsif ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
+ } elsif ($newval) {
+ $newaccesstext->{$tool} = $reqdisplay{$newval};
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif ($tool eq 'webdav') {
- if ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4228,17 +3729,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif ($tool eq 'webdav') {
- if ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4267,17 +3757,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif ($tool eq 'webdav') {
- if ($newval) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4772,10 +4251,6 @@ sub tool_admin {
if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
$canchange = 1;
}
- } elsif ($context eq 'authordefaults') {
- if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
- $canchange = 1;
- }
} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
# Current user has quota modification privileges
$canchange = 1;
@@ -4786,10 +4261,6 @@ sub tool_admin {
$toolchanged = 1;
if ($tool eq 'requestauthor') {
$changeHash->{$context} = $settool;
- } elsif ($tool eq 'editors') {
- $changeHash->{'author'.$tool} = $settool;
- } elsif ($tool eq 'webdav') {
- $changeHash->{'tools.'.$tool} = $settool;
} else {
$changeHash->{$context.'.'.$tool} = $settool;
}
@@ -4834,9 +4305,9 @@ sub build_roles {
# ========================================================== Custom Role Editor
sub custom_role_editor {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$brcrum,$prefix) = @_;
my $action = $env{'form.customroleaction'};
- my ($rolename,$helpitem);
+ my $rolename;
if ($action eq 'new') {
$rolename=$env{'form.newrolename'};
} else {
@@ -4847,17 +4318,14 @@ sub custom_role_editor {
if ($env{'request.course.id'}) {
$crstype = &Apache::loncommon::course_type();
$context = 'course';
- $helpitem = 'Course_Editing_Custom_Roles';
} else {
$context = 'domain';
$crstype = 'course';
- $helpitem = 'Domain_Editing_Custom_Roles';
}
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename || $env{'form.phase'} eq 'pickrole') {
- &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum);
return;
}
@@ -4912,7 +4380,7 @@ sub custom_role_editor {
text => "Edit custom role",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem}
+ help => 'Course_Editing_Custom_Roles'}
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
@@ -4939,11 +4407,11 @@ ENDCCF
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$context,$brcrum,$prefix) = @_;
my $rolename=$env{'form.rolename'};
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename) {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
return;
}
my ($jsback,$elements) = &crumb_utilities();
@@ -4952,10 +4420,6 @@ sub set_custom_role {
.$jsback."\n"
.'// ]]>'."\n"
.'</script>'."\n";
- my $helpitem = 'Course_Editing_Custom_Roles';
- if ($context eq 'domain') {
- $helpitem = 'Domain_Editing_Custom_Roles';
- }
push(@{$brcrum},
{href => "javascript:backPage(document.customresult,'pickrole','')",
text => "Pick custom role",
@@ -4969,7 +4433,7 @@ sub set_custom_role {
text => "Result",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem,}
+ help => 'Course_Editing_Custom_Roles'},
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
@@ -5040,8 +4504,7 @@ sub handler {
$r->send_http_header;
return OK;
}
- my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);
-
+ my ($context,$crstype);
if ($env{'request.course.id'}) {
$context = 'course';
$crstype = &Apache::loncommon::course_type();
@@ -5051,69 +4514,6 @@ sub handler {
$context = 'domain';
}
- my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context,$crstype);
-
- if ($allowed) {
- my @allhelp;
- if ($context eq 'course') {
- $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
-
- if ($permission->{'cusr'}) {
- push(@allhelp,'Course_Create_Class_List');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,('Course_Change_Privileges','Course_View_Class_List'));
- }
- if ($permission->{'custom'}) {
- push(@allhelp,'Course_Editing_Custom_Roles');
- }
- if ($permission->{'cusr'}) {
- push(@allhelp,('Course_Add_Student','Course_Drop_Student'));
- }
- unless ($permission->{'cusr_section'}) {
- if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
- push(@allhelp,'Course_Automated_Enrollment');
- }
- if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
- push(@allhelp,'Course_Approve_Selfenroll');
- }
- }
- if ($permission->{'grp_manage'}) {
- push(@allhelp,'Course_Manage_Group');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,'Course_User_Logs');
- }
- } elsif ($context eq 'author') {
- push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
- 'Author_View_Coauthor_List','Author_User_Logs'));
- } else {
- if ($permission->{'cusr'}) {
- push(@allhelp,'Domain_Change_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_Create_Users','Domain_View_Users_List'));
- if ($permission->{'custom'}) {
- push(@allhelp,'Domain_Editing_Custom_Roles');
- }
- push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs'));
- } elsif ($permission->{'view'}) {
- push(@allhelp,'Domain_View_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs'));
- }
- }
- if (@allhelp) {
- $allhelpitems = join(',',@allhelp);
- }
- }
-
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
@@ -5124,9 +4524,13 @@ sub handler {
if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",
text=>"User Management",
- help=>$allhelpitems}
+ help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}
];
}
+ #SD Following files not added to help, because the corresponding .tex-files seem to
+ #be missing: Course_Approve_Selfenroll,Course_User_Logs,
+ my ($permission,$allowed) =
+ &Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {
if ($context eq 'course') {
$r->internal_redirect('/adm/viewclasslist');
@@ -5158,16 +4562,10 @@ sub handler {
$r->print(&header(undef,$args));
$r->print(&print_main_menu($permission,$context,$crstype));
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
- my $helpitem = 'Course_Create_Class_List';
- if ($context eq 'author') {
- $helpitem = 'Author_Create_Coauthor_List';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Create_Users';
- }
push(@{$brcrum},
{ href => '/adm/createuser?action=upload&state=',
text => 'Upload Users List',
- help => $helpitem,
+ help => 'Course_Create_Class_List',
});
$bread_crumbs_component = 'Upload Users List';
$args = {bread_crumbs => $brcrum,
@@ -5179,41 +4577,16 @@ sub handler {
if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {
- my $result =
- &Apache::lonuserutils::print_upload_manager_form($r,$context,
- $permission,
- $crstype,$showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- }
+ &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+ $crstype,$showcredits);
} elsif ($env{'form.state'} eq 'enrolling') {
if ($env{'form.datatoken'}) {
- my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
- $permission,
- $showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- } elsif ($result eq 'invalidhome') {
- $env{'form.state'} = 'got_file';
- delete($env{'form.lcserver'});
- my $result =
- &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
- $crstype,$showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- }
- }
- } else {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+ &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
+ $showcredits);
}
} else {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}
- $r->print('</form>');
} elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
eq 'singlestudent')) && ($permission->{'cusr'})) ||
(($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
@@ -5237,7 +4610,7 @@ sub handler {
.'</span>';
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,
- $crstype,$brcrum,$permission);
+ $crstype,$brcrum,$showcredits);
} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
@@ -5282,8 +4655,7 @@ sub handler {
# }
#}
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
} else {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
@@ -5300,8 +4672,7 @@ sub handler {
} else {
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
}
} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
@@ -5319,17 +4690,17 @@ sub handler {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
} elsif ($env{'form.phase'} eq 'update_user_data') {
- &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
+ &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
- $brcrum,$permission);
+ $brcrum);
}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
my $prefix;
if ($env{'form.phase'} eq 'set_custom_roles') {
- &set_custom_role($r,$context,$brcrum,$prefix,$permission);
+ &set_custom_role($r,$context,$brcrum,$prefix);
} else {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
}
} elsif (($env{'form.action'} eq 'processauthorreq') &&
($permission->{'cusr'}) &&
@@ -5435,92 +4806,56 @@ sub handler {
unless ($usertype) {
$usertype = 'default';
}
- my ($showstatus,$showemail,$pickstart);
- my $numextras = 0;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
- if (ref($usertypes) eq 'HASH') {
- if ($usertypes->{$usertype}) {
- $showstatus = $usertypes->{$usertype};
- } else {
- $showstatus = $othertitle;
- }
- if ($showstatus) {
- $numextras ++;
- }
- }
- }
- if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
- $showemail = $info{$uname}{'email'};
- $numextras ++;
- }
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
- $pickstart = 1;
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
- my ($num,$count);
+ my ($num,$count,$showstatus);
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
- $count += $numextras;
+ unless ($usertype eq 'default') {
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($dom);
+ if (ref($usertypes) eq 'HASH') {
+ if ($usertypes->{$usertype}) {
+ $showstatus = $usertypes->{$usertype};
+ $count ++;
+ }
+ }
+ }
foreach my $field (@{$infofields}) {
next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
next unless ($infotitles->{$field});
$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
$info{$uname}{$field});
$num ++;
- unless ($count == $num) {
+ if ($count == $num) {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ } else {
$r->print(&Apache::lonhtmlcommon::row_closure());
}
}
- }
- }
- if ($numextras) {
- unless ($pickstart) {
- $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
- $pickstart = 1;
- }
- if ($showemail) {
- my $closure = '';
- unless ($showstatus) {
- $closure = 1;
+ if ($showstatus) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
+ $showstatus.
+ &Apache::lonhtmlcommon::row_closure(1));
}
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
- $showemail.
- &Apache::lonhtmlcommon::row_closure($closure));
- }
- if ($showstatus) {
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','<br />')).
- $showstatus.
- &Apache::lonhtmlcommon::row_closure(1));
+ $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
}
}
- if ($pickstart) {
- $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
- } else {
- $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
- }
- } else {
- $r->print('<div>'.&mt('No information available for this account request.').'</div>');
}
}
}
}
+ $r->print(&close_popup_form());
}
- $r->print(&close_popup_form());
} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} || $permission->{'cusr'})) {
- my $helpitem = 'Course_View_Class_List';
- if ($context eq 'author') {
- $helpitem = 'Author_View_Coauthor_List';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_View_Users_List';
- }
if ($env{'form.phase'} eq 'bulkchange') {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users"},
{href => "/adm/createuser",
text => "Result",
- help => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'Update Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -5537,7 +4872,7 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users",
- help => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'List Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -5617,9 +4952,11 @@ sub handler {
'<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>');
}
} elsif ($env{'form.action'} eq 'selfenroll') {
- my %currsettings;
- if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
- %currsettings = (
+ if ($permission->{selfenrolladmin}) {
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+ my %currsettings = (
selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'},
@@ -5635,8 +4972,6 @@ sub handler {
default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'},
uniquecode => $env{'course.'.$cid.'.internal.uniquecode'},
);
- }
- if ($permission->{selfenrolladmin}) {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenroll',
text => "Configure Self-enrollment",
@@ -5657,16 +4992,6 @@ sub handler {
$r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
&update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
}
- } elsif ($permission->{selfenrollview}) {
- push(@{$brcrum},
- {href => '/adm/createuser?action=selfenroll',
- text => "View Self-enrollment configuration",
- help => 'Course_Self_Enrollment'});
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'Self-enrollment Settings'};
- $r->print(&header(undef,$args));
- $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
- &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings,'',1);
} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).
'<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>');
@@ -5676,18 +5001,21 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Enrollment requests',
- help => 'Course_Approve_Selfenroll'});
+ help => 'Course_Self_Enrollment'});
$bread_crumbs_component = 'Enrollment requests';
if ($env{'form.state'} eq 'done') {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Result',
- help => 'Course_Approve_Selfenroll'});
+ help => 'Course_Self_Enrollment'});
$bread_crumbs_component = 'Enrollment result';
}
$args = { bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
$r->print(&header(undef,$args));
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
my $coursedesc = $env{'course.'.$cid.'.description'};
if (!exists($env{'form.state'})) {
$r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
@@ -5710,8 +5038,7 @@ sub handler {
'<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>');
}
} elsif ($env{'form.action'} eq 'helpdesk') {
- if (($permission->{'owner'} || $permission->{'co-owner'}) &&
- ($permission->{'cusr'} || $permission->{'view'})) {
+ if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
if ($env{'form.state'} eq 'process') {
if ($permission->{'owner'}) {
&update_helpdeskaccess($r,$permission,$brcrum);
@@ -6097,6 +5424,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -6111,6 +5439,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -6138,8 +5468,7 @@ sub print_main_menu {
icon => 'helpdesk-access.png',
#help => 'Course_Helpdesk_Access',
url => '/adm/createuser?action=helpdesk',
- permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
- ($permission->{'view'} || $permission->{'cusr'})),
+ permission => ($permission->{'owner'} || $permission->{'co-owner'}),
linktitle => 'Helpdesk access options',
},
{
@@ -6174,7 +5503,7 @@ sub print_main_menu {
icon => 'selfenrl-queue.png',
#help => 'Course_Approve_Selfenroll',
url => '/adm/createuser?action=selfenrollqueue',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle =>'Approve or reject enrollment requests.',
},
);
@@ -6201,7 +5530,7 @@ sub print_main_menu {
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle => 'Configure user self-enrollment.',
},
);
@@ -6387,13 +5716,12 @@ function validate_types(form) {
}
function check_types(num,countfail,needaction) {
- var boxname = 'selfenroll_types_'+num;
- var typeidx = getIndexByName(boxname);
+ var typeidx = getIndexByName('selfenroll_types_'+num);
var count = 0;
if (typeidx != -1) {
- if (document.$formname.elements[boxname].length) {
- for (var k=0; k<document.$formname.elements[boxname].length; k++) {
- if (document.$formname.elements[boxname][k].checked) {
+ if (document.$formname.elements[typeidx].length) {
+ for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
+ if (document.$formname.elements[typeidx][k].checked) {
count ++;
}
}
@@ -6450,7 +5778,8 @@ ENDSCRIPT
'// ]]>'."\n".
'</script>'."\n".
'<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
- my $visactions = &cat_visibility($cdom);
+
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -6995,7 +6324,6 @@ sub visible_in_stdcat {
}
sub cat_visibility {
- my ($cdom) = @_;
my %visactions = &Apache::lonlocal::texthash(
vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
@@ -7008,24 +6336,13 @@ sub cat_visibility {
dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
- dc_addinst => 'Ask a domain coordinator to enable catalog display of "Official courses (with institutional codes)".',
+ dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
);
- if ($env{'request.role'} eq "dc./$cdom/") {
- $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','»');
- $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','»');
- $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','»');
- $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','»');
- $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','»');
- $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','»');
- $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','»');
- $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','»');
- $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to assign a category to the course.','»');
- }
$visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
$visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
$visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
@@ -7167,10 +6484,6 @@ sub print_userchangelogs_display {
my $helpitem;
if ($context eq 'course') {
$helpitem = 'Course_User_Logs';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Role_Logs';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_User_Logs';
}
push (@{$brcrum},
{href => '/adm/createuser?action=changelogs',
@@ -7371,25 +6684,20 @@ sub print_useraccesslogs_display {
# set breadcrumbs
my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom);
- my $prevphasestr;
- if ($env{'form.popup'}) {
- $brcrum = [];
- } else {
- push (@{$brcrum},
- {href => "javascript:backPage($form)",
- text => $breadcrumb_text{'search'}});
- my @prevphases;
- if ($env{'form.prevphases'}) {
- @prevphases = split(/,/,$env{'form.prevphases'});
- $prevphasestr = $env{'form.prevphases'};
- }
- if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
- push(@{$brcrum},
- {href => "javascript:backPage($form,'get_user_info','select')",
- text => $breadcrumb_text{'userpicked'}});
- if ($env{'form.phase'} eq 'userpicked') {
- $prevphasestr = 'userpicked';
- }
+ push (@{$brcrum},
+ {href => "javascript:backPage($form)",
+ text => $breadcrumb_text{'search'}});
+ my (@prevphases,$prevphasestr);
+ if ($env{'form.prevphases'}) {
+ @prevphases = split(/,/,$env{'form.prevphases'});
+ $prevphasestr = $env{'form.prevphases'};
+ }
+ if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) {
+ push(@{$brcrum},
+ {href => "javascript:backPage($form,'get_user_info','select')",
+ text => $breadcrumb_text{'userpicked'}});
+ if ($env{'form.phase'} eq 'userpicked') {
+ $prevphasestr = 'userpicked';
}
}
push(@{$brcrum},
@@ -7401,7 +6709,6 @@ sub print_useraccesslogs_display {
bread_crumbs_component => 'User Management'};
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
- $args->{'bread_crumbs_nomenu'} = 1;
}
# set javascript
@@ -7427,12 +6734,8 @@ ENDSCRIPT
unless ($permission->{'activity'}) {
$r->print('<p class="LC_warning">'
.&mt('You do not have rights to display user access logs.')
- .'</p>');
- if ($env{'form.popup'}) {
- $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
- } else {
- $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- }
+ .'</p>'
+ .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
return;
}
@@ -7452,24 +6755,6 @@ ENDSCRIPT
return;
}
- if (&Apache::lonnet::privileged($uname,$udom,
- [$env{'request.role.domain'}],['dc','su'])) {
- unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
- [$env{'request.role.domain'}],['dc','su'])) {
- $r->print('<p class="LC_warning">'
- .&mt('You need to be a privileged user to display user access logs for [_1]',
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
- $uname,$udom))
- .'</p>');
- if ($env{'form.popup'}) {
- $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
- } else {
- $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- }
- return;
- }
- }
-
# set defaults
my $now = time();
my $defstart = $now - (7*24*3600);
@@ -7516,11 +6801,8 @@ ENDSCRIPT
my ($nav_script,$nav_links);
# table header
- my $heading = '<h3>'.
- &mt('User access logs for: [_1]',
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>';
- my $tableheader = $heading
- .&Apache::loncommon::start_data_table_header_row()
+ my $tableheader =
+ &Apache::loncommon::start_data_table_header_row()
.'<th> </th>'
.'<th>'.&mt('When').'</th>'
.'<th>'.&mt('HostID').'</th>'
@@ -7557,7 +6839,7 @@ ENDSCRIPT
$showntableheader = 1;
}
my ($shown,$extra);
- my ($event,$data) = split(/\s+/,&unescape($event),2);
+ my ($event,$data) = split(/\s+/,&unescape($event));
if ($event eq 'Role') {
my ($rolecode,$extent) = split(/\./,$data,2);
next if ($extent eq '');
@@ -7609,17 +6891,8 @@ ENDSCRIPT
$shown = &mt('Role selection: [_1]',$rolename);
} else {
$shown = &mt($event);
- if ($data =~ /^webdav/) {
- my ($path,$clientip) = split(/\s+/,$data,2);
- $path =~ s/^webdav//;
- if ($clientip ne '') {
- $extra = &mt('Client IP address: [_1]',$clientip);
- }
- if ($path ne '') {
- $shown .= ' '.&mt('(WebDAV access to [_1])',$path);
- }
- } elsif ($data ne '') {
- $extra = &mt('Client IP address: [_1]',$data);
+ if ($data ne '') {
+ $extra = &mt('Client IP address: [_1]',$data);
}
}
$r->print(
@@ -7637,7 +6910,7 @@ ENDSCRIPT
$r->print(&Apache::loncommon::end_data_table().
&userlogdisplay_navlinks(\%curr,$more_records));
} else { # No content displayed above
- $r->print($heading.'<p class="LC_info">'
+ $r->print('<p class="LC_info">'
.&mt('There are no records to display.')
.'</p>');
}
@@ -7728,7 +7001,7 @@ sub activity_display_filter {
# Update Display button
$output .= '<p>'
.'<input type="submit" value="'.&mt('Update Display').'" />'
- .'</p><hr />';
+ .'</p>';
return $output;
}
@@ -7826,12 +7099,12 @@ sub role_display_filter {
&mt('Context:').'</b><br /><select name="chgcontext">';
my @posscontexts;
if ($context eq 'course') {
- @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
+ @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
@posscontexts = ('any','author','domain');
- }
+ }
foreach my $chgtype (@posscontexts) {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
@@ -7875,7 +7148,6 @@ sub rolechg_contexts {
%lt = &Apache::lonlocal::texthash (
any => 'Any',
automated => 'Automated Enrollment',
- chgtype => 'Enrollment Type/Lock Change',
updatenow => 'Roster Update',
createcourse => 'Course Creation',
course => 'User Management in course',
@@ -7923,7 +7195,7 @@ sub print_helpdeskaccess_display {
my $confname = $cdom.'-domainconfig';
my $crstype = &Apache::loncommon::course_type();
- my @accesstypes = ('all','dh','da','none');
+ my @accesstypes = ('all','none');
my ($numstatustypes,@jsarray);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
if (ref($types) eq 'ARRAY') {
@@ -7934,7 +7206,7 @@ sub print_helpdeskaccess_display {
}
}
my %customroles = &get_domain_customroles($cdom,$confname);
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
+ my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
if (keys(%domhelpdesk)) {
push(@accesstypes,('inc','exc'));
push(@jsarray,('notinc','notexc'));
@@ -8132,9 +7404,7 @@ ENDJS
'rou' => 'Role usage',
'whi' => 'Which helpdesk personnel may use this role?',
'udd' => 'Use domain default',
- 'all' => 'All with domain helpdesk or helpdesk assistant role',
- 'dh' => 'All with domain helpdesk role',
- 'da' => 'All with domain helpdesk assistant role',
+ 'all' => 'All',
'none' => 'None',
'status' => 'Determined based on institutional status',
'inc' => 'Include all, but exclude specific personnel',
@@ -8321,8 +7591,7 @@ sub domain_adhoc_access {
my $access = $domcurrent->{$role}{'access'};
if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) {
$access = 'all';
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'),
- &Apache::lonnet::plaintext('da'));
+ $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
} elsif ($access eq 'status') {
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {
my @shown;
@@ -8338,8 +7607,8 @@ sub domain_adhoc_access {
}
if (@shown) {
my $shownstatus = join(' '.&mt('or').' ',@shown);
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus);
+ $domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]',
+ &Apache::lonnet::plaintext('dh'),$shownstatus);
} else {
$domusage{$role} = &mt('No one in the domain');
}
@@ -8353,11 +7622,10 @@ sub domain_adhoc_access {
}
my $showninc = join(', ',@dominc);
if ($showninc ne '') {
- $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc);
+ $domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]',
+ &Apache::lonnet::plaintext('dh'),$showninc);
} else {
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+ $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
}
}
} elsif ($access eq 'exc') {
@@ -8370,24 +7638,18 @@ sub domain_adhoc_access {
}
my $shownexc = join(', ',@domexc);
if ($shownexc ne '') {
- $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc);
+ $domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]',
+ &Apache::lonnet::plaintext('dh'),$shownexc);
} else {
$domusage{$role} = &mt('No one in the domain');
}
} elsif ($access eq 'none') {
$domusage{$role} = &mt('No one in the domain');
- } elsif ($access eq 'dh') {
- $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
- } elsif ($access eq 'da') {
- $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da'));
} elsif ($access eq 'all') {
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+ $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
}
} else {
- $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
- &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
+ $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
}
}
return %domusage;
@@ -8568,7 +7830,7 @@ sub update_helpdeskaccess {
$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');
return;
}
- my @accesstypes = ('all','dh','da','none','status','inc','exc');
+ my @accesstypes = ('all','none','status','inc','exc');
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $confname = $cdom.'-domainconfig';
@@ -8578,7 +7840,7 @@ sub update_helpdeskaccess {
my (%settings,%overridden);
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
$types,\%customroles,\%settings,\%overridden);
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
+ my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
my (%changed,%storehash,@todelete);
if (keys(%customroles)) {
@@ -8819,12 +8081,6 @@ sub update_helpdeskaccess {
if ($env{'form.'.$role.'_incrs'}) {
if ($newsettings{$role}{'access'} eq 'all') {
$r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));
- } elsif ($newsettings{$role}{'access'} eq 'dh') {
- $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
- &Apache::lonnet::plaintext('dh')));
- } elsif ($newsettings{$role}{'access'} eq 'da') {
- $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
- &Apache::lonnet::plaintext('da')));
} elsif ($newsettings{$role}{'access'} eq 'none') {
$r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
} elsif ($newsettings{$role}{'access'} eq 'status') {
@@ -8947,7 +8203,7 @@ sub user_search_result {
} else {
unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
my $domd_chk = &domdirectorysrch_check($srch);
- if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) {
+ if ($domd_chk ne 'ok') {
my $instd_chk = &instdirectorysrch_check($srch);
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
if ($instd_chk eq 'ok') {
@@ -9298,7 +8554,7 @@ sub build_search_response {
if ($srch->{'srchin'} ne 'alc') {
$forcenewuser = 1;
my $cansrchinst = 0;
- if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) {
+ if ($srch->{'srchdomain'}) {
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
if (ref($domconfig{'directorysrch'}) eq 'HASH') {
if ($domconfig{'directorysrch'}{'available'}) {
@@ -9645,7 +8901,7 @@ sub course_level_dc {
ENDTIMEENTRY
$otheritems .= &Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table()."\n";
- return $cb_jscript.$hiddenitems.$header.$otheritems;
+ return $cb_jscript.$header.$hiddenitems.$otheritems;
}
sub update_selfenroll_config {
@@ -9981,7 +9237,7 @@ sub update_selfenroll_config {
} else {
$r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
}
- my $visactions = &cat_visibility($cdom);
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {