|
version 1.1075.2.77, 2014/06/18 06:15:58
|
version 1.1211, 2015/04/03 17:31:24
|
|
Line 73 use Apache::courseclassifier();
|
Line 73 use Apache::courseclassifier();
|
| use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
| use DateTime::TimeZone; |
use DateTime::TimeZone; |
| use DateTime::Locale::Catalog; |
use DateTime::Locale::Catalog; |
| |
use Text::Aspell; |
| use Authen::Captcha; |
use Authen::Captcha; |
| use Captcha::reCAPTCHA; |
use Captcha::reCAPTCHA; |
| use Crypt::DES; |
use Crypt::DES; |
|
Line 161 sub ssi_with_retries {
|
Line 162 sub ssi_with_retries {
|
| # ----------------------------------------------- Filetypes/Languages/Copyright |
# ----------------------------------------------- Filetypes/Languages/Copyright |
| my %language; |
my %language; |
| my %supported_language; |
my %supported_language; |
| |
my %supported_codes; |
| my %latex_language; # For choosing hyphenation in <transl..> |
my %latex_language; # For choosing hyphenation in <transl..> |
| my %latex_language_bykey; # for choosing hyphenation from metadata |
my %latex_language_bykey; # for choosing hyphenation from metadata |
| my %cprtag; |
my %cprtag; |
|
Line 195 BEGIN {
|
Line 197 BEGIN {
|
| while (my $line = <$fh>) { |
while (my $line = <$fh>) { |
| next if ($line=~/^\#/); |
next if ($line=~/^\#/); |
| chomp($line); |
chomp($line); |
| my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line)); |
my ($key,$code,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line)); |
| $language{$key}=$val.' - '.$enc; |
$language{$key}=$val.' - '.$enc; |
| if ($sup) { |
if ($sup) { |
| $supported_language{$key}=$sup; |
$supported_language{$key}=$sup; |
| |
$supported_codes{$key} = $code; |
| } |
} |
| if ($latex) { |
if ($latex) { |
| $latex_language_bykey{$key} = $latex; |
$latex_language_bykey{$key} = $latex; |
| $latex_language{$two} = $latex; |
$latex_language{$code} = $latex; |
| } |
} |
| } |
} |
| close($fh); |
close($fh); |
|
Line 666 if (!Array.prototype.indexOf) {
|
Line 669 if (!Array.prototype.indexOf) {
|
| var n = 0; |
var n = 0; |
| if (arguments.length > 0) { |
if (arguments.length > 0) { |
| n = Number(arguments[1]); |
n = Number(arguments[1]); |
| if (n !== n) { // shortcut for verifying if it's NaN |
if (n !== n) { // shortcut for verifying if it is NaN |
| n = 0; |
n = 0; |
| } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) { |
} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) { |
| n = (n > 0 || -1) * Math.floor(Math.abs(n)); |
n = (n > 0 || -1) * Math.floor(Math.abs(n)); |
|
Line 902 sub check_uncheck_jscript {
|
Line 905 sub check_uncheck_jscript {
|
| function checkAll(field) { |
function checkAll(field) { |
| if (field.length > 0) { |
if (field.length > 0) { |
| for (i = 0; i < field.length; i++) { |
for (i = 0; i < field.length; i++) { |
| if (!field[i].disabled) { |
if (!field[i].disabled) { |
| field[i].checked = true; |
field[i].checked = true; |
| } |
} |
| } |
} |
| } else { |
} else { |
| if (!field.disabled) { |
if (!field.disabled) { |
| field.checked = true; |
field.checked = true; |
| } |
} |
| } |
} |
|
Line 1017 sub select_language {
|
Line 1020 sub select_language {
|
| |
|
| =pod |
=pod |
| |
|
| |
|
| |
=item * &list_languages() |
| |
|
| |
Returns an array reference that is suitable for use in language prompters. |
| |
Each array element is itself a two element array. The first element |
| |
is the language code. The second element a descsriptiuon of the |
| |
language itself. This is suitable for use in e.g. |
| |
&Apache::edit::select_arg (once dereferenced that is). |
| |
|
| |
=cut |
| |
|
| |
sub list_languages { |
| |
my @lang_choices; |
| |
|
| |
foreach my $id (&languageids()) { |
| |
my $code = &supportedlanguagecode($id); |
| |
if ($code) { |
| |
my $selector = $supported_codes{$id}; |
| |
my $description = &plainlanguagedescription($id); |
| |
push (@lang_choices, [$selector, $description]); |
| |
} |
| |
} |
| |
return \@lang_choices; |
| |
} |
| |
|
| |
=pod |
| |
|
| =item * &linked_select_forms(...) |
=item * &linked_select_forms(...) |
| |
|
| linked_select_forms returns a string containing a <script></script> block |
linked_select_forms returns a string containing a <script></script> block |
|
Line 1237 sub help_open_topic {
|
Line 1267 sub help_open_topic {
|
| $topic=~s/\W/\_/g; |
$topic=~s/\W/\_/g; |
| |
|
| if (!$stayOnPage) { |
if (!$stayOnPage) { |
| if ($env{'browser.mobile'}) { |
$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');"; |
| $link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');"; |
|
| } else { |
|
| $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
|
| } |
|
| } elsif ($stayOnPage eq 'popup') { |
} elsif ($stayOnPage eq 'popup') { |
| $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
| } else { |
} else { |
|
Line 1290 sub helpLatexCheatsheet {
|
Line 1316 sub helpLatexCheatsheet {
|
| .&help_open_topic('Other_Symbols',&mt('Other Symbols'),$stayOnPage,undef,600) |
.&help_open_topic('Other_Symbols',&mt('Other Symbols'),$stayOnPage,undef,600) |
| .'</span>'; |
.'</span>'; |
| unless ($not_author) { |
unless ($not_author) { |
| $out .= ' <span>' |
$out .= '<span>' |
| .&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600) |
.&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600) |
| .'</span> <span>' |
.'</span> <span>' |
| .&help_open_topic('Authoring_Multilingual_Problems',&mt('How to create problems in different languages'),$stayOnPage,undef,600) |
.&help_open_topic('Authoring_Multilingual_Problems',&mt('How to create problems in different languages'),$stayOnPage,undef,600) |
| .'</span>'; |
.'</span>'; |
| } |
} |
| $out .= '</span>'; # End cheatsheet |
$out .= '</span>'; # End cheatsheet |
| return $out; |
return $out; |
|
Line 1357 sub help_open_menu {
|
Line 1383 sub help_open_menu {
|
| sub top_nav_help { |
sub top_nav_help { |
| my ($text) = @_; |
my ($text) = @_; |
| $text = &mt($text); |
$text = &mt($text); |
| my $stay_on_page; |
my $stay_on_page = 1; |
| unless ($env{'environment.remote'} eq 'on') { |
|
| $stay_on_page = 1; |
|
| } |
|
| my ($link,$banner_link); |
my ($link,$banner_link); |
| unless ($env{'request.noversionuri'} =~ m{^/adm/helpmenu}) { |
unless ($env{'request.noversionuri'} =~ m{^/adm/helpmenu}) { |
| $link = ($stay_on_page) ? "javascript:helpMenu('display')" |
$link = ($stay_on_page) ? "javascript:helpMenu('display')" |
|
Line 1390 sub help_menu_js {
|
Line 1414 sub help_menu_js {
|
| &Apache::loncommon::start_page('Help Menu', undef, |
&Apache::loncommon::start_page('Help Menu', undef, |
| {'frameset' => 1, |
{'frameset' => 1, |
| 'js_ready' => 1, |
'js_ready' => 1, |
| 'use_absolute' => $httphost, |
'use_absolute' => $httphost, |
| 'add_entries' => { |
'add_entries' => { |
| 'border' => '0', |
'border' => '0', |
| 'rows' => "110,*",},}); |
'rows' => "110,*",},}); |
| my $end_page = |
my $end_page = |
| &Apache::loncommon::end_page({'frameset' => 1, |
&Apache::loncommon::end_page({'frameset' => 1, |
|
Line 1733 RESIZE
|
Line 1757 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 2194 The optional $onchange argument specifie
|
Line 2453 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. |
| |
|
| =cut |
=cut |
| |
|
|
Line 2212 sub select_dom_form {
|
Line 2471 sub select_dom_form {
|
| } |
} |
| if ($includeempty) { @domains=('',@domains); } |
if ($includeempty) { @domains=('',@domains); } |
| 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>\n"; |
| foreach my $dom (@domains) { |
foreach my $dom (@domains) { |
|
Line 2568 sub authform_nochange {
|
Line 2827 sub authform_nochange {
|
| kerb_def_dom => 'MSU.EDU', |
kerb_def_dom => 'MSU.EDU', |
| @_, |
@_, |
| ); |
); |
| my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); |
| my $result; |
my $result; |
| if (!$authnum) { |
if (!$authnum) { |
| $result = &mt('Under your current role you are not permitted to change login settings for this user'); |
$result = &mt('Under your current role you are not permitted to change login settings for this user'); |
|
Line 3064 sub get_related_words {
|
Line 3323 sub get_related_words {
|
| untie %thesaurus_db; |
untie %thesaurus_db; |
| return @Words; |
return @Words; |
| } |
} |
| |
############################################################### |
| |
# |
| |
# Spell checking |
| |
# |
| |
|
| =pod |
=pod |
| |
|
| =back |
=back |
| |
|
| |
=head1 Spell checking |
| |
|
| |
=over 4 |
| |
|
| |
=item * &check_spelling($wordlist $language) |
| |
|
| |
Takes a string containing words and feeds it to an external |
| |
spellcheck program via a pipeline. Returns a string containing |
| |
them mis-spelled words. |
| |
|
| |
Parameters: |
| |
|
| |
=over 4 |
| |
|
| |
=item - $wordlist |
| |
|
| |
String that will be fed into the spellcheck program. |
| |
|
| |
=item - $language |
| |
|
| |
Language string that specifies the language for which the spell |
| |
check will be performed. |
| |
|
| |
=back |
| |
|
| |
=back |
| |
|
| |
Note: This sub assumes that aspell is installed. |
| |
|
| |
|
| =cut |
=cut |
| |
|
| |
|
| |
sub check_spelling { |
| |
my ($wordlist, $language) = @_; |
| |
my @misspellings; |
| |
|
| |
# Generate the speller and set the langauge. |
| |
# if explicitly selected: |
| |
|
| |
my $speller = Text::Aspell->new; |
| |
if ($language) { |
| |
$speller->set_option('lang', $language); |
| |
} |
| |
|
| |
# Turn the word list into an array of words by splittingon whitespace |
| |
|
| |
my @words = split(/\s+/, $wordlist); |
| |
|
| |
foreach my $word (@words) { |
| |
if(! $speller->check($word)) { |
| |
push(@misspellings, $word); |
| |
} |
| |
} |
| |
return join(' ', @misspellings); |
| |
|
| |
} |
| |
|
| # -------------------------------------------------------------- Plaintext name |
# -------------------------------------------------------------- Plaintext name |
| =pod |
=pod |
| |
|
|
Line 3677 sub user_lang {
|
Line 3996 sub user_lang {
|
| =over 4 |
=over 4 |
| |
|
| =item * &get_previous_attempt($symb, $username, $domain, $course, |
=item * &get_previous_attempt($symb, $username, $domain, $course, |
| $getattempt, $regexp, $gradesub) |
$getattempt, $regexp, $gradesub, $usec, $identifier) |
| |
|
| Return string with previous attempt on problem. Arguments: |
Return string with previous attempt on problem. Arguments: |
| |
|
|
Line 3699 Return string with previous attempt on p
|
Line 4018 Return string with previous attempt on p
|
| |
|
| =item * $gradesub: routine that processes the string if it matches $regexp |
=item * $gradesub: routine that processes the string if it matches $regexp |
| |
|
| |
=item * $usec: section of the desired student |
| |
|
| |
=item * $identifier: counter for student (multiple students one problem) or |
| |
problem (one student; whole sequence). |
| |
|
| =back |
=back |
| |
|
| The output string is a table containing all desired attempts, if any. |
The output string is a table containing all desired attempts, if any. |
|
Line 3706 The output string is a table containing
|
Line 4030 The output string is a table containing
|
| =cut |
=cut |
| |
|
| sub get_previous_attempt { |
sub get_previous_attempt { |
| my ($symb,$username,$domain,$course,$getattempt,$regexp,$gradesub)=@_; |
my ($symb,$username,$domain,$course,$getattempt,$regexp,$gradesub,$usec,$identifier)=@_; |
| my $prevattempts=''; |
my $prevattempts=''; |
| no strict 'refs'; |
no strict 'refs'; |
| if ($symb) { |
if ($symb) { |
|
Line 3722 sub get_previous_attempt {
|
Line 4046 sub get_previous_attempt {
|
| } |
} |
| $prevattempts=&start_data_table().&start_data_table_header_row(); |
$prevattempts=&start_data_table().&start_data_table_header_row(); |
| $prevattempts.='<th>'.&mt('History').'</th>'; |
$prevattempts.='<th>'.&mt('History').'</th>'; |
| my (%typeparts,%lasthidden); |
my (%typeparts,%lasthidden,%regraded,%hidestatus); |
| my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'}); |
my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'}); |
| foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
| my ($ign,@parts) = split(/\./,$key); |
my ($ign,@parts) = split(/\./,$key); |
|
Line 3739 sub get_previous_attempt {
|
Line 4063 sub get_previous_attempt {
|
| $lasthidden{$ign.'.'.$id} = 1; |
$lasthidden{$ign.'.'.$id} = 1; |
| } |
} |
| } |
} |
| |
if ($identifier ne '') { |
| |
my $id = join(',',@parts); |
| |
if (&Apache::lonnet::EXT("resource.$id.problemstatus",$symb, |
| |
$domain,$username,$usec,undef,$course) =~ /^no/) { |
| |
$hidestatus{$ign.'.'.$id} = 1; |
| |
} |
| |
} |
| |
} elsif ($data eq 'regrader') { |
| |
if (($identifier ne '') && (@parts)) { |
| |
my $id = join(',',@parts); |
| |
$regraded{$ign.'.'.$id} = 1; |
| |
} |
| } |
} |
| } else { |
} else { |
| if ($#parts == 0) { |
if ($#parts == 0) { |
|
Line 3750 sub get_previous_attempt {
|
Line 4086 sub get_previous_attempt {
|
| } |
} |
| $prevattempts.=&end_data_table_header_row(); |
$prevattempts.=&end_data_table_header_row(); |
| if ($getattempt eq '') { |
if ($getattempt eq '') { |
| |
my (%solved,%resets,%probstatus); |
| |
if (($identifier ne '') && (keys(%regraded) > 0)) { |
| |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
| |
foreach my $id (keys(%regraded)) { |
| |
if (($returnhash{$version.':'.$id.'.regrader'}) && |
| |
($returnhash{$version.':'.$id.'.tries'} eq '') && |
| |
($returnhash{$version.':'.$id.'.award'} eq '')) { |
| |
push(@{$resets{$id}},$version); |
| |
} |
| |
} |
| |
} |
| |
} |
| for ($version=1;$version<=$returnhash{'version'};$version++) { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
| my @hidden; |
my (@hidden,@unsolved); |
| if (%typeparts) { |
if (%typeparts) { |
| foreach my $id (keys(%typeparts)) { |
foreach my $id (keys(%typeparts)) { |
| if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) { |
if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || |
| |
($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) { |
| push(@hidden,$id); |
push(@hidden,$id); |
| |
} elsif ($identifier ne '') { |
| |
unless (($returnhash{$version.':'.$id.'.type'} eq 'survey') || |
| |
($returnhash{$version.':'.$id.'.type'} eq 'surveycred') || |
| |
($hidestatus{$id})) { |
| |
next if ((ref($resets{$id}) eq 'ARRAY') && grep(/^\Q$version\E$/,@{$resets{$id}})); |
| |
if ($returnhash{$version.':'.$id.'.solved'} eq 'correct_by_student') { |
| |
push(@{$solved{$id}},$version); |
| |
} elsif (($returnhash{$version.':'.$id.'.solved'} ne '') && |
| |
(ref($solved{$id}) eq 'ARRAY')) { |
| |
my $skip; |
| |
if (ref($resets{$id}) eq 'ARRAY') { |
| |
foreach my $reset (@{$resets{$id}}) { |
| |
if ($reset > $solved{$id}[-1]) { |
| |
$skip=1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
unless ($skip) { |
| |
my ($ign,$partslist) = split(/\./,$id,2); |
| |
push(@unsolved,$partslist); |
| |
} |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| $prevattempts.=&start_data_table_row(). |
$prevattempts.=&start_data_table_row(). |
| '<td>'.&mt('Transaction [_1]',$version).'</td>'; |
'<td>'.&mt('Transaction [_1]',$version); |
| |
if (@unsolved) { |
| |
$prevattempts .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="checkbox" name="HIDE'.$identifier.'" value="'.$version.':'.join('_',@unsolved).'" />'. |
| |
&mt('Hide').'</label></span>'; |
| |
} |
| |
$prevattempts .= '</td>'; |
| if (@hidden) { |
if (@hidden) { |
| foreach my $key (sort(keys(%lasthash))) { |
foreach my $key (sort(keys(%lasthash))) { |
| next if ($key =~ /\.foilorder$/); |
next if ($key =~ /\.foilorder$/); |
|
Line 3820 sub get_previous_attempt {
|
Line 4199 sub get_previous_attempt {
|
| if ($key =~/$regexp$/ && (defined &$gradesub)) { |
if ($key =~/$regexp$/ && (defined &$gradesub)) { |
| $value = &$gradesub($value); |
$value = &$gradesub($value); |
| } |
} |
| $prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'. $value.' </td>'; |
| } else { |
} else { |
| $prevattempts.='<td> </td>'; |
$prevattempts.='<td> </td>'; |
| } |
} |
|
Line 3836 sub get_previous_attempt {
|
Line 4215 sub get_previous_attempt {
|
| if ($key =~/$regexp$/ && (defined &$gradesub)) { |
if ($key =~/$regexp$/ && (defined &$gradesub)) { |
| $value = &$gradesub($value); |
$value = &$gradesub($value); |
| } |
} |
| $prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
| } |
} |
| } |
} |
| $prevattempts.= &end_data_table_row().&end_data_table(); |
$prevattempts.= &end_data_table_row().&end_data_table(); |
|
Line 3857 sub get_previous_attempt {
|
Line 4236 sub get_previous_attempt {
|
| sub format_previous_attempt_value { |
sub format_previous_attempt_value { |
| my ($key,$value) = @_; |
my ($key,$value) = @_; |
| if (($key =~ /timestamp/) || ($key=~/duedate/)) { |
if (($key =~ /timestamp/) || ($key=~/duedate/)) { |
| $value = &Apache::lonlocal::locallocaltime($value); |
$value = &Apache::lonlocal::locallocaltime($value); |
| } elsif (ref($value) eq 'ARRAY') { |
} elsif (ref($value) eq 'ARRAY') { |
| $value = '('.join(', ', @{ $value }).')'; |
$value = &HTML::Entities::encode('('.join(', ', @{ $value }).')','"<>&'); |
| } elsif ($key =~ /answerstring$/) { |
} elsif ($key =~ /answerstring$/) { |
| my %answers = &Apache::lonnet::str2hash($value); |
my %answers = &Apache::lonnet::str2hash($value); |
| |
my @answer = %answers; |
| |
%answers = map {&HTML::Entities::encode($_, '"<>&')} @answer; |
| my @anskeys = sort(keys(%answers)); |
my @anskeys = sort(keys(%answers)); |
| if (@anskeys == 1) { |
if (@anskeys == 1) { |
| my $answer = $answers{$anskeys[0]}; |
my $answer = $answers{$anskeys[0]}; |
|
Line 3884 sub format_previous_attempt_value {
|
Line 4265 sub format_previous_attempt_value {
|
| } |
} |
| } |
} |
| } else { |
} else { |
| $value = &unescape($value); |
$value = &HTML::Entities::encode(&unescape($value), '"<>&'); |
| } |
} |
| return $value; |
return $value; |
| } |
} |
|
Line 4593 END_BLOCK
|
Line 4974 END_BLOCK
|
| ############################################### |
############################################### |
| |
|
| sub check_ip_acc { |
sub check_ip_acc { |
| my ($acc)=@_; |
my ($acc,$clientip)=@_; |
| &Apache::lonxml::debug("acc is $acc"); |
&Apache::lonxml::debug("acc is $acc"); |
| if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { |
if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { |
| return 1; |
return 1; |
| } |
} |
| my $allowed=0; |
my $allowed=0; |
| my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'}; |
my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip; |
| |
|
| my $name; |
my $name; |
| foreach my $pattern (split(',',$acc)) { |
foreach my $pattern (split(',',$acc)) { |
|
Line 4695 sub get_domainconf {
|
Line 5076 sub get_domainconf {
|
| if (keys(%{$domconfig{'login'}})) { |
if (keys(%{$domconfig{'login'}})) { |
| foreach my $key (keys(%{$domconfig{'login'}})) { |
foreach my $key (keys(%{$domconfig{'login'}})) { |
| if (ref($domconfig{'login'}{$key}) eq 'HASH') { |
if (ref($domconfig{'login'}{$key}) eq 'HASH') { |
| if ($key eq 'loginvia') { |
if (($key eq 'loginvia') || ($key eq 'headtag')) { |
| if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') { |
if (ref($domconfig{'login'}{$key}) eq 'HASH') { |
| foreach my $hostname (keys(%{$domconfig{'login'}{'loginvia'}})) { |
foreach my $hostname (keys(%{$domconfig{'login'}{$key}})) { |
| if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') { |
if (ref($domconfig{'login'}{$key}{$hostname}) eq 'HASH') { |
| if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) { |
if ($key eq 'loginvia') { |
| my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'}; |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) { |
| $designhash{$udom.'.login.loginvia'} = $server; |
my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'}; |
| if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') { |
$designhash{$udom.'.login.loginvia'} = $server; |
| |
if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') { |
| $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'}; |
|
| } else { |
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'}; |
| $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'}; |
} else { |
| |
$designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'}; |
| |
} |
| } |
} |
| if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) { |
} elsif ($key eq 'headtag') { |
| $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}; |
if ($domconfig{'login'}{'headtag'}{$hostname}{'url'}) { |
| |
$designhash{$udom.'.login.headtag_'.$hostname} = $domconfig{'login'}{'headtag'}{$hostname}{'url'}; |
| } |
} |
| } |
} |
| |
if ($domconfig{'login'}{$key}{$hostname}{'exempt'}) { |
| |
$designhash{$udom.'.login.'.$key.'_exempt_'.$hostname} = $domconfig{'login'}{$key}{$hostname}{'exempt'}; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 5030 Inputs:
|
Line 5417 Inputs:
|
| |
|
| =item * $bgcolor, used to override the bgcolor on a webpage to a specific value |
=item * $bgcolor, used to override the bgcolor on a webpage to a specific value |
| |
|
| =item * $no_inline_link, if true and in remote mode, don't show the |
|
| 'Switch To Inline Menu' link |
|
| |
|
| =item * $args, optional argument valid values are |
=item * $args, optional argument valid values are |
| no_auto_mt_title -> prevents &mt()ing the title arg |
no_auto_mt_title -> prevents &mt()ing the title arg |
| inherit_jsmath -> when creating popup window in a page, |
inherit_jsmath -> when creating popup window in a page, |
|
Line 5054 other decorations will be returned.
|
Line 5438 other decorations will be returned.
|
| |
|
| sub bodytag { |
sub bodytag { |
| my ($title,$function,$addentries,$bodyonly,$domain,$forcereg, |
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg, |
| $no_nav_bar,$bgcolor,$no_inline_link,$args,$advtoolsref)=@_; |
$no_nav_bar,$bgcolor,$args,$advtoolsref)=@_; |
| |
|
| my $public; |
my $public; |
| if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) |
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) |
|
Line 5131 sub bodytag {
|
Line 5515 sub bodytag {
|
| |
|
| $role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
| |
|
| if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
| |
|
| |
|
| |
|
| my $funclist; |
|
| if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) { |
|
| $bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions($httphost), 'start')."\n". |
|
| Apache::lonmenu::serverform(); |
|
| my $forbodytag; |
|
| &Apache::lonmenu::prepare_functions($env{'request.noversionuri'}, |
|
| $forcereg,$args->{'group'}, |
|
| $args->{'bread_crumbs'}, |
|
| $advtoolsref,'',\$forbodytag); |
|
| unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') { |
|
| $funclist = $forbodytag; |
|
| } |
|
| } else { |
|
| |
|
| # if ($env{'request.state'} eq 'construct') { |
# if ($env{'request.state'} eq 'construct') { |
| # $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls |
|
Line 5159 sub bodytag {
|
Line 5527 sub bodytag {
|
| my ($left,$right) = Apache::lonmenu::primary_menu(); |
my ($left,$right) = Apache::lonmenu::primary_menu(); |
| |
|
| if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { |
| if ($dc_info) { |
if ($dc_info) { |
| $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|; |
$dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|; |
| } |
} |
| $bodytag .= qq|<div id="LC_nav_bar">$left $role<br /> |
$bodytag .= qq|<div id="LC_nav_bar">$left $role<br /> |
| <em>$realm</em> $dc_info</div>|; |
<em>$realm</em> $dc_info</div>|; |
| return $bodytag; |
return $bodytag; |
| } |
} |
| |
|
|
Line 5178 sub bodytag {
|
Line 5546 sub bodytag {
|
| } |
} |
| $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|; |
$bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|; |
| |
|
| #if directed to not display the secondary menu, don't. |
#if directed to not display the secondary menu, don't. |
| if ($args->{'no_secondary_menu'}) { |
if ($args->{'no_secondary_menu'}) { |
| return $bodytag; |
return $bodytag; |
| } |
} |
|
Line 5190 sub bodytag {
|
Line 5558 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'}); |
| } else { |
} else { |
| my $forbodytag; |
$bodytag .= |
| &Apache::lonmenu::prepare_functions($env{'request.noversionuri'}, |
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'}, |
| $forcereg,$args->{'group'}, |
$forcereg,$args->{'group'}, |
| $args->{'bread_crumbs'}, |
$args->{'bread_crumbs'}, |
| $advtoolsref,'',\$forbodytag); |
$advtoolsref); |
| unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') { |
|
| $bodytag .= $forbodytag; |
|
| } |
|
| } |
} |
| }else{ |
}else{ |
| # this is to seperate menu from content when there's no secondary |
# this is to seperate menu from content when there's no secondary |
|
Line 5211 sub bodytag {
|
Line 5576 sub bodytag {
|
| } |
} |
| |
|
| return $bodytag; |
return $bodytag; |
| } |
|
| |
|
| # |
|
| # Top frame rendering, Remote is up |
|
| # |
|
| |
|
| my $imgsrc = $img; |
|
| if ($img =~ /^\/adm/) { |
|
| $imgsrc = &lonhttpdurl($img); |
|
| } |
|
| my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />'; |
|
| |
|
| my $help=($no_inline_link?'' |
|
| :&Apache::loncommon::top_nav_help('Help')); |
|
| |
|
| # Explicit link to get inline menu |
|
| my $menu= ($no_inline_link?'' |
|
| :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>'); |
|
| |
|
| if ($dc_info) { |
|
| $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|; |
|
| } |
|
| |
|
| my $name = &plainname($env{'user.name'},$env{'user.domain'}); |
|
| unless ($public) { |
|
| $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'}, |
|
| undef,'LC_menubuttons_link'); |
|
| } |
|
| |
|
| unless ($env{'form.inhibitmenu'}) { |
|
| $bodytag .= qq|<div id="LC_nav_bar">$name $role</div> |
|
| <ol class="LC_primary_menu LC_floatright LC_right"> |
|
| <li>$help</li> |
|
| <li>$menu</li> |
|
| </ol><div id="LC_realm"> $realm $dc_info</div>|; |
|
| } |
|
| if ($env{'request.state'} eq 'construct') { |
|
| if (!$public){ |
|
| if ($env{'request.state'} eq 'construct') { |
|
| $funclist = &Apache::lonhtmlcommon::scripttag( |
|
| &Apache::lonmenu::utilityfunctions($httphost), 'start'). |
|
| &Apache::lonhtmlcommon::scripttag('','end'). |
|
| &Apache::lonmenu::innerregister($forcereg, |
|
| $args->{'bread_crumbs'}); |
|
| } |
|
| } |
|
| } |
|
| return $bodytag."\n".$funclist; |
|
| } |
} |
| |
|
| sub dc_courseid_toggle { |
sub dc_courseid_toggle { |
|
Line 5290 sub make_attr_string {
|
Line 5607 sub make_attr_string {
|
| delete($attr_ref->{$key}); |
delete($attr_ref->{$key}); |
| } |
} |
| } |
} |
| if ($env{'environment.remote'} eq 'on') { |
$attr_ref->{'onload'} = $on_load; |
| $attr_ref->{'onload'} = |
$attr_ref->{'onunload'}= $on_unload; |
| &Apache::lonmenu::loadevents(). $on_load; |
|
| $attr_ref->{'onunload'}= |
|
| &Apache::lonmenu::unloadevents().$on_unload; |
|
| } else { |
|
| $attr_ref->{'onload'} = $on_load; |
|
| $attr_ref->{'onunload'}= $on_unload; |
|
| } |
|
| } |
} |
| |
|
| my $attr_string; |
my $attr_string; |
|
Line 6486 div.LC_edit_problem_footer div,
|
Line 6796 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; |
margin-top: 5px; |
| |
z-index: 100; |
| } |
} |
| |
|
| div.LC_edit_problem_header_title { |
div.LC_edit_problem_header_title { |
|
Line 6503 table.LC_edit_problem_header_title {
|
Line 6814 table.LC_edit_problem_header_title {
|
| |
|
| div.LC_edit_problem_discards { |
div.LC_edit_problem_discards { |
| float: left; |
float: left; |
| padding-bottom: 5px; |
} |
| |
|
| |
div.LC_edit_actionbar { |
| |
margin: -5px 0px 0px 0px !important; |
| |
background-color: $sidebg; |
| |
height: 31px; |
| } |
} |
| |
|
| div.LC_edit_problem_saves { |
div.LC_edit_problem_saves { |
|
Line 6524 div.LC_edit_problem_saves {
|
Line 6840 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 6611 fieldset {
|
Line 6931 fieldset {
|
| /* overflow: hidden; */ |
/* overflow: hidden; */ |
| } |
} |
| |
|
| |
article.geogebraweb div { |
| |
margin: 0; |
| |
} |
| |
|
| fieldset > legend { |
fieldset > legend { |
| font-weight: bold; |
font-weight: bold; |
| padding: 0 5px 0 5px; |
padding: 0 5px 0 5px; |
|
Line 6638 fieldset > legend {
|
Line 6962 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 6650 ol.LC_primary_menu li {
|
Line 6973 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 6675 ol.LC_primary_menu li:hover ul, ol.LC_pr
|
Line 7023 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 6691 ol.LC_primary_menu li li a:hover {
|
Line 7045 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 6747 ul#LC_secondary_menu li {
|
Line 7106 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 7311 sub headtag {
|
Line 7669 sub headtag {
|
| if (!$args->{'frameset'}) { |
if (!$args->{'frameset'}) { |
| $result .= &Apache::lonhtmlcommon::htmlareaheaders(); |
$result .= &Apache::lonhtmlcommon::htmlareaheaders(); |
| } |
} |
| if ($args->{'force_register'}) { |
if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) { |
| $result .= &Apache::lonmenu::registerurl(1); |
$result .= Apache::lonxml::display_title(); |
| } |
} |
| if (!$args->{'no_nav_bar'} |
if (!$args->{'no_nav_bar'} |
| && !$args->{'only_body'} |
&& !$args->{'only_body'} |
|
Line 7346 sub headtag {
|
Line 7704 sub headtag {
|
| <meta http-equiv="pragma" content="no-cache" /> |
<meta http-equiv="pragma" content="no-cache" /> |
| <meta http-equiv="Refresh" content="$time; url=$url" /> |
<meta http-equiv="Refresh" content="$time; url=$url" /> |
| ADDMETA |
ADDMETA |
| |
} else { |
| |
unless (($args->{'frameset'}) || ($args->{'js_ready'}) || ($args->{'only_body'}) || ($args->{'no_nav_bar'})) { |
| |
my $requrl = $env{'request.uri'}; |
| |
if ($requrl eq '') { |
| |
$requrl = $ENV{'REQUEST_URI'}; |
| |
$requrl =~ s/\?.+$//; |
| |
} |
| |
unless (($requrl =~ m{^/adm/(?:switchserver|login|authenticate|logout|groupsort|cleanup|helper|slotrequest|grades)(\?|$)}) || |
| |
(($requrl =~ m{^/res/}) && (($env{'form.submitted'} eq 'scantron') || |
| |
($env{'form.grade_symb'}) || ($Apache::lonhomework::scantronmode)))) { |
| |
my $dom_in_use = $Apache::lonnet::perlvar{'lonDefDomain'}; |
| |
unless (&Apache::lonnet::allowed('mau',$dom_in_use)) { |
| |
my %domdefs = &Apache::lonnet::get_domain_defaults($dom_in_use); |
| |
if (ref($domdefs{'offloadnow'}) eq 'HASH') { |
| |
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; |
| |
if ($domdefs{'offloadnow'}{$lonhost}) { |
| |
my $newserver = &Apache::lonnet::spareserver(30000,undef,1,$dom_in_use); |
| |
if (($newserver) && ($newserver ne $lonhost)) { |
| |
my $numsec = 5; |
| |
my $timeout = $numsec * 1000; |
| |
my ($newurl,$locknum,%locks,$msg); |
| |
if ($env{'request.role.adv'}) { |
| |
($locknum,%locks) = &Apache::lonnet::get_locks(); |
| |
} |
| |
my $disable_submit = 0; |
| |
if ($requrl =~ /$LONCAPA::assess_re/) { |
| |
$disable_submit = 1; |
| |
} |
| |
if ($locknum) { |
| |
my @lockinfo = sort(values(%locks)); |
| |
$msg = &mt('Once the following tasks are complete: ')."\\n". |
| |
join(", ",sort(values(%locks)))."\\n". |
| |
&mt('your session will be transferred to a different server, after you click "Roles".'); |
| |
} else { |
| |
if (($requrl =~ m{^/res/}) && ($env{'form.submitted'} =~ /^part_/)) { |
| |
$msg = &mt('Your LON-CAPA submission has been recorded')."\\n"; |
| |
} |
| |
$msg .= &mt('Your current LON-CAPA session will be transferred to a different server in [quant,_1,second].',$numsec); |
| |
$newurl = '/adm/switchserver?otherserver='.$newserver; |
| |
if (($env{'request.role'}) && ($env{'request.role'} ne 'cm')) { |
| |
$newurl .= '&role='.$env{'request.role'}; |
| |
} |
| |
if ($env{'request.symb'}) { |
| |
$newurl .= '&symb='.$env{'request.symb'}; |
| |
} else { |
| |
$newurl .= '&origurl='.$requrl; |
| |
} |
| |
} |
| |
$result.=<<OFFLOAD |
| |
<meta http-equiv="pragma" content="no-cache" /> |
| |
<script type="text/javascript"> |
| |
function LC_Offload_Now() { |
| |
var dest = "$newurl"; |
| |
if (dest != '') { |
| |
window.location.href="$newurl"; |
| |
} |
| |
} |
| |
window.alert('$msg'); |
| |
if ($disable_submit) { |
| |
\$(document).ready(function () { |
| |
\$(".LC_hwk_submit").prop("disabled", true); |
| |
\$( ".LC_textline" ).prop( "readonly", "readonly"); |
| |
}); |
| |
} |
| |
setTimeout('LC_Offload_Now()', $timeout); |
| |
</script> |
| |
OFFLOAD |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| if (!defined($title)) { |
if (!defined($title)) { |
| $title = 'The LearningOnline Network with CAPA'; |
$title = 'The LearningOnline Network with CAPA'; |
|
Line 7356 ADDMETA
|
Line 7787 ADDMETA
|
| if (!$args->{'frameset'}) { |
if (!$args->{'frameset'}) { |
| $result .= ' /'; |
$result .= ' /'; |
| } |
} |
| $result .= '>' |
$result .= '>' |
| .$inhibitprint |
.$inhibitprint |
| .$head_extra; |
.$head_extra; |
| if ($env{'browser.mobile'}) { |
if ($env{'browser.mobile'}) { |
|
Line 7382 sub font_settings {
|
Line 7813 sub font_settings {
|
| my $headerstring=''; |
my $headerstring=''; |
| if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) || |
if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) || |
| ((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) { |
((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) { |
| $headerstring.= |
$headerstring.= |
| '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"'; |
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8"'; |
| if (!$args->{'frameset'}) { |
if (!$args->{'frameset'}) { |
| $headerstring.= ' /'; |
$headerstring.= ' /'; |
| } |
} |
| $headerstring .= '>'."\n"; |
$headerstring .= '>'."\n"; |
| } |
} |
| return $headerstring; |
return $headerstring; |
| } |
} |
|
Line 7540 $args - additional optional args support
|
Line 7971 $args - additional optional args support
|
| skip_phases -> hash ref of |
skip_phases -> hash ref of |
| head -> skip the <html><head> generation |
head -> skip the <html><head> generation |
| body -> skip all <body> generation |
body -> skip all <body> generation |
| no_inline_link -> if true and in remote mode, don't show the |
|
| 'Switch To Inline Menu' link |
|
| no_auto_mt_title -> prevent &mt()ing the title arg |
no_auto_mt_title -> prevent &mt()ing the title arg |
| inherit_jsmath -> when creating popup window in a page, |
inherit_jsmath -> when creating popup window in a page, |
| should it have jsmath forced on by the |
should it have jsmath forced on by the |
| current page |
current page |
| 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 |
| group -> includes the current group, if page is for a |
group -> includes the current group, if page is for a |
| specific group |
specific group |
| |
|
| =back |
=back |
| |
|
|
Line 7579 sub start_page {
|
Line 8008 sub start_page {
|
| $args->{'function'}, $args->{'add_entries'}, |
$args->{'function'}, $args->{'add_entries'}, |
| $args->{'only_body'}, $args->{'domain'}, |
$args->{'only_body'}, $args->{'domain'}, |
| $args->{'force_register'}, $args->{'no_nav_bar'}, |
$args->{'force_register'}, $args->{'no_nav_bar'}, |
| $args->{'bgcolor'}, $args->{'no_inline_link'}, |
$args->{'bgcolor'}, $args, |
| $args, \@advtools); |
\@advtools); |
| } |
} |
| } |
} |
| |
|
|
Line 7620 sub start_page {
|
Line 8049 sub start_page {
|
| }else{ |
}else{ |
| $result .= &Apache::lonhtmlcommon::breadcrumbs(); |
$result .= &Apache::lonhtmlcommon::breadcrumbs(); |
| } |
} |
| } elsif (($env{'environment.remote'} eq 'on') && |
|
| ($env{'form.inhibitmenu'} ne 'yes') && |
|
| ($env{'request.noversionuri'} =~ m{^/res/}) && |
|
| ($env{'request.noversionuri'} !~ m{^/res/adm/pages/})) { |
|
| $result .= '<div style="padding:0;margin:0;clear:both"><hr /></div>'; |
|
| } |
} |
| return $result; |
return $result; |
| } |
} |
|
Line 7672 function set_wishlistlink(title, path) {
|
Line 8096 function set_wishlistlink(title, path) {
|
| title = title.replace(/^LON-CAPA /,''); |
title = title.replace(/^LON-CAPA /,''); |
| } |
} |
| title = encodeURIComponent(title); |
title = encodeURIComponent(title); |
| |
title = title.replace("'","\\\'"); |
| if (!path) { |
if (!path) { |
| path = location.pathname; |
path = location.pathname; |
| } |
} |
| path = encodeURIComponent(path); |
path = encodeURIComponent(path); |
| |
path = path.replace("'","\\\'"); |
| Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path, |
Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path, |
| 'wishlistNewLink','width=560,height=350,scrollbars=0'); |
'wishlistNewLink','width=560,height=350,scrollbars=0'); |
| } |
} |
|
Line 7718 var modalWindow = {
|
Line 8144 var modalWindow = {
|
| }; |
}; |
| var openMyModal = function(source,width,height,scrolling,transparency,style) |
var openMyModal = function(source,width,height,scrolling,transparency,style) |
| { |
{ |
| |
source = source.replace("'","'"); |
| modalWindow.windowId = "myModal"; |
modalWindow.windowId = "myModal"; |
| modalWindow.width = width; |
modalWindow.width = width; |
| modalWindow.height = height; |
modalWindow.height = height; |
| modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='"+transparency+"' src='" + source + "' style='"+style+"'></iframe>"; |
modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='"+transparency+"' src='" + source + "' style='"+style+"'></iframe>"; |
| modalWindow.open(); |
modalWindow.open(); |
| }; |
}; |
| // END LON-CAPA Internal --> |
// END LON-CAPA Internal --> |
| // ]]> |
// ]]> |
| </script> |
</script> |
|
Line 7769 sub modal_adhoc_inner {
|
Line 8196 sub modal_adhoc_inner {
|
| my ($funcname,$width,$height,$content)=@_; |
my ($funcname,$width,$height,$content)=@_; |
| my $innerwidth=$width-20; |
my $innerwidth=$width-20; |
| $content=&js_ready( |
$content=&js_ready( |
| &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}). |
&start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}). |
| &start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1). |
&start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1). |
| $content. |
$content. |
| &end_scrollbox(). |
&end_scrollbox(). |
|
Line 8325 role status: active, previous or future.
|
Line 8752 role status: active, previous or future.
|
| sub check_user_status { |
sub check_user_status { |
| my ($udom,$uname,$cdom,$crs,$role,$sec) = @_; |
my ($udom,$uname,$cdom,$crs,$role,$sec) = @_; |
| my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname); |
my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname); |
| my @uroles = keys %userinfo; |
my @uroles = keys(%userinfo); |
| my $srchstr; |
my $srchstr; |
| my $active_chk = 'none'; |
my $active_chk = 'none'; |
| my $now = time; |
my $now = time; |
|
Line 8414 sub get_sections {
|
Line 8841 sub get_sections {
|
| } |
} |
| } |
} |
| |
|
| if ($check_students) { |
if ($check_students) { |
| my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
| my $sec_index = &Apache::loncoursedata::CL_SECTION(); |
my $sec_index = &Apache::loncoursedata::CL_SECTION(); |
| my $status_index = &Apache::loncoursedata::CL_STATUS(); |
my $status_index = &Apache::loncoursedata::CL_STATUS(); |
|
Line 8810 sub get_user_quota {
|
Line 9237 sub get_user_quota {
|
| if ($quota eq '' || wantarray) { |
if ($quota eq '' || wantarray) { |
| if ($quotaname eq 'course') { |
if ($quotaname eq 'course') { |
| my %domdefs = &Apache::lonnet::get_domain_defaults($udom); |
my %domdefs = &Apache::lonnet::get_domain_defaults($udom); |
| if (($crstype eq 'official') || ($crstype eq 'unofficial') || |
if (($crstype eq 'official') || ($crstype eq 'unofficial') || |
| ($crstype eq 'community') || ($crstype eq 'textbook')) { |
($crstype eq 'community') || ($crstype eq 'textbook')) { |
| $defquota = $domdefs{$crstype.'quota'}; |
$defquota = $domdefs{$crstype.'quota'}; |
| } |
} |
| if ($defquota eq '') { |
if ($defquota eq '') { |
|
Line 8995 sub excess_filesize_warning {
|
Line 9422 sub excess_filesize_warning {
|
| ############################################### |
############################################### |
| |
|
| |
|
| |
|
| |
|
| sub get_secgrprole_info { |
sub get_secgrprole_info { |
| my ($cdom,$cnum,$needroles,$type) = @_; |
my ($cdom,$cnum,$needroles,$type) = @_; |
| my %sections_count = &get_sections($cdom,$cnum); |
my %sections_count = &get_sections($cdom,$cnum); |
|
Line 9852 sub ask_for_embedded_content {
|
Line 10281 sub ask_for_embedded_content {
|
| $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| } |
} |
| if (($actionurl eq '/adm/portfolio') || |
if (($actionurl eq '/adm/portfolio') || |
| ($actionurl eq '/adm/coursegrp_portfolio')) { |
($actionurl eq '/adm/coursegrp_portfolio')) { |
| my $current_path='/'; |
my $current_path='/'; |
| if ($env{'form.currentpath'}) { |
if ($env{'form.currentpath'}) { |
|
Line 9884 sub ask_for_embedded_content {
|
Line 10313 sub ask_for_embedded_content {
|
| $toplevel = $url; |
$toplevel = $url; |
| if ($args->{'context'} eq 'paste') { |
if ($args->{'context'} eq 'paste') { |
| ($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/}); |
($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/}); |
| ($path) = |
($path) = |
| ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
| $fileloc = &Apache::lonnet::filelocation('',$toplevel); |
$fileloc = &Apache::lonnet::filelocation('',$toplevel); |
| $fileloc =~ s{^/}{}; |
$fileloc =~ s{^/}{}; |
| } |
} |
| } |
} |
| } elsif ($actionurl eq '/adm/dependencies') { |
} elsif ($actionurl eq '/adm/dependencies') { |
| if ($env{'request.course.id'} ne '') { |
if ($env{'request.course.id'} ne '') { |
| if (ref($args) eq 'HASH') { |
if (ref($args) eq 'HASH') { |
| $url = $args->{'docs_url'}; |
$url = $args->{'docs_url'}; |
| $title = $args->{'docs_title'}; |
$title = $args->{'docs_title'}; |
| $toplevel = $url; |
$toplevel = $url; |
| unless ($toplevel =~ m{^/}) { |
unless ($toplevel =~ m{^/}) { |
| $toplevel = "/$url"; |
$toplevel = "/$url"; |
| } |
} |
|
Line 9906 sub ask_for_embedded_content {
|
Line 10335 sub ask_for_embedded_content {
|
| ($path) = |
($path) = |
| ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
| } |
} |
| $fileloc = &Apache::lonnet::filelocation('',$toplevel); |
if ($toplevel=~/^\/*(uploaded|editupload)/) { |
| |
$fileloc = $toplevel; |
| |
$fileloc=~ s/^\s*(\S+)\s*$/$1/; |
| |
my ($udom,$uname,$fname) = |
| |
($fileloc=~ m{^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$}); |
| |
$fileloc = propath($udom,$uname).'/userfiles/'.$fname; |
| |
} else { |
| |
$fileloc = &Apache::lonnet::filelocation('',$toplevel); |
| |
} |
| $fileloc =~ s{^/}{}; |
$fileloc =~ s{^/}{}; |
| ($filename) = ($fileloc =~ m{.+/([^/]+)$}); |
($filename) = ($fileloc =~ m{.+/([^/]+)$}); |
| $heading = &mt('Status of dependencies in [_1]',"$title ($filename)"); |
$heading = &mt('Status of dependencies in [_1]',"$title ($filename)"); |
|
Line 9966 sub ask_for_embedded_content {
|
Line 10403 sub ask_for_embedded_content {
|
| my $dirptr = 16384; |
my $dirptr = 16384; |
| foreach my $path (keys(%subdependencies)) { |
foreach my $path (keys(%subdependencies)) { |
| $currsubfile{$path} = {}; |
$currsubfile{$path} = {}; |
| if (($actionurl eq '/adm/portfolio') || |
if (($actionurl eq '/adm/portfolio') || |
| ($actionurl eq '/adm/coursegrp_portfolio')) { |
($actionurl eq '/adm/coursegrp_portfolio')) { |
| my ($sublistref,$listerror) = |
my ($sublistref,$listerror) = |
| &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath); |
&Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath); |
| if (ref($sublistref) eq 'ARRAY') { |
if (ref($sublistref) eq 'ARRAY') { |
|
Line 10109 sub ask_for_embedded_content {
|
Line 10546 sub ask_for_embedded_content {
|
| $counter = scalar(keys(%existing)); |
$counter = scalar(keys(%existing)); |
| $numpathchg = scalar(keys(%pathchanges)); |
$numpathchg = scalar(keys(%pathchanges)); |
| return ($output,$counter,$numpathchg,\%existing); |
return ($output,$counter,$numpathchg,\%existing); |
| } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") && |
} elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") && |
| (ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) { |
(ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) { |
| $counter = scalar(keys(%existing)); |
$counter = scalar(keys(%existing)); |
| $numpathchg = scalar(keys(%pathchanges)); |
$numpathchg = scalar(keys(%pathchanges)); |
|
Line 10338 sub ask_for_embedded_content {
|
Line 10775 sub ask_for_embedded_content {
|
| |
|
| Performs clean-up of directories, subdirectories and filename in an |
Performs clean-up of directories, subdirectories and filename in an |
| embedded object, referenced in an HTML file which is being uploaded |
embedded object, referenced in an HTML file which is being uploaded |
| to a course or portfolio, where |
to a course or portfolio, where |
| "Upload embedded images/multimedia files if HTML file" checkbox was |
"Upload embedded images/multimedia files if HTML file" checkbox was |
| checked. |
checked. |
| |
|
|
Line 10357 sub clean_path {
|
Line 10794 sub clean_path {
|
| @contents = ($embed_file); |
@contents = ($embed_file); |
| } |
} |
| my $lastidx = scalar(@contents)-1; |
my $lastidx = scalar(@contents)-1; |
| for (my $i=0; $i<=$lastidx; $i++) { |
for (my $i=0; $i<=$lastidx; $i++) { |
| $contents[$i]=~s{\\}{/}g; |
$contents[$i]=~s{\\}{/}g; |
| $contents[$i]=~s/\s+/\_/g; |
$contents[$i]=~s/\s+/\_/g; |
| $contents[$i]=~s{[^/\w\.\-]}{}g; |
$contents[$i]=~s{[^/\w\.\-]}{}g; |
|
Line 10696 sub modify_html_refs {
|
Line 11133 sub modify_html_refs {
|
| } |
} |
| my (%allfiles,%codebase,$output,$content); |
my (%allfiles,%codebase,$output,$content); |
| my @changes = &get_env_multiple('form.namechange'); |
my @changes = &get_env_multiple('form.namechange'); |
| unless ((@changes > 0) || ($context eq 'syllabus')) { |
unless ((@changes > 0) || ($context eq 'syllabus')) { |
| if (wantarray) { |
if (wantarray) { |
| return ('',0,0); |
return ('',0,0); |
| } else { |
} else { |
|
Line 10831 sub modify_html_refs {
|
Line 11268 sub modify_html_refs {
|
| } |
} |
| } |
} |
| if ($rewrites) { |
if ($rewrites) { |
| my $saveresult; |
my $saveresult; |
| my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult); |
my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult); |
| if ($url eq $container) { |
if ($url eq $container) { |
| my ($fname) = ($container =~ m{/([^/]+)$}); |
my ($fname) = ($container =~ m{/([^/]+)$}); |
|
Line 11062 sub decompress_form {
|
Line 11499 sub decompress_form {
|
| "$topdir/media/player.swf", |
"$topdir/media/player.swf", |
| "$topdir/media/swfobject.js", |
"$topdir/media/swfobject.js", |
| "$topdir/media/expressInstall.swf"); |
"$topdir/media/expressInstall.swf"); |
| my @camtasia8 = ("$topdir/","$topdir/$topdir.html", |
my @camtasia8_1 = ("$topdir/","$topdir/$topdir.html", |
| "$topdir/$topdir.mp4", |
"$topdir/$topdir.mp4", |
| "$topdir/$topdir\_config.xml", |
"$topdir/$topdir\_config.xml", |
| "$topdir/$topdir\_controller.swf", |
"$topdir/$topdir\_controller.swf", |
|
Line 11084 sub decompress_form {
|
Line 11521 sub decompress_form {
|
| "$topdir/skins/express_show/", |
"$topdir/skins/express_show/", |
| "$topdir/skins/express_show/player-min.css", |
"$topdir/skins/express_show/player-min.css", |
| "$topdir/skins/express_show/spritesheet.png"); |
"$topdir/skins/express_show/spritesheet.png"); |
| |
my @camtasia8_4 = ("$topdir/","$topdir/$topdir.html", |
| |
"$topdir/$topdir.mp4", |
| |
"$topdir/$topdir\_config.xml", |
| |
"$topdir/$topdir\_controller.swf", |
| |
"$topdir/$topdir\_embed.css", |
| |
"$topdir/$topdir\_First_Frame.png", |
| |
"$topdir/$topdir\_player.html", |
| |
"$topdir/$topdir\_Thumbnails.png", |
| |
"$topdir/playerProductInstall.swf", |
| |
"$topdir/scripts/", |
| |
"$topdir/scripts/config_xml.js", |
| |
"$topdir/scripts/techsmith-smart-player.min.js", |
| |
"$topdir/skins/", |
| |
"$topdir/skins/configuration_express.xml", |
| |
"$topdir/skins/express_show/", |
| |
"$topdir/skins/express_show/spritesheet.min.css", |
| |
"$topdir/skins/express_show/spritesheet.png", |
| |
"$topdir/skins/express_show/techsmith-smart-player.min.css"); |
| my @diffs = &compare_arrays(\@paths,\@camtasia6); |
my @diffs = &compare_arrays(\@paths,\@camtasia6); |
| if (@diffs == 0) { |
if (@diffs == 0) { |
| $is_camtasia = 6; |
$is_camtasia = 6; |
| } else { |
} else { |
| @diffs = &compare_arrays(\@paths,\@camtasia8); |
@diffs = &compare_arrays(\@paths,\@camtasia8_1); |
| if (@diffs == 0) { |
if (@diffs == 0) { |
| $is_camtasia = 8; |
$is_camtasia = 8; |
| |
} else { |
| |
@diffs = &compare_arrays(\@paths,\@camtasia8_4); |
| |
if (@diffs == 0) { |
| |
$is_camtasia = 8; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 11418 sub process_decompression {
|
Line 11878 sub process_decompression {
|
| $env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'}; |
$env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'}; |
| $displayed{'folder'} = $i; |
$displayed{'folder'} = $i; |
| } elsif ((($item eq "$contents[0]/index.html") && ($version == 6)) || |
} elsif ((($item eq "$contents[0]/index.html") && ($version == 6)) || |
| (($item eq "$contents[0]/$contents[0]".'.html') && ($version == 8))) { |
(($item eq "$contents[0]/$contents[0]".'.html') && ($version == 8))) { |
| $env{'form.archive_'.$i} = 'display'; |
$env{'form.archive_'.$i} = 'display'; |
| $env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'}; |
$env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'}; |
| $displayed{'web'} = $i; |
$displayed{'web'} = $i; |
|
Line 11870 sub process_extracted_files {
|
Line 12330 sub process_extracted_files {
|
| $folders{'0'} = $items[-2]; |
$folders{'0'} = $items[-2]; |
| if ($env{'form.folderpath'} =~ /\:1$/) { |
if ($env{'form.folderpath'} =~ /\:1$/) { |
| $containers{'0'}='page'; |
$containers{'0'}='page'; |
| } else { |
} else { |
| $containers{'0'}='sequence'; |
$containers{'0'}='sequence'; |
| } |
} |
| } |
} |
|
Line 11990 sub process_extracted_files {
|
Line 12450 sub process_extracted_files {
|
| } |
} |
| } |
} |
| } else { |
} else { |
| $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; |
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; |
| } |
} |
| } |
} |
| for (my $i=1; $i<=$numitems; $i++) { |
for (my $i=1; $i<=$numitems; $i++) { |
|
Line 12012 sub process_extracted_files {
|
Line 12472 sub process_extracted_files {
|
| } |
} |
| if ($itemidx eq '') { |
if ($itemidx eq '') { |
| $itemidx = 0; |
$itemidx = 0; |
| } |
} |
| if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) { |
if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) { |
| if ($mapinner{$referrer{$i}}) { |
if ($mapinner{$referrer{$i}}) { |
| $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}"; |
$fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}"; |
|
Line 12059 sub process_extracted_files {
|
Line 12519 sub process_extracted_files {
|
| $showpath = "$relpath/$title"; |
$showpath = "$relpath/$title"; |
| } 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',$showpath).'</li>'."\n"; |
| } |
} |
| unless ($ishome) { |
unless ($ishome) { |
| my $fetch = "$fullpath/$title"; |
my $fetch = "$fullpath/$title"; |
| $fetch =~ s/^\Q$prefix$dir\E//; |
$fetch =~ s/^\Q$prefix$dir\E//; |
| $prompttofetch{$fetch} = 1; |
$prompttofetch{$fetch} = 1; |
| } |
} |
| } |
} |
|
Line 12074 sub process_extracted_files {
|
Line 12534 sub process_extracted_files {
|
| $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />'; |
$path,$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.',$path).'<br />'; |
| } |
} |
| } |
} |
| if (keys(%todelete)) { |
if (keys(%todelete)) { |
|
Line 13264 generated by lonerrorhandler.pm, CHECKRP
|
Line 13724 generated by lonerrorhandler.pm, CHECKRP
|
| lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl respectively. |
lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl respectively. |
| |
|
| Inputs: |
Inputs: |
| defmail (scalar - email address of default recipient), |
defmail (scalar - email address of default recipient), |
| mailing type (scalar: errormail, packagesmail, helpdeskmail, |
mailing type (scalar: errormail, packagesmail, helpdeskmail, |
| requestsmail, updatesmail, or idconflictsmail). |
requestsmail, updatesmail, or idconflictsmail). |
| |
|
| defdom (domain for which to retrieve configuration settings), |
defdom (domain for which to retrieve configuration settings), |
| |
|
| 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 |
| |
|
| Returns: comma separated list of addresses to which to send e-mail. |
Returns: comma separated list of addresses to which to send e-mail. |
| |
|
|
Line 13815 sub commit_studentrole {
|
Line 14275 sub commit_studentrole {
|
| } |
} |
| } |
} |
| } else { |
} else { |
| if ($secchange) { |
if ($secchange) { |
| $$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed; |
$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed; |
| } else { |
} else { |
| $$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed; |
$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed; |
|
Line 14235 sub construct_course {
|
Line 14695 sub construct_course {
|
| if (ref($crsinfo{$$crsudom.'_'.$$crsunum}) eq 'HASH') { |
if (ref($crsinfo{$$crsudom.'_'.$$crsunum}) eq 'HASH') { |
| $crsinfo{$$crsudom.'_'.$$crsunum}{'uniquecode'} = $code; |
$crsinfo{$$crsudom.'_'.$$crsunum}{'uniquecode'} = $code; |
| my $putres = &Apache::lonnet::courseidput($$crsudom,\%crsinfo,$crsuhome,'notime'); |
my $putres = &Apache::lonnet::courseidput($$crsudom,\%crsinfo,$crsuhome,'notime'); |
| } |
} |
| if (ref($coderef)) { |
if (ref($coderef)) { |
| $$coderef = $code; |
$$coderef = $code; |
| } |
} |
|
Line 14320 sub make_unique_code {
|
Line 14780 sub make_unique_code {
|
| my $tries = 0; |
my $tries = 0; |
| my $gotlock = &Apache::lonnet::newput_dom('uniquecodes',$lockhash,$cdom); |
my $gotlock = &Apache::lonnet::newput_dom('uniquecodes',$lockhash,$cdom); |
| my ($code,$error); |
my ($code,$error); |
| |
|
| while (($gotlock ne 'ok') && ($tries<3)) { |
while (($gotlock ne 'ok') && ($tries<3)) { |
| $tries ++; |
$tries ++; |
| sleep 1; |
sleep 1; |
|
Line 14457 sub escape_url {
|
Line 14917 sub escape_url {
|
| my ($url) = @_; |
my ($url) = @_; |
| my @urlslices = split(/\//, $url,-1); |
my @urlslices = split(/\//, $url,-1); |
| my $lastitem = &escape(pop(@urlslices)); |
my $lastitem = &escape(pop(@urlslices)); |
| return join('/',@urlslices).'/'.$lastitem; |
return &HTML::Entities::encode(join('/',@urlslices),"'").'/'.$lastitem; |
| } |
} |
| |
|
| sub compare_arrays { |
sub compare_arrays { |
|
Line 14515 sub init_user_environment {
|
Line 14975 sub init_user_environment {
|
| } |
} |
| } |
} |
| closedir(DIR); |
closedir(DIR); |
| |
# If there is a undeleted lockfile for the user's paste buffer remove it. |
| |
my $namespace = 'nohist_courseeditor'; |
| |
my $lockingkey = 'paste'."\0".'locked_num'; |
| |
my %lockhash = &Apache::lonnet::get($namespace,[$lockingkey], |
| |
$domain,$username); |
| |
if (exists($lockhash{$lockingkey})) { |
| |
my $delresult = &Apache::lonnet::del($namespace,[$lockingkey],$domain,$username); |
| |
unless ($delresult eq 'ok') { |
| |
&Apache::lonnet::logthis("Failed to delete paste buffer locking key in $namespace for ".$username.":".$domain." Result was: $delresult"); |
| |
} |
| |
} |
| } |
} |
| # Give them a new cookie |
# Give them a new cookie |
| my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'} |
my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'} |
|
Line 14614 sub init_user_environment {
|
Line 15085 sub init_user_environment {
|
| my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'], |
my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'], |
| $domain,$username); |
$domain,$username); |
| my $reqstatus = $reqauthor{'author_status'}; |
my $reqstatus = $reqauthor{'author_status'}; |
| if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { |
if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { |
| if (ref($reqauthor{'author'}) eq 'HASH') { |
if (ref($reqauthor{'author'}) eq 'HASH') { |
| $userenv{'requestauthorqueued'} = $reqstatus.':'. |
$userenv{'requestauthorqueued'} = $reqstatus.':'. |
| $reqauthor{'author'}{'timestamp'}; |
$reqauthor{'author'}{'timestamp'}; |
|
Line 14724 and quotacheck.pl
|
Line 15195 and quotacheck.pl
|
| |
|
| Inputs: |
Inputs: |
| |
|
| filterlist - anonymous array of fields to include as potential filters |
filterlist - anonymous array of fields to include as potential filters |
| |
|
| crstype - course type |
crstype - course type |
| |
|
| roleelement - fifth arg in selectcourse_link() populates fifth arg in javascript: opencrsbrowser() function, used |
roleelement - fifth arg in selectcourse_link() populates fifth arg in javascript: opencrsbrowser() function, used |
| to pop-open a course selector (will contain "extra element"). |
to pop-open a course selector (will contain "extra element"). |
| |
|
| multelement - if multiple course selections will be allowed, this will be a hidden form element: name: multiple; value: 1 |
multelement - if multiple course selections will be allowed, this will be a hidden form element: name: multiple; value: 1 |
| |
|
|
Line 14745 cloneruname - username of owner of new c
|
Line 15216 cloneruname - username of owner of new c
|
| |
|
| clonerudom - domain of owner of new course who wants to clone |
clonerudom - domain of owner of new course who wants to clone |
| |
|
| typeelem - text to use for left column in row containing course type (i.e., Course, Community or Course/Community) |
typeelem - text to use for left column in row containing course type (i.e., Course, Community or Course/Community) |
| |
|
| codetitlesref - reference to array of titles of components in institutional codes (official courses) |
codetitlesref - reference to array of titles of components in institutional codes (official courses) |
| |
|
| codedom - domain |
codedom - domain |
| |
|
| formname - value of form element named "form". |
formname - value of form element named "form". |
| |
|
| fixeddom - domain, if fixed. |
fixeddom - domain, if fixed. |
| |
|
| prevphase - value to assign to form element named "phase" when going back to the previous screen |
prevphase - value to assign to form element named "phase" when going back to the previous screen |
| |
|
| cnameelement - name of form element in form on opener page which will receive title of selected course |
cnameelement - name of form element in form on opener page which will receive title of selected course |
| |
|
| cnumelement - name of form element in form on opener page which will receive courseID of selected course |
cnumelement - name of form element in form on opener page which will receive courseID of selected course |
| |
|
|
Line 14899 sub build_filters {
|
Line 15370 sub build_filters {
|
| if (exists($filter->{'instcodefilter'})) { |
if (exists($filter->{'instcodefilter'})) { |
| # if (($fixeddom) || ($formname eq 'requestcrs') || |
# if (($fixeddom) || ($formname eq 'requestcrs') || |
| # ($formname eq 'modifycourse') || ($formname eq 'filterpicker')) { |
# ($formname eq 'modifycourse') || ($formname eq 'filterpicker')) { |
| if ($codedom) { |
if ($codedom) { |
| $officialjs = 1; |
$officialjs = 1; |
| ($instcodeform,$jscript,$$numtitlesref) = |
($instcodeform,$jscript,$$numtitlesref) = |
| &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker', |
&Apache::courseclassifier::instcode_selectors($codedom,'filterpicker', |
|
Line 14933 sub build_filters {
|
Line 15404 sub build_filters {
|
| $output .= '<input type="hidden" name="phase" value="courselist" />'."\n". |
$output .= '<input type="hidden" name="phase" value="courselist" />'."\n". |
| '<input type="hidden" name="prevphase" value="'. |
'<input type="hidden" name="prevphase" value="'. |
| $prevphase.'" />'."\n"; |
$prevphase.'" />'."\n"; |
| } elsif ($formname ne 'quotacheck') { |
} elsif ($formname eq 'quotacheck') { |
| |
$output .= qq| |
| |
<input type="hidden" name="sortby" value="" /> |
| |
<input type="hidden" name="sortorder" value="" /> |
| |
|; |
| |
} else { |
| my $name_input; |
my $name_input; |
| if ($cnameelement ne '') { |
if ($cnameelement ne '') { |
| $name_input = '<input type="hidden" name="cnameelement" value="'. |
$name_input = '<input type="hidden" name="cnameelement" value="'. |
|
Line 15023 $typeelement
|
Line 15499 $typeelement
|
| return $jscript.$clonewarning.$output; |
return $jscript.$clonewarning.$output; |
| } |
} |
| |
|
| =pod |
=pod |
| |
|
| =item * &timebased_select_form() |
=item * &timebased_select_form() |
| |
|
|
Line 15038 item - name of form element (sincefilter
|
Line 15514 item - name of form element (sincefilter
|
| filter - anonymous hash of criteria and their values |
filter - anonymous hash of criteria and their values |
| |
|
| Returns: HTML for a select box contained a blank, then six time selections, |
Returns: HTML for a select box contained a blank, then six time selections, |
| with value set in incoming form variables currently selected. |
with value set in incoming form variables currently selected. |
| |
|
| Side Effects: None |
Side Effects: None |
| |
|
|
Line 15075 page load completion for page showing se
|
Line 15551 page load completion for page showing se
|
| |
|
| Inputs: None |
Inputs: None |
| |
|
| Returns: markup containing updateFilters() and hideSearching() javascript functions. |
Returns: markup containing updateFilters() and hideSearching() javascript functions. |
| |
|
| Side Effects: None |
Side Effects: None |
| |
|
|
Line 15114 to retrieve a hash for which keys are co
|
Line 15590 to retrieve a hash for which keys are co
|
| |
|
| Inputs: |
Inputs: |
| |
|
| dom - domain being searched |
dom - domain being searched |
| |
|
| type - course type ('Course' or 'Community' or '.' if any). |
type - course type ('Course' or 'Community' or '.' if any). |
| |
|
|
Line 15126 cloneruname - optional username of new c
|
Line 15602 cloneruname - optional username of new c
|
| |
|
| clonerudom - optional domain of new course owner |
clonerudom - optional domain of new course owner |
| |
|
| domcloner - Optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by, |
domcloner - Optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by, |
| (used when DC is using course creation form) |
(used when DC is using course creation form) |
| |
|
| codetitles - reference to array of titles of components in institutional codes (official courses). |
codetitles - reference to array of titles of components in institutional codes (official courses). |
|
Line 15226 sub search_courses {
|
Line 15702 sub search_courses {
|
| return %courses; |
return %courses; |
| } |
} |
| |
|
| |
=pod |
| |
|
| |
=back |
| |
|
| |
=head1 Routines for version requirements for current course. |
| |
|
| |
=over 4 |
| |
|
| |
=item * &check_release_required() |
| |
|
| |
Compares required LON-CAPA version with version on server, and |
| |
if required version is newer looks for a server with the required version. |
| |
|
| |
Looks first at servers in user's owen domain; if none suitable, looks at |
| |
servers in course's domain are permitted to host sessions for user's domain. |
| |
|
| |
Inputs: |
| |
|
| |
$loncaparev - Version on current server (format: Major.Minor.Subrelease-datestamp) |
| |
|
| |
$courseid - Course ID of current course |
| |
|
| |
$rolecode - User's current role in course (for switchserver query string). |
| |
|
| |
$required - LON-CAPA version needed by course (format: Major.Minor). |
| |
|
| |
|
| |
Returns: |
| |
|
| |
$switchserver - query string tp append to /adm/switchserver call (if |
| |
current server's LON-CAPA version is too old. |
| |
|
| |
$warning - Message is displayed if no suitable server could be found. |
| |
|
| |
=cut |
| |
|
| |
sub check_release_required { |
| |
my ($loncaparev,$courseid,$rolecode,$required) = @_; |
| |
my ($switchserver,$warning); |
| |
if ($required ne '') { |
| |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
| |
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
| |
if ($reqdmajor ne '' && $reqdminor ne '') { |
| |
my $otherserver; |
| |
if (($major eq '' && $minor eq '') || |
| |
(($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { |
| |
my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required,1); |
| |
my $switchlcrev = |
| |
&Apache::lonnet::get_server_loncaparev($env{'user.domain'}, |
| |
$userdomserver); |
| |
my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
| |
if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || |
| |
(($reqdmajor == $swmajor) && ($reqdminor > $swminor))) { |
| |
my $cdom = $env{'course.'.$courseid.'.domain'}; |
| |
if ($cdom ne $env{'user.domain'}) { |
| |
my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom,undef,$required,1); |
| |
my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname); |
| |
my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); |
| |
my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); |
| |
my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'}); |
| |
my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver); |
| |
my $canhost = |
| |
&Apache::lonnet::can_host_session($env{'user.domain'}, |
| |
$coursedomserver, |
| |
$remoterev, |
| |
$udomdefaults{'remotesessions'}, |
| |
$defdomdefaults{'hostedsessions'}); |
| |
|
| |
if ($canhost) { |
| |
$otherserver = $coursedomserver; |
| |
} else { |
| |
$warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$courseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain."); |
| |
} |
| |
} else { |
| |
$warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$courseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain)."); |
| |
} |
| |
} else { |
| |
$otherserver = $userdomserver; |
| |
} |
| |
} |
| |
if ($otherserver ne '') { |
| |
$switchserver = 'otherserver='.$otherserver.'&role='.$rolecode; |
| |
} |
| |
} |
| |
} |
| |
return ($switchserver,$warning); |
| |
} |
| |
|
| =pod |
=pod |
| |
|
| |
=item * &check_release_result() |
| |
|
| |
Inputs: |
| |
|
| |
$switchwarning - Warning message if no suitable server found to host session. |
| |
|
| |
$switchserver - query string to append to /adm/switchserver containing lonHostID |
| |
and current role. |
| |
|
| |
Returns: HTML to display with information about requirement to switch server. |
| |
Either displaying warning with link to Roles/Courses screen or |
| |
display link to switchserver. |
| |
|
| |
=cut |
| |
|
| |
sub check_release_result { |
| |
my ($switchwarning,$switchserver) = @_; |
| |
my $output = &start_page('Selected course unavailable on this server'). |
| |
'<p class="LC_warning">'; |
| |
if ($switchwarning) { |
| |
$output .= $switchwarning.'<br /><a href="/adm/roles">'; |
| |
if (&show_course()) { |
| |
$output .= &mt('Display courses'); |
| |
} else { |
| |
$output .= &mt('Display roles'); |
| |
} |
| |
$output .= '</a>'; |
| |
} elsif ($switchserver) { |
| |
$output .= &mt('This course requires a newer version of LON-CAPA than is installed on this server.'). |
| |
'<br />'. |
| |
'<a href="/adm/switchserver?'.$switchserver.'">'. |
| |
&mt('Switch Server'). |
| |
'</a>'; |
| |
} |
| |
$output .= '</p>'.&end_page(); |
| |
return $output; |
| |
} |
| |
|
| |
=pod |
| |
|
| |
=item * &needs_coursereinit() |
| |
|
| |
Determine if course contents stored for user's session needs to be |
| |
refreshed, because content has changed since "Big Hash" last tied. |
| |
|
| |
Check for change is made if time last checked is more than 10 minutes ago |
| |
(by default). |
| |
|
| |
Inputs: |
| |
|
| |
$loncaparev - Version on current server (format: Major.Minor.Subrelease-datestamp) |
| |
|
| |
$interval (optional) - Time which may elapse (in s) between last check for content |
| |
change in current course. (default: 600 s). |
| |
|
| |
Returns: an array; first element is: |
| |
|
| |
=over 4 |
| |
|
| |
'switch' - if content updates mean user's session |
| |
needs to be switched to a server running a newer LON-CAPA version |
| |
|
| |
'update' - if course session needs to be refreshed (i.e., Big Hash needs to be reloaded) |
| |
on current server hosting user's session |
| |
|
| |
'' - if no action required. |
| |
|
| |
=back |
| |
|
| |
If first item element is 'switch': |
| |
|
| |
second item is $switchwarning - Warning message if no suitable server found to host session. |
| |
|
| |
third item is $switchserver - query string to append to /adm/switchserver containing lonHostID |
| |
and current role. |
| |
|
| |
otherwise: no other elements returned. |
| |
|
| =back |
=back |
| |
|
| =cut |
=cut |
| |
|
| |
sub needs_coursereinit { |
| |
my ($loncaparev,$interval) = @_; |
| |
return() unless ($env{'request.course.id'} && $env{'request.course.tied'}); |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
my $now = time; |
| |
if ($interval eq '') { |
| |
$interval = 600; |
| |
} |
| |
if (($now-$env{'request.course.timechecked'})>$interval) { |
| |
my $lastchange = &Apache::lonnet::get_coursechange($cdom,$cnum); |
| |
&Apache::lonnet::appenv({'request.course.timechecked'=>$now}); |
| |
if ($lastchange > $env{'request.course.tied'}) { |
| |
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); |
| |
if ($curr_reqd_hash{'internal.releaserequired'} ne '') { |
| |
my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'}; |
| |
if ($curr_reqd_hash{'internal.releaserequired'} ne $required) { |
| |
&Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' => |
| |
$curr_reqd_hash{'internal.releaserequired'}}); |
| |
my ($switchserver,$switchwarning) = |
| |
&check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'}, |
| |
$curr_reqd_hash{'internal.releaserequired'}); |
| |
if ($switchwarning ne '' || $switchserver ne '') { |
| |
return ('switch',$switchwarning,$switchserver); |
| |
} |
| |
} |
| |
} |
| |
return ('update'); |
| |
} |
| |
} |
| |
return (); |
| |
} |
| |
|
| sub update_content_constraints { |
sub update_content_constraints { |
| my ($cdom,$cnum,$chome,$cid) = @_; |
my ($cdom,$cnum,$chome,$cid) = @_; |
|
Line 15615 sub cleanup_html {
|
Line 16288 sub cleanup_html {
|
| sub critical_redirect { |
sub critical_redirect { |
| my ($interval) = @_; |
my ($interval) = @_; |
| if ((time-$env{'user.criticalcheck.time'})>$interval) { |
if ((time-$env{'user.criticalcheck.time'})>$interval) { |
| my @what=&Apache::lonnet::dump('critical', $env{'user.domain'}, |
my @what=&Apache::lonnet::dump('critical', $env{'user.domain'}, |
| $env{'user.name'}); |
$env{'user.name'}); |
| &Apache::lonnet::appenv({'user.criticalcheck.time'=>time}); |
&Apache::lonnet::appenv({'user.criticalcheck.time'=>time}); |
| my $redirecturl; |
my $redirecturl; |
| if ($what[0]) { |
if ($what[0]) { |
| if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { |
if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { |
| $redirecturl='/adm/email?critical=display'; |
$redirecturl='/adm/email?critical=display'; |
| my $url=&Apache::lonnet::absolute_url().$redirecturl; |
my $url=&Apache::lonnet::absolute_url().$redirecturl; |
| return (1, $url); |
return (1, $url); |
| } |
} |
| } |
} |
| } |
} |
| return (); |
return (); |
| } |
} |
| |
|
![[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