version 1.358.4.1, 2012/02/06 04:50:52
|
version 1.361, 2012/06/01 11:39:24
|
Line 223 sub build_tools_display {
|
Line 223 sub build_tools_display {
|
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
'blog' => "Personal User Blog", |
'blog' => "Personal User Blog", |
'aboutme' => "Personal Information Page", |
'aboutme' => "Personal Information Page", |
|
'webdav' => "WebDAV access to authoring spaces (if SSL and author/co-author)", |
'portfolio' => "Personal User Portfolio", |
'portfolio' => "Personal User Portfolio", |
'avai' => "Available", |
'avai' => "Available", |
'cusa' => "availability", |
'cusa' => "availability", |
Line 248 sub build_tools_display {
|
Line 249 sub build_tools_display {
|
$isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); |
$isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); |
} else { |
} else { |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
'tools.aboutme','tools.portfolio','tools.blog'); |
'tools.aboutme','tools.portfolio','tools.blog', |
@usertools = ('aboutme','blog','portfolio'); |
'tools.webdav'); |
|
@usertools = ('aboutme','blog','webdav','portfolio'); |
} |
} |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, |
my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, |
Line 356 sub build_tools_display {
|
Line 358 sub build_tools_display {
|
$currdisp = ($curr_access?&mt('Yes'):&mt('No')); |
$currdisp = ($curr_access?&mt('Yes'):&mt('No')); |
$custdisp = '<span class="LC_nobreak"><label>'. |
$custdisp = '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="'.$context.'_'.$item.'"'. |
'<input type="radio" name="'.$context.'_'.$item.'"'. |
' value="1"'. $tool_on.'/>'.&mt('On').'</label> <label>'. |
' value="1" '.$tool_on.'/>'.&mt('On').'</label> <label>'. |
'<input type="radio" name="'.$context.'_'.$item.'" value="0" '. |
'<input type="radio" name="'.$context.'_'.$item.'" value="0" '. |
$tool_off.'/>'.&mt('Off').'</label></span>'; |
$tool_off.'/>'.&mt('Off').'</label></span>'; |
$custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. |
$custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. |
Line 674 $userpicker
|
Line 676 $userpicker
|
ENDBLOCK |
ENDBLOCK |
if ($env{'form.phase'} eq '') { |
if ($env{'form.phase'} eq '') { |
my $defdom=$env{'request.role.domain'}; |
my $defdom=$env{'request.role.domain'}; |
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain','',1); |
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'enro' => 'Enroll one student', |
'enro' => 'Enroll one student', |
'enrm' => 'Enroll one member', |
'enrm' => 'Enroll one member', |
Line 723 $showresponse
|
Line 725 $showresponse
|
<table> |
<table> |
<tr> |
<tr> |
<td>$lt{'usr'}:</td> |
<td>$lt{'usr'}:</td> |
<td><input type="text" size="25" name="srchterm" /></td> |
<td><input type="text" size="15" name="srchterm" /></td> |
<td> $lt{'dom'}:</td><td>$domform</td> |
<td> $lt{'dom'}:</td><td>$domform</td> |
<td> $sellink </td> |
<td> $sellink </td> |
<td> <input name="userrole" type="submit" value="$buttontext" /></td> |
<td> <input name="userrole" type="submit" value="$buttontext" /></td> |
Line 742 sub user_modification_js {
|
Line 744 sub user_modification_js {
|
<script type="text/javascript" language="Javascript"> |
<script type="text/javascript" language="Javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
|
function pclose() { |
|
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", |
|
"height=350,width=350,scrollbars=no,menubar=no"); |
|
parmwin.close(); |
|
} |
|
|
|
$pjump_def |
$pjump_def |
$dc_setcourse_code |
$dc_setcourse_code |
|
|
function dateset() { |
function dateset() { |
eval("document.cu."+document.cu.pres_marker.value+ |
eval("document.cu."+document.cu.pres_marker.value+ |
".value=document.cu.pres_value.value"); |
".value=document.cu.pres_value.value"); |
pclose(); |
modalWindow.close(); |
} |
} |
|
|
$nondc_setsection_code |
$nondc_setsection_code |
Line 938 sub print_user_modification_page {
|
Line 934 sub print_user_modification_page {
|
my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules); |
my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules); |
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); |
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
my $lc_ccuname = lc($ccuname); |
my $usertype; |
if ($lc_ccuname ne $ccuname) { |
|
$uhome = &Apache::lonnet::homeserver($lc_ccuname,$ccdomain); |
|
$ccuname = $lc_ccuname; |
|
} |
|
} |
|
if ($uhome eq 'no_host') { |
|
my ($rules,$ruleorder) = |
my ($rules,$ruleorder) = |
&Apache::lonnet::inst_userrules($ccdomain,'username'); |
&Apache::lonnet::inst_userrules($ccdomain,'username'); |
my $usertype = |
$usertype = |
&Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules, |
&Apache::lonuserutils::check_usertype($ccdomain,$ccuname,$rules, |
\%curr_rules,\%got_rules); |
\%curr_rules,\%got_rules); |
my $cancreate = |
my $cancreate = |
&Apache::lonuserutils::can_create_user($ccdomain,$context, |
&Apache::lonuserutils::can_create_user($ccdomain,$context, |
$usertype); |
$usertype); |
Line 1268 ENDNOPORTPRIV
|
Line 1258 ENDNOPORTPRIV
|
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) { |
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'utav' => "User Tools Availability", |
'utav' => "User Tools Availability", |
'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page 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", |
'ifch' => "If a change is required, contact a domain coordinator for the domain", |
); |
); |
$user_tools_text = <<ENDNOTOOLSPRIV; |
$user_tools_text = <<ENDNOTOOLSPRIV; |
Line 1477 sub display_existing_roles {
|
Line 1467 sub display_existing_roles {
|
$rolesdump{$newkey} = $newvalue; |
$rolesdump{$newkey} = $newvalue; |
} |
} |
} else { |
} else { |
my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1}); |
%rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); |
%rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname,'.',undef,$extra); |
|
} |
} |
# Build up table of user roles to allow revocation and re-enabling of roles. |
# Build up table of user roles to allow revocation and re-enabling of roles. |
my ($tmp) = keys(%rolesdump); |
my ($tmp) = keys(%rolesdump); |
Line 2325 sub update_user_data {
|
Line 2314 sub update_user_data {
|
|
|
my (%alerts,%rulematch,%inst_results,%curr_rules); |
my (%alerts,%rulematch,%inst_results,%curr_rules); |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
my @usertools = ('aboutme','blog','portfolio'); |
my @usertools = ('aboutme','blog','webdav','portfolio'); |
my @requestcourses = ('official','unofficial','community'); |
my @requestcourses = ('official','unofficial','community'); |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
Line 2478 sub update_user_data {
|
Line 2467 sub update_user_data {
|
my %userenv = &Apache::lonnet::get |
my %userenv = &Apache::lonnet::get |
('environment',['firstname','middlename','lastname','generation', |
('environment',['firstname','middlename','lastname','generation', |
'id','permanentemail','portfolioquota','inststatus','tools.aboutme', |
'id','permanentemail','portfolioquota','inststatus','tools.aboutme', |
'tools.blog','tools.portfolio','requestcourses.official', |
'tools.blog','tools.webdav','tools.portfolio', |
'requestcourses.unofficial','requestcourses.community', |
'requestcourses.official','requestcourses.unofficial', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'requestcourses.community','reqcrsotherdom.official', |
'reqcrsotherdom.community'], |
'reqcrsotherdom.unofficial','reqcrsotherdom.community'], |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
my ($tmp) = keys(%userenv); |
my ($tmp) = keys(%userenv); |
if ($tmp =~ /^(con_lost|error)/i) { |
if ($tmp =~ /^(con_lost|error)/i) { |
Line 2931 sub display_userinfo {
|
Line 2920 sub display_userinfo {
|
'permanentemail' => 'Permanent e-mail address', |
'permanentemail' => 'Permanent e-mail address', |
'quota' => 'Disk space allocated to portfolio files', |
'quota' => 'Disk space allocated to portfolio files', |
'blog' => 'Blog Availability', |
'blog' => 'Blog Availability', |
|
'webdav' => 'WebDAV Availability', |
'aboutme' => 'Personal Information Page Availability', |
'aboutme' => 'Personal Information Page Availability', |
'portfolio' => 'Portfolio Availability', |
'portfolio' => 'Portfolio Availability', |
'official' => 'Can Request Official Courses', |
'official' => 'Can Request Official Courses', |
Line 4106 sub handler {
|
Line 4096 sub handler {
|
if ($env{'form.phase'} eq 'createnewuser') { |
if ($env{'form.phase'} eq 'createnewuser') { |
my $response; |
my $response; |
if ($env{'form.srchterm'} !~ /^$match_username$/) { |
if ($env{'form.srchterm'} !~ /^$match_username$/) { |
my $response = '<p class="LC_warning">'. |
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); |
&mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'). |
|
'</p>'; |
|
$env{'form.phase'} = ''; |
$env{'form.phase'} = ''; |
&print_username_entry_form($r,$context,$response,$srch,undef,$crstype,$brcrum); |
&print_username_entry_form($r,$context,$response,$srch,undef,$crstype,$brcrum); |
} else { |
} else { |
Line 5622 sub user_search_result {
|
Line 5610 sub user_search_result {
|
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) { |
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) { |
if (($srch->{'srchdomain'} eq '') || |
if (($srch->{'srchdomain'} eq '') || |
! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { |
! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { |
$response = '<p class="LC_warning">'. |
$response = &mt('You must specify a valid domain when searching in a domain or institutional directory.') |
&mt('You must specify a valid domain when searching in a domain or institutional directory.'). |
|
'</p>'; |
|
} |
} |
} |
} |
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') || |
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') || |
Line 5637 sub user_search_result {
|
Line 5623 sub user_search_result {
|
} |
} |
} |
} |
if ($unamecheck !~ /^$match_username$/) { |
if ($unamecheck !~ /^$match_username$/) { |
$response = '<p class="LC_warning">'. |
$response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); |
&mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'). |
|
'</p>'; |
|
} |
} |
} |
} |
} |
} |
Line 5814 sub user_search_result {
|
Line 5798 sub user_search_result {
|
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($context,$srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
my $showdom = &display_domain_info($srch->{'srchdomain'}); |
my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
|
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
'</span><br />'. |
'</span><br />'. |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |