|
version 1.1075.2.109, 2016/08/14 00:24:29
|
version 1.1075.2.127.2.4, 2017/11/16 15:06:35
|
|
Line 80 use JSON::DWIW;
|
Line 80 use JSON::DWIW;
|
| use LWP::UserAgent; |
use LWP::UserAgent; |
| use Crypt::DES; |
use Crypt::DES; |
| use DynaLoader; # for Crypt::DES version |
use DynaLoader; # for Crypt::DES version |
| |
use File::Copy(); |
| |
use File::Path(); |
| |
|
| # ---------------------------------------------- Designs |
# ---------------------------------------------- Designs |
| use vars qw(%defaultdesign); |
use vars qw(%defaultdesign); |
|
Line 262 BEGIN {
|
Line 264 BEGIN {
|
| next if ($line =~ /^\#/); |
next if ($line =~ /^\#/); |
| chomp($line); |
chomp($line); |
| my ($extension,$category)=(split(/\s+/,$line,2)); |
my ($extension,$category)=(split(/\s+/,$line,2)); |
| push @{$category_extensions{lc($category)}},$extension; |
push(@{$category_extensions{lc($category)}},$extension); |
| } |
} |
| close($fh); |
close($fh); |
| } |
} |
|
Line 936 ENDSCRT
|
Line 938 ENDSCRT
|
| } |
} |
| |
|
| sub select_timezone { |
sub select_timezone { |
| my ($name,$selected,$onchange,$includeempty)=@_; |
my ($name,$selected,$onchange,$includeempty,$disabled)=@_; |
| my $output='<select name="'.$name.'" '.$onchange.'>'."\n"; |
my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n"; |
| if ($includeempty) { |
if ($includeempty) { |
| $output .= '<option value=""'; |
$output .= '<option value=""'; |
| if (($selected eq '') || ($selected eq 'local')) { |
if (($selected eq '') || ($selected eq 'local')) { |
|
Line 958 sub select_timezone {
|
Line 960 sub select_timezone {
|
| } |
} |
| |
|
| sub select_datelocale { |
sub select_datelocale { |
| my ($name,$selected,$onchange,$includeempty)=@_; |
my ($name,$selected,$onchange,$includeempty,$disabled)=@_; |
| my $output='<select name="'.$name.'" '.$onchange.'>'."\n"; |
my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n"; |
| if ($includeempty) { |
if ($includeempty) { |
| $output .= '<option value=""'; |
$output .= '<option value=""'; |
| if ($selected eq '') { |
if ($selected eq '') { |
|
Line 1011 sub select_datelocale {
|
Line 1013 sub select_datelocale {
|
| } |
} |
| |
|
| sub select_language { |
sub select_language { |
| my ($name,$selected,$includeempty) = @_; |
my ($name,$selected,$includeempty,$noedit) = @_; |
| my %langchoices; |
my %langchoices; |
| if ($includeempty) { |
if ($includeempty) { |
| %langchoices = ('' => 'No language preference'); |
%langchoices = ('' => 'No language preference'); |
|
Line 1023 sub select_language {
|
Line 1025 sub select_language {
|
| } |
} |
| } |
} |
| %langchoices = &Apache::lonlocal::texthash(%langchoices); |
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
| return &select_form($selected,$name,\%langchoices); |
return &select_form($selected,$name,\%langchoices,undef,$noedit); |
| } |
} |
| |
|
| =pod |
=pod |
|
Line 1138 sub linked_select_forms {
|
Line 1140 sub linked_select_forms {
|
| $result.="select2data.d_$s1.texts = new Array("; |
$result.="select2data.d_$s1.texts = new Array("; |
| my @s2texts; |
my @s2texts; |
| foreach my $value (@s2values) { |
foreach my $value (@s2values) { |
| push @s2texts, $hashref->{$s1}->{'select2'}->{$value}; |
push(@s2texts, $hashref->{$s1}->{'select2'}->{$value}); |
| } |
} |
| $result.="\"@s2texts\");\n"; |
$result.="\"@s2texts\");\n"; |
| } |
} |
|
Line 1744 RESIZE
|
Line 1746 RESIZE
|
| |
|
| } |
} |
| |
|
| |
sub colorfuleditor_js { |
| |
return <<"COLORFULEDIT" |
| |
<script type="text/javascript"> |
| |
// <![CDATA[> |
| |
function fold_box(curDepth, lastresource){ |
| |
|
| |
// we need a list because there can be several blocks you need to fold in one tag |
| |
var block = document.getElementsByName('foldblock_'+curDepth); |
| |
// but there is only one folding button per tag |
| |
var foldbutton = document.getElementById('folding_btn_'+curDepth); |
| |
|
| |
if(block.item(0).style.display == 'none'){ |
| |
|
| |
foldbutton.value = '@{[&mt("Hide")]}'; |
| |
for (i = 0; i < block.length; i++){ |
| |
block.item(i).style.display = ''; |
| |
} |
| |
}else{ |
| |
|
| |
foldbutton.value = '@{[&mt("Show")]}'; |
| |
for (i = 0; i < block.length; i++){ |
| |
// block.item(i).style.visibility = 'collapse'; |
| |
block.item(i).style.display = 'none'; |
| |
} |
| |
}; |
| |
saveState(lastresource); |
| |
} |
| |
|
| |
function saveState (lastresource) { |
| |
|
| |
var tag_list = getTagList(); |
| |
if(tag_list != null){ |
| |
var timestamp = new Date().getTime(); |
| |
var key = lastresource; |
| |
|
| |
// the value pattern is: 'time;key1,value1;key2,value2; ... ' |
| |
// starting with timestamp |
| |
var value = timestamp+';'; |
| |
|
| |
// building the list of key-value pairs |
| |
for(var i = 0; i < tag_list.length; i++){ |
| |
value += tag_list[i]+','; |
| |
value += document.getElementsByName(tag_list[i])[0].style.display+';'; |
| |
} |
| |
|
| |
// only iterate whole storage if nothing to override |
| |
if(localStorage.getItem(key) == null){ |
| |
|
| |
// prevent storage from growing large |
| |
if(localStorage.length > 50){ |
| |
var regex_getTimestamp = /^(?:\d)+;/; |
| |
var oldest_timestamp = regex_getTimestamp.exec(localStorage.key(0)); |
| |
var oldest_key; |
| |
|
| |
for(var i = 1; i < localStorage.length; i++){ |
| |
if (regex_getTimestamp.exec(localStorage.key(i)) < oldest_timestamp) { |
| |
oldest_key = localStorage.key(i); |
| |
oldest_timestamp = regex_getTimestamp.exec(oldest_key); |
| |
} |
| |
} |
| |
localStorage.removeItem(oldest_key); |
| |
} |
| |
} |
| |
localStorage.setItem(key,value); |
| |
} |
| |
} |
| |
|
| |
// restore folding status of blocks (on page load) |
| |
function restoreState (lastresource) { |
| |
if(localStorage.getItem(lastresource) != null){ |
| |
var key = lastresource; |
| |
var value = localStorage.getItem(key); |
| |
var regex_delTimestamp = /^\d+;/; |
| |
|
| |
value.replace(regex_delTimestamp, ''); |
| |
|
| |
var valueArr = value.split(';'); |
| |
var pairs; |
| |
var elements; |
| |
for (var i = 0; i < valueArr.length; i++){ |
| |
pairs = valueArr[i].split(','); |
| |
elements = document.getElementsByName(pairs[0]); |
| |
|
| |
for (var j = 0; j < elements.length; j++){ |
| |
elements[j].style.display = pairs[1]; |
| |
if (pairs[1] == "none"){ |
| |
var regex_id = /([_\\d]+)\$/; |
| |
regex_id.exec(pairs[0]); |
| |
document.getElementById("folding_btn"+RegExp.\$1).value = "Show"; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
function getTagList () { |
| |
|
| |
var stringToSearch = document.lonhomework.innerHTML; |
| |
|
| |
var ret = new Array(); |
| |
var regex_findBlock = /(foldblock_.*?)"/g; |
| |
var tag_list = stringToSearch.match(regex_findBlock); |
| |
|
| |
if(tag_list != null){ |
| |
for(var i = 0; i < tag_list.length; i++){ |
| |
ret.push(tag_list[i].replace(/"/, '')); |
| |
} |
| |
} |
| |
return ret; |
| |
} |
| |
|
| |
function saveScrollPosition (resource) { |
| |
var tag_list = getTagList(); |
| |
|
| |
// we dont always want to jump to the first block |
| |
// 170 is roughly above the "Problem Editing" header. we just want to save if the user scrolled down further than this |
| |
if(\$(window).scrollTop() > 170){ |
| |
if(tag_list != null){ |
| |
var result; |
| |
for(var i = 0; i < tag_list.length; i++){ |
| |
if(isElementInViewport(tag_list[i])){ |
| |
result += tag_list[i]+';'; |
| |
} |
| |
} |
| |
sessionStorage.setItem('anchor_'+resource, result); |
| |
} |
| |
} else { |
| |
// we dont need to save zero, just delete the item to leave everything tidy |
| |
sessionStorage.removeItem('anchor_'+resource); |
| |
} |
| |
} |
| |
|
| |
function restoreScrollPosition(resource){ |
| |
|
| |
var elem = sessionStorage.getItem('anchor_'+resource); |
| |
if(elem != null){ |
| |
var tag_list = elem.split(';'); |
| |
var elem_list; |
| |
|
| |
for(var i = 0; i < tag_list.length; i++){ |
| |
elem_list = document.getElementsByName(tag_list[i]); |
| |
|
| |
if(elem_list.length > 0){ |
| |
elem = elem_list[0]; |
| |
break; |
| |
} |
| |
} |
| |
elem.scrollIntoView(); |
| |
} |
| |
} |
| |
|
| |
function isElementInViewport(el) { |
| |
|
| |
// change to last element instead of first |
| |
var elem = document.getElementsByName(el); |
| |
var rect = elem[0].getBoundingClientRect(); |
| |
|
| |
return ( |
| |
rect.top >= 0 && |
| |
rect.left >= 0 && |
| |
rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */ |
| |
rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */ |
| |
); |
| |
} |
| |
|
| |
function autosize(depth){ |
| |
var cmInst = window['cm'+depth]; |
| |
var fitsizeButton = document.getElementById('fitsize'+depth); |
| |
|
| |
// is fixed size, switching to dynamic |
| |
if (sessionStorage.getItem("autosized_"+depth) == null) { |
| |
cmInst.setSize("","auto"); |
| |
fitsizeButton.value = "@{[&mt('Fixed size')]}"; |
| |
sessionStorage.setItem("autosized_"+depth, "yes"); |
| |
|
| |
// is dynamic size, switching to fixed |
| |
} else { |
| |
cmInst.setSize("","300px"); |
| |
fitsizeButton.value = "@{[&mt('Dynamic size')]}"; |
| |
sessionStorage.removeItem("autosized_"+depth); |
| |
} |
| |
} |
| |
|
| |
|
| |
|
| |
// ]]> |
| |
</script> |
| |
COLORFULEDIT |
| |
} |
| |
|
| |
sub xmleditor_js { |
| |
return <<XMLEDIT |
| |
<script type="text/javascript" src="/adm/jQuery/addons/jquery-scrolltofixed.js"></script> |
| |
<script type="text/javascript"> |
| |
// <![CDATA[> |
| |
|
| |
function saveScrollPosition (resource) { |
| |
|
| |
var scrollPos = \$(window).scrollTop(); |
| |
sessionStorage.setItem(resource,scrollPos); |
| |
} |
| |
|
| |
function restoreScrollPosition(resource){ |
| |
|
| |
var scrollPos = sessionStorage.getItem(resource); |
| |
\$(window).scrollTop(scrollPos); |
| |
} |
| |
|
| |
// unless internet explorer |
| |
if (!(window.navigator.appName == "Microsoft Internet Explorer" && (document.documentMode || document.compatMode))){ |
| |
|
| |
\$(document).ready(function() { |
| |
\$(".LC_edit_actionbar").scrollToFixed(\{zIndex: 100\}); |
| |
}); |
| |
} |
| |
|
| |
// inserts text at cursor position into codemirror (xml editor only) |
| |
function insertText(text){ |
| |
cm.focus(); |
| |
var curPos = cm.getCursor(); |
| |
cm.replaceRange(text.replace(/ESCAPEDSCRIPT/g,'script'), {line: curPos.line,ch: curPos.ch}); |
| |
} |
| |
// ]]> |
| |
</script> |
| |
XMLEDIT |
| |
} |
| |
|
| |
sub insert_folding_button { |
| |
my $curDepth = $Apache::lonxml::curdepth; |
| |
my $lastresource = $env{'request.ambiguous'}; |
| |
|
| |
return "<input type=\"button\" id=\"folding_btn_$curDepth\" |
| |
value=\"".&mt('Hide')."\" onclick=\"fold_box('$curDepth','$lastresource')\">"; |
| |
} |
| |
|
| |
|
| =pod |
=pod |
| |
|
| =head1 Excel and CSV file utility routines |
=head1 Excel and CSV file utility routines |
|
Line 2003 sub multiple_select_form {
|
Line 2241 sub multiple_select_form {
|
| |
|
| =pod |
=pod |
| |
|
| =item * &select_form($defdom,$name,$hashref,$onchange) |
=item * &select_form($defdom,$name,$hashref,$onchange,$readonly) |
| |
|
| Returns a string containing a <select name='$name' size='1'> form to |
Returns a string containing a <select name='$name' size='1'> form to |
| allow a user to select options from a ref to a hash containing: |
allow a user to select options from a ref to a hash containing: |
| option_name => displayed text. An optional $onchange can include |
option_name => displayed text. An optional $onchange can include |
| a javascript onchange item, e.g., onchange="this.form.submit();" |
a javascript onchange item, e.g., onchange="this.form.submit();". |
| |
An optional arg -- $readonly -- if true will cause the select form |
| |
to be disabled, e.g., for the case where an instructor has a section- |
| |
specific role, and is viewing/modifying parameters. |
| |
|
| See lonrights.pm for an example invocation and use. |
See lonrights.pm for an example invocation and use. |
| |
|
|
Line 2016 See lonrights.pm for an example invocati
|
Line 2257 See lonrights.pm for an example invocati
|
| |
|
| #------------------------------------------- |
#------------------------------------------- |
| sub select_form { |
sub select_form { |
| my ($def,$name,$hashref,$onchange) = @_; |
my ($def,$name,$hashref,$onchange,$readonly) = @_; |
| return unless (ref($hashref) eq 'HASH'); |
return unless (ref($hashref) eq 'HASH'); |
| if ($onchange) { |
if ($onchange) { |
| $onchange = ' onchange="'.$onchange.'"'; |
$onchange = ' onchange="'.$onchange.'"'; |
|
Line 2190 sub select_level_form {
|
Line 2431 sub select_level_form {
|
| |
|
| =pod |
=pod |
| |
|
| =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) |
=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) |
| |
|
| Returns a string containing a <select name='$name' size='1'> form to |
Returns a string containing a <select name='$name' size='1'> form to |
| allow a user to select the domain to preform an operation in. |
allow a user to select the domain to preform an operation in. |
|
Line 2205 The optional $onchange argument specifie
|
Line 2446 The optional $onchange argument specifie
|
| |
|
| The optional $incdoms is a reference to an array of domains which will be the only available options. |
The optional $incdoms is a reference to an array of domains which will be the only available options. |
| |
|
| The optional $excdoms is a reference to an array of domains which will be excluded from the available options. |
The optional $excdoms is a reference to an array of domains which will be excluded from the available options. |
| |
|
| |
The optional $disabled argument, if true, adds the disabled attribute to the select tag. |
| |
|
| =cut |
=cut |
| |
|
| #------------------------------------------- |
#------------------------------------------- |
| sub select_dom_form { |
sub select_dom_form { |
| my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_; |
my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) = @_; |
| if ($onchange) { |
if ($onchange) { |
| $onchange = ' onchange="'.$onchange.'"'; |
$onchange = ' onchange="'.$onchange.'"'; |
| } |
} |
| |
if ($disabled) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| my (@domains,%exclude); |
my (@domains,%exclude); |
| if (ref($incdoms) eq 'ARRAY') { |
if (ref($incdoms) eq 'ARRAY') { |
| @domains = sort {lc($a) cmp lc($b)} (@{$incdoms}); |
@domains = sort {lc($a) cmp lc($b)} (@{$incdoms}); |
|
Line 2225 sub select_dom_form {
|
Line 2471 sub select_dom_form {
|
| if (ref($excdoms) eq 'ARRAY') { |
if (ref($excdoms) eq 'ARRAY') { |
| map { $exclude{$_} = 1; } @{$excdoms}; |
map { $exclude{$_} = 1; } @{$excdoms}; |
| } |
} |
| my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n"; |
my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n"; |
| foreach my $dom (@domains) { |
foreach my $dom (@domains) { |
| next if ($exclude{$dom}); |
next if ($exclude{$dom}); |
| $selectdomain.="<option value=\"$dom\" ". |
$selectdomain.="<option value=\"$dom\" ". |
|
Line 2601 sub authform_kerberos {
|
Line 2847 sub authform_kerberos {
|
| @_, |
@_, |
| ); |
); |
| my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype, |
my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype, |
| $autharg,$jscall); |
$autharg,$jscall,$disabled); |
| my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| if ($in{'kerb_def_auth'} eq 'krb5') { |
if ($in{'kerb_def_auth'} eq 'krb5') { |
| $check5 = ' checked="checked"'; |
$check5 = ' checked="checked"'; |
| } else { |
} else { |
| $check4 = ' checked="checked"'; |
$check4 = ' checked="checked"'; |
| } |
} |
| |
if ($in{'readonly'}) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| $krbarg = $in{'kerb_def_dom'}; |
$krbarg = $in{'kerb_def_dom'}; |
| if (defined($in{'curr_authtype'})) { |
if (defined($in{'curr_authtype'})) { |
| if ($in{'curr_authtype'} eq 'krb') { |
if ($in{'curr_authtype'} eq 'krb') { |
|
Line 2652 sub authform_kerberos {
|
Line 2901 sub authform_kerberos {
|
| if (defined($in{'mode'})) { |
if (defined($in{'mode'})) { |
| if ($in{'mode'} eq 'modifycourse') { |
if ($in{'mode'} eq 'modifycourse') { |
| if ($authnum == 1) { |
if ($authnum == 1) { |
| $authtype = '<input type="radio" name="login" value="krb" />'; |
$authtype = '<input type="radio" name="login" value="krb"'.$disabled.' />'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 2661 sub authform_kerberos {
|
Line 2910 sub authform_kerberos {
|
| if ($authtype eq '') { |
if ($authtype eq '') { |
| $authtype = '<input type="radio" name="login" value="krb" '. |
$authtype = '<input type="radio" name="login" value="krb" '. |
| 'onclick="'.$jscall.'" onchange="'.$jscall.'"'. |
'onclick="'.$jscall.'" onchange="'.$jscall.'"'. |
| $krbcheck.' />'; |
$krbcheck.$disabled.' />'; |
| } |
} |
| if (($can_assign{'krb4'} && $can_assign{'krb5'}) || |
if (($can_assign{'krb4'} && $can_assign{'krb5'}) || |
| ($can_assign{'krb4'} && !$can_assign{'krb5'} && |
($can_assign{'krb4'} && !$can_assign{'krb5'} && |
|
Line 2674 sub authform_kerberos {
|
Line 2923 sub authform_kerberos {
|
| '<label>'.$authtype, |
'<label>'.$authtype, |
| '</label><input type="text" size="10" name="krbarg" '. |
'</label><input type="text" size="10" name="krbarg" '. |
| 'value="'.$krbarg.'" '. |
'value="'.$krbarg.'" '. |
| 'onchange="'.$jscall.'" />', |
'onchange="'.$jscall.'"'.$disabled.' />', |
| '<label><input type="radio" name="krbver" value="4" '.$check4.' />', |
'<label><input type="radio" name="krbver" value="4" '.$check4.$disabled.' />', |
| '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />', |
'</label><label><input type="radio" name="krbver" value="5" '.$check5.$disabled.' />', |
| '</label>'); |
'</label>'); |
| } elsif ($can_assign{'krb4'}) { |
} elsif ($can_assign{'krb4'}) { |
| $result .= &mt |
$result .= &mt |
|
Line 2685 sub authform_kerberos {
|
Line 2934 sub authform_kerberos {
|
| '<label>'.$authtype, |
'<label>'.$authtype, |
| '</label><input type="text" size="10" name="krbarg" '. |
'</label><input type="text" size="10" name="krbarg" '. |
| 'value="'.$krbarg.'" '. |
'value="'.$krbarg.'" '. |
| 'onchange="'.$jscall.'" />', |
'onchange="'.$jscall.'"'.$disabled.' />', |
| '<label><input type="hidden" name="krbver" value="4" />', |
'<label><input type="hidden" name="krbver" value="4" />', |
| '</label>'); |
'</label>'); |
| } elsif ($can_assign{'krb5'}) { |
} elsif ($can_assign{'krb5'}) { |
|
Line 2695 sub authform_kerberos {
|
Line 2944 sub authform_kerberos {
|
| '<label>'.$authtype, |
'<label>'.$authtype, |
| '</label><input type="text" size="10" name="krbarg" '. |
'</label><input type="text" size="10" name="krbarg" '. |
| 'value="'.$krbarg.'" '. |
'value="'.$krbarg.'" '. |
| 'onchange="'.$jscall.'" />', |
'onchange="'.$jscall.'"'.$disabled.' />', |
| '<label><input type="hidden" name="krbver" value="5" />', |
'<label><input type="hidden" name="krbver" value="5" />', |
| '</label>'); |
'</label>'); |
| } |
} |
|
Line 2708 sub authform_internal {
|
Line 2957 sub authform_internal {
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall); |
my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall,$disabled); |
| my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| |
if ($in{'readonly'}) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| if (defined($in{'curr_authtype'})) { |
if (defined($in{'curr_authtype'})) { |
| if ($in{'curr_authtype'} eq 'int') { |
if ($in{'curr_authtype'} eq 'int') { |
| if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
|
Line 2738 sub authform_internal {
|
Line 2990 sub authform_internal {
|
| if (defined($in{'mode'})) { |
if (defined($in{'mode'})) { |
| if ($in{'mode'} eq 'modifycourse') { |
if ($in{'mode'} eq 'modifycourse') { |
| if ($authnum == 1) { |
if ($authnum == 1) { |
| $authtype = '<input type="radio" name="login" value="int" />'; |
$authtype = '<input type="radio" name="login" value="int"'.$disabled.' />'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 2746 sub authform_internal {
|
Line 2998 sub authform_internal {
|
| $jscall = "javascript:changed_radio('int',$in{'formname'});"; |
$jscall = "javascript:changed_radio('int',$in{'formname'});"; |
| if ($authtype eq '') { |
if ($authtype eq '') { |
| $authtype = '<input type="radio" name="login" value="int" '.$intcheck. |
$authtype = '<input type="radio" name="login" value="int" '.$intcheck. |
| ' onchange="'.$jscall.'" onclick="'.$jscall.'" />'; |
' onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />'; |
| } |
} |
| $autharg = '<input type="password" size="10" name="intarg" value="'. |
$autharg = '<input type="password" size="10" name="intarg" value="'. |
| $intarg.'" onchange="'.$jscall.'" />'; |
$intarg.'" onchange="'.$jscall.'"'.$disabled.' />'; |
| $result = &mt |
$result = &mt |
| ('[_1] Internally authenticated (with initial password [_2])', |
('[_1] Internally authenticated (with initial password [_2])', |
| '<label>'.$authtype,'</label>'.$autharg); |
'<label>'.$authtype,'</label>'.$autharg); |
| $result.="<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>'; |
$result.='<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'; |
| return $result; |
return $result; |
| } |
} |
| |
|
|
Line 2763 sub authform_local {
|
Line 3015 sub authform_local {
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall); |
my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall,$disabled); |
| my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| |
if ($in{'readonly'}) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| if (defined($in{'curr_authtype'})) { |
if (defined($in{'curr_authtype'})) { |
| if ($in{'curr_authtype'} eq 'loc') { |
if ($in{'curr_authtype'} eq 'loc') { |
| if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
|
Line 2793 sub authform_local {
|
Line 3048 sub authform_local {
|
| if (defined($in{'mode'})) { |
if (defined($in{'mode'})) { |
| if ($in{'mode'} eq 'modifycourse') { |
if ($in{'mode'} eq 'modifycourse') { |
| if ($authnum == 1) { |
if ($authnum == 1) { |
| $authtype = '<input type="radio" name="login" value="loc" />'; |
$authtype = '<input type="radio" name="login" value="loc"'.$disabled.' />'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 2802 sub authform_local {
|
Line 3057 sub authform_local {
|
| if ($authtype eq '') { |
if ($authtype eq '') { |
| $authtype = '<input type="radio" name="login" value="loc" '. |
$authtype = '<input type="radio" name="login" value="loc" '. |
| $loccheck.' onchange="'.$jscall.'" onclick="'. |
$loccheck.' onchange="'.$jscall.'" onclick="'. |
| $jscall.'" />'; |
$jscall.'"'.$disabled.' />'; |
| } |
} |
| $autharg = '<input type="text" size="10" name="locarg" value="'. |
$autharg = '<input type="text" size="10" name="locarg" value="'. |
| $locarg.'" onchange="'.$jscall.'" />'; |
$locarg.'" onchange="'.$jscall.'"'.$disabled.' />'; |
| $result = &mt('[_1] Local Authentication with argument [_2]', |
$result = &mt('[_1] Local Authentication with argument [_2]', |
| '<label>'.$authtype,'</label>'.$autharg); |
'<label>'.$authtype,'</label>'.$autharg); |
| return $result; |
return $result; |
|
Line 2817 sub authform_filesystem {
|
Line 3072 sub authform_filesystem {
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my ($fsyscheck,$result,$authtype,$autharg,$jscall); |
my ($fsyscheck,$result,$authtype,$autharg,$jscall,$disabled); |
| my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| |
if ($in{'readonly'}) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| if (defined($in{'curr_authtype'})) { |
if (defined($in{'curr_authtype'})) { |
| if ($in{'curr_authtype'} eq 'fsys') { |
if ($in{'curr_authtype'} eq 'fsys') { |
| if ($can_assign{'fsys'}) { |
if ($can_assign{'fsys'}) { |
|
Line 2844 sub authform_filesystem {
|
Line 3102 sub authform_filesystem {
|
| if (defined($in{'mode'})) { |
if (defined($in{'mode'})) { |
| if ($in{'mode'} eq 'modifycourse') { |
if ($in{'mode'} eq 'modifycourse') { |
| if ($authnum == 1) { |
if ($authnum == 1) { |
| $authtype = '<input type="radio" name="login" value="fsys" />'; |
$authtype = '<input type="radio" name="login" value="fsys"'.$disabled.' />'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 2853 sub authform_filesystem {
|
Line 3111 sub authform_filesystem {
|
| if ($authtype eq '') { |
if ($authtype eq '') { |
| $authtype = '<input type="radio" name="login" value="fsys" '. |
$authtype = '<input type="radio" name="login" value="fsys" '. |
| $fsyscheck.' onchange="'.$jscall.'" onclick="'. |
$fsyscheck.' onchange="'.$jscall.'" onclick="'. |
| $jscall.'" />'; |
$jscall.'"'.$disabled.' />'; |
| } |
} |
| $autharg = '<input type="text" size="10" name="fsysarg" value=""'. |
$autharg = '<input type="text" size="10" name="fsysarg" value=""'. |
| ' onchange="'.$jscall.'" />'; |
' onchange="'.$jscall.'"'.$disabled.' />'; |
| $result = &mt |
$result = &mt |
| ('[_1] Filesystem Authenticated (with initial password [_2])', |
('[_1] Filesystem Authenticated (with initial password [_2])', |
| '<label><input type="radio" name="login" value="fsys" '. |
'<label><input type="radio" name="login" value="fsys" '. |
| $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />', |
$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />', |
| '</label><input type="password" size="10" name="fsysarg" value="" '. |
'</label><input type="password" size="10" name="fsysarg" value="" '. |
| 'onchange="'.$jscall.'" />'); |
'onchange="'.$jscall.'"'.$disabled.' />'); |
| return $result; |
return $result; |
| } |
} |
| |
|
|
Line 2884 sub get_assignable_auth {
|
Line 3142 sub get_assignable_auth {
|
| my $context; |
my $context; |
| if ($env{'request.role'} =~ /^au/) { |
if ($env{'request.role'} =~ /^au/) { |
| $context = 'author'; |
$context = 'author'; |
| } elsif ($env{'request.role'} =~ /^dc/) { |
} elsif ($env{'request.role'} =~ /^(dc|dh)/) { |
| $context = 'domain'; |
$context = 'domain'; |
| } elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
| $context = 'course'; |
$context = 'course'; |
|
Line 4440 sub blockcheck {
|
Line 4698 sub blockcheck {
|
| $tdom,$spec,$trest,$area); |
$tdom,$spec,$trest,$area); |
| } |
} |
| } |
} |
| my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles); |
my ($author,$adv,$rar) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles); |
| if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) { |
if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) { |
| if ($1) { |
if ($1) { |
| $no_userblock = 1; |
$no_userblock = 1; |
|
Line 4691 sub check_ip_acc {
|
Line 4949 sub check_ip_acc {
|
| return 1; |
return 1; |
| } |
} |
| my $allowed=0; |
my $allowed=0; |
| my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip; |
my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'}; |
| |
|
| my $name; |
my $name; |
| foreach my $pattern (split(',',$acc)) { |
foreach my $pattern (split(',',$acc)) { |
|
Line 4736 sub check_ip_acc {
|
Line 4994 sub check_ip_acc {
|
| return $allowed; |
return $allowed; |
| } |
} |
| |
|
| |
sub check_slotip_acc { |
| |
my ($acc,$clientip)=@_; |
| |
&Apache::lonxml::debug("acc is $acc"); |
| |
if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { |
| |
return 1; |
| |
} |
| |
my $allowed; |
| |
my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'}; |
| |
|
| |
my $name; |
| |
my %access = ( |
| |
allowfrom => 1, |
| |
denyfrom => 0, |
| |
); |
| |
my @allows; |
| |
my @denies; |
| |
foreach my $item (split(',',$acc)) { |
| |
$item =~ s/^\s*//; |
| |
$item =~ s/\s*$//; |
| |
my $pattern; |
| |
if ($item =~ /^\!(.+)$/) { |
| |
push(@denies,$1); |
| |
} else { |
| |
push(@allows,$item); |
| |
} |
| |
} |
| |
my $numdenies = scalar(@denies); |
| |
my $numallows = scalar(@allows); |
| |
my $count = 0; |
| |
foreach my $pattern (@denies,@allows) { |
| |
$count ++; |
| |
my $acctype = 'allowfrom'; |
| |
if ($count <= $numdenies) { |
| |
$acctype = 'denyfrom'; |
| |
} |
| |
if ($pattern =~ /\*$/) { |
| |
#35.8.* |
| |
$pattern=~s/\*//; |
| |
if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; } |
| |
} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) { |
| |
#35.8.3.[34-56] |
| |
my $low=$2; |
| |
my $high=$3; |
| |
$pattern=$1; |
| |
if ($ip =~ /^\Q$pattern\E/) { |
| |
my $last=(split(/\./,$ip))[3]; |
| |
if ($last <=$high && $last >=$low) { $allowed=$access{$acctype}; } |
| |
} |
| |
} elsif ($pattern =~ /^\*/) { |
| |
#*.msu.edu |
| |
$pattern=~s/\*//; |
| |
if (!defined($name)) { |
| |
use Socket; |
| |
my $netaddr=inet_aton($ip); |
| |
($name)=gethostbyaddr($netaddr,AF_INET); |
| |
} |
| |
if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; } |
| |
} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) { |
| |
#127.0.0.1 |
| |
if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; } |
| |
} else { |
| |
#some.name.com |
| |
if (!defined($name)) { |
| |
use Socket; |
| |
my $netaddr=inet_aton($ip); |
| |
($name)=gethostbyaddr($netaddr,AF_INET); |
| |
} |
| |
if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; } |
| |
} |
| |
if ($allowed =~ /^(0|1)$/) { last; } |
| |
} |
| |
if ($allowed eq '') { |
| |
if ($numdenies && !$numallows) { |
| |
$allowed = 1; |
| |
} else { |
| |
$allowed = 0; |
| |
} |
| |
} |
| |
return $allowed; |
| |
} |
| |
|
| ############################################### |
############################################### |
| |
|
| =pod |
=pod |
|
Line 5184 sub bodytag {
|
Line 5523 sub bodytag {
|
| if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
| if ($env{'request.role'} !~ /^cr/) { |
if ($env{'request.role'} !~ /^cr/) { |
| $role = &Apache::lonnet::plaintext($role,&course_type()); |
$role = &Apache::lonnet::plaintext($role,&course_type()); |
| |
} elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) { |
| |
if ($env{'request.role.desc'}) { |
| |
$role = $env{'request.role.desc'}; |
| |
} else { |
| |
$role = &mt('Helpdesk[_1]',' '.$2); |
| |
} |
| |
} else { |
| |
$role = (split(/\//,$role,4))[-1]; |
| } |
} |
| if ($env{'request.course.sec'}) { |
if ($env{'request.course.sec'}) { |
| $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'}; |
$role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'}; |
|
Line 5284 sub bodytag {
|
Line 5631 sub bodytag {
|
| if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
| $bodytag .= &Apache::lonmenu::innerregister($forcereg, |
$bodytag .= &Apache::lonmenu::innerregister($forcereg, |
| $args->{'bread_crumbs'}); |
$args->{'bread_crumbs'}); |
| } elsif ($forcereg) { |
} elsif ($forcereg) { |
| $bodytag .= &Apache::lonmenu::innerregister($forcereg,undef, |
$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef, |
| $args->{'group'}); |
$args->{'group'}, |
| |
$args->{'hide_buttons'}); |
| } else { |
} else { |
| my $forbodytag; |
my $forbodytag; |
| &Apache::lonmenu::prepare_functions($env{'request.noversionuri'}, |
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'}, |
|
Line 6593 div.LC_edit_problem_footer,
|
Line 6941 div.LC_edit_problem_footer,
|
| div.LC_edit_problem_footer div, |
div.LC_edit_problem_footer div, |
| div.LC_edit_problem_editxml_header, |
div.LC_edit_problem_editxml_header, |
| div.LC_edit_problem_editxml_header div { |
div.LC_edit_problem_editxml_header div { |
| margin-top: 5px; |
z-index: 100; |
| } |
} |
| |
|
| div.LC_edit_problem_header_title { |
div.LC_edit_problem_header_title { |
|
Line 6609 table.LC_edit_problem_header_title {
|
Line 6957 table.LC_edit_problem_header_title {
|
| background: $tabbg; |
background: $tabbg; |
| } |
} |
| |
|
| div.LC_edit_problem_discards { |
div.LC_edit_actionbar { |
| float: left; |
background-color: $sidebg; |
| padding-bottom: 5px; |
margin: 0; |
| |
padding: 0; |
| |
line-height: 200%; |
| } |
} |
| |
|
| div.LC_edit_problem_saves { |
div.LC_edit_actionbar div{ |
| float: right; |
padding: 0; |
| padding-bottom: 5px; |
margin: 0; |
| |
display: inline-block; |
| } |
} |
| |
|
| .LC_edit_opt { |
.LC_edit_opt { |
|
Line 6632 div.LC_edit_problem_saves {
|
Line 6983 div.LC_edit_problem_saves {
|
| margin-left: 40px; |
margin-left: 40px; |
| } |
} |
| |
|
| |
#LC_edit_problem_codemirror div{ |
| |
margin-left: 0px; |
| |
} |
| |
|
| img.stift { |
img.stift { |
| border-width: 0; |
border-width: 0; |
| vertical-align: middle; |
vertical-align: middle; |
|
Line 6750 fieldset > legend {
|
Line 7105 fieldset > legend {
|
| ol.LC_primary_menu { |
ol.LC_primary_menu { |
| margin: 0; |
margin: 0; |
| padding: 0; |
padding: 0; |
| background-color: $pgbg_or_bgcolor; |
|
| } |
} |
| |
|
| ol#LC_PathBreadcrumbs { |
ol#LC_PathBreadcrumbs { |
|
Line 6762 ol.LC_primary_menu li {
|
Line 7116 ol.LC_primary_menu li {
|
| vertical-align: middle; |
vertical-align: middle; |
| text-align: left; |
text-align: left; |
| list-style: none; |
list-style: none; |
| |
position: relative; |
| float: left; |
float: left; |
| |
z-index: 100; /* will be displayed above codemirror and underneath the help-layer */ |
| |
line-height: 1.5em; |
| } |
} |
| |
|
| ol.LC_primary_menu li a { |
ol.LC_primary_menu li a, |
| |
ol.LC_primary_menu li p { |
| display: block; |
display: block; |
| margin: 0; |
margin: 0; |
| padding: 0 5px 0 10px; |
padding: 0 5px 0 10px; |
| text-decoration: none; |
text-decoration: none; |
| } |
} |
| |
|
| ol.LC_primary_menu li ul { |
ol.LC_primary_menu li p span.LC_primary_menu_innertitle { |
| |
display: inline-block; |
| |
width: 95%; |
| |
text-align: left; |
| |
} |
| |
|
| |
ol.LC_primary_menu li p span.LC_primary_menu_innerarrow { |
| |
display: inline-block; |
| |
width: 5%; |
| |
float: right; |
| |
text-align: right; |
| |
font-size: 70%; |
| |
} |
| |
|
| |
ol.LC_primary_menu ul { |
| display: none; |
display: none; |
| width: 10em; |
width: 15em; |
| background-color: $data_table_light; |
background-color: $data_table_light; |
| |
position: absolute; |
| |
top: 100%; |
| |
} |
| |
|
| |
ol.LC_primary_menu ul ul { |
| |
left: 100%; |
| |
top: 0; |
| } |
} |
| |
|
| ol.LC_primary_menu li:hover ul, ol.LC_primary_menu li.hover ul { |
ol.LC_primary_menu li:hover > ul, ol.LC_primary_menu li.hover > ul { |
| display: block; |
display: block; |
| position: absolute; |
position: absolute; |
| margin: 0; |
margin: 0; |
|
Line 6787 ol.LC_primary_menu li:hover ul, ol.LC_pr
|
Line 7166 ol.LC_primary_menu li:hover ul, ol.LC_pr
|
| } |
} |
| |
|
| ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li { |
ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li { |
| |
/* First Submenu -> size should be smaller than the menu title of the whole menu */ |
| font-size: 90%; |
font-size: 90%; |
| vertical-align: top; |
vertical-align: top; |
| float: none; |
float: none; |
| border-left: 1px solid black; |
border-left: 1px solid black; |
| border-right: 1px solid black; |
border-right: 1px solid black; |
| |
/* A dark bottom border to visualize different menu options; |
| |
overwritten in the create_submenu routine for the last border-bottom of the menu */ |
| |
border-bottom: 1px solid $data_table_dark; |
| } |
} |
| |
|
| ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a { |
ol.LC_primary_menu li li p:hover { |
| background-color:$data_table_light; |
color:$button_hover; |
| |
text-decoration:none; |
| |
background-color:$data_table_dark; |
| } |
} |
| |
|
| ol.LC_primary_menu li li a:hover { |
ol.LC_primary_menu li li a:hover { |
|
Line 6803 ol.LC_primary_menu li li a:hover {
|
Line 7188 ol.LC_primary_menu li li a:hover {
|
| background-color:$data_table_dark; |
background-color:$data_table_dark; |
| } |
} |
| |
|
| |
/* Font-size equal to the size of the predecessors*/ |
| |
ol.LC_primary_menu li:hover li li { |
| |
font-size: 100%; |
| |
} |
| |
|
| ol.LC_primary_menu li img { |
ol.LC_primary_menu li img { |
| vertical-align: bottom; |
vertical-align: bottom; |
| height: 1.1em; |
height: 1.1em; |
|
Line 6859 ul#LC_secondary_menu li {
|
Line 7249 ul#LC_secondary_menu li {
|
| font-weight: bold; |
font-weight: bold; |
| line-height: 1.8em; |
line-height: 1.8em; |
| border-right: 1px solid black; |
border-right: 1px solid black; |
| vertical-align: middle; |
|
| float: left; |
float: left; |
| } |
} |
| |
|
|
Line 7366 span.roman {font-family: serif; font-sty
|
Line 7755 span.roman {font-family: serif; font-sty
|
| span.overacc2 {position: relative; left: .8em; top: -1.2ex;} |
span.overacc2 {position: relative; left: .8em; top: -1.2ex;} |
| span.overacc1 {position: relative; left: .6em; top: -1.2ex;} |
span.overacc1 {position: relative; left: .6em; top: -1.2ex;} |
| |
|
| |
#LC_minitab_header { |
| |
float:left; |
| |
width:100%; |
| |
background:#DAE0D2 url("/res/adm/pages/minitabmenu_bg.gif") repeat-x bottom; |
| |
font-size:93%; |
| |
line-height:normal; |
| |
margin: 0.5em 0 0.5em 0; |
| |
} |
| |
#LC_minitab_header ul { |
| |
margin:0; |
| |
padding:10px 10px 0; |
| |
list-style:none; |
| |
} |
| |
#LC_minitab_header li { |
| |
float:left; |
| |
background:url("/res/adm/pages/minitabmenu_left.gif") no-repeat left top; |
| |
margin:0; |
| |
padding:0 0 0 9px; |
| |
} |
| |
#LC_minitab_header a { |
| |
display:block; |
| |
background:url("/res/adm/pages/minitabmenu_right.gif") no-repeat right top; |
| |
padding:5px 15px 4px 6px; |
| |
} |
| |
#LC_minitab_header #LC_current_minitab { |
| |
background-image:url("/res/adm/pages/minitabmenu_left_on.gif"); |
| |
} |
| |
#LC_minitab_header #LC_current_minitab a { |
| |
background-image:url("/res/adm/pages/minitabmenu_right_on.gif"); |
| |
padding-bottom:5px; |
| |
} |
| |
|
| |
|
| END |
END |
| } |
} |
| |
|
|
Line 7558 OFFLOAD
|
Line 7980 OFFLOAD
|
| <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"> |
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"> |
| <meta name="apple-mobile-web-app-capable" content="yes" />'; |
<meta name="apple-mobile-web-app-capable" content="yes" />'; |
| } |
} |
| |
$result .= '<meta name="google" content="notranslate" />'."\n"; |
| return $result.'</head>'; |
return $result.'</head>'; |
| } |
} |
| |
|
|
Line 7739 $args - additional optional args support
|
Line 8162 $args - additional optional args support
|
| no_auto_mt_title -> prevent &mt()ing the title arg |
no_auto_mt_title -> prevent &mt()ing the title arg |
| bread_crumbs -> Array containing breadcrumbs |
bread_crumbs -> Array containing breadcrumbs |
| bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs |
bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs |
| |
bread_crumbs_nomenu -> if true will pass false as the value of $menulink |
| |
to lonhtmlcommon::breadcrumbs |
| group -> includes the current group, if page is for a |
group -> includes the current group, if page is for a |
| specific group |
specific group |
| |
|
|
Line 7804 sub start_page {
|
Line 8229 sub start_page {
|
| if (@advtools > 0) { |
if (@advtools > 0) { |
| &Apache::lonmenu::advtools_crumbs(@advtools); |
&Apache::lonmenu::advtools_crumbs(@advtools); |
| } |
} |
| |
my $menulink; |
| |
# if arg: bread_crumbs_nomenu is true pass 0 as $menulink item. |
| |
if (exists($args->{'bread_crumbs_nomenu'})) { |
| |
$menulink = 0; |
| |
} else { |
| |
undef($menulink); |
| |
} |
| #if bread_crumbs_component exists show it as headline else show only the breadcrumbs |
#if bread_crumbs_component exists show it as headline else show only the breadcrumbs |
| if(exists($args->{'bread_crumbs_component'})){ |
if(exists($args->{'bread_crumbs_component'})){ |
| $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'}); |
$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'},'',$menulink); |
| }else{ |
}else{ |
| $result .= &Apache::lonhtmlcommon::breadcrumbs(); |
$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink); |
| } |
} |
| } elsif (($env{'environment.remote'} eq 'on') && |
} elsif (($env{'environment.remote'} eq 'on') && |
| ($env{'form.inhibitmenu'} ne 'yes') && |
($env{'form.inhibitmenu'} ne 'yes') && |
|
Line 7911 var modalWindow = {
|
Line 8342 var modalWindow = {
|
| }; |
}; |
| var openMyModal = function(source,width,height,scrolling,transparency,style) |
var openMyModal = function(source,width,height,scrolling,transparency,style) |
| { |
{ |
| source = source.replace("'","'"); |
source = source.replace(/'/g,"'"); |
| modalWindow.windowId = "myModal"; |
modalWindow.windowId = "myModal"; |
| modalWindow.width = width; |
modalWindow.width = width; |
| modalWindow.height = height; |
modalWindow.height = height; |
|
Line 9227 sub get_secgrprole_info {
|
Line 9658 sub get_secgrprole_info {
|
| } |
} |
| |
|
| sub user_picker { |
sub user_picker { |
| my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_; |
my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context,$fixeddom,$noinstd) = @_; |
| my $currdom = $dom; |
my $currdom = $dom; |
| |
my @alldoms = &Apache::lonnet::all_domains(); |
| |
if (@alldoms == 1) { |
| |
my %domsrch = &Apache::lonnet::get_dom('configuration', |
| |
['directorysrch'],$alldoms[0]); |
| |
my $domdesc = &Apache::lonnet::domain($alldoms[0],'description'); |
| |
my $showdom = $domdesc; |
| |
if ($showdom eq '') { |
| |
$showdom = $dom; |
| |
} |
| |
if (ref($domsrch{'directorysrch'}) eq 'HASH') { |
| |
if ((!$domsrch{'directorysrch'}{'available'}) && |
| |
($domsrch{'directorysrch'}{'lcavailable'} eq '0')) { |
| |
return (&mt('LON-CAPA directory search is not available in domain: [_1]',$showdom),0); |
| |
} |
| |
} |
| |
} |
| my %curr_selected = ( |
my %curr_selected = ( |
| srchin => 'dom', |
srchin => 'dom', |
| srchby => 'lastname', |
srchby => 'lastname', |
|
Line 9275 sub user_picker {
|
Line 9722 sub user_picker {
|
| ); |
); |
| &html_escape(\%html_lt); |
&html_escape(\%html_lt); |
| &js_escape(\%js_lt); |
&js_escape(\%js_lt); |
| my $domform = &select_dom_form($currdom,'srchdomain',1,1); |
my $domform; |
| |
my $allow_blank = 1; |
| |
if ($fixeddom) { |
| |
$allow_blank = 0; |
| |
$domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1,undef,[$currdom]); |
| |
} else { |
| |
$domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1); |
| |
} |
| my $srchinsel = ' <select name="srchin">'; |
my $srchinsel = ' <select name="srchin">'; |
| |
|
| my @srchins = ('crs','dom','alc','instd'); |
my @srchins = ('crs','dom','alc','instd'); |
|
Line 9287 sub user_picker {
|
Line 9741 sub user_picker {
|
| next if ($option eq 'alc'); |
next if ($option eq 'alc'); |
| next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs')); |
next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs')); |
| next if ($option eq 'crs' && !$env{'request.course.id'}); |
next if ($option eq 'crs' && !$env{'request.course.id'}); |
| |
next if (($option eq 'instd') && ($noinstd)); |
| if ($curr_selected{'srchin'} eq $option) { |
if ($curr_selected{'srchin'} eq $option) { |
| $srchinsel .= ' |
$srchinsel .= ' |
| <option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>'; |
<option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>'; |
|
Line 9469 END_BLOCK
|
Line 9924 END_BLOCK
|
| &Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::row_closure(1). |
| &Apache::lonhtmlcommon::end_pick_box(). |
&Apache::lonhtmlcommon::end_pick_box(). |
| '<br />'; |
'<br />'; |
| return $output; |
return ($output,1); |
| } |
} |
| |
|
| sub user_rule_check { |
sub user_rule_check { |
|
Line 9784 sub get_institutional_codes {
|
Line 10239 sub get_institutional_codes {
|
| foreach (@currxlists) { |
foreach (@currxlists) { |
| if (m/^([^:]+):(\w*)$/) { |
if (m/^([^:]+):(\w*)$/) { |
| unless (grep/^$1$/,@{$allcourses}) { |
unless (grep/^$1$/,@{$allcourses}) { |
| push @{$allcourses},$1; |
push(@{$allcourses},$1); |
| $$LC_code{$1} = $2; |
$$LC_code{$1} = $2; |
| } |
} |
| } |
} |
|
Line 9797 sub get_institutional_codes {
|
Line 10252 sub get_institutional_codes {
|
| my $sec = $coursecode.$1; |
my $sec = $coursecode.$1; |
| my $lc_sec = $2; |
my $lc_sec = $2; |
| unless (grep/^$sec$/,@{$allcourses}) { |
unless (grep/^$sec$/,@{$allcourses}) { |
| push @{$allcourses},$sec; |
push(@{$allcourses},$sec); |
| $$LC_code{$sec} = $lc_sec; |
$$LC_code{$sec} = $lc_sec; |
| } |
} |
| } |
} |
|
Line 11630 sub decompress_uploaded_file {
|
Line 12085 sub decompress_uploaded_file {
|
| |
|
| sub process_decompression { |
sub process_decompression { |
| my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_; |
my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_; |
| |
unless (($dir_root eq '/userfiles') && ($destination =~ m{^(docs|supplemental)/(default|\d+)/\d+$})) { |
| |
return '<p class="LC_error">'.&mt('Not extracted.').'<br />'. |
| |
&mt('Unexpected file path.').'</p>'."\n"; |
| |
} |
| |
unless (($docudom =~ /^$match_domain$/) && ($docuname =~ /^$match_courseid$/)) { |
| |
return '<p class="LC_error">'.&mt('Not extracted.').'<br />'. |
| |
&mt('Unexpected course context.').'</p>'."\n"; |
| |
} |
| |
unless ($file eq &Apache::lonnet::clean_filename($file)) { |
| |
return '<p class="LC_error">'.&mt('Not extracted.').'<br />'. |
| |
&mt('Filename contained unexpected characters.').'</p>'."\n"; |
| |
} |
| my ($dir,$error,$warning,$output); |
my ($dir,$error,$warning,$output); |
| if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i) { |
if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i) { |
| $error = &mt('Filename not a supported archive file type.'). |
$error = &mt('Filename not a supported archive file type.'). |
|
Line 11664 sub process_decompression {
|
Line 12131 sub process_decompression {
|
| } |
} |
| } |
} |
| my $numskip = scalar(@to_skip); |
my $numskip = scalar(@to_skip); |
| if (($numskip > 0) && |
my $numoverwrite = scalar(@to_overwrite); |
| ($numskip == $env{'form.archive_itemcount'})) { |
if (($numskip) && (!$numoverwrite)) { |
| $warning = &mt('All items in the archive file already exist, and no overwriting of existing files has been requested.'); |
$warning = &mt('All items in the archive file already exist, and no overwriting of existing files has been requested.'); |
| } elsif ($dir eq '') { |
} elsif ($dir eq '') { |
| $error = &mt('Directory containing archive file unavailable.'); |
$error = &mt('Directory containing archive file unavailable.'); |
| } elsif (!$error) { |
} elsif (!$error) { |
| my ($decompressed,$display); |
my ($decompressed,$display); |
| if ($numskip > 0) { |
if (($numskip) || ($numoverwrite)) { |
| my $tempdir = time.'_'.$$.int(rand(10000)); |
my $tempdir = time.'_'.$$.int(rand(10000)); |
| mkdir("$dir/$tempdir",0755); |
mkdir("$dir/$tempdir",0755); |
| system("mv $dir/$file $dir/$tempdir/$file"); |
if (&File::Copy::move("$dir/$file","$dir/$tempdir/$file")) { |
| ($decompressed,$display) = |
($decompressed,$display) = |
| &decompress_uploaded_file($file,"$dir/$tempdir"); |
&decompress_uploaded_file($file,"$dir/$tempdir"); |
| foreach my $item (@to_skip) { |
foreach my $item (@to_skip) { |
| if (($item ne '') && ($item !~ /\.\./)) { |
if (($item ne '') && ($item !~ /\.\./)) { |
| if (-f "$dir/$tempdir/$item") { |
if (-f "$dir/$tempdir/$item") { |
| unlink("$dir/$tempdir/$item"); |
unlink("$dir/$tempdir/$item"); |
| } elsif (-d "$dir/$tempdir/$item") { |
} elsif (-d "$dir/$tempdir/$item") { |
| system("rm -rf $dir/$tempdir/$item"); |
&File::Path::remove_tree("$dir/$tempdir/$item",{ safe => 1 }); |
| |
} |
| |
} |
| |
} |
| |
foreach my $item (@to_overwrite) { |
| |
if ((-e "$dir/$tempdir/$item") && (-e "$dir/$item")) { |
| |
if (($item ne '') && ($item !~ /\.\./)) { |
| |
if (-f "$dir/$item") { |
| |
unlink("$dir/$item"); |
| |
} elsif (-d "$dir/$item") { |
| |
&File::Path::remove_tree("$dir/$item",{ safe => 1 }); |
| |
} |
| |
&File::Copy::move("$dir/$tempdir/$item","$dir/$item"); |
| |
} |
| } |
} |
| } |
} |
| |
if (&File::Copy::move("$dir/$tempdir/$file","$dir/$file")) { |
| |
&File::Path::remove_tree("$dir/$tempdir",{ safe => 1 }); |
| |
} |
| } |
} |
| system("mv $dir/$tempdir/* $dir"); |
|
| rmdir("$dir/$tempdir"); |
|
| } else { |
} else { |
| ($decompressed,$display) = |
($decompressed,$display) = |
| &decompress_uploaded_file($file,$dir); |
&decompress_uploaded_file($file,$dir); |
|
Line 12191 END
|
Line 12672 END
|
| sub process_extracted_files { |
sub process_extracted_files { |
| my ($context,$docudom,$docuname,$destination,$dir_root,$hiddenelem) = @_; |
my ($context,$docudom,$docuname,$destination,$dir_root,$hiddenelem) = @_; |
| my $numitems = $env{'form.archive_count'}; |
my $numitems = $env{'form.archive_count'}; |
| return unless ($numitems); |
return if ((!$numitems) || ($numitems =~ /\D/)); |
| my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
| my ($prefix,$pathtocheck,$dir,$ishome,$error,$warning,%toplevelitems,%is_dir, |
my ($prefix,$pathtocheck,$dir,$ishome,$error,$warning,%toplevelitems,%is_dir, |
| %folders,%containers,%mapinner,%prompttofetch); |
%folders,%containers,%mapinner,%prompttofetch); |
|
Line 12204 sub process_extracted_files {
|
Line 12685 sub process_extracted_files {
|
| } else { |
} else { |
| $prefix = $Apache::lonnet::perlvar{'lonDocRoot'}; |
$prefix = $Apache::lonnet::perlvar{'lonDocRoot'}; |
| $pathtocheck = "$dir_root/$docudom/$docuname/$destination"; |
$pathtocheck = "$dir_root/$docudom/$docuname/$destination"; |
| $dir = "$dir_root/$docudom/$docuname"; |
$dir = "$dir_root/$docudom/$docuname"; |
| } |
} |
| my $currdir = "$dir_root/$destination"; |
my $currdir = "$dir_root/$destination"; |
| (my $docstype,$mapinner{'0'}) = ($destination =~ m{^(docs|supplemental)/(\w+)/}); |
(my $docstype,$mapinner{'0'}) = ($destination =~ m{^(docs|supplemental)/(\w+)/}); |
|
Line 12293 sub process_extracted_files {
|
Line 12774 sub process_extracted_files {
|
| '.'.$containers{$outer},1,1); |
'.'.$containers{$outer},1,1); |
| $newseqid{$i} = $newidx; |
$newseqid{$i} = $newidx; |
| unless ($errtext) { |
unless ($errtext) { |
| $result .= '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n"; |
$result .= '<li>'.&mt('Folder: [_1] added to course', |
| |
&HTML::Entities::encode($docstitle,'<>&"')). |
| |
'</li>'."\n"; |
| } |
} |
| } |
} |
| } else { |
} else { |
|
Line 12302 sub process_extracted_files {
|
Line 12785 sub process_extracted_files {
|
| my $url = '/uploaded/'.$docudom.'/'.$docuname.'/'. |
my $url = '/uploaded/'.$docudom.'/'.$docuname.'/'. |
| $docstype.'/'.$mapinner{$outer}.'/'.$newidx.'/'. |
$docstype.'/'.$mapinner{$outer}.'/'.$newidx.'/'. |
| $title; |
$title; |
| if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") { |
if (($outer !~ /\D/) && ($mapinner{$outer} !~ /\D/) && ($newidx !~ /\D/)) { |
| mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755); |
if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") { |
| } |
mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755); |
| if (!-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") { |
|
| mkdir("$prefix$dir/$docstype/$mapinner{$outer}/$newidx"); |
|
| } |
|
| if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") { |
|
| system("mv $prefix$path $prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title"); |
|
| $newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx"; |
|
| unless ($ishome) { |
|
| my $fetch = "$newdest{$i}/$title"; |
|
| $fetch =~ s/^\Q$prefix$dir\E//; |
|
| $prompttofetch{$fetch} = 1; |
|
| } |
} |
| } |
if (!-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") { |
| $LONCAPA::map::resources[$newidx]= |
mkdir("$prefix$dir/$docstype/$mapinner{$outer}/$newidx"); |
| $docstitle.':'.$url.':false:normal:res'; |
|
| push(@LONCAPA::map::order, $newidx); |
|
| my ($outtext,$errtext)= |
|
| &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
|
| $docuname.'/'.$folders{$outer}. |
|
| '.'.$containers{$outer},1,1); |
|
| unless ($errtext) { |
|
| if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") { |
|
| $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n"; |
|
| } |
} |
| |
if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") { |
| |
if (rename("$prefix$path","$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title")) { |
| |
$newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx"; |
| |
unless ($ishome) { |
| |
my $fetch = "$newdest{$i}/$title"; |
| |
$fetch =~ s/^\Q$prefix$dir\E//; |
| |
$prompttofetch{$fetch} = 1; |
| |
} |
| |
} |
| |
} |
| |
$LONCAPA::map::resources[$newidx]= |
| |
$docstitle.':'.$url.':false:normal:res'; |
| |
push(@LONCAPA::map::order, $newidx); |
| |
my ($outtext,$errtext)= |
| |
&LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
| |
$docuname.'/'.$folders{$outer}. |
| |
'.'.$containers{$outer},1,1); |
| |
unless ($errtext) { |
| |
if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") { |
| |
$result .= '<li>'.&mt('File: [_1] added to course', |
| |
&HTML::Entities::encode($docstitle,'<>&"')). |
| |
'</li>'."\n"; |
| |
} |
| |
} |
| |
} else { |
| |
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.', |
| |
&HTML::Entities::encode($path,'<>&"')).'<br />'; |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| } else { |
} else { |
| $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; |
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.', |
| |
&HTML::Entities::encode($path,'<>&"')).'<br />'; |
| } |
} |
| } |
} |
| for (my $i=1; $i<=$numitems; $i++) { |
for (my $i=1; $i<=$numitems; $i++) { |
|
Line 12394 sub process_extracted_files {
|
Line 12886 sub process_extracted_files {
|
| } |
} |
| if ($fullpath ne '') { |
if ($fullpath ne '') { |
| if (-e "$prefix$path") { |
if (-e "$prefix$path") { |
| system("mv $prefix$path $fullpath/$title"); |
unless (rename("$prefix$path","$fullpath/$title")) { |
| |
$warning .= &mt('Failed to rename dependency').'<br />'; |
| |
} |
| } |
} |
| if (-e "$fullpath/$title") { |
if (-e "$fullpath/$title") { |
| my $showpath; |
my $showpath; |
|
Line 12403 sub process_extracted_files {
|
Line 12897 sub process_extracted_files {
|
| } else { |
} else { |
| $showpath = "/$title"; |
$showpath = "/$title"; |
| } |
} |
| $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n"; |
$result .= '<li>'.&mt('[_1] included as a dependency', |
| |
&HTML::Entities::encode($showpath,'<>&"')). |
| |
'</li>'."\n"; |
| } |
} |
| unless ($ishome) { |
unless ($ishome) { |
| my $fetch = "$fullpath/$title"; |
my $fetch = "$fullpath/$title"; |
|
Line 12414 sub process_extracted_files {
|
Line 12910 sub process_extracted_files {
|
| } |
} |
| } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') { |
} elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') { |
| $warning .= &mt('[_1] is a dependency of [_2], which was discarded.', |
$warning .= &mt('[_1] is a dependency of [_2], which was discarded.', |
| $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />'; |
&HTML::Entities::encode($path,'<>&"'), |
| |
&HTML::Entities::encode($env{'form.archive_content_'.$referrer{$i}},'<>&"')). |
| |
'<br />'; |
| } |
} |
| } else { |
} else { |
| $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; |
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.', |
| |
&HTML::Entities::encode($path)).'<br />'; |
| } |
} |
| } |
} |
| if (keys(%todelete)) { |
if (keys(%todelete)) { |
|
Line 12691 sub upfile_store {
|
Line 13190 sub upfile_store {
|
| $env{'form.upfile'}=~s/\n+/\n/gs; |
$env{'form.upfile'}=~s/\n+/\n/gs; |
| $env{'form.upfile'}=~s/\n+$//gs; |
$env{'form.upfile'}=~s/\n+$//gs; |
| |
|
| my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}. |
my $datatoken = &valid_datatoken($env{'user.name'}.'_'.$env{'user.domain'}. |
| '_enroll_'.$env{'request.course.id'}.'_'.time.'_'.$$; |
'_enroll_'.$env{'request.course.id'}.'_'. |
| |
time.'_'.$$); |
| |
return if ($datatoken eq ''); |
| { |
{ |
| my $datafile = $r->dir_config('lonDaemons'). |
my $datafile = $r->dir_config('lonDaemons'). |
| '/tmp/'.$datatoken.'.tmp'; |
'/tmp/'.$datatoken.'.tmp'; |
|
Line 12706 sub upfile_store {
|
Line 13207 sub upfile_store {
|
| |
|
| =pod |
=pod |
| |
|
| =item * &load_tmp_file($r) |
=item * &load_tmp_file($r,$datatoken) |
| |
|
| Load uploaded file from tmp, $r should be the HTTP Request object, |
Load uploaded file from tmp, $r should be the HTTP Request object, |
| needs $env{'form.datatoken'}, |
$datatoken is the name to assign to the temporary file. |
| sets $env{'form.upfile'} to the contents of the file |
sets $env{'form.upfile'} to the contents of the file |
| |
|
| =cut |
=cut |
| |
|
| sub load_tmp_file { |
sub load_tmp_file { |
| my $r=shift; |
my ($r,$datatoken) = @_; |
| |
return if ($datatoken eq ''); |
| my @studentdata=(); |
my @studentdata=(); |
| { |
{ |
| my $studentfile = $r->dir_config('lonDaemons'). |
my $studentfile = $r->dir_config('lonDaemons'). |
| '/tmp/'.$env{'form.datatoken'}.'.tmp'; |
'/tmp/'.$datatoken.'.tmp'; |
| if ( open(my $fh,"<$studentfile") ) { |
if ( open(my $fh,"<$studentfile") ) { |
| @studentdata=<$fh>; |
@studentdata=<$fh>; |
| close($fh); |
close($fh); |
|
Line 12728 sub load_tmp_file {
|
Line 13230 sub load_tmp_file {
|
| $env{'form.upfile'}=join('',@studentdata); |
$env{'form.upfile'}=join('',@studentdata); |
| } |
} |
| |
|
| |
sub valid_datatoken { |
| |
my ($datatoken) = @_; |
| |
if ($datatoken =~ /^$match_username\_$match_domain\_enroll_$match_domain\_$match_courseid\_\d+_\d+$/) { |
| |
return $datatoken; |
| |
} |
| |
return; |
| |
} |
| |
|
| =pod |
=pod |
| |
|
| =item * &upfile_record_sep() |
=item * &upfile_record_sep() |
|
Line 13168 sub DrawBarGraph {
|
Line 13678 sub DrawBarGraph {
|
| @Labels = @$labels; |
@Labels = @$labels; |
| } else { |
} else { |
| for (my $i=0;$i<@{$Values[0]};$i++) { |
for (my $i=0;$i<@{$Values[0]};$i++) { |
| push (@Labels,$i+1); |
push(@Labels,$i+1); |
| } |
} |
| } |
} |
| # |
# |
|
Line 13616 defdom (domain for which to retrieve con
|
Line 14126 defdom (domain for which to retrieve con
|
| origmail (scalar - email address of recipient from loncapa.conf, |
origmail (scalar - email address of recipient from loncapa.conf, |
| i.e., predates configuration by DC via domainprefs.pm |
i.e., predates configuration by DC via domainprefs.pm |
| |
|
| |
$requname username of requester (if mailing type is helpdeskmail) |
| |
|
| |
$requdom domain of requester (if mailing type is helpdeskmail) |
| |
|
| |
$reqemail e-mail address of requester (if mailing type is helpdeskmail) |
| |
|
| |
|
| Returns: comma separated list of addresses to which to send e-mail. |
Returns: comma separated list of addresses to which to send e-mail. |
| |
|
| =back |
=back |
|
Line 13625 Returns: comma separated list of address
|
Line 14142 Returns: comma separated list of address
|
| ############################################################ |
############################################################ |
| ############################################################ |
############################################################ |
| sub build_recipient_list { |
sub build_recipient_list { |
| my ($defmail,$mailing,$defdom,$origmail) = @_; |
my ($defmail,$mailing,$defdom,$origmail,$requname,$requdom,$reqemail) = @_; |
| my @recipients; |
my @recipients; |
| my $otheremails; |
my ($otheremails,$lastresort,$allbcc,$addtext); |
| my %domconfig = |
my %domconfig = |
| &Apache::lonnet::get_dom('configuration',['contacts'],$defdom); |
&Apache::lonnet::get_dom('configuration',['contacts'],$defdom); |
| if (ref($domconfig{'contacts'}) eq 'HASH') { |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
| if (exists($domconfig{'contacts'}{$mailing})) { |
if (exists($domconfig{'contacts'}{$mailing})) { |
| if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') { |
if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') { |
|
Line 13641 sub build_recipient_list {
|
Line 14158 sub build_recipient_list {
|
| push(@recipients,$addr); |
push(@recipients,$addr); |
| } |
} |
| } |
} |
| $otheremails = $domconfig{'contacts'}{$mailing}{'others'}; |
} |
| |
$otheremails = $domconfig{'contacts'}{$mailing}{'others'}; |
| |
if ($mailing eq 'helpdeskmail') { |
| |
if ($domconfig{'contacts'}{$mailing}{'bcc'}) { |
| |
my @bccs = split(/,/,$domconfig{'contacts'}{$mailing}{'bcc'}); |
| |
my @ok_bccs; |
| |
foreach my $bcc (@bccs) { |
| |
$bcc =~ s/^\s+//g; |
| |
$bcc =~ s/\s+$//g; |
| |
if ($bcc =~ m/^[^\@]+\@[^\@]+$/) { |
| |
if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) { |
| |
push(@ok_bccs,$bcc); |
| |
} |
| |
} |
| |
} |
| |
if (@ok_bccs > 0) { |
| |
$allbcc = join(', ',@ok_bccs); |
| |
} |
| |
} |
| |
$addtext = $domconfig{'contacts'}{$mailing}{'include'}; |
| } |
} |
| } |
} |
| } elsif ($origmail ne '') { |
} elsif ($origmail ne '') { |
| push(@recipients,$origmail); |
$lastresort = $origmail; |
| |
} |
| |
if ($mailing eq 'helpdeskmail') { |
| |
if ((ref($domconfig{'contacts'}{'overrides'}) eq 'HASH') && |
| |
(keys(%{$domconfig{'contacts'}{'overrides'}}))) { |
| |
my ($inststatus,$inststatus_checked); |
| |
if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '') && |
| |
($env{'user.domain'} ne 'public')) { |
| |
$inststatus_checked = 1; |
| |
$inststatus = $env{'environment.inststatus'}; |
| |
} |
| |
unless ($inststatus_checked) { |
| |
if (($requname ne '') && ($requdom ne '')) { |
| |
if (($requname =~ /^$match_username$/) && |
| |
($requdom =~ /^$match_domain$/) && |
| |
(&Apache::lonnet::domain($requdom))) { |
| |
my $requhome = &Apache::lonnet::homeserver($requname, |
| |
$requdom); |
| |
unless ($requhome eq 'no_host') { |
| |
my %userenv = &Apache::lonnet::userenvironment($requdom,$requname,'inststatus'); |
| |
$inststatus = $userenv{'inststatus'}; |
| |
$inststatus_checked = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless ($inststatus_checked) { |
| |
if ($reqemail =~ /^[^\@]+\@[^\@]+$/) { |
| |
my %srch = (srchby => 'email', |
| |
srchdomain => $defdom, |
| |
srchterm => $reqemail, |
| |
srchtype => 'exact'); |
| |
my %srch_results = &Apache::lonnet::usersearch(\%srch); |
| |
foreach my $uname (keys(%srch_results)) { |
| |
if (ref($srch_results{$uname}{'inststatus'}) eq 'ARRAY') { |
| |
$inststatus = join(',',@{$srch_results{$uname}{'inststatus'}}); |
| |
$inststatus_checked = 1; |
| |
last; |
| |
} |
| |
} |
| |
unless ($inststatus_checked) { |
| |
my ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query(\%srch); |
| |
if ($dirsrchres eq 'ok') { |
| |
foreach my $uname (keys(%srch_results)) { |
| |
if (ref($srch_results{$uname}{'inststatus'}) eq 'ARRAY') { |
| |
$inststatus = join(',',@{$srch_results{$uname}{'inststatus'}}); |
| |
$inststatus_checked = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($inststatus ne '') { |
| |
foreach my $status (split(/\:/,$inststatus)) { |
| |
if (ref($domconfig{'contacts'}{'overrides'}{$status}) eq 'HASH') { |
| |
my @contacts = ('adminemail','supportemail'); |
| |
foreach my $item (@contacts) { |
| |
if ($domconfig{'contacts'}{'overrides'}{$status}{$item}) { |
| |
my $addr = $domconfig{'contacts'}{'overrides'}{$status}; |
| |
if (!grep(/^\Q$addr\E$/,@recipients)) { |
| |
push(@recipients,$addr); |
| |
} |
| |
} |
| |
} |
| |
$otheremails = $domconfig{'contacts'}{'overrides'}{$status}{'others'}; |
| |
if ($domconfig{'contacts'}{'overrides'}{$status}{'bcc'}) { |
| |
my @bccs = split(/,/,$domconfig{'contacts'}{'overrides'}{$status}{'bcc'}); |
| |
my @ok_bccs; |
| |
foreach my $bcc (@bccs) { |
| |
$bcc =~ s/^\s+//g; |
| |
$bcc =~ s/\s+$//g; |
| |
if ($bcc =~ m/^[^\@]+\@[^\@]+$/) { |
| |
if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) { |
| |
push(@ok_bccs,$bcc); |
| |
} |
| |
} |
| |
} |
| |
if (@ok_bccs > 0) { |
| |
$allbcc = join(', ',@ok_bccs); |
| |
} |
| |
} |
| |
$addtext = $domconfig{'contacts'}{'overrides'}{$status}{'include'}; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| } elsif ($origmail ne '') { |
} elsif ($origmail ne '') { |
| push(@recipients,$origmail); |
$lastresort = $origmail; |
| |
} |
| |
|
| |
if (($mailing eq 'helpdeskmail') && ($lastresort ne '')) { |
| |
unless (grep(/^\Q$defdom\E$/,&Apache::lonnet::current_machine_domains())) { |
| |
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; |
| |
my $machinedom = $Apache::lonnet::perlvar{'lonDefDomain'}; |
| |
my %what = ( |
| |
perlvar => 1, |
| |
); |
| |
my $primary = &Apache::lonnet::domain($defdom,'primary'); |
| |
if ($primary) { |
| |
my $gotaddr; |
| |
my ($result,$returnhash) = |
| |
&Apache::lonnet::get_remote_globals($primary,{ perlvar => 1 }); |
| |
if (($result eq 'ok') && (ref($returnhash) eq 'HASH')) { |
| |
if ($returnhash->{'lonSupportEMail'} =~ /^[^\@]+\@[^\@]+$/) { |
| |
$lastresort = $returnhash->{'lonSupportEMail'}; |
| |
$gotaddr = 1; |
| |
} |
| |
} |
| |
unless ($gotaddr) { |
| |
my $uintdom = &Apache::lonnet::internet_dom($primary); |
| |
my $intdom = &Apache::lonnet::internet_dom($lonhost); |
| |
unless ($uintdom eq $intdom) { |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['contacts'],$machinedom); |
| |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
| |
if (ref($domconfig{'contacts'}{'otherdomsmail'}) eq 'HASH') { |
| |
my @contacts = ('adminemail','supportemail'); |
| |
foreach my $item (@contacts) { |
| |
if ($domconfig{'contacts'}{'otherdomsmail'}{$item}) { |
| |
my $addr = $domconfig{'contacts'}{$item}; |
| |
if (!grep(/^\Q$addr\E$/,@recipients)) { |
| |
push(@recipients,$addr); |
| |
} |
| |
} |
| |
} |
| |
if ($domconfig{'contacts'}{'otherdomsmail'}{'others'}) { |
| |
$otheremails = $domconfig{'contacts'}{'otherdomsmail'}{'others'}; |
| |
} |
| |
if ($domconfig{'contacts'}{'otherdomsmail'}{'bcc'}) { |
| |
my @bccs = split(/,/,$domconfig{'contacts'}{'otherdomsmail'}{'bcc'}); |
| |
my @ok_bccs; |
| |
foreach my $bcc (@bccs) { |
| |
$bcc =~ s/^\s+//g; |
| |
$bcc =~ s/\s+$//g; |
| |
if ($bcc =~ m/^[^\@]+\@[^\@]+$/) { |
| |
if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) { |
| |
push(@ok_bccs,$bcc); |
| |
} |
| |
} |
| |
} |
| |
if (@ok_bccs > 0) { |
| |
$allbcc = join(', ',@ok_bccs); |
| |
} |
| |
} |
| |
$addtext = $domconfig{'contacts'}{'otherdomsmail'}{'include'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| if (defined($defmail)) { |
if (defined($defmail)) { |
| if ($defmail ne '') { |
if ($defmail ne '') { |
|
Line 13668 sub build_recipient_list {
|
Line 14355 sub build_recipient_list {
|
| } |
} |
| } |
} |
| } |
} |
| my $recipientlist = join(',',@recipients); |
if ($mailing eq 'helpdeskmail') { |
| return $recipientlist; |
if ((!@recipients) && ($lastresort ne '')) { |
| |
push(@recipients,$lastresort); |
| |
} |
| |
} elsif ($lastresort ne '') { |
| |
if (!grep(/^\Q$lastresort\E$/,@recipients)) { |
| |
push(@recipients,$lastresort); |
| |
} |
| |
} |
| |
my $recipientlist = join(',',@recipients); |
| |
if (wantarray) { |
| |
return ($recipientlist,$allbcc,$addtext); |
| |
} else { |
| |
return $recipientlist; |
| |
} |
| } |
} |
| |
|
| ############################################################ |
############################################################ |
|
Line 13893 currcat - scalar with an & separated lis
|
Line 14593 currcat - scalar with an & separated lis
|
| |
|
| type - scalar contains course type (Course or Community). |
type - scalar contains course type (Course or Community). |
| |
|
| |
disabled - scalar (optional) contains disabled="disabled" if input elements are |
| |
to be readonly (e.g., Domain Helpdesk role viewing course settings). |
| |
|
| Returns: $output (markup to be displayed) |
Returns: $output (markup to be displayed) |
| |
|
| =cut |
=cut |
| |
|
| sub assign_categories_table { |
sub assign_categories_table { |
| my ($cathash,$currcat,$type) = @_; |
my ($cathash,$currcat,$type,$disabled) = @_; |
| my $output; |
my $output; |
| if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
| my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth); |
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth); |
|
Line 13934 sub assign_categories_table {
|
Line 14637 sub assign_categories_table {
|
| } |
} |
| $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'. |
$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'. |
| '<input type="checkbox" name="usecategory" value="'. |
'<input type="checkbox" name="usecategory" value="'. |
| $item.'"'.$checked.' />'.$parent_title.'</span>'. |
$item.'"'.$checked.$disabled.' />'.$parent_title.'</span>'. |
| '<input type="hidden" name="catname" value="'.$parent.'" /></td>'; |
'<input type="hidden" name="catname" value="'.$parent.'" /></td>'; |
| my $depth = 1; |
my $depth = 1; |
| push(@path,$parent); |
push(@path,$parent); |
| $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories); |
$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories,$disabled); |
| pop(@path); |
pop(@path); |
| $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>'; |
$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>'; |
| $itemcount ++; |
$itemcount ++; |
|
Line 13977 path - Array containing all categories b
|
Line 14680 path - Array containing all categories b
|
| |
|
| currcategories - reference to array of current categories assigned to the course |
currcategories - reference to array of current categories assigned to the course |
| |
|
| |
disabled - scalar (optional) contains disabled="disabled" if input elements are |
| |
to be readonly (e.g., Domain Helpdesk role viewing course settings). |
| |
|
| Returns: $output (markup to be displayed). |
Returns: $output (markup to be displayed). |
| |
|
| =cut |
=cut |
| |
|
| sub assign_category_rows { |
sub assign_category_rows { |
| my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_; |
my ($itemcount,$cats,$depth,$parent,$path,$currcategories,$disabled) = @_; |
| my ($text,$name,$item,$chgstr); |
my ($text,$name,$item,$chgstr); |
| if (ref($cats) eq 'ARRAY') { |
if (ref($cats) eq 'ARRAY') { |
| my $maxdepth = scalar(@{$cats}); |
my $maxdepth = scalar(@{$cats}); |
|
Line 14005 sub assign_category_rows {
|
Line 14711 sub assign_category_rows {
|
| } |
} |
| $text .= '<tr><td><span class="LC_nobreak"><label>'. |
$text .= '<tr><td><span class="LC_nobreak"><label>'. |
| '<input type="checkbox" name="usecategory" value="'. |
'<input type="checkbox" name="usecategory" value="'. |
| $item.'"'.$checked.' />'.$name.'</label></span>'. |
$item.'"'.$checked.$disabled.' />'.$name.'</label></span>'. |
| '<input type="hidden" name="catname" value="'.$name.'" />'. |
'<input type="hidden" name="catname" value="'.$name.'" />'. |
| '</td><td>'; |
'</td><td>'; |
| if (ref($path) eq 'ARRAY') { |
if (ref($path) eq 'ARRAY') { |
| push(@{$path},$name); |
push(@{$path},$name); |
| $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories); |
$text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories,$disabled); |
| pop(@{$path}); |
pop(@{$path}); |
| } |
} |
| $text .= '</td></tr>'; |
$text .= '</td></tr>'; |
|
Line 14241 sub check_clone {
|
Line 14947 sub check_clone {
|
| return ($can_clone, $clonemsg, $cloneid, $clonehome); |
return ($can_clone, $clonemsg, $cloneid, $clonehome); |
| } |
} |
| } |
} |
| if (($env{'request.role.domain'} eq $args->{'clonedomain'}) && |
if (($env{'request.role.domain'} eq $args->{'clonedomain'}) && |
| (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) { |
(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) { |
| $can_clone = 1; |
$can_clone = 1; |
| } else { |
} else { |
|
Line 14338 sub check_clone {
|
Line 15044 sub check_clone {
|
| } |
} |
| |
|
| sub construct_course { |
sub construct_course { |
| my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category,$coderef) = @_; |
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context, |
| |
$cnum,$category,$coderef) = @_; |
| my $outcome; |
my $outcome; |
| my $linefeed = '<br />'."\n"; |
my $linefeed = '<br />'."\n"; |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
|
Line 14486 sub construct_course {
|
Line 15193 sub construct_course {
|
| my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'}); |
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'}); |
| $cenv{'internal.sectionnums'} .= $item.','; |
$cenv{'internal.sectionnums'} .= $item.','; |
| unless ($addcheck eq 'ok') { |
unless ($addcheck eq 'ok') { |
| push @badclasses, $class; |
push(@badclasses,$class); |
| } |
} |
| } |
} |
| $cenv{'internal.sectionnums'} =~ s/,$//; |
$cenv{'internal.sectionnums'} =~ s/,$//; |
|
Line 14514 sub construct_course {
|
Line 15221 sub construct_course {
|
| my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'}); |
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'}); |
| $cenv{'internal.crosslistings'} .= $item.','; |
$cenv{'internal.crosslistings'} .= $item.','; |
| unless ($addcheck eq 'ok') { |
unless ($addcheck eq 'ok') { |
| push @badclasses, $xl; |
push(@badclasses,$xl); |
| } |
} |
| } |
} |
| $cenv{'internal.crosslistings'} =~ s/,$//; |
$cenv{'internal.crosslistings'} =~ s/,$//; |
|
Line 14549 sub construct_course {
|
Line 15256 sub construct_course {
|
| } |
} |
| if (@badclasses > 0) { |
if (@badclasses > 0) { |
| my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| 'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course', |
'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.', |
| 'dnhr' => 'does not have rights to access enrollment in these classes', |
'howi' => 'However, if automated course roster updates are enabled for this class, these particular sections/crosslistings are not guaranteed to contribute towards enrollment.', |
| 'adby' => 'as determined by the policies of your institution on access to official classlists' |
'itis' => 'It is possible that rights to access enrollment for these classes will be available through assignment of co-owners.', |
| ); |
); |
| my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}. |
my $badclass_msg = $lt{'tclb'}.$linefeed.$lt{'howi'}.$linefeed. |
| ' ('.$lt{'adby'}.')'; |
&mt('That is because the user identified as the course owner ([_1]) does not have rights to access enrollment in these classes, as determined by the policies of your institution on access to official classlists',$cenv{'internal.courseowner'}).$linefeed.$lt{'itis'}; |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= $badclass_msg.$linefeed; |
$outcome .= $badclass_msg.$linefeed; |
| |
} else { |
| $outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
$outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n"; |
| foreach my $item (@badclasses) { |
} |
| if ($context eq 'auto') { |
foreach my $item (@badclasses) { |
| $outcome .= " - $item\n"; |
|
| } else { |
|
| $outcome .= "<li>$item</li>\n"; |
|
| } |
|
| } |
|
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $outcome .= $linefeed; |
$outcome .= " - $item\n"; |
| } else { |
} else { |
| $outcome .= "</ul><br /><br /></div>\n"; |
$outcome .= "<li>$item</li>\n"; |
| } |
} |
| } |
} |
| |
if ($context eq 'auto') { |
| |
$outcome .= $linefeed; |
| |
} else { |
| |
$outcome .= "</ul><br /><br /></div>\n"; |
| |
} |
| } |
} |
| if ($args->{'no_end_date'}) { |
if ($args->{'no_end_date'}) { |
| $args->{'endaccess'} = 0; |
$args->{'endaccess'} = 0; |
|
Line 14602 sub construct_course {
|
Line 15310 sub construct_course {
|
| if ($args->{'setcontent'}) { |
if ($args->{'setcontent'}) { |
| $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
$cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
| } |
} |
| |
if ($args->{'setcomment'}) { |
| |
$cenv{'comment.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
| |
} |
| } |
} |
| if ($args->{'reshome'}) { |
if ($args->{'reshome'}) { |
| $cenv{'reshome'}=$args->{'reshome'}.'/'; |
$cenv{'reshome'}=$args->{'reshome'}.'/'; |
|
Line 14947 sub init_user_environment {
|
Line 15658 sub init_user_environment {
|
| |
|
| my %userenv = &Apache::lonnet::dump('environment',$domain,$username); |
my %userenv = &Apache::lonnet::dump('environment',$domain,$username); |
| my ($tmp) = keys(%userenv); |
my ($tmp) = keys(%userenv); |
| if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
if ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
| } else { |
|
| undef(%userenv); |
undef(%userenv); |
| } |
} |
| if (($userenv{'interface'}) && (!$form->{'interface'})) { |
if (($userenv{'interface'}) && (!$form->{'interface'})) { |
|
Line 15000 sub init_user_environment {
|
Line 15710 sub init_user_environment {
|
| $env{'user.noloadbalance'} = $lonhost; |
$env{'user.noloadbalance'} = $lonhost; |
| } |
} |
| |
|
| my %is_adv = ( is_adv => $env{'user.adv'} ); |
if ($form->{'noloadbalance'}) { |
| my %domdef; |
my @hosts = &Apache::lonnet::current_machine_ids(); |
| unless ($domain eq 'public') { |
my $hosthere = $form->{'noloadbalance'}; |
| %domdef = &Apache::lonnet::get_domain_defaults($domain); |
if (grep(/^\Q$hosthere\E$/,@hosts)) { |
| |
$initial_env{"user.noloadbalance"} = $hosthere; |
| |
$env{'user.noloadbalance'} = $hosthere; |
| |
} |
| } |
} |
| |
|
| foreach my $tool ('aboutme','blog','webdav','portfolio') { |
unless ($domain eq 'public') { |
| $userenv{'availabletools.'.$tool} = |
my %is_adv = ( is_adv => $env{'user.adv'} ); |
| &Apache::lonnet::usertools_access($username,$domain,$tool,'reload', |
my %domdef = &Apache::lonnet::get_domain_defaults($domain); |
| undef,\%userenv,\%domdef,\%is_adv); |
|
| } |
|
| |
|
| foreach my $crstype ('official','unofficial','community','textbook') { |
foreach my $tool ('aboutme','blog','webdav','portfolio') { |
| $userenv{'canrequest.'.$crstype} = |
$userenv{'availabletools.'.$tool} = |
| &Apache::lonnet::usertools_access($username,$domain,$crstype, |
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload', |
| 'reload','requestcourses', |
undef,\%userenv,\%domdef,\%is_adv); |
| \%userenv,\%domdef,\%is_adv); |
} |
| } |
|
| |
|
| $userenv{'canrequest.author'} = |
foreach my $crstype ('official','unofficial','community','textbook') { |
| &Apache::lonnet::usertools_access($username,$domain,'requestauthor', |
$userenv{'canrequest.'.$crstype} = |
| 'reload','requestauthor', |
&Apache::lonnet::usertools_access($username,$domain,$crstype, |
| \%userenv,\%domdef,\%is_adv); |
'reload','requestcourses', |
| my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'], |
\%userenv,\%domdef,\%is_adv); |
| $domain,$username); |
} |
| my $reqstatus = $reqauthor{'author_status'}; |
|
| if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { |
$userenv{'canrequest.author'} = |
| if (ref($reqauthor{'author'}) eq 'HASH') { |
&Apache::lonnet::usertools_access($username,$domain,'requestauthor', |
| $userenv{'requestauthorqueued'} = $reqstatus.':'. |
'reload','requestauthor', |
| $reqauthor{'author'}{'timestamp'}; |
\%userenv,\%domdef,\%is_adv); |
| |
my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'], |
| |
$domain,$username); |
| |
my $reqstatus = $reqauthor{'author_status'}; |
| |
if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { |
| |
if (ref($reqauthor{'author'}) eq 'HASH') { |
| |
$userenv{'requestauthorqueued'} = $reqstatus.':'. |
| |
$reqauthor{'author'}{'timestamp'}; |
| |
} |
| } |
} |
| } |
} |
| |
|
|
Line 15637 sub search_courses {
|
Line 16355 sub search_courses {
|
| if (ref($courses{$cid}) eq 'HASH') { |
if (ref($courses{$cid}) eq 'HASH') { |
| if (ref($courses{$cid}{roles}) eq 'ARRAY') { |
if (ref($courses{$cid}{roles}) eq 'ARRAY') { |
| if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { |
if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { |
| push (@{$courses{$cid}{roles}},$courserole); |
push(@{$courses{$cid}{roles}},$courserole); |
| } |
} |
| } else { |
} else { |
| $courses{$cid}{roles} = [$courserole]; |
$courses{$cid}{roles} = [$courserole]; |
|
Line 15967 sub recurse_supplemental {
|
Line 16685 sub recurse_supplemental {
|
| } |
} |
| |
|
| sub symb_to_docspath { |
sub symb_to_docspath { |
| my ($symb) = @_; |
my ($symb,$navmapref) = @_; |
| return unless ($symb); |
return unless ($symb && ref($navmapref)); |
| my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb); |
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb); |
| if ($resurl=~/\.(sequence|page)$/) { |
if ($resurl=~/\.(sequence|page)$/) { |
| $mapurl=$resurl; |
$mapurl=$resurl; |
|
Line 15976 sub symb_to_docspath {
|
Line 16694 sub symb_to_docspath {
|
| $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'}; |
$mapurl=$env{'course.'.$env{'request.course.id'}.'.url'}; |
| } |
} |
| my $mapresobj; |
my $mapresobj; |
| my $navmap = Apache::lonnavmaps::navmap->new(); |
unless (ref($$navmapref)) { |
| if (ref($navmap)) { |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
| $mapresobj = $navmap->getResourceByUrl($mapurl); |
} |
| |
if (ref($$navmapref)) { |
| |
$mapresobj = $$navmapref->getResourceByUrl($mapurl); |
| } |
} |
| $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1}; |
$mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1}; |
| my $type=$2; |
my $type=$2; |
|
Line 15988 sub symb_to_docspath {
|
Line 16708 sub symb_to_docspath {
|
| if ($pcslist ne '') { |
if ($pcslist ne '') { |
| foreach my $pc (split(/,/,$pcslist)) { |
foreach my $pc (split(/,/,$pcslist)) { |
| next if ($pc <= 1); |
next if ($pc <= 1); |
| my $res = $navmap->getByMapPc($pc); |
my $res = $$navmapref->getByMapPc($pc); |
| if (ref($res)) { |
if (ref($res)) { |
| my $thisurl = $res->src(); |
my $thisurl = $res->src(); |
| $thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; |
$thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; |
![[BACK]](/icons/back.gif){kind=icon}
Return to loncommon.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface