|
version 1.1075.2.26, 2013/01/03 20:10:02
|
version 1.1137, 2013/07/10 22:07:37
|
|
Line 68 use Apache::loncoursedata();
|
Line 68 use Apache::loncoursedata();
|
| use Apache::lontexconvert(); |
use Apache::lontexconvert(); |
| use Apache::lonclonecourse(); |
use Apache::lonclonecourse(); |
| use Apache::lonuserutils(); |
use Apache::lonuserutils(); |
| |
use Apache::lonuserstate(); |
| 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; |
| |
|
|
Line 157 sub ssi_with_retries {
|
Line 159 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 191 BEGIN {
|
Line 194 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 527 ENDAUTHORBRW
|
Line 531 ENDAUTHORBRW
|
| } |
} |
| |
|
| sub coursebrowser_javascript { |
sub coursebrowser_javascript { |
| my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_; |
my ($domainfilter,$sec_element,$formname,$role_element,$crstype, |
| |
$credits_element) = @_; |
| my $wintitle = 'Course_Browser'; |
my $wintitle = 'Course_Browser'; |
| if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
| $wintitle = 'Community_Browser'; |
$wintitle = 'Community_Browser'; |
|
Line 590 sub coursebrowser_javascript {
|
Line 595 sub coursebrowser_javascript {
|
| } |
} |
| $id_functions |
$id_functions |
| ENDSTDBRW |
ENDSTDBRW |
| if (($sec_element ne '') || ($role_element ne '')) { |
if (($sec_element ne '') || ($role_element ne '') || ($credits_element ne '')) { |
| $output .= &setsec_javascript($sec_element,$formname,$role_element); |
$output .= &setsec_javascript($sec_element,$formname,$role_element, |
| |
$credits_element); |
| } |
} |
| $output .= ' |
$output .= ' |
| // ]]> |
// ]]> |
|
Line 660 if (!Array.prototype.indexOf) {
|
Line 666 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 748 ENDUSERBRW
|
Line 754 ENDUSERBRW
|
| } |
} |
| |
|
| sub setsec_javascript { |
sub setsec_javascript { |
| my ($sec_element,$formname,$role_element) = @_; |
my ($sec_element,$formname,$role_element,$credits_element) = @_; |
| my (@courserolenames,@communityrolenames,$rolestr,$courserolestr, |
my (@courserolenames,@communityrolenames,$rolestr,$courserolestr, |
| $communityrolestr); |
$communityrolestr); |
| if ($role_element ne '') { |
if ($role_element ne '') { |
|
Line 843 function setRole(crstype) {
|
Line 849 function setRole(crstype) {
|
| } |
} |
| |; |
|; |
| } |
} |
| |
if ($credits_element) { |
| |
$setsections .= qq| |
| |
function setCredits(defaultcredits) { |
| |
document.$formname.$credits_element.value = defaultcredits; |
| |
return; |
| |
} |
| |
|; |
| |
} |
| return $setsections; |
return $setsections; |
| } |
} |
| |
|
|
Line 888 sub check_uncheck_jscript {
|
Line 902 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 997 sub select_language {
|
Line 1011 sub select_language {
|
| $langchoices{$code} = &plainlanguagedescription($id); |
$langchoices{$code} = &plainlanguagedescription($id); |
| } |
} |
| } |
} |
| |
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
| return &select_form($selected,$name,\%langchoices); |
return &select_form($selected,$name,\%langchoices); |
| } |
} |
| |
|
| =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 1028 linked_select_forms takes the following
|
Line 1070 linked_select_forms takes the following
|
| |
|
| =item * $menuorder, the order of values in the first menu |
=item * $menuorder, the order of values in the first menu |
| |
|
| |
=item * $onchangefirst, additional javascript call to execute for an onchange |
| |
event for the first <select> tag |
| |
|
| |
=item * $onchangesecond, additional javascript call to execute for an onchange |
| |
event for the second <select> tag |
| |
|
| =back |
=back |
| |
|
| Below is an example of such a hash. Only the 'text', 'default', and |
Below is an example of such a hash. Only the 'text', 'default', and |
|
Line 1081 sub linked_select_forms {
|
Line 1129 sub linked_select_forms {
|
| $secondselectname, |
$secondselectname, |
| $hashref, |
$hashref, |
| $menuorder, |
$menuorder, |
| |
$onchangefirst, |
| |
$onchangesecond |
| ) = @_; |
) = @_; |
| my $second = "document.$formname.$secondselectname"; |
my $second = "document.$formname.$secondselectname"; |
| my $first = "document.$formname.$firstselectname"; |
my $first = "document.$formname.$firstselectname"; |
|
Line 1137 function select1_changed() {
|
Line 1187 function select1_changed() {
|
| </script> |
</script> |
| END |
END |
| # output the initial values for the selection lists |
# output the initial values for the selection lists |
| $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n"; |
$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed();$onchangefirst\">\n"; |
| my @order = sort(keys(%{$hashref})); |
my @order = sort(keys(%{$hashref})); |
| if (ref($menuorder) eq 'ARRAY') { |
if (ref($menuorder) eq 'ARRAY') { |
| @order = @{$menuorder}; |
@order = @{$menuorder}; |
|
Line 1150 END
|
Line 1200 END
|
| $result .= "</select>\n"; |
$result .= "</select>\n"; |
| my %select2 = %{$hashref->{$firstdefault}->{'select2'}}; |
my %select2 = %{$hashref->{$firstdefault}->{'select2'}}; |
| $result .= $middletext; |
$result .= $middletext; |
| $result .= "<select size=\"1\" name=\"$secondselectname\">\n"; |
$result .= "<select size=\"1\" name=\"$secondselectname\""; |
| |
if ($onchangesecond) { |
| |
$result .= ' onchange="'.$onchangesecond.'"'; |
| |
} |
| |
$result .= ">\n"; |
| my $seconddefault = $hashref->{$firstdefault}->{'default'}; |
my $seconddefault = $hashref->{$firstdefault}->{'default'}; |
| |
|
| my @secondorder = sort(keys(%select2)); |
my @secondorder = sort(keys(%select2)); |
|
Line 2137 sub select_level_form {
|
Line 2191 sub select_level_form {
|
| |
|
| =pod |
=pod |
| |
|
| =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) |
=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) |
| |
|
| 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 2150 If the $showdomdesc flag is set, the dom
|
Line 2204 If the $showdomdesc flag is set, the dom
|
| |
|
| The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted. |
The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted. |
| |
|
| 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. |
| |
|
| =cut |
=cut |
| |
|
| #------------------------------------------- |
#------------------------------------------- |
| sub select_dom_form { |
sub select_dom_form { |
| my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_; |
my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_; |
| if ($onchange) { |
if ($onchange) { |
| $onchange = ' onchange="'.$onchange.'"'; |
$onchange = ' onchange="'.$onchange.'"'; |
| } |
} |
| my @domains; |
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}); |
| } else { |
} else { |
| @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains()); |
@domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains()); |
| } |
} |
| if ($includeempty) { @domains=('',@domains); } |
if ($includeempty) { @domains=('',@domains); } |
| |
if (ref($excdoms) eq 'ARRAY') { |
| |
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) { |
| |
next if ($exclude{$dom}); |
| $selectdomain.="<option value=\"$dom\" ". |
$selectdomain.="<option value=\"$dom\" ". |
| ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom; |
($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom; |
| if ($showdomdesc) { |
if ($showdomdesc) { |
|
Line 2289 Outputs:
|
Line 2349 Outputs:
|
| |
|
| =item * $clientos |
=item * $clientos |
| |
|
| |
=item * $clientmobile |
| |
|
| =back |
=back |
| |
|
| =back |
=back |
|
Line 2307 sub decode_user_agent {
|
Line 2369 sub decode_user_agent {
|
| my $clientversion='0'; |
my $clientversion='0'; |
| my $clientmathml=''; |
my $clientmathml=''; |
| my $clientunicode='0'; |
my $clientunicode='0'; |
| |
my $clientmobile=0; |
| for (my $i=0;$i<=$#browsertype;$i++) { |
for (my $i=0;$i<=$#browsertype;$i++) { |
| my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]); |
my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]); |
| if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) { |
if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) { |
|
Line 2329 sub decode_user_agent {
|
Line 2392 sub decode_user_agent {
|
| ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } |
($httpbrowser=~/powerpc/i)) { $clientos='mac'; } |
| if ($httpbrowser=~/win/i) { $clientos='win'; } |
if ($httpbrowser=~/win/i) { $clientos='win'; } |
| if ($httpbrowser=~/embed/i) { $clientos='pda'; } |
if ($httpbrowser=~/embed/i) { $clientos='pda'; } |
| |
if ($httpbrowser=~/(Android|iPod|iPad|iPhone|webOS|Blackberry|Windows Phone|Opera m(?:ob|in)|Fennec)/i) { |
| |
$clientmobile=lc($1); |
| |
} |
| return ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
return ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
| $clientunicode,$clientos,); |
$clientunicode,$clientos,$clientmobile); |
| } |
} |
| |
|
| ############################################################### |
############################################################### |
|
Line 2497 sub authform_nochange {
|
Line 2563 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 2993 sub get_related_words {
|
Line 3059 sub get_related_words {
|
| untie %thesaurus_db; |
untie %thesaurus_db; |
| return @Words; |
return @Words; |
| } |
} |
| |
############################################################### |
| |
# |
| |
# Spell checking |
| |
# |
| |
|
| |
=pod |
| |
|
| |
=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 |
| |
|
| |
|
| =pod |
=pod |
| |
|
|
Line 3000 sub get_related_words {
|
Line 3105 sub get_related_words {
|
| |
|
| =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 4808 sub designparm {
|
Line 4938 sub designparm {
|
| |
|
| Inputs: $url (usually will be undef). |
Inputs: $url (usually will be undef). |
| |
|
| Returns: Path to Construction Space containing the resource or |
Returns: Path to Authoring Space containing the resource or |
| directory being viewed (or for which action is being taken). |
directory being viewed (or for which action is being taken). |
| If $url is provided, and begins /priv/<domain>/<uname> |
If $url is provided, and begins /priv/<domain>/<uname> |
| the path will be that portion of the $context argument. |
the path will be that portion of the $context argument. |
|
Line 4871 Input: (optional) filename from which br
|
Line 5001 Input: (optional) filename from which br
|
| is appropriate for use in building the breadcrumb trail. |
is appropriate for use in building the breadcrumb trail. |
| |
|
| Returns: HTML div with CSTR path and recent box |
Returns: HTML div with CSTR path and recent box |
| To be included on Construction Space pages |
To be included on Authoring Space pages |
| |
|
| =cut |
=cut |
| |
|
|
Line 4886 sub CSTR_pageheader {
|
Line 5016 sub CSTR_pageheader {
|
| |
|
| my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
| my ($udom,$uname,$thisdisfn)= |
my ($udom,$uname,$thisdisfn)= |
| ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$}); |
($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)(?:|/(.*))$}); |
| my $formaction = "/priv/$udom/$uname/$thisdisfn"; |
my $formaction = "/priv/$udom/$uname/$thisdisfn"; |
| $formaction =~ s{/+}{/}g; |
$formaction =~ s{/+}{/}g; |
| |
|
|
Line 4902 sub CSTR_pageheader {
|
Line 5032 sub CSTR_pageheader {
|
| my $output = |
my $output = |
| '<div>' |
'<div>' |
| .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it? |
.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it? |
| .'<b>'.&mt('Construction Space:').'</b> ' |
.'<b>'.&mt('Authoring Space:').'</b> ' |
| .'<form name="dirs" method="post" action="'.$formaction |
.'<form name="dirs" method="post" action="'.$formaction |
| .'" target="_top">' #FIXME lonpubdir: target="_parent" |
.'" target="_top">' #FIXME lonpubdir: target="_parent" |
| .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef); |
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef); |
|
Line 4961 Inputs:
|
Line 5091 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 4985 other decorations will be returned.
|
Line 5112 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 5034 sub bodytag {
|
Line 5161 sub bodytag {
|
| my $bodytag = "<body $extra_body_attr>". |
my $bodytag = "<body $extra_body_attr>". |
| &Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'}); |
&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'}); |
| |
|
| if ($bodyonly) { |
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
| |
|
| |
if (($bodyonly) || ($no_nav_bar) || ($env{'form.inhibitmenu'} eq 'yes')) { |
| return $bodytag; |
return $bodytag; |
| } |
} |
| |
|
| my $name = &plainname($env{'user.name'},$env{'user.domain'}); |
|
| if ($public) { |
if ($public) { |
| undef($role); |
undef($role); |
| } else { |
|
| $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'}, |
|
| undef,'LC_menubuttons_link'); |
|
| } |
} |
| |
|
| my $titleinfo = '<h1>'.$title.'</h1>'; |
my $titleinfo = '<h1>'.$title.'</h1>'; |
|
Line 5059 sub bodytag {
|
Line 5184 sub bodytag {
|
| } |
} |
| |
|
| $role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role; |
| &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); |
|
| |
|
| if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { |
|
| return $bodytag; |
|
| } |
|
| |
|
| if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
|
| |
|
| my $funclist; |
if ($env{'request.state'} eq 'construct') { $forcereg=1; } |
| if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) { |
|
| $bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions(), '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 |
| # } |
# } |
| |
|
| |
$bodytag .= Apache::lonhtmlcommon::scripttag( |
| |
Apache::lonmenu::utilityfunctions(), 'start'); |
| |
|
| |
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">$name $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; |
| } |
} |
| |
|
| unless ($env{'request.symb'} =~ m/\.page___\d+___/) { |
unless ($env{'request.symb'} =~ m/\.page___\d+___/) { |
| $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|; |
$bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|; |
| } |
} |
| |
|
| $bodytag .= Apache::lonhtmlcommon::scripttag( |
$bodytag .= $right; |
| Apache::lonmenu::utilityfunctions(), 'start'); |
|
| |
|
| $bodytag .= Apache::lonmenu::primary_menu(); |
|
| |
|
| if ($dc_info) { |
if ($dc_info) { |
| $dc_info = &dc_courseid_toggle($dc_info); |
$dc_info = &dc_courseid_toggle($dc_info); |
|
Line 5118 sub bodytag {
|
Line 5224 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 5139 sub bodytag {
|
Line 5242 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.'" />'; |
|
| |
|
| # 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>|; |
|
| } |
|
| |
|
| unless ($env{'form.inhibitmenu'}) { |
|
| $bodytag .= qq|<div id="LC_nav_bar">$name $role</div> |
|
| <ol class="LC_primary_menu LC_right"> |
|
| <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(), '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 5208 sub make_attr_string {
|
Line 5273 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 5351 form, .inline {
|
Line 5409 form, .inline {
|
| vertical-align:middle; |
vertical-align:middle; |
| } |
} |
| |
|
| |
.LC_floatleft { |
| |
float: left; |
| |
} |
| |
|
| |
.LC_floatright { |
| |
float: right; |
| |
} |
| |
|
| .LC_400Box { |
.LC_400Box { |
| width:400px; |
width:400px; |
| } |
} |
|
Line 5694 table.LC_nested tr.LC_empty_row td {
|
Line 5760 table.LC_nested tr.LC_empty_row td {
|
| padding: 8px; |
padding: 8px; |
| } |
} |
| |
|
| table.LC_data_table tr.LC_empty_row td { |
table.LC_data_table tr.LC_empty_row td, |
| |
table.LC_data_table tr.LC_footer_row td { |
| background-color: $sidebg; |
background-color: $sidebg; |
| } |
} |
| |
|
|
Line 6420 div.LC_edit_problem_saves {
|
Line 6487 div.LC_edit_problem_saves {
|
| padding-bottom: 5px; |
padding-bottom: 5px; |
| } |
} |
| |
|
| |
.LC_edit_opt { |
| |
padding-left: 1em; |
| |
white-space: nowrap; |
| |
} |
| |
|
| img.stift { |
img.stift { |
| border-width: 0; |
border-width: 0; |
| vertical-align: middle; |
vertical-align: middle; |
|
Line 6434 div.LC_createcourse {
|
Line 6506 div.LC_createcourse {
|
| } |
} |
| |
|
| .LC_dccid { |
.LC_dccid { |
| |
float: right; |
| margin: 0.2em 0 0 0; |
margin: 0.2em 0 0 0; |
| padding: 0; |
padding: 0; |
| font-size: 90%; |
font-size: 90%; |
|
Line 6531 fieldset > legend {
|
Line 6604 fieldset > legend {
|
| } |
} |
| |
|
| ol.LC_primary_menu { |
ol.LC_primary_menu { |
| float: right; |
|
| margin: 0; |
margin: 0; |
| padding: 0; |
padding: 0; |
| background-color: $pgbg_or_bgcolor; |
background-color: $pgbg_or_bgcolor; |
|
Line 6643 ul#LC_secondary_menu li {
|
Line 6715 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 6676 ul#LC_secondary_menu li ul li {
|
Line 6747 ul#LC_secondary_menu li ul li {
|
| vertical-align: top; |
vertical-align: top; |
| border-left: 1px solid black; |
border-left: 1px solid black; |
| border-right: 1px solid black; |
border-right: 1px solid black; |
| background-color: $data_table_light |
background-color: $data_table_light; |
| list-style:none; |
list-style:none; |
| float: none; |
float: none; |
| } |
} |
|
Line 7203 sub headtag {
|
Line 7274 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 7247 ADDMETA
|
Line 7318 ADDMETA
|
| .'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />' |
| .$inhibitprint |
.$inhibitprint |
| .$head_extra; |
.$head_extra; |
| |
if ($env{'browser.mobile'}) { |
| |
$result .= ' |
| |
<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" />'; |
| |
} |
| return $result.'</head>'; |
return $result.'</head>'; |
| } |
} |
| |
|
|
Line 7413 $args - additional optional args support
|
Line 7489 $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 7452 sub start_page {
|
Line 7526 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 7493 sub start_page {
|
Line 7567 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 7639 sub modal_adhoc_inner {
|
Line 7708 sub modal_adhoc_inner {
|
| 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'). |
&start_scrollbox($width.'px',$innerwidth.'px',$height.'px','modal'). |
| $content. |
$content. |
| &end_scrollbox(). |
&end_scrollbox(). |
| &end_page() |
&end_page() |
|
Line 7761 sub LCprogressbar {
|
Line 7830 sub LCprogressbar {
|
| $LCcurrentid=$$.'_'.$LCidcnt; |
$LCcurrentid=$$.'_'.$LCidcnt; |
| my $starting=&mt('Starting'); |
my $starting=&mt('Starting'); |
| my $content=(<<ENDPROGBAR); |
my $content=(<<ENDPROGBAR); |
| <p> |
|
| <div id="progressbar$LCcurrentid"> |
<div id="progressbar$LCcurrentid"> |
| <span class="pblabel">$starting</span> |
<span class="pblabel">$starting</span> |
| </div> |
</div> |
| </p> |
|
| ENDPROGBAR |
ENDPROGBAR |
| &r_print($r,$content.&LCprogressbar_script($LCcurrentid)); |
&r_print($r,$content.&LCprogressbar_script($LCcurrentid)); |
| } |
} |
|
Line 7868 sub start_scrollbox {
|
Line 7935 sub start_scrollbox {
|
| my ($table_id,$div_id,$tdcol); |
my ($table_id,$div_id,$tdcol); |
| if ($id ne '') { |
if ($id ne '') { |
| $table_id = " id='table_$id'"; |
$table_id = " id='table_$id'"; |
| $div_id = " id='div_$id'"; |
$div_id = ' id="div_'.$id.'"'; |
| } |
} |
| if ($bgcolor ne '') { |
if ($bgcolor ne '') { |
| $tdcol = "background-color: $bgcolor;"; |
$tdcol = "background-color: $bgcolor;"; |
| } |
} |
| |
my $nicescroll_js; |
| |
if ($env{'browser.mobile'}) { |
| |
$nicescroll_js = ' |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
$(document).ready( |
| |
function() { |
| |
$("#div_'.$id.'").niceScroll({cursorcolor:"#00F"}); |
| |
} |
| |
); |
| |
|
| |
// ]]> |
| |
</script> |
| |
'; |
| |
} |
| |
|
| return <<"END"; |
return <<"END"; |
| <table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol"><div style="overflow:auto; width:$width; height: $height;"$div_id> |
$nicescroll_js |
| |
|
| |
<table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol"> |
| |
<div style="overflow:auto; width:$width; height:$height;"$div_id> |
| END |
END |
| } |
} |
| |
|
|
Line 8179 sub get_sections {
|
Line 8265 sub get_sections {
|
| my %sectioncount; |
my %sectioncount; |
| my $now = time; |
my $now = time; |
| |
|
| if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) { |
my $check_students = 1; |
| |
my $only_students = 0; |
| |
if (ref($possible_roles) eq 'ARRAY') { |
| |
if (grep(/^st$/,@{$possible_roles})) { |
| |
if (@{$possible_roles} == 1) { |
| |
$only_students = 1; |
| |
} |
| |
} else { |
| |
$check_students = 0; |
| |
} |
| |
} |
| |
|
| |
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 8206 sub get_sections {
|
Line 8304 sub get_sections {
|
| } |
} |
| } |
} |
| } |
} |
| |
if ($only_students) { |
| |
return %sectioncount; |
| |
} |
| my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); |
my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); |
| foreach my $user (sort(keys(%courseroles))) { |
foreach my $user (sort(keys(%courseroles))) { |
| if ($user !~ /^(\w{2})/) { next; } |
if ($user !~ /^(\w{2})/) { next; } |
|
Line 8353 sub get_course_users {
|
Line 8454 sub get_course_users {
|
| active => 'Active', |
active => 'Active', |
| future => 'Future', |
future => 'Future', |
| ); |
); |
| my %nothide; |
my (%nothide,@possdoms); |
| if ($hidepriv) { |
if ($hidepriv) { |
| my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum); |
my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum); |
| foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
|
Line 8363 sub get_course_users {
|
Line 8464 sub get_course_users {
|
| $nothide{$user} = 1; |
$nothide{$user} = 1; |
| } |
} |
| } |
} |
| |
my @possdoms = ($cdom); |
| |
if ($coursehash{'checkforpriv'}) { |
| |
push(@possdoms,split(/,/,$coursehash{'checkforpriv'})); |
| |
} |
| } |
} |
| foreach my $person (sort(keys(%coursepersonnel))) { |
foreach my $person (sort(keys(%coursepersonnel))) { |
| my $match = 0; |
my $match = 0; |
|
Line 8398 sub get_course_users {
|
Line 8503 sub get_course_users {
|
| } |
} |
| if ($uname ne '' && $udom ne '') { |
if ($uname ne '' && $udom ne '') { |
| if ($hidepriv) { |
if ($hidepriv) { |
| if ((&Apache::lonnet::privileged($uname,$udom)) && |
if ((&Apache::lonnet::privileged($uname,$udom,\@possdoms)) && |
| (!$nothide{$uname.':'.$udom})) { |
(!$nothide{$uname.':'.$udom})) { |
| next; |
next; |
| } |
} |
|
Line 8486 sub get_user_info {
|
Line 8591 sub get_user_info {
|
| |
|
| =item * &get_user_quota() |
=item * &get_user_quota() |
| |
|
| Retrieves quota assigned for storage of portfolio files for a user |
Retrieves quota assigned for storage of user files. |
| |
Default is to report quota for portfolio files. |
| |
|
| Incoming parameters: |
Incoming parameters: |
| 1. user's username |
1. user's username |
| 2. user's domain |
2. user's domain |
| |
3. quota name - portfolio, author, or course |
| |
(if no quota name provided, defaults to portfolio). |
| |
4. crstype - official, unofficial or community, if quota name is |
| |
course |
| |
|
| Returns: |
Returns: |
| 1. Disk quota (in Mb) assigned to student. |
1. Disk quota (in Mb) assigned to student. |
|
Line 8504 Returns:
|
Line 8614 Returns:
|
| |
|
| If a value has been stored in the user's environment, |
If a value has been stored in the user's environment, |
| it will return that, otherwise it returns the maximal default |
it will return that, otherwise it returns the maximal default |
| defined for the user's instituional status(es) in the domain. |
defined for the user's institutional status(es) in the domain. |
| |
|
| =cut |
=cut |
| |
|
|
Line 8512 defined for the user's instituional stat
|
Line 8622 defined for the user's instituional stat
|
| |
|
| |
|
| sub get_user_quota { |
sub get_user_quota { |
| my ($uname,$udom) = @_; |
my ($uname,$udom,$quotaname,$crstype) = @_; |
| my ($quota,$quotatype,$settingstatus,$defquota); |
my ($quota,$quotatype,$settingstatus,$defquota); |
| if (!defined($udom)) { |
if (!defined($udom)) { |
| $udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
|
Line 8527 sub get_user_quota {
|
Line 8637 sub get_user_quota {
|
| $defquota = 0; |
$defquota = 0; |
| } else { |
} else { |
| my $inststatus; |
my $inststatus; |
| if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) { |
if ($quotaname eq 'course') { |
| $quota = $env{'environment.portfolioquota'}; |
if (($env{'course.'.$udom.'_'.$uname.'.num'} eq $uname) && |
| $inststatus = $env{'environment.inststatus'}; |
($env{'course.'.$udom.'_'.$uname.'.domain'} eq $udom)) { |
| } else { |
$quota = $env{'course.'.$udom.'_'.$uname.'.internal.uploadquota'}; |
| my %userenv = |
} else { |
| &Apache::lonnet::get('environment',['portfolioquota', |
my %cenv = &Apache::lonnet::coursedescription("$udom/$uname"); |
| 'inststatus'],$udom,$uname); |
$quota = $cenv{'internal.uploadquota'}; |
| my ($tmp) = keys(%userenv); |
} |
| if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
|
| $quota = $userenv{'portfolioquota'}; |
|
| $inststatus = $userenv{'inststatus'}; |
|
| } else { |
|
| undef(%userenv); |
|
| } |
|
| } |
|
| ($defquota,$settingstatus) = &default_quota($udom,$inststatus); |
|
| if ($quota eq '') { |
|
| $quota = $defquota; |
|
| $quotatype = 'default'; |
|
| } else { |
} else { |
| $quotatype = 'custom'; |
if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) { |
| |
if ($quotaname eq 'author') { |
| |
$quota = $env{'environment.authorquota'}; |
| |
} else { |
| |
$quota = $env{'environment.portfolioquota'}; |
| |
} |
| |
$inststatus = $env{'environment.inststatus'}; |
| |
} else { |
| |
my %userenv = |
| |
&Apache::lonnet::get('environment',['portfolioquota', |
| |
'authorquota','inststatus'],$udom,$uname); |
| |
my ($tmp) = keys(%userenv); |
| |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
| |
if ($quotaname eq 'author') { |
| |
$quota = $userenv{'authorquota'}; |
| |
} else { |
| |
$quota = $userenv{'portfolioquota'}; |
| |
} |
| |
$inststatus = $userenv{'inststatus'}; |
| |
} else { |
| |
undef(%userenv); |
| |
} |
| |
} |
| |
} |
| |
if ($quota eq '' || wantarray) { |
| |
if ($quotaname eq 'course') { |
| |
my %domdefs = &Apache::lonnet::get_domain_defaults($udom); |
| |
if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'community')) { |
| |
$defquota = $domdefs{$crstype.'quota'}; |
| |
} |
| |
if ($defquota eq '') { |
| |
$defquota = 500; |
| |
} |
| |
} else { |
| |
($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname); |
| |
} |
| |
if ($quota eq '') { |
| |
$quota = $defquota; |
| |
$quotatype = 'default'; |
| |
} else { |
| |
$quotatype = 'custom'; |
| |
} |
| } |
} |
| } |
} |
| if (wantarray) { |
if (wantarray) { |
|
Line 8572 Incoming parameters:
|
Line 8712 Incoming parameters:
|
| status types (e.g., faculty, staff, student etc.) |
status types (e.g., faculty, staff, student etc.) |
| which apply to the user for whom the default is being retrieved. |
which apply to the user for whom the default is being retrieved. |
| If the institutional status string in undefined, the domain |
If the institutional status string in undefined, the domain |
| default quota will be returned. |
default quota will be returned. |
| |
3. quota name - portfolio, author, or course |
| |
(if no quota name provided, defaults to portfolio). |
| |
|
| Returns: |
Returns: |
| 1. Default disk quota (in Mb) for user portfolios in the domain. |
1. Default disk quota (in Mb) for user portfolios in the domain. |
|
Line 8596 default quota returned.
|
Line 8738 default quota returned.
|
| |
|
| |
|
| sub default_quota { |
sub default_quota { |
| my ($udom,$inststatus) = @_; |
my ($udom,$inststatus,$quotaname) = @_; |
| my ($defquota,$settingstatus); |
my ($defquota,$settingstatus); |
| my %quotahash = &Apache::lonnet::get_dom('configuration', |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
| ['quotas'],$udom); |
['quotas'],$udom); |
| |
my $key = 'defaultquota'; |
| |
if ($quotaname eq 'author') { |
| |
$key = 'authorquota'; |
| |
} |
| if (ref($quotahash{'quotas'}) eq 'HASH') { |
if (ref($quotahash{'quotas'}) eq 'HASH') { |
| if ($inststatus ne '') { |
if ($inststatus ne '') { |
| my @statuses = map { &unescape($_); } split(/:/,$inststatus); |
my @statuses = map { &unescape($_); } split(/:/,$inststatus); |
| foreach my $item (@statuses) { |
foreach my $item (@statuses) { |
| if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') { |
if (ref($quotahash{'quotas'}{$key}) eq 'HASH') { |
| if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') { |
if ($quotahash{'quotas'}{$key}{$item} ne '') { |
| if ($defquota eq '') { |
if ($defquota eq '') { |
| $defquota = $quotahash{'quotas'}{'defaultquota'}{$item}; |
$defquota = $quotahash{'quotas'}{$key}{$item}; |
| $settingstatus = $item; |
$settingstatus = $item; |
| } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) { |
} elsif ($quotahash{'quotas'}{$key}{$item} > $defquota) { |
| $defquota = $quotahash{'quotas'}{'defaultquota'}{$item}; |
$defquota = $quotahash{'quotas'}{$key}{$item}; |
| $settingstatus = $item; |
$settingstatus = $item; |
| } |
} |
| } |
} |
| } else { |
} elsif ($key eq 'defaultquota') { |
| if ($quotahash{'quotas'}{$item} ne '') { |
if ($quotahash{'quotas'}{$item} ne '') { |
| if ($defquota eq '') { |
if ($defquota eq '') { |
| $defquota = $quotahash{'quotas'}{$item}; |
$defquota = $quotahash{'quotas'}{$item}; |
|
Line 8628 sub default_quota {
|
Line 8774 sub default_quota {
|
| } |
} |
| } |
} |
| if ($defquota eq '') { |
if ($defquota eq '') { |
| if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') { |
if (ref($quotahash{'quotas'}{$key}) eq 'HASH') { |
| $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'}; |
$defquota = $quotahash{'quotas'}{$key}{'default'}; |
| } else { |
} elsif ($key eq 'defaultquota') { |
| $defquota = $quotahash{'quotas'}{'default'}; |
$defquota = $quotahash{'quotas'}{'default'}; |
| } |
} |
| $settingstatus = 'default'; |
$settingstatus = 'default'; |
| } |
} |
| } else { |
} else { |
| $settingstatus = 'default'; |
$settingstatus = 'default'; |
| $defquota = 20; |
if ($quotaname eq 'author') { |
| |
$defquota = 500; |
| |
} else { |
| |
$defquota = 20; |
| |
} |
| } |
} |
| if (wantarray) { |
if (wantarray) { |
| return ($defquota,$settingstatus); |
return ($defquota,$settingstatus); |
|
Line 8646 sub default_quota {
|
Line 8796 sub default_quota {
|
| } |
} |
| } |
} |
| |
|
| |
############################################### |
| |
|
| |
=pod |
| |
|
| |
=item * &excess_filesize_warning() |
| |
|
| |
Returns warning message if upload of file to authoring space, or copying |
| |
of existing file within authoring space will cause quota for the authoring |
| |
space to be exceeded, |
| |
|
| |
Same, if upload of a file directly to a course/community via Course Editor |
| |
will cause quota for uploaded content for the course to be exceeded. |
| |
|
| |
Inputs: 6 |
| |
1. username or coursenum |
| |
2. domain |
| |
3. context ('author' or 'course') |
| |
4. filename of file for which action is being requested |
| |
5. filesize (kB) of file |
| |
6. action being taken: copy or upload. |
| |
|
| |
Returns: 1 scalar: HTML to display containing warning if quota would be exceeded, |
| |
otherwise return null. |
| |
|
| |
=cut |
| |
|
| |
sub excess_filesize_warning { |
| |
my ($uname,$udom,$context,$filename,$filesize,$action) = @_; |
| |
my $current_disk_usage = 0; |
| |
my $disk_quota = &get_user_quota($uname,$udom,$context); #expressed in MB |
| |
if ($context eq 'author') { |
| |
my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname"; |
| |
$current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace); |
| |
} else { |
| |
foreach my $subdir ('docs','supplemental') { |
| |
$current_disk_usage += &Apache::lonnet::diskusage($udom,$uname,"userfiles/$subdir",1); |
| |
} |
| |
} |
| |
$disk_quota = int($disk_quota * 1000); |
| |
if (($current_disk_usage + $filesize) > $disk_quota) { |
| |
return '<p><span class="LC_warning">'. |
| |
&mt("Unable to $action [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.", |
| |
'<span class="LC_filename">'.$filename.'</span>',$filesize).'</span>'. |
| |
'<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.', |
| |
$disk_quota,$current_disk_usage). |
| |
'</p>'; |
| |
} |
| |
return; |
| |
} |
| |
|
| |
############################################### |
| |
|
| |
|
| |
|
| |
|
| 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 9489 sub ask_for_embedded_content {
|
Line 9694 sub ask_for_embedded_content {
|
| my $heading = &mt('Upload embedded files'); |
my $heading = &mt('Upload embedded files'); |
| my $buttontext = &mt('Upload'); |
my $buttontext = &mt('Upload'); |
| |
|
| my $navmap; |
my ($navmap,$cdom,$cnum); |
| if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
| $navmap = Apache::lonnavmaps::navmap->new(); |
if ($actionurl eq '/adm/dependencies') { |
| |
$navmap = Apache::lonnavmaps::navmap->new(); |
| |
} |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| } |
} |
| if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
if (($actionurl eq '/adm/portfolio') || |
| |
($actionurl eq '/adm/coursegrp_portfolio')) { |
| my $current_path='/'; |
my $current_path='/'; |
| if ($env{'form.currentpath'}) { |
if ($env{'form.currentpath'}) { |
| $current_path = $env{'form.currentpath'}; |
$current_path = $env{'form.currentpath'}; |
| } |
} |
| if ($actionurl eq '/adm/coursegrp_portfolio') { |
if ($actionurl eq '/adm/coursegrp_portfolio') { |
| $udom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$udom = $cdom; |
| $uname = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$uname = $cnum; |
| $url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio'; |
$url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio'; |
| } else { |
} else { |
| $udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
|
Line 9524 sub ask_for_embedded_content {
|
Line 9734 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 '') { |
| $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
| $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
| 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{^/}) { |
| |
$toplevel = "/$url"; |
| |
} |
| ($rem) = ($toplevel =~ m{^(.+/)[^/]+$}); |
($rem) = ($toplevel =~ m{^(.+/)[^/]+$}); |
| ($path) = |
if ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E)}) { |
| ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
$path = $1; |
| |
} else { |
| |
($path) = |
| |
($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{^/}{}; |
| ($filename) = ($fileloc =~ m{.+/([^/]+)$}); |
($filename) = ($fileloc =~ m{.+/([^/]+)$}); |
| $heading = &mt('Status of dependencies in [_1]',"$title ($filename)"); |
$heading = &mt('Status of dependencies in [_1]',"$title ($filename)"); |
| } |
} |
| } |
} |
| } |
} elsif ($actionurl eq "/public/$cdom/$cnum/syllabus") { |
| my $now = time(); |
$udom = $cdom; |
| foreach my $embed_file (keys(%{$allfiles})) { |
$uname = $cnum; |
| |
$url = "/uploaded/$cdom/$cnum/portfolio/syllabus"; |
| |
$toplevel = $url; |
| |
$path = $url; |
| |
$fileloc = &Apache::lonnet::filelocation('',$toplevel).'/'; |
| |
$fileloc =~ s{^/}{}; |
| |
} |
| |
foreach my $file (keys(%{$allfiles})) { |
| |
my $embed_file; |
| |
if (($path eq "/uploaded/$cdom/$cnum/portfolio/syllabus") && ($file =~ m{^\Q$path/\E(.+)$})) { |
| |
$embed_file = $1; |
| |
} else { |
| |
$embed_file = $file; |
| |
} |
| my $absolutepath; |
my $absolutepath; |
| if ($embed_file =~ m{^\w+://}) { |
if ($embed_file =~ m{^\w+://}) { |
| $newfiles{$embed_file} = 1; |
$newfiles{$embed_file} = 1; |
|
Line 9587 sub ask_for_embedded_content {
|
Line 9815 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') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
if (($actionurl eq '/adm/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 9603 sub ask_for_embedded_content {
|
Line 9832 sub ask_for_embedded_content {
|
| } |
} |
| } elsif (($actionurl eq '/adm/dependencies') || |
} elsif (($actionurl eq '/adm/dependencies') || |
| (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
| ($args->{'context'} eq 'paste'))) { |
($args->{'context'} eq 'paste')) || |
| |
($actionurl eq "/public/$cdom/$cnum/syllabus")) { |
| if ($env{'request.course.id'} ne '') { |
if ($env{'request.course.id'} ne '') { |
| my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
my $dir; |
| |
if ($actionurl eq "/public/$cdom/$cnum/syllabus") { |
| |
$dir = $fileloc; |
| |
} else { |
| |
($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
| |
} |
| if ($dir ne '') { |
if ($dir ne '') { |
| my ($sublistref,$listerror) = |
my ($sublistref,$listerror) = |
| &Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/'); |
&Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/'); |
|
Line 9653 sub ask_for_embedded_content {
|
Line 9888 sub ask_for_embedded_content {
|
| } |
} |
| } |
} |
| my %currfile; |
my %currfile; |
| if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
if (($actionurl eq '/adm/portfolio') || |
| |
($actionurl eq '/adm/coursegrp_portfolio')) { |
| my ($dirlistref,$listerror) = |
my ($dirlistref,$listerror) = |
| &Apache::lonnet::dirlist($url,$udom,$uname,$getpropath); |
&Apache::lonnet::dirlist($url,$udom,$uname,$getpropath); |
| if (ref($dirlistref) eq 'ARRAY') { |
if (ref($dirlistref) eq 'ARRAY') { |
|
Line 9669 sub ask_for_embedded_content {
|
Line 9905 sub ask_for_embedded_content {
|
| } |
} |
| } elsif (($actionurl eq '/adm/dependencies') || |
} elsif (($actionurl eq '/adm/dependencies') || |
| (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
| ($args->{'context'} eq 'paste'))) { |
($args->{'context'} eq 'paste')) || |
| |
($actionurl eq "/public/$cdom/$cnum/syllabus")) { |
| if ($env{'request.course.id'} ne '') { |
if ($env{'request.course.id'} ne '') { |
| my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
| if ($dir ne '') { |
if ($dir ne '') { |
|
Line 9704 sub ask_for_embedded_content {
|
Line 9941 sub ask_for_embedded_content {
|
| ($file eq $filename.'.bak') || |
($file eq $filename.'.bak') || |
| ($dependencies{$file})) { |
($dependencies{$file})) { |
| if ($actionurl eq '/adm/dependencies') { |
if ($actionurl eq '/adm/dependencies') { |
| next if (($rem ne '') && |
unless ($toplevel =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E}) { |
| (($env{"httpref.$rem".$file} ne '') || |
next if (($rem ne '') && |
| (ref($navmap) && |
(($env{"httpref.$rem".$file} ne '') || |
| (($navmap->getResourceByUrl($rem.$file) ne '') || |
(ref($navmap) && |
| (($file =~ /^(.*\.s?html?)\.bak$/i) && |
(($navmap->getResourceByUrl($rem.$file) ne '') || |
| ($navmap->getResourceByUrl($rem.$1))))))); |
(($file =~ /^(.*\.s?html?)\.bak$/i) && |
| |
($navmap->getResourceByUrl($rem.$1))))))); |
| |
} |
| } |
} |
| $unused{$file} = 1; |
$unused{$file} = 1; |
| } |
} |
|
Line 9719 sub ask_for_embedded_content {
|
Line 9958 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") && |
| |
(ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) { |
| |
$counter = scalar(keys(%existing)); |
| |
$numpathchg = scalar(keys(%pathchanges)); |
| |
return ($output,$counter,$numpathchg,\%existing,\%mapping); |
| } |
} |
| foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) { |
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) { |
| if ($actionurl eq '/adm/dependencies') { |
if ($actionurl eq '/adm/dependencies') { |
| next if ($embed_file =~ m{^\w+://}); |
next if ($embed_file =~ m{^\w+://}); |
| } |
} |
| $upload_output .= &start_data_table_row(). |
$upload_output .= &start_data_table_row(). |
| '<td><img src="'.&icon($embed_file).'" /> '. |
'<td valign="top"><img src="'.&icon($embed_file).'" /> '. |
| '<span class="LC_filename">'.$embed_file.'</span>'; |
'<span class="LC_filename">'.$embed_file.'</span>'; |
| unless ($mapping{$embed_file} eq $embed_file) { |
unless ($mapping{$embed_file} eq $embed_file) { |
| $upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.&mt('changed from: [_1]',$mapping{$embed_file}).'</span>'; |
$upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'. |
| |
&mt('changed from: [_1]',$mapping{$embed_file}).'</span>'; |
| } |
} |
| $upload_output .= '</td><td>'; |
$upload_output .= '</td>'; |
| if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) { |
if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) { |
| $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>'; |
$upload_output.='<td align="right">'. |
| |
'<span class="LC_info LC_fontsize_medium">'. |
| |
&mt("URL points to web address").'</span>'; |
| $numremref++; |
$numremref++; |
| } elsif ($args->{'error_on_invalid_names'} |
} elsif ($args->{'error_on_invalid_names'} |
| && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) { |
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) { |
| $upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>'; |
$upload_output.='<td align="right"><span class="LC_warning">'. |
| |
&mt('Invalid characters').'</span>'; |
| $numinvalid++; |
$numinvalid++; |
| } else { |
} else { |
| $upload_output .= &embedded_file_element('upload_embedded',$counter, |
$upload_output .= '<td>'. |
| |
&embedded_file_element('upload_embedded',$counter, |
| $embed_file,\%mapping, |
$embed_file,\%mapping, |
| $allfiles,$codebase,'upload'); |
$allfiles,$codebase,'upload'); |
| $counter ++; |
$counter ++; |
|
Line 9768 sub ask_for_embedded_content {
|
Line 10017 sub ask_for_embedded_content {
|
| $counter ++; |
$counter ++; |
| } else { |
} else { |
| $upload_output .= &start_data_table_row(). |
$upload_output .= &start_data_table_row(). |
| '<td><span class="LC_filename">'.$embed_file.'</span></td>'; |
'<td valign="top"><img src="'.&icon($embed_file).'" /> '. |
| '<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'. |
'<span class="LC_filename">'.$embed_file.'</span></td>'. |
| |
'<td align="right"><span class="LC_info LC_fontsize_medium">'.&mt('Already exists').'</span></td>'. |
| &Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
| } |
} |
| } |
} |
|
Line 9864 sub ask_for_embedded_content {
|
Line 10114 sub ask_for_embedded_content {
|
| $output = '<b>'.&mt('Referenced files').'</b>:<br />'; |
$output = '<b>'.&mt('Referenced files').'</b>:<br />'; |
| if ($applies > 1) { |
if ($applies > 1) { |
| $output .= |
$output .= |
| &mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>'; |
&mt('No dependencies need to be uploaded, as one of the following applies to each reference:').'<ul>'; |
| if ($numremref) { |
if ($numremref) { |
| $output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n"; |
$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n"; |
| } |
} |
|
Line 9907 sub ask_for_embedded_content {
|
Line 10157 sub ask_for_embedded_content {
|
| $chgcount ++; |
$chgcount ++; |
| } |
} |
| } |
} |
| if ($counter) { |
if (($counter) || ($numunused)) { |
| if ($numpathchg) { |
if ($numpathchg) { |
| $output .= '<input type ="hidden" name="number_pathchange_items" value="'. |
$output .= '<input type ="hidden" name="number_pathchange_items" value="'. |
| $numpathchg.'" />'."\n"; |
$numpathchg.'" />'."\n"; |
|
Line 9920 sub ask_for_embedded_content {
|
Line 10170 sub ask_for_embedded_content {
|
| } elsif ($actionurl eq '/adm/dependencies') { |
} elsif ($actionurl eq '/adm/dependencies') { |
| $output .= '<input type="hidden" name="action" value="process_changes" />'; |
$output .= '<input type="hidden" name="action" value="process_changes" />'; |
| } |
} |
| $output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n"; |
$output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n"; |
| } elsif ($numpathchg) { |
} elsif ($numpathchg) { |
| my %pathchange = (); |
my %pathchange = (); |
| $output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output); |
$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output); |
| if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
| $output .= '<p>'.&mt('or').'</p>'; |
$output .= '<p>'.&mt('or').'</p>'; |
| } |
} |
| } |
} |
| return ($output,$counter,$numpathchg); |
return ($output,$counter,$numpathchg); |
| } |
} |
|
Line 10062 sub upload_embedded {
|
Line 10312 sub upload_embedded {
|
| $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />'; |
$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />'; |
| next; |
next; |
| } elsif ($fname=~/\.(\d+)\.(\w+)$/) { |
} elsif ($fname=~/\.(\d+)\.(\w+)$/) { |
| $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />'; |
$output .= &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />'; |
| next; |
next; |
| } |
} |
| $env{'form.embedded_item_'.$i.'.filename'}=$fname; |
$env{'form.embedded_item_'.$i.'.filename'}=$fname; |
| |
my $subdir = $path; |
| |
$subdir =~ s{/+$}{}; |
| if ($context eq 'portfolio') { |
if ($context eq 'portfolio') { |
| my $result; |
my $result; |
| if ($state eq 'existingfile') { |
if ($state eq 'existingfile') { |
| $result= |
$result= |
| &Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile', |
&Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile', |
| $dirpath.$env{'form.currentpath'}.$path); |
$dirpath.$env{'form.currentpath'}.$subdir); |
| } else { |
} else { |
| $result= |
$result= |
| &Apache::lonnet::userfileupload('embedded_item_'.$i,'', |
&Apache::lonnet::userfileupload('embedded_item_'.$i,'', |
| $dirpath. |
$dirpath. |
| $env{'form.currentpath'}.$path); |
$env{'form.currentpath'}.$subdir); |
| if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
| $output .= '<span class="LC_error">' |
$output .= '<span class="LC_error">' |
| .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].' |
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].' |
|
Line 10088 sub upload_embedded {
|
Line 10340 sub upload_embedded {
|
| $path.$fname.'</span>').'<br />'; |
$path.$fname.'</span>').'<br />'; |
| } |
} |
| } |
} |
| } elsif ($context eq 'coursedoc') { |
} elsif (($context eq 'coursedoc') || ($context eq 'syllabus')) { |
| |
my $extendedsubdir = $dirpath.'/'.$subdir; |
| |
$extendedsubdir =~ s{/+$}{}; |
| my $result = |
my $result = |
| &Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc', |
&Apache::lonnet::userfileupload('embedded_item_'.$i,$context,$extendedsubdir); |
| $dirpath.'/'.$path); |
|
| if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
| $output .= '<span class="LC_error">' |
$output .= '<span class="LC_error">' |
| .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].' |
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].' |
|
Line 10101 sub upload_embedded {
|
Line 10354 sub upload_embedded {
|
| } else { |
} else { |
| $output .= &mt('Uploaded [_1]','<span class="LC_filename">'. |
$output .= &mt('Uploaded [_1]','<span class="LC_filename">'. |
| $path.$fname.'</span>').'<br />'; |
$path.$fname.'</span>').'<br />'; |
| |
if ($context eq 'syllabus') { |
| |
&Apache::lonnet::make_public_indefinitely($result); |
| |
} |
| } |
} |
| } else { |
} else { |
| # Save the file |
# Save the file |
|
Line 10232 sub modify_html_form {
|
Line 10488 sub modify_html_form {
|
| } |
} |
| |
|
| sub modify_html_refs { |
sub modify_html_refs { |
| my ($context,$dirpath,$uname,$udom,$dir_root) = @_; |
my ($context,$dirpath,$uname,$udom,$dir_root,$url) = @_; |
| my $container; |
my $container; |
| if ($context eq 'portfolio') { |
if ($context eq 'portfolio') { |
| $container = $env{'form.container'}; |
$container = $env{'form.container'}; |
|
Line 10241 sub modify_html_refs {
|
Line 10497 sub modify_html_refs {
|
| } elsif ($context eq 'manage_dependencies') { |
} elsif ($context eq 'manage_dependencies') { |
| (undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
(undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
| $container = "/$container"; |
$container = "/$container"; |
| |
} elsif ($context eq 'syllabus') { |
| |
$container = $url; |
| } else { |
} else { |
| $container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'}; |
$container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'}; |
| } |
} |
| 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) { |
unless ((@changes > 0) || ($context eq 'syllabus')) { |
| if (wantarray) { |
if (wantarray) { |
| return ('',0,0); |
return ('',0,0); |
| } else { |
} else { |
|
Line 10254 sub modify_html_refs {
|
Line 10512 sub modify_html_refs {
|
| } |
} |
| } |
} |
| if (($context eq 'portfolio') || ($context eq 'coursedoc') || |
if (($context eq 'portfolio') || ($context eq 'coursedoc') || |
| ($context eq 'manage_dependencies')) { |
($context eq 'manage_dependencies') || ($context eq 'syllabus')) { |
| unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) { |
unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) { |
| if (wantarray) { |
if (wantarray) { |
| return ('',0,0); |
return ('',0,0); |
|
Line 10310 sub modify_html_refs {
|
Line 10568 sub modify_html_refs {
|
| if ($content =~ m{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}) { |
if ($content =~ m{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}) { |
| my $numchg = ($content =~ s{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi); |
my $numchg = ($content =~ s{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi); |
| $count += $numchg; |
$count += $numchg; |
| |
$allfiles{$newname} = $allfiles{$ref}; |
| } |
} |
| if ($env{'form.embedded_codebase_'.$i} ne '') { |
if ($env{'form.embedded_codebase_'.$i} ne '') { |
| $codebase = &unescape($env{'form.embedded_codebase_'.$i}); |
$codebase = &unescape($env{'form.embedded_codebase_'.$i}); |
|
Line 10318 sub modify_html_refs {
|
Line 10577 sub modify_html_refs {
|
| } |
} |
| } |
} |
| } |
} |
| |
my $skiprewrites; |
| if ($count || $codebasecount) { |
if ($count || $codebasecount) { |
| my $saveresult; |
my $saveresult; |
| if (($context eq 'portfolio') || ($context eq 'coursedoc') || |
if (($context eq 'portfolio') || ($context eq 'coursedoc') || |
| ($context eq 'manage_dependencies')) { |
($context eq 'manage_dependencies') || ($context eq 'syllabus')) { |
| 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 10334 sub modify_html_refs {
|
Line 10594 sub modify_html_refs {
|
| '<span class="LC_filename">'. |
'<span class="LC_filename">'. |
| $container.'</span>').'</p>'; |
$container.'</span>').'</p>'; |
| } |
} |
| |
if ($context eq 'syllabus') { |
| |
unless ($saveresult eq 'ok') { |
| |
$skiprewrites = 1; |
| |
} |
| |
} |
| } else { |
} else { |
| if (open(my $fh,">$container")) { |
if (open(my $fh,">$container")) { |
| print $fh $content; |
print $fh $content; |
|
Line 10349 sub modify_html_refs {
|
Line 10614 sub modify_html_refs {
|
| } |
} |
| } |
} |
| } |
} |
| |
if (($context eq 'syllabus') && (!$skiprewrites)) { |
| |
my ($actionurl,$state); |
| |
$actionurl = "/public/$udom/$uname/syllabus"; |
| |
my ($ignore,$num,$numpathchanges,$existing,$mapping) = |
| |
&ask_for_embedded_content($actionurl,$state,\%allfiles, |
| |
\%codebase, |
| |
{'context' => 'rewrites', |
| |
'ignore_remote_references' => 1,}); |
| |
if (ref($mapping) eq 'HASH') { |
| |
my $rewrites = 0; |
| |
foreach my $key (keys(%{$mapping})) { |
| |
next if ($key =~ m{^https?://}); |
| |
my $ref = $mapping->{$key}; |
| |
my $newname = "/uploaded/$udom/$uname/portfolio/syllabus/$key"; |
| |
my $attrib; |
| |
if (ref($allfiles{$mapping->{$key}}) eq 'ARRAY') { |
| |
$attrib = join('|',@{$allfiles{$mapping->{$key}}}); |
| |
} |
| |
if ($content =~ m{($attrib\s*=\s*['"]?)\Q$ref\E(['"]?)}) { |
| |
my $numchg = ($content =~ s{($attrib\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi); |
| |
$rewrites += $numchg; |
| |
} |
| |
} |
| |
if ($rewrites) { |
| |
my $saveresult; |
| |
my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult); |
| |
if ($url eq $container) { |
| |
my ($fname) = ($container =~ m{/([^/]+)$}); |
| |
$output .= '<p>'.&mt('Rewrote [quant,_1,link] as [quant,_1,absolute link] in [_2].', |
| |
$count,'<span class="LC_filename">'. |
| |
$fname.'</span>').'</p>'; |
| |
} else { |
| |
$output .= '<p class="LC_error">'. |
| |
&mt('Error: could not update links in [_1].', |
| |
'<span class="LC_filename">'. |
| |
$container.'</span>').'</p>'; |
| |
|
| |
} |
| |
} |
| |
} |
| |
} |
| } else { |
} else { |
| &logthis('Failed to parse '.$container. |
&logthis('Failed to parse '.$container. |
| ' to modify references: '.$parse_result); |
' to modify references: '.$parse_result); |
|
Line 10764 sub process_decompression {
|
Line 11070 sub process_decompression {
|
| my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_; |
my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_; |
| my ($dir,$error,$warning,$output); |
my ($dir,$error,$warning,$output); |
| if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { |
if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { |
| $error = &mt('File name not a supported archive file type.'). |
$error = &mt('Filename not a supported archive file type.'). |
| '<br />'.&mt('File name should end with one of: [_1].', |
'<br />'.&mt('Filename should end with one of: [_1].', |
| '.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz'); |
'.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz'); |
| } else { |
} else { |
| my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom); |
my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom); |
|
Line 11341 sub process_extracted_files {
|
Line 11647 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 11461 sub process_extracted_files {
|
Line 11767 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 11483 sub process_extracted_files {
|
Line 11789 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 11530 sub process_extracted_files {
|
Line 11836 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 11545 sub process_extracted_files {
|
Line 11851 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 11604 sub cleanup_empty_dirs {
|
Line 11910 sub cleanup_empty_dirs {
|
| my $numitems = 0; |
my $numitems = 0; |
| foreach my $item (@dircontents) { |
foreach my $item (@dircontents) { |
| if (-d "$path/$item") { |
if (-d "$path/$item") { |
| &recurse_dirs("$path/$item"); |
&cleanup_empty_dirs("$path/$item"); |
| if (-e "$path/$item") { |
if (-e "$path/$item") { |
| $numitems ++; |
$numitems ++; |
| } |
} |
|
Line 11651 sub get_folder_hierarchy {
|
Line 11957 sub get_folder_hierarchy {
|
| my @pcs = split(/,/,$pcslist); |
my @pcs = split(/,/,$pcslist); |
| foreach my $pc (@pcs) { |
foreach my $pc (@pcs) { |
| if ($pc == 1) { |
if ($pc == 1) { |
| push(@pathitems,&mt('Main Course Documents')); |
push(@pathitems,&mt('Main Content')); |
| } else { |
} else { |
| my $res = $navmap->getByMapPc($pc); |
my $res = $navmap->getByMapPc($pc); |
| if (ref($res)) { |
if (ref($res)) { |
|
Line 11666 sub get_folder_hierarchy {
|
Line 11972 sub get_folder_hierarchy {
|
| } |
} |
| if ($showitem) { |
if ($showitem) { |
| if ($mapres->{ID} eq '0.0') { |
if ($mapres->{ID} eq '0.0') { |
| push(@pathitems,&mt('Main Course Documents')); |
push(@pathitems,&mt('Main Content')); |
| } else { |
} else { |
| my $maptitle = $mapres->compTitle(); |
my $maptitle = $mapres->compTitle(); |
| $maptitle =~ s/\W+/_/g; |
$maptitle =~ s/\W+/_/g; |
|
Line 13153 sub commit_customrole {
|
Line 13459 sub commit_customrole {
|
| } |
} |
| |
|
| sub commit_standardrole { |
sub commit_standardrole { |
| my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits) = @_; |
| my ($output,$logmsg,$linefeed); |
my ($output,$logmsg,$linefeed); |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $linefeed = "\n"; |
$linefeed = "\n"; |
|
Line 13162 sub commit_standardrole {
|
Line 13468 sub commit_standardrole {
|
| } |
} |
| if ($three eq 'st') { |
if ($three eq 'st') { |
| my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end, |
| $one,$two,$sec,$context); |
$one,$two,$sec,$context,$credits); |
| if (($result =~ /^error/) || ($result eq 'not_in_class') || |
if (($result =~ /^error/) || ($result eq 'not_in_class') || |
| ($result eq 'unknown_course') || ($result eq 'refused')) { |
($result eq 'unknown_course') || ($result eq 'refused')) { |
| $output = $logmsg.' '.&mt('Error: ').$result."\n"; |
$output = $logmsg.' '.&mt('Error: ').$result."\n"; |
|
Line 13193 sub commit_standardrole {
|
Line 13499 sub commit_standardrole {
|
| } |
} |
| |
|
| sub commit_studentrole { |
sub commit_studentrole { |
| my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_; |
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context, |
| |
$credits) = @_; |
| my ($result,$linefeed,$oldsecurl,$newsecurl); |
my ($result,$linefeed,$oldsecurl,$newsecurl); |
| if ($context eq 'auto') { |
if ($context eq 'auto') { |
| $linefeed = "\n"; |
$linefeed = "\n"; |
|
Line 13240 sub commit_studentrole {
|
Line 13547 sub commit_studentrole {
|
| } |
} |
| } |
} |
| if (($expire_role_result eq 'ok') || ($secchange == 0)) { |
if (($expire_role_result eq 'ok') || ($secchange == 0)) { |
| $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid,'',$context); |
$modify_section_result = |
| |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef, |
| |
undef,undef,undef,$sec, |
| |
$end,$start,'','',$cid, |
| |
'',$context,$credits); |
| if ($modify_section_result =~ /^ok/) { |
if ($modify_section_result =~ /^ok/) { |
| if ($secchange == 1) { |
if ($secchange == 1) { |
| if ($sec eq '') { |
if ($sec eq '') { |
|
Line 13262 sub commit_studentrole {
|
Line 13573 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 13480 sub construct_course {
|
Line 13791 sub construct_course {
|
| 'pch.users.denied', |
'pch.users.denied', |
| 'plc.users.denied', |
'plc.users.denied', |
| 'hidefromcat', |
'hidefromcat', |
| |
'checkforpriv', |
| 'categories'], |
'categories'], |
| $$crsudom,$$crsunum); |
$$crsudom,$$crsunum); |
| } |
} |
|
Line 13509 sub construct_course {
|
Line 13821 sub construct_course {
|
| } else { |
} else { |
| $cenv{'internal.courseowner'} = $args->{'curruser'}; |
$cenv{'internal.courseowner'} = $args->{'curruser'}; |
| } |
} |
| |
if ($args->{'defaultcredits'}) { |
| |
$cenv{'internal.defaultcredits'} = $args->{'defaultcredits'}; |
| |
} |
| my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. |
my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. |
| if ($args->{'crssections'}) { |
if ($args->{'crssections'}) { |
| $cenv{'internal.sectionnums'} = ''; |
$cenv{'internal.sectionnums'} = ''; |
|
Line 13533 sub construct_course {
|
Line 13848 sub construct_course {
|
| # do not hide course coordinator from staff listing, |
# do not hide course coordinator from staff listing, |
| # even if privileged |
# even if privileged |
| $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
$cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
| |
# add course coordinator's domain to domains to check for privileged users |
| |
# if different to course domain |
| |
if ($$crsudom ne $args->{'ccdomain'}) { |
| |
$cenv{'checkforpriv'} = $args->{'ccdomain'}; |
| |
} |
| # add crosslistings |
# add crosslistings |
| if ($args->{'crsxlist'}) { |
if ($args->{'crsxlist'}) { |
| $cenv{'internal.crosslistings'}=''; |
$cenv{'internal.crosslistings'}=''; |
|
Line 13889 sub init_user_environment {
|
Line 14209 sub init_user_environment {
|
| # ------------------------------------ Check browser type and MathML capability |
# ------------------------------------ Check browser type and MathML capability |
| |
|
| my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, |
| $clientunicode,$clientos) = &decode_user_agent($r); |
$clientunicode,$clientos,$clientmobile) = &decode_user_agent($r); |
| |
|
| # ------------------------------------------------------------- Get environment |
# ------------------------------------------------------------- Get environment |
| |
|
|
Line 13920 sub init_user_environment {
|
Line 14240 sub init_user_environment {
|
| "browser.mathml" => $clientmathml, |
"browser.mathml" => $clientmathml, |
| "browser.unicode" => $clientunicode, |
"browser.unicode" => $clientunicode, |
| "browser.os" => $clientos, |
"browser.os" => $clientos, |
| |
"browser.mobile" => $clientmobile, |
| "server.domain" => $Apache::lonnet::perlvar{'lonDefDomain'}, |
"server.domain" => $Apache::lonnet::perlvar{'lonDefDomain'}, |
| "request.course.fn" => '', |
"request.course.fn" => '', |
| "request.course.uri" => '', |
"request.course.uri" => '', |
|
Line 13965 sub init_user_environment {
|
Line 14286 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 14123 sub update_content_constraints {
|
Line 14444 sub update_content_constraints {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub allmaps_incourse { |
| |
my ($cdom,$cnum,$chome,$cid) = @_; |
| |
if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') { |
| |
$cid = $env{'request.course.id'}; |
| |
$cdom = $env{'course.'.$cid.'.domain'}; |
| |
$cnum = $env{'course.'.$cid.'.num'}; |
| |
$chome = $env{'course.'.$cid.'.home'}; |
| |
} |
| |
my %allmaps = (); |
| |
my $lastchange = |
| |
&Apache::lonnet::get_coursechange($cdom,$cnum); |
| |
if ($lastchange > $env{'request.course.tied'}) { |
| |
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
| |
unless ($ferr) { |
| |
&update_content_constraints($cdom,$cnum,$chome,$cid); |
| |
} |
| |
} |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
if (defined($navmap)) { |
| |
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
| |
$allmaps{$res->src()} = 1; |
| |
} |
| |
} |
| |
return \%allmaps; |
| |
} |
| |
|
| sub parse_supplemental_title { |
sub parse_supplemental_title { |
| my ($title) = @_; |
my ($title) = @_; |
| |
|
|
Line 14187 sub symb_to_docspath {
|
Line 14534 sub symb_to_docspath {
|
| $path =~ s/^\&//; |
$path =~ s/^\&//; |
| my $maptitle = $mapresobj->title(); |
my $maptitle = $mapresobj->title(); |
| if ($mapurl eq 'default') { |
if ($mapurl eq 'default') { |
| $maptitle = 'Main Course Documents'; |
$maptitle = 'Main Content'; |
| } |
} |
| $path .= (($path ne '')? '&' : ''). |
$path .= (($path ne '')? '&' : ''). |
| &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
|
Line 14201 sub symb_to_docspath {
|
Line 14548 sub symb_to_docspath {
|
| my $maptitle = &Apache::lonnet::gettitle($mapurl); |
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
| my $ispage = (($type eq 'page')? 1 : ''); |
my $ispage = (($type eq 'page')? 1 : ''); |
| if ($mapurl eq 'default') { |
if ($mapurl eq 'default') { |
| $maptitle = 'Main Course Documents'; |
$maptitle = 'Main Content'; |
| } |
} |
| $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
| &Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage; |
&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage; |
| } |
} |
| unless ($mapurl eq 'default') { |
unless ($mapurl eq 'default') { |
| $path = 'default&'. |
$path = 'default&'. |
| &Apache::lonhtmlcommon::entity_encode('Main Course Documents'). |
&Apache::lonhtmlcommon::entity_encode('Main Content'). |
| ':::::&'.$path; |
':::::&'.$path; |
| } |
} |
| return $path; |
return $path; |
|
Line 14221 sub captcha_display {
|
Line 14568 sub captcha_display {
|
| if ($captcha eq 'original') { |
if ($captcha eq 'original') { |
| $output = &create_captcha(); |
$output = &create_captcha(); |
| unless ($output) { |
unless ($output) { |
| $error = 'captcha'; |
$error = 'captcha'; |
| } |
} |
| } elsif ($captcha eq 'recaptcha') { |
} elsif ($captcha eq 'recaptcha') { |
| $output = &create_recaptcha($pubkey); |
$output = &create_recaptcha($pubkey); |
| unless ($output) { |
unless ($output) { |
| $error = 'recaptcha'; |
$error = 'recaptcha'; |
| } |
} |
| } |
} |
| return ($output,$error); |
return ($output,$error); |
|
Line 14351 sub create_recaptcha {
|
Line 14698 sub create_recaptcha {
|
| return $captcha->get_options_setter({theme => 'white'})."\n". |
return $captcha->get_options_setter({theme => 'white'})."\n". |
| $captcha->get_html($pubkey). |
$captcha->get_html($pubkey). |
| &mt('If either word is hard to read, [_1] will replace them.', |
&mt('If either word is hard to read, [_1] will replace them.', |
| '<image src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />'). |
'<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />'). |
| '<br /><br />'; |
'<br /><br />'; |
| } |
} |
| |
|
![[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