version 1.1070, 2012/04/11 15:53:22
|
version 1.1089, 2012/08/07 09:25:39
|
Line 154 sub ssi_with_retries {
|
Line 154 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 188 BEGIN {
|
Line 189 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 657 if (!Array.prototype.indexOf) {
|
Line 659 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 995 sub select_language {
|
Line 997 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 1374 function helpMenu(target) {
|
Line 1403 function helpMenu(target) {
|
return; |
return; |
} |
} |
function writeHelp(caller) { |
function writeHelp(caller) { |
caller.document.writeln('$start_page<frame name="bannerframe" src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page') |
caller.document.writeln('$start_page\\n<frame name="bannerframe" src="'+banner_link+'" />\\n<frame name="bodyframe" src="$details_link" />\\n$end_page') |
caller.document.close() |
caller.document.close() |
caller.focus() |
caller.focus() |
} |
} |
Line 1981 sub select_form {
|
Line 2010 sub select_form {
|
# For display filters |
# For display filters |
|
|
sub display_filter { |
sub display_filter { |
|
my ($context) = @_; |
if (!$env{'form.show'}) { $env{'form.show'}=10; } |
if (!$env{'form.show'}) { $env{'form.show'}=10; } |
if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; } |
if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; } |
return '<span class="LC_nobreak"><label>'.&mt('Records [_1]', |
my $phraseinput = 'hidden'; |
|
my $includeinput = 'hidden'; |
|
my ($checked,$includetypestext); |
|
if ($env{'form.displayfilter'} eq 'containing') { |
|
$phraseinput = 'text'; |
|
if ($context eq 'parmslog') { |
|
$includeinput = 'checkbox'; |
|
if ($env{'form.includetypes'}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$includetypestext = &mt('Include parameter types'); |
|
} |
|
} else { |
|
$includetypestext = ' '; |
|
} |
|
my ($additional,$secondid,$thirdid); |
|
if ($context eq 'parmslog') { |
|
$additional = |
|
'<label><input type="'.$includeinput.'" name="includetypes"'. |
|
$checked.' name="includetypes" value="1" id="includetypes" />'. |
|
' <span id="includetypestext">'.$includetypestext.'</span>'. |
|
'</label>'; |
|
$secondid = 'includetypes'; |
|
$thirdid = 'includetypestext'; |
|
} |
|
my $onchange = "javascript:toggleHistoryOptions(this,'containingphrase','$context', |
|
'$secondid','$thirdid')"; |
|
return '<span class="LC_nobreak"><label>'.&mt('Records: [_1]', |
&Apache::lonmeta::selectbox('show',$env{'form.show'},undef, |
&Apache::lonmeta::selectbox('show',$env{'form.show'},undef, |
(&mt('all'),10,20,50,100,1000,10000))). |
(&mt('all'),10,20,50,100,1000,10000))). |
'</label></span> <span class="LC_nobreak">'. |
'</label></span> <span class="LC_nobreak">'. |
&mt('Filter [_1]', |
&mt('Filter: [_1]', |
&select_form($env{'form.displayfilter'}, |
&select_form($env{'form.displayfilter'}, |
'displayfilter', |
'displayfilter', |
{'currentfolder' => 'Current folder/page', |
{'currentfolder' => 'Current folder/page', |
'containing' => 'Containing phrase', |
'containing' => 'Containing phrase', |
'none' => 'None'})). |
'none' => 'None'},$onchange)).' '. |
'<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>'; |
'<input type="'.$phraseinput.'" name="containingphrase" id="containingphrase" size="30" value="'. |
|
&HTML::Entities::encode($env{'form.containingphrase'}). |
|
'" />'.$additional; |
|
} |
|
|
|
sub display_filter_js { |
|
my $includetext = &mt('Include parameter types'); |
|
return <<"ENDJS"; |
|
|
|
function toggleHistoryOptions(setter,firstid,context,secondid,thirdid) { |
|
var firstType = 'hidden'; |
|
if (setter.options[setter.selectedIndex].value == 'containing') { |
|
firstType = 'text'; |
|
} |
|
firstObject = document.getElementById(firstid); |
|
if (typeof(firstObject) == 'object') { |
|
if (firstObject.type != firstType) { |
|
changeInputType(firstObject,firstType); |
|
} |
|
} |
|
if (context == 'parmslog') { |
|
var secondType = 'hidden'; |
|
if (firstType == 'text') { |
|
secondType = 'checkbox'; |
|
} |
|
secondObject = document.getElementById(secondid); |
|
if (typeof(secondObject) == 'object') { |
|
if (secondObject.type != secondType) { |
|
changeInputType(secondObject,secondType); |
|
} |
|
} |
|
var textItem = document.getElementById(thirdid); |
|
var currtext = textItem.innerHTML; |
|
var newtext; |
|
if (firstType == 'text') { |
|
newtext = '$includetext'; |
|
} else { |
|
newtext = ' '; |
|
} |
|
if (currtext != newtext) { |
|
textItem.innerHTML = newtext; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function changeInputType(oldObject,newType) { |
|
var newObject = document.createElement('input'); |
|
newObject.type = newType; |
|
if (oldObject.size) { |
|
newObject.size = oldObject.size; |
|
} |
|
if (oldObject.value) { |
|
newObject.value = oldObject.value; |
|
} |
|
if (oldObject.name) { |
|
newObject.name = oldObject.name; |
|
} |
|
if (oldObject.id) { |
|
newObject.id = oldObject.id; |
|
} |
|
oldObject.parentNode.replaceChild(newObject,oldObject); |
|
return; |
|
} |
|
|
|
ENDJS |
} |
} |
|
|
sub gradeleveldescription { |
sub gradeleveldescription { |
Line 3990 sub findallcourses {
|
Line 4112 sub findallcourses {
|
$udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
} |
} |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1}); |
my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname); |
my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef, |
|
$extra); |
|
if (!%roles) { |
if (!%roles) { |
%roles = ( |
%roles = ( |
cc => 1, |
cc => 1, |
Line 5072 i.e., $env{'internal.head.redirect'} exi
|
Line 5192 i.e., $env{'internal.head.redirect'} exi
|
|
|
sub endbodytag { |
sub endbodytag { |
my ($args) = @_; |
my ($args) = @_; |
my $endbodytag='</body>'; |
my $endbodytag; |
|
unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) { |
|
$endbodytag='</body>'; |
|
} |
$endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; |
$endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag; |
if ( exists( $env{'internal.head.redirect'} ) ) { |
if ( exists( $env{'internal.head.redirect'} ) ) { |
if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) { |
if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) { |
Line 6355 fieldset > legend {
|
Line 6478 fieldset > legend {
|
ol.LC_primary_menu { |
ol.LC_primary_menu { |
float: right; |
float: right; |
margin: 0; |
margin: 0; |
|
padding: 0; |
background-color: $pgbg_or_bgcolor; |
background-color: $pgbg_or_bgcolor; |
} |
} |
|
|
Line 6363 ol#LC_PathBreadcrumbs {
|
Line 6487 ol#LC_PathBreadcrumbs {
|
} |
} |
|
|
ol.LC_primary_menu li { |
ol.LC_primary_menu li { |
display: inline; |
color: RGB(80, 80, 80); |
padding: 5px 5px 0 10px; |
vertical-align: middle; |
|
text-align: left; |
|
list-style: none; |
|
float: left; |
|
} |
|
|
|
ol.LC_primary_menu li a { |
|
display: block; |
|
margin: 0; |
|
padding: 0 5px 0 10px; |
|
text-decoration: none; |
|
} |
|
|
|
ol.LC_primary_menu li ul { |
|
display: none; |
|
width: 10em; |
|
background-color: $data_table_light; |
|
} |
|
|
|
ol.LC_primary_menu li:hover ul, ol.LC_primary_menu li.hover ul { |
|
display: block; |
|
position: absolute; |
|
margin: 0; |
|
padding: 0; |
|
z-index: 2; |
|
} |
|
|
|
ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li { |
|
font-size: 90%; |
vertical-align: top; |
vertical-align: top; |
|
float: none; |
|
border-left: 1px solid black; |
|
border-right: 1px solid black; |
|
} |
|
|
|
ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a { |
|
background-color:$data_table_light; |
|
} |
|
|
|
ol.LC_primary_menu li li a:hover { |
|
color:$button_hover; |
|
background-color:$data_table_dark; |
} |
} |
|
|
ol.LC_primary_menu li img { |
ol.LC_primary_menu li img { |
vertical-align: bottom; |
vertical-align: bottom; |
height: 1.1em; |
height: 1.1em; |
|
margin: 0.2em 0 0 0; |
} |
} |
|
|
ol.LC_primary_menu a { |
ol.LC_primary_menu a { |
Line 6764 ul#LC_toolbar {
|
Line 6929 ul#LC_toolbar {
|
list-style:none; |
list-style:none; |
position:relative; |
position:relative; |
background-color:white; |
background-color:white; |
|
overflow: auto; |
} |
} |
|
|
ul#LC_toolbar li { |
ul#LC_toolbar li { |
Line 6773 ul#LC_toolbar li {
|
Line 6939 ul#LC_toolbar li {
|
float: left; |
float: left; |
display:inline; |
display:inline; |
vertical-align:middle; |
vertical-align:middle; |
|
white-space: nowrap; |
} |
} |
|
|
|
|
Line 7224 sub end_page {
|
Line 7391 sub end_page {
|
} else { |
} else { |
$result .= &endbodytag($args); |
$result .= &endbodytag($args); |
} |
} |
$result .= "\n</html>"; |
unless ($args->{'notbody'}) { |
|
$result .= "\n</html>"; |
|
} |
|
|
if ($args->{'js_ready'}) { |
if ($args->{'js_ready'}) { |
$result = &js_ready($result); |
$result = &js_ready($result); |
Line 7309 sub modal_link {
|
Line 7478 sub modal_link {
|
unless ($width) { $width=480; } |
unless ($width) { $width=480; } |
unless ($height) { $height=400; } |
unless ($height) { $height=400; } |
unless ($scrolling) { $scrolling='yes'; } |
unless ($scrolling) { $scrolling='yes'; } |
return '<a href="'.$link.'" target="'.$target.'" title="'.$title.'" onclick="openMyModal(\''.$link.'\','.$width.','.$height.',\''.$scrolling.'\'); return false;">'. |
my $target_attr; |
$linktext.'</a>'; |
if (defined($target)) { |
|
$target_attr = 'target="'.$target.'"'; |
|
} |
|
return <<"ENDLINK"; |
|
<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling'); return false;"> |
|
$linktext</a> |
|
ENDLINK |
} |
} |
|
|
sub modal_adhoc_script { |
sub modal_adhoc_script { |
Line 7558 sub validate_page {
|
Line 7733 sub validate_page {
|
|
|
|
|
sub start_scrollbox { |
sub start_scrollbox { |
my ($outerwidth,$width,$height,$id)=@_; |
my ($outerwidth,$width,$height,$id,$bgcolor)=@_; |
unless ($outerwidth) { $outerwidth='520px'; } |
unless ($outerwidth) { $outerwidth='520px'; } |
unless ($width) { $width='500px'; } |
unless ($width) { $width='500px'; } |
unless ($height) { $height='200px'; } |
unless ($height) { $height='200px'; } |
my ($table_id,$div_id); |
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'"; |
} |
} |
return "<table style='width: $outerwidth; border: 1px solid none;'$table_id><tr><td style='width: $width;' bgcolor='#FFFFFF'><div style='overflow:auto; width:$width; height: $height;'$div_id>"; |
if ($bgcolor ne '') { |
|
$tdcol = "background-color: $bgcolor;"; |
|
} |
|
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> |
|
END |
} |
} |
|
|
sub end_scrollbox { |
sub end_scrollbox { |
Line 7793 role status: active, previous or future.
|
Line 7973 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 $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1}); |
my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname); |
my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra); |
|
my @uroles = keys %userinfo; |
my @uroles = keys %userinfo; |
my $srchstr; |
my $srchstr; |
my $active_chk = 'none'; |
my $active_chk = 'none'; |
Line 9165 sub get_env_multiple {
|
Line 9344 sub get_env_multiple {
|
|
|
sub ask_for_embedded_content { |
sub ask_for_embedded_content { |
my ($actionurl,$state,$allfiles,$codebase,$args)=@_; |
my ($actionurl,$state,$allfiles,$codebase,$args)=@_; |
my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges); |
my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges, |
my $num = 0; |
%currsubfile,%unused,$rem); |
|
my $counter = 0; |
|
my $numnew = 0; |
my $numremref = 0; |
my $numremref = 0; |
my $numinvalid = 0; |
my $numinvalid = 0; |
my $numpathchg = 0; |
my $numpathchg = 0; |
my $numexisting = 0; |
my $numexisting = 0; |
my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath); |
my $numunused = 0; |
|
my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum, |
|
$fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path); |
|
my $heading = &mt('Upload embedded files'); |
|
my $buttontext = &mt('Upload'); |
|
|
|
my $navmap; |
|
if ($env{'request.course.id'}) { |
|
$navmap = Apache::lonnavmaps::navmap->new(); |
|
} |
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'}) { |
Line 9199 sub ask_for_embedded_content {
|
Line 9389 sub ask_for_embedded_content {
|
} |
} |
} elsif ($actionurl eq '/adm/coursedocs') { |
} elsif ($actionurl eq '/adm/coursedocs') { |
if (ref($args) eq 'HASH') { |
if (ref($args) eq 'HASH') { |
$url = $args->{'docs_url'}; |
$url = $args->{'docs_url'}; |
$toplevel = $url; |
$toplevel = $url; |
|
if ($args->{'context'} eq 'paste') { |
|
($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/}); |
|
($path) = |
|
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
|
$fileloc = &Apache::lonnet::filelocation('',$toplevel); |
|
$fileloc =~ s{^/}{}; |
|
} |
|
} |
|
} elsif ($actionurl eq '/adm/dependencies') { |
|
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') { |
|
$url = $args->{'docs_url'}; |
|
$title = $args->{'docs_title'}; |
|
$toplevel = "/$url"; |
|
($rem) = ($toplevel =~ m{^(.+/)[^/]+$}); |
|
($path) = |
|
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/}); |
|
$fileloc = &Apache::lonnet::filelocation('',$toplevel); |
|
$fileloc =~ s{^/}{}; |
|
($filename) = ($fileloc =~ m{.+/([^/]+)$}); |
|
$heading = &mt('Status of dependencies in [_1]',"$title ($filename)"); |
|
} |
} |
} |
} |
} |
my $now = time(); |
my $now = time(); |
Line 9239 sub ask_for_embedded_content {
|
Line 9453 sub ask_for_embedded_content {
|
} |
} |
} |
} |
} |
} |
|
my $dirptr = 16384; |
foreach my $path (keys(%subdependencies)) { |
foreach my $path (keys(%subdependencies)) { |
my %currsubfile; |
$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') { |
foreach my $line (@{$sublistref}) { |
foreach my $line (@{$sublistref}) { |
my ($file_name,$rest) = split(/\&/,$line,2); |
my ($file_name,$rest) = split(/\&/,$line,2); |
$currsubfile{$file_name} = 1; |
$currsubfile{$path}{$file_name} = 1; |
} |
} |
} |
} |
} elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) { |
} elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) { |
if (opendir(my $dir,$url.'/'.$path)) { |
if (opendir(my $dir,$url.'/'.$path)) { |
my @subdir_list = grep(!/^\./,readdir($dir)); |
my @subdir_list = grep(!/^\./,readdir($dir)); |
map {$currsubfile{$_} = 1;} @subdir_list; |
map {$currsubfile{$path}{$_} = 1;} @subdir_list; |
|
} |
|
} elsif (($actionurl eq '/adm/dependencies') || |
|
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
|
($args->{'context'} eq 'paste'))) { |
|
if ($env{'request.course.id'} ne '') { |
|
my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
|
if ($dir ne '') { |
|
my ($sublistref,$listerror) = |
|
&Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/'); |
|
if (ref($sublistref) eq 'ARRAY') { |
|
foreach my $line (@{$sublistref}) { |
|
my ($file_name,$dom,undef,$testdir,undef,undef,undef,undef,$size, |
|
undef,$mtime)=split(/\&/,$line,12); |
|
unless (($testdir&$dirptr) || |
|
($file_name =~ /^\.\.?$/)) { |
|
$currsubfile{$path}{$file_name} = [$size,$mtime]; |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
foreach my $file (keys(%{$subdependencies{$path}})) { |
foreach my $file (keys(%{$subdependencies{$path}})) { |
if ($currsubfile{$file}) { |
if (exists($currsubfile{$path}{$file})) { |
my $item = $path.'/'.$file; |
my $item = $path.'/'.$file; |
unless ($mapping{$item} eq $item) { |
unless ($mapping{$item} eq $item) { |
$pathchanges{$item} = 1; |
$pathchanges{$item} = 1; |
Line 9268 sub ask_for_embedded_content {
|
Line 9503 sub ask_for_embedded_content {
|
$newfiles{$path.'/'.$file} = 1; |
$newfiles{$path.'/'.$file} = 1; |
} |
} |
} |
} |
|
if ($actionurl eq '/adm/dependencies') { |
|
foreach my $path (keys(%currsubfile)) { |
|
if (ref($currsubfile{$path}) eq 'HASH') { |
|
foreach my $file (keys(%{$currsubfile{$path}})) { |
|
unless ($subdependencies{$path}{$file}) { |
|
next if (($rem ne '') && |
|
(($env{"httpref.$rem"."$path/$file"} ne '') || |
|
(ref($navmap) && |
|
(($navmap->getResourceByUrl($rem."$path/$file") ne '') || |
|
(($file =~ /^(.*\.s?html?)\.bak$/i) && |
|
($navmap->getResourceByUrl($rem."$path/$1"))))))); |
|
$unused{$path.'/'.$file} = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
} |
my %currfile; |
my %currfile; |
if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) { |
Line 9284 sub ask_for_embedded_content {
|
Line 9536 sub ask_for_embedded_content {
|
my @dir_list = grep(!/^\./,readdir($dir)); |
my @dir_list = grep(!/^\./,readdir($dir)); |
map {$currfile{$_} = 1;} @dir_list; |
map {$currfile{$_} = 1;} @dir_list; |
} |
} |
|
} elsif (($actionurl eq '/adm/dependencies') || |
|
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
|
($args->{'context'} eq 'paste'))) { |
|
if ($env{'request.course.id'} ne '') { |
|
my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$}); |
|
if ($dir ne '') { |
|
my ($dirlistref,$listerror) = |
|
&Apache::lonnet::dirlist($dir,$cdom,$cnum,$getpropath,undef,'/'); |
|
if (ref($dirlistref) eq 'ARRAY') { |
|
foreach my $line (@{$dirlistref}) { |
|
my ($file_name,$dom,undef,$testdir,undef,undef,undef,undef, |
|
$size,undef,$mtime)=split(/\&/,$line,12); |
|
unless (($testdir&$dirptr) || |
|
($file_name =~ /^\.\.?$/)) { |
|
$currfile{$file_name} = [$size,$mtime]; |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
} |
foreach my $file (keys(%dependencies)) { |
foreach my $file (keys(%dependencies)) { |
if ($currfile{$file}) { |
if (exists($currfile{$file})) { |
unless ($mapping{$file} eq $file) { |
unless ($mapping{$file} eq $file) { |
$pathchanges{$file} = 1; |
$pathchanges{$file} = 1; |
} |
} |
Line 9296 sub ask_for_embedded_content {
|
Line 9568 sub ask_for_embedded_content {
|
$newfiles{$file} = 1; |
$newfiles{$file} = 1; |
} |
} |
} |
} |
|
foreach my $file (keys(%currfile)) { |
|
unless (($file eq $filename) || |
|
($file eq $filename.'.bak') || |
|
($dependencies{$file})) { |
|
if ($actionurl eq '/adm/dependencies') { |
|
next if (($rem ne '') && |
|
(($env{"httpref.$rem".$file} ne '') || |
|
(ref($navmap) && |
|
(($navmap->getResourceByUrl($rem.$file) ne '') || |
|
(($file =~ /^(.*\.s?html?)\.bak$/i) && |
|
($navmap->getResourceByUrl($rem.$1))))))); |
|
} |
|
$unused{$file} = 1; |
|
} |
|
} |
|
if (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') && |
|
($args->{'context'} eq 'paste')) { |
|
$counter = scalar(keys(%existing)); |
|
$numpathchg = scalar(keys(%pathchanges)); |
|
return ($output,$counter,$numpathchg,\%existing); |
|
} |
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') { |
|
next if ($embed_file =~ m{^\w+://}); |
|
} |
$upload_output .= &start_data_table_row(). |
$upload_output .= &start_data_table_row(). |
'<td><span class="LC_filename">'.$embed_file.'</span>'; |
'<td><img src="'.&icon($embed_file).'" /> '. |
|
'<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><td>'; |
if ($args->{'ignore_remote_references'} |
if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) { |
&& $embed_file =~ m{^\w+://}) { |
|
$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>'; |
$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</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.='<span class="LC_warning">'.&mt('Invalid characters').'</span>'; |
$numinvalid++; |
$numinvalid++; |
} else { |
} else { |
$upload_output .= &embedded_file_element('upload_embedded',$num, |
$upload_output .= &embedded_file_element('upload_embedded',$counter, |
$embed_file,\%mapping, |
$embed_file,\%mapping, |
$allfiles,$codebase); |
$allfiles,$codebase,'upload'); |
$num++; |
$counter ++; |
|
$numnew ++; |
} |
} |
$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row()."\n"; |
$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row()."\n"; |
} |
} |
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%existing)) { |
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%existing)) { |
$upload_output .= &start_data_table_row(). |
if ($actionurl eq '/adm/dependencies') { |
'<td><span class="LC_filename">'.$embed_file.'</span></td>'. |
my ($size,$mtime) = &get_dependency_details(\%currfile,\%currsubfile,$embed_file); |
'<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'. |
$modify_output .= &start_data_table_row(). |
&Apache::loncommon::end_data_table_row()."\n"; |
'<td><a href="'.$path.'/'.$embed_file.'" style="text-decoration:none;">'. |
|
'<img src="'.&icon($embed_file).'" border="0" />'. |
|
' <span class="LC_filename">'.$embed_file.'</span></a></td>'. |
|
'<td>'.$size.'</td>'. |
|
'<td>'.$mtime.'</td>'. |
|
'<td><label><input type="checkbox" name="mod_upload_dep" '. |
|
'onclick="toggleBrowse('."'$counter'".')" id="mod_upload_dep_'. |
|
$counter.'" value="'.$counter.'" />'.&mt('Yes').'</label>'. |
|
'<div id="moduploaddep_'.$counter.'" style="display:none;">'. |
|
&embedded_file_element('upload_embedded',$counter, |
|
$embed_file,\%mapping, |
|
$allfiles,$codebase,'modify'). |
|
'</div></td>'. |
|
&end_data_table_row()."\n"; |
|
$counter ++; |
|
} else { |
|
$upload_output .= &start_data_table_row(). |
|
'<td><span class="LC_filename">'.$embed_file.'</span></td>'; |
|
'<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
|
} |
|
my $delidx = $counter; |
|
foreach my $oldfile (sort {lc($a) cmp lc($b)} keys(%unused)) { |
|
my ($size,$mtime) = &get_dependency_details(\%currfile,\%currsubfile,$oldfile); |
|
$delete_output .= &start_data_table_row(). |
|
'<td><img src="'.&icon($oldfile).'" />'. |
|
' <span class="LC_filename">'.$oldfile.'</span></td>'. |
|
'<td>'.$size.'</td>'. |
|
'<td>'.$mtime.'</td>'. |
|
'<td><label><input type="checkbox" name="del_upload_dep" '. |
|
' value="'.$delidx.'" />'.&mt('Yes').'</label>'. |
|
&embedded_file_element('upload_embedded',$delidx, |
|
$oldfile,\%mapping,$allfiles, |
|
$codebase,'delete').'</td>'. |
|
&end_data_table_row()."\n"; |
|
$numunused ++; |
|
$delidx ++; |
} |
} |
if ($upload_output) { |
if ($upload_output) { |
$upload_output = &start_data_table(). |
$upload_output = &start_data_table(). |
$upload_output. |
$upload_output. |
&end_data_table()."\n"; |
&end_data_table()."\n"; |
} |
} |
|
if ($modify_output) { |
|
$modify_output = &start_data_table(). |
|
&start_data_table_header_row(). |
|
'<th>'.&mt('File').'</th>'. |
|
'<th>'.&mt('Size (KB)').'</th>'. |
|
'<th>'.&mt('Modified').'</th>'. |
|
'<th>'.&mt('Upload replacement?').'</th>'. |
|
&end_data_table_header_row(). |
|
$modify_output. |
|
&end_data_table()."\n"; |
|
} |
|
if ($delete_output) { |
|
$delete_output = &start_data_table(). |
|
&start_data_table_header_row(). |
|
'<th>'.&mt('File').'</th>'. |
|
'<th>'.&mt('Size (KB)').'</th>'. |
|
'<th>'.&mt('Modified').'</th>'. |
|
'<th>'.&mt('Delete?').'</th>'. |
|
&end_data_table_header_row(). |
|
$delete_output. |
|
&end_data_table()."\n"; |
|
} |
my $applies = 0; |
my $applies = 0; |
if ($numremref) { |
if ($numremref) { |
$applies ++; |
$applies ++; |
Line 9341 sub ask_for_embedded_content {
|
Line 9696 sub ask_for_embedded_content {
|
if ($numexisting) { |
if ($numexisting) { |
$applies ++; |
$applies ++; |
} |
} |
if ($num) { |
if ($counter || $numunused) { |
$output = '<form name="upload_embedded" action="'.$actionurl.'"'. |
$output = '<form name="upload_embedded" action="'.$actionurl.'"'. |
' method="post" enctype="multipart/form-data">'."\n". |
' method="post" enctype="multipart/form-data">'."\n". |
$state. |
$state.'<h3>'.$heading.'</h3>'; |
'<h3>'.&mt('Upload embedded files'). |
if ($actionurl eq '/adm/dependencies') { |
':</h3>'.$upload_output.'<br />'."\n". |
if ($numnew) { |
'<input type ="hidden" name="number_embedded_items" value="'. |
$output .= '<h4>'.&mt('Missing dependencies').'</h4>'. |
$num.'" />'."\n"; |
'<p>'.&mt('The following files need to be uploaded.').'</p>'."\n". |
if ($actionurl eq '') { |
$upload_output.'<br />'."\n"; |
|
} |
|
if ($numexisting) { |
|
$output .= '<h4>'.&mt('Uploaded dependencies (in use)').'</h4>'. |
|
'<p>'.&mt('Upload a new file to replace the one currently in use.').'</p>'."\n". |
|
$modify_output.'<br />'."\n"; |
|
$buttontext = &mt('Save changes'); |
|
} |
|
if ($numunused) { |
|
$output .= '<h4>'.&mt('Unused files').'</h4>'. |
|
'<p>'.&mt('The following uploaded files are no longer used.').'</p>'."\n". |
|
$delete_output.'<br />'."\n"; |
|
$buttontext = &mt('Save changes'); |
|
} |
|
} else { |
|
$output .= $upload_output.'<br />'."\n"; |
|
} |
|
$output .= '<input type ="hidden" name="number_embedded_items" value="'. |
|
$counter.'" />'."\n"; |
|
if ($actionurl eq '/adm/dependencies') { |
|
$output .= '<input type ="hidden" name="number_newemb_items" value="'. |
|
$numnew.'" />'."\n"; |
|
} elsif ($actionurl eq '') { |
$output .= '<input type="hidden" name="phase" value="three" />'; |
$output .= '<input type="hidden" name="phase" value="three" />'; |
} |
} |
} elsif ($applies) { |
} elsif ($applies) { |
Line 9377 sub ask_for_embedded_content {
|
Line 9754 sub ask_for_embedded_content {
|
$output .= $upload_output.'<br />'; |
$output .= $upload_output.'<br />'; |
} |
} |
my ($pathchange_output,$chgcount); |
my ($pathchange_output,$chgcount); |
$chgcount = $num; |
$chgcount = $counter; |
if (keys(%pathchanges) > 0) { |
if (keys(%pathchanges) > 0) { |
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%pathchanges)) { |
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%pathchanges)) { |
if ($num) { |
if ($counter) { |
$output .= &embedded_file_element('pathchange',$chgcount, |
$output .= &embedded_file_element('pathchange',$chgcount, |
$embed_file,\%mapping, |
$embed_file,\%mapping, |
$allfiles,$codebase); |
$allfiles,$codebase,'change'); |
} else { |
} else { |
$pathchange_output .= |
$pathchange_output .= |
&start_data_table_row(). |
&start_data_table_row(). |
Line 9392 sub ask_for_embedded_content {
|
Line 9769 sub ask_for_embedded_content {
|
'<td>'.$mapping{$embed_file}.'</td>'. |
'<td>'.$mapping{$embed_file}.'</td>'. |
'<td>'.$embed_file. |
'<td>'.$embed_file. |
&embedded_file_element('pathchange',$numpathchg,$embed_file, |
&embedded_file_element('pathchange',$numpathchg,$embed_file, |
\%mapping,$allfiles,$codebase). |
\%mapping,$allfiles,$codebase,'change'). |
'</td>'.&end_data_table_row(); |
'</td>'.&end_data_table_row(); |
} |
} |
$numpathchg ++; |
$numpathchg ++; |
$chgcount ++; |
$chgcount ++; |
} |
} |
} |
} |
if ($num) { |
if ($counter) { |
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 9409 sub ask_for_embedded_content {
|
Line 9786 sub ask_for_embedded_content {
|
$output .= '<input type="hidden" name="phase" value="three" />'."\n"; |
$output .= '<input type="hidden" name="phase" value="three" />'."\n"; |
} elsif ($actionurl eq '/adm/portfolio' || $actionurl eq '/adm/coursegrp_portfolio') { |
} elsif ($actionurl eq '/adm/portfolio' || $actionurl eq '/adm/coursegrp_portfolio') { |
$output .= '<input type="hidden" name="action" value="upload_embedded" />'; |
$output .= '<input type="hidden" name="action" value="upload_embedded" />'; |
|
} elsif ($actionurl eq '/adm/dependencies') { |
|
$output .= '<input type="hidden" name="action" value="process_changes" />'; |
} |
} |
$output .= '<input type ="submit" value="'.&mt('Upload Listed Files').'" />'."\n". |
$output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n"; |
&mt('(only files for which a location has been provided will be uploaded)').'</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); |
Line 9419 sub ask_for_embedded_content {
|
Line 9797 sub ask_for_embedded_content {
|
$output .= '<p>'.&mt('or').'</p>'; |
$output .= '<p>'.&mt('or').'</p>'; |
} |
} |
} |
} |
return ($output,$num,$numpathchg); |
return ($output,$counter,$numpathchg); |
} |
} |
|
|
sub embedded_file_element { |
sub embedded_file_element { |
my ($context,$num,$embed_file,$mapping,$allfiles,$codebase) = @_; |
my ($context,$num,$embed_file,$mapping,$allfiles,$codebase,$type) = @_; |
return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') && |
return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') && |
(ref($codebase) eq 'HASH')); |
(ref($codebase) eq 'HASH')); |
my $output; |
my $output; |
if ($context eq 'upload_embedded') { |
if (($context eq 'upload_embedded') && ($type ne 'delete')) { |
$output = '<input name="embedded_item_'.$num.'" type="file" value="" />'."\n"; |
$output = '<input name="embedded_item_'.$num.'" type="file" value="" />'."\n"; |
} |
} |
$output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'. |
$output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'. |
Line 9454 sub embedded_file_element {
|
Line 9832 sub embedded_file_element {
|
return $output; |
return $output; |
} |
} |
|
|
|
sub get_dependency_details { |
|
my ($currfile,$currsubfile,$embed_file) = @_; |
|
my ($size,$mtime,$showsize,$showmtime); |
|
if ((ref($currfile) eq 'HASH') && (ref($currsubfile))) { |
|
if ($embed_file =~ m{/}) { |
|
my ($path,$fname) = split(/\//,$embed_file); |
|
if (ref($currsubfile->{$path}{$fname}) eq 'ARRAY') { |
|
($size,$mtime) = @{$currsubfile->{$path}{$fname}}; |
|
} |
|
} else { |
|
if (ref($currfile->{$embed_file}) eq 'ARRAY') { |
|
($size,$mtime) = @{$currfile->{$embed_file}}; |
|
} |
|
} |
|
$showsize = $size/1024.0; |
|
$showsize = sprintf("%.1f",$showsize); |
|
if ($mtime > 0) { |
|
$showmtime = &Apache::lonlocal::locallocaltime($mtime); |
|
} |
|
} |
|
return ($showsize,$showmtime); |
|
} |
|
|
|
sub ask_embedded_js { |
|
return <<"END"; |
|
<script type="text/javascript""> |
|
// <![CDATA[ |
|
function toggleBrowse(counter) { |
|
var chkboxid = document.getElementById('mod_upload_dep_'+counter); |
|
var fileid = document.getElementById('embedded_item_'+counter); |
|
var uploaddivid = document.getElementById('moduploaddep_'+counter); |
|
if (chkboxid.checked == true) { |
|
uploaddivid.style.display='block'; |
|
} else { |
|
uploaddivid.style.display='none'; |
|
fileid.value = ''; |
|
} |
|
} |
|
// ]]> |
|
</script> |
|
|
|
END |
|
} |
|
|
sub upload_embedded { |
sub upload_embedded { |
my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota, |
my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota, |
$current_disk_usage,$hiddenstate,$actionurl) = @_; |
$current_disk_usage,$hiddenstate,$actionurl) = @_; |
Line 9512 sub upload_embedded {
|
Line 9934 sub upload_embedded {
|
$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('File name 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; |
if ($context eq 'portfolio') { |
if ($context eq 'portfolio') { |
my $result; |
my $result; |
Line 9569 sub upload_embedded {
|
Line 9990 sub upload_embedded {
|
if (!open($fh,'>'.$dest)) { |
if (!open($fh,'>'.$dest)) { |
&Apache::lonnet::logthis('Failed to create '.$dest); |
&Apache::lonnet::logthis('Failed to create '.$dest); |
$output .= '<span class="LC_error">'. |
$output .= '<span class="LC_error">'. |
&mt('An error occurred while trying to upload [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}). |
&mt('An error occurred while trying to upload [_1] for embedded element [_2].', |
|
$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}). |
'</span><br />'; |
'</span><br />'; |
} else { |
} else { |
if (!print $fh $env{'form.embedded_item_'.$i}) { |
if (!print $fh $env{'form.embedded_item_'.$i}) { |
&Apache::lonnet::logthis('Failed to write to '.$dest); |
&Apache::lonnet::logthis('Failed to write to '.$dest); |
$output .= '<span class="LC_error">'. |
$output .= '<span class="LC_error">'. |
&mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}). |
&mt('An error occurred while writing the file [_1] for embedded element [_2].', |
|
$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}). |
'</span><br />'; |
'</span><br />'; |
} else { |
} else { |
$output .= &mt('Uploaded [_1]','<span class="LC_filename">'. |
$output .= &mt('Uploaded [_1]','<span class="LC_filename">'. |
Line 9597 sub upload_embedded {
|
Line 10020 sub upload_embedded {
|
} |
} |
$output .= &modify_html_form('upload_embedded',$actionurl,$hiddenstate,\%pathchange); |
$output .= &modify_html_form('upload_embedded',$actionurl,$hiddenstate,\%pathchange); |
$returnflag = 'ok'; |
$returnflag = 'ok'; |
if (keys(%pathchange) > 0) { |
my $numpathchgs = scalar(keys(%pathchange)); |
|
if ($numpathchgs > 0) { |
if ($context eq 'portfolio') { |
if ($context eq 'portfolio') { |
$output .= '<p>'.&mt('or').'</p>'; |
$output .= '<p>'.&mt('or').'</p>'; |
} elsif ($context eq 'testbank') { |
} elsif ($context eq 'testbank') { |
$output .= '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>'; |
$output .= '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).', |
|
'<a href="javascript:document.testbankForm.submit();">','</a>').'</p>'; |
$returnflag = 'modify_orightml'; |
$returnflag = 'modify_orightml'; |
} |
} |
} |
} |
return ($output.$footer,$returnflag); |
return ($output.$footer,$returnflag,$numpathchgs); |
} |
} |
|
|
sub modify_html_form { |
sub modify_html_form { |
Line 9640 sub modify_html_form {
|
Line 10065 sub modify_html_form {
|
'<input type="hidden" name="embedded_orig_'.$i.'" value="'. |
'<input type="hidden" name="embedded_orig_'.$i.'" value="'. |
&escape($env{'form.embedded_orig_'.$i}).'" /></td>'. |
&escape($env{'form.embedded_orig_'.$i}).'" /></td>'. |
&end_data_table_row(); |
&end_data_table_row(); |
} |
} |
} |
} |
} else { |
} else { |
$modifyform = $pathchgtable; |
$modifyform = $pathchgtable; |
Line 9651 sub modify_html_form {
|
Line 10076 sub modify_html_form {
|
} |
} |
} |
} |
if ($modifyform) { |
if ($modifyform) { |
|
if ($actionurl eq '/adm/dependencies') { |
|
$hiddenstate .= '<input type="hidden" name="action" value="modifyhrefs" />'; |
|
} |
return '<h3>'.&mt('Changes in content of HTML file required').'</h3>'."\n". |
return '<h3>'.&mt('Changes in content of HTML file required').'</h3>'."\n". |
'<p>'.&mt('Changes need to be made to the reference(s) used for one or more of the dependencies, if your HTML file is to work correctly:').'<ol>'."\n". |
'<p>'.&mt('Changes need to be made to the reference(s) used for one or more of the dependencies, if your HTML file is to work correctly:').'<ol>'."\n". |
'<li>'.&mt('For consistency between the reference(s) and the location of the corresponding stored file within LON-CAPA.').'</li>'."\n". |
'<li>'.&mt('For consistency between the reference(s) and the location of the corresponding stored file within LON-CAPA.').'</li>'."\n". |
Line 9679 sub modify_html_refs {
|
Line 10107 sub modify_html_refs {
|
$container = $env{'form.container'}; |
$container = $env{'form.container'}; |
} elsif ($context eq 'coursedoc') { |
} elsif ($context eq 'coursedoc') { |
$container = $env{'form.primaryurl'}; |
$container = $env{'form.primaryurl'}; |
|
} elsif ($context eq 'manage_dependencies') { |
|
(undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
|
$container = "/$container"; |
} 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'); |
return unless (@changes > 0); |
unless (@changes > 0) { |
if (($context eq 'portfolio') || ($context eq 'coursedoc')) { |
if (wantarray) { |
return unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}); |
return ('',0,0); |
|
} else { |
|
return; |
|
} |
|
} |
|
if (($context eq 'portfolio') || ($context eq 'coursedoc') || |
|
($context eq 'manage_dependencies')) { |
|
unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) { |
|
if (wantarray) { |
|
return ('',0,0); |
|
} else { |
|
return; |
|
} |
|
} |
$content = &Apache::lonnet::getfile($container); |
$content = &Apache::lonnet::getfile($container); |
return if ($content eq '-1'); |
if ($content eq '-1') { |
|
if (wantarray) { |
|
return ('',0,0); |
|
} else { |
|
return; |
|
} |
|
} |
} else { |
} else { |
return unless ($container =~ /^\Q$dir_root\E/); |
unless ($container =~ /^\Q$dir_root\E/) { |
|
if (wantarray) { |
|
return ('',0,0); |
|
} else { |
|
return; |
|
} |
|
} |
if (open(my $fh,"<$container")) { |
if (open(my $fh,"<$container")) { |
$content = join('', <$fh>); |
$content = join('', <$fh>); |
close($fh); |
close($fh); |
} else { |
} else { |
return; |
if (wantarray) { |
|
return ('',0,0); |
|
} else { |
|
return; |
|
} |
} |
} |
} |
} |
my ($count,$codebasecount) = (0,0); |
my ($count,$codebasecount) = (0,0); |
Line 9729 sub modify_html_refs {
|
Line 10189 sub modify_html_refs {
|
} |
} |
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')) { |
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{/([^/]+)$}); |
$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].', |
$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].', |
$count,'<span class="LC_filename">'. |
$count,'<span class="LC_filename">'. |
$fname.'</span>').'</p>'; |
$fname.'</span>').'</p>'; |
} else { |
} else { |
$output = '<p class="LC_error">'. |
$output = '<p class="LC_error">'. |
&mt('Error: update failed for: [_1].', |
&mt('Error: update failed for: [_1].', |
Line 9762 sub modify_html_refs {
|
Line 10223 sub modify_html_refs {
|
' to modify references: '.$parse_result); |
' to modify references: '.$parse_result); |
} |
} |
} |
} |
return $output; |
if (wantarray) { |
|
return ($output,$count,$codebasecount); |
|
} else { |
|
return $output; |
|
} |
} |
} |
|
|
sub check_for_existing { |
sub check_for_existing { |
Line 10627 function dependencyCheck(form,count,offs
|
Line 11092 function dependencyCheck(form,count,offs
|
document.getElementById('arc_depon_'+count).style.display='block'; |
document.getElementById('arc_depon_'+count).style.display='block'; |
form.elements[depitem].options.length = 0; |
form.elements[depitem].options.length = 0; |
form.elements[depitem].options[0] = new Option('Select','',true,true); |
form.elements[depitem].options[0] = new Option('Select','',true,true); |
for (var i=1; i<count; i++) { |
for (var i=1; i<=numitems; i++) { |
|
if (i == count) { |
|
continue; |
|
} |
var startelement = $startcount + (i-1) * 7; |
var startelement = $startcount + (i-1) * 7; |
for (var j=1; j<6; j++) { |
for (var j=1; j<6; j++) { |
if ((j != 2) && (j!= 4)) { |
if ((j != 2) && (j!= 4)) { |
Line 10768 sub process_extracted_files {
|
Line 11236 sub process_extracted_files {
|
my (%referrer,%orphaned,%todelete,%todeletedir,%newdest,%newseqid); |
my (%referrer,%orphaned,%todelete,%todeletedir,%newdest,%newseqid); |
if ($numitems) { |
if ($numitems) { |
for (my $i=1; $i<=$numitems; $i++) { |
for (my $i=1; $i<=$numitems; $i++) { |
|
next if ($env{'form.archive_'.$i} eq 'dependency'); |
my $path = $env{'form.archive_content_'.$i}; |
my $path = $env{'form.archive_content_'.$i}; |
if ($path =~ /^\Q$pathtocheck\E/) { |
if ($path =~ /^\Q$pathtocheck\E/) { |
if ($env{'form.archive_'.$i} eq 'discard') { |
if ($env{'form.archive_'.$i} eq 'discard') { |
Line 10818 sub process_extracted_files {
|
Line 11287 sub process_extracted_files {
|
my ($outtext,$errtext) = |
my ($outtext,$errtext) = |
&LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
&LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
$docuname.'/'.$folders{$outer}. |
$docuname.'/'.$folders{$outer}. |
'.'.$containers{$outer},1); |
'.'.$containers{$outer},1,1); |
$newseqid{$i} = $newidx; |
$newseqid{$i} = $newidx; |
unless ($errtext) { |
unless ($errtext) { |
$result .= '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n"; |
$result .= '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n"; |
Line 10851 sub process_extracted_files {
|
Line 11320 sub process_extracted_files {
|
my ($outtext,$errtext)= |
my ($outtext,$errtext)= |
&LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
&LONCAPA::map::storemap('/uploaded/'.$docudom.'/'. |
$docuname.'/'.$folders{$outer}. |
$docuname.'/'.$folders{$outer}. |
'.'.$containers{$outer},1); |
'.'.$containers{$outer},1,1); |
unless ($errtext) { |
unless ($errtext) { |
if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") { |
if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") { |
$result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n"; |
$result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n"; |
Line 10859 sub process_extracted_files {
|
Line 11328 sub process_extracted_files {
|
} |
} |
} |
} |
} |
} |
} elsif ($env{'form.archive_'.$i} eq 'dependency') { |
} |
my ($title) = ($path =~ m{/([^/]+)$}); |
} else { |
$referrer{$i} = $env{'form.archive_dependent_on_'.$i}; |
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; |
if ($env{'form.archive_'.$referrer{$i}} eq 'display') { |
} |
if (ref($dirorder{$i}) eq 'ARRAY') { |
} |
my ($itemidx,$fullpath,$relpath); |
for (my $i=1; $i<=$numitems; $i++) { |
|
next unless ($env{'form.archive_'.$i} eq 'dependency'); |
|
my $path = $env{'form.archive_content_'.$i}; |
|
if ($path =~ /^\Q$pathtocheck\E/) { |
|
my ($title) = ($path =~ m{/([^/]+)$}); |
|
$referrer{$i} = $env{'form.archive_dependent_on_'.$i}; |
|
if ($env{'form.archive_'.$referrer{$i}} eq 'display') { |
|
if (ref($dirorder{$i}) eq 'ARRAY') { |
|
my ($itemidx,$fullpath,$relpath); |
|
if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') { |
|
my $container = $dirorder{$referrer{$i}}->[-1]; |
for (my $j=0; $j<@{$dirorder{$i}}; $j++) { |
for (my $j=0; $j<@{$dirorder{$i}}; $j++) { |
if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') { |
if ($dirorder{$i}->[$j] eq $container) { |
my $container = $dirorder{$referrer{$i}}->[-1]; |
$itemidx = $j; |
for (my $j=0; $j<@{$dirorder{$i}}; $j++) { |
|
if ($dirorder{$i}->[$j] eq $container) { |
|
$itemidx = $j; |
|
} |
|
} |
|
} |
} |
} |
} |
if ($itemidx ne '') { |
} |
if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) { |
if ($itemidx eq '') { |
if ($mapinner{$referrer{$i}}) { |
$itemidx = 0; |
$fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}"; |
} |
for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) { |
if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) { |
if (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) { |
if ($mapinner{$referrer{$i}}) { |
unless (defined($newseqid{$dirorder{$i}->[$j]})) { |
$fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}"; |
$fullpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) { |
$relpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
if (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) { |
if (!-e $fullpath) { |
unless (defined($newseqid{$dirorder{$i}->[$j]})) { |
mkdir($fullpath,0755); |
$fullpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
} |
$relpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
} |
if (!-e $fullpath) { |
} else { |
mkdir($fullpath,0755); |
last; |
|
} |
|
} |
|
} |
|
} elsif ($newdest{$referrer{$i}}) { |
|
$fullpath = $newdest{$referrer{$i}}; |
|
for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) { |
|
if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') { |
|
$orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]}; |
|
last; |
|
} elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) { |
|
unless (defined($newseqid{$dirorder{$i}->[$j]})) { |
|
$fullpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
|
$relpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
|
if (!-e $fullpath) { |
|
mkdir($fullpath,0755); |
|
} |
|
} |
} |
} else { |
|
last; |
|
} |
} |
|
} else { |
|
last; |
} |
} |
} |
} |
if ($fullpath ne '') { |
} |
if (-e "$prefix$path") { |
} elsif ($newdest{$referrer{$i}}) { |
system("mv $prefix$path $fullpath/$title"); |
$fullpath = $newdest{$referrer{$i}}; |
} |
for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) { |
if (-e "$fullpath/$title") { |
if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') { |
my $showpath; |
$orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]}; |
if ($relpath ne '') { |
last; |
$showpath = "$relpath/$title"; |
} elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) { |
} else { |
unless (defined($newseqid{$dirorder{$i}->[$j]})) { |
$showpath = "/$title"; |
$fullpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
} |
$relpath .= '/'.$titles{$dirorder{$i}->[$j]}; |
$result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n"; |
if (!-e $fullpath) { |
} |
mkdir($fullpath,0755); |
unless ($ishome) { |
} |
my $fetch = "$fullpath/$title"; |
|
$fetch =~ s/^\Q$prefix$dir\E//; |
|
$prompttofetch{$fetch} = 1; |
|
} |
} |
|
} else { |
|
last; |
} |
} |
} |
} |
} |
} |
} elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') { |
if ($fullpath ne '') { |
$warning .= &mt('[_1] is a dependency of [_2], which was discarded.', |
if (-e "$prefix$path") { |
$path,$env{'form.archive_content_'.$referrer{$i}}).'<br />'; |
system("mv $prefix$path $fullpath/$title"); |
|
} |
|
if (-e "$fullpath/$title") { |
|
my $showpath; |
|
if ($relpath ne '') { |
|
$showpath = "$relpath/$title"; |
|
} else { |
|
$showpath = "/$title"; |
|
} |
|
$result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n"; |
|
} |
|
unless ($ishome) { |
|
my $fetch = "$fullpath/$title"; |
|
$fetch =~ s/^\Q$prefix$dir\E//; |
|
$prompttofetch{$fetch} = 1; |
|
} |
|
} |
} |
} |
|
} elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') { |
|
$warning .= &mt('[_1] is a dependency of [_2], which was discarded.', |
|
$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 />'; |
Line 11058 sub get_folder_hierarchy {
|
Line 11533 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 Course Documents')); |
} else { |
} else { |
my $maptitle = $mapres->compTitle(); |
my $maptitle = $mapres->compTitle(); |
$maptitle =~ s/\W+/_/g; |
$maptitle =~ s/\W+/_/g; |
if ($maptitle ne '') { |
if ($maptitle ne '') { |
push(@pathitems,$maptitle); |
push(@pathitems,$maptitle); |
} |
} |
} |
} |
} |
} |
} |
Line 13319 sub init_user_environment {
|
Line 13794 sub init_user_environment {
|
%domdef = &Apache::lonnet::get_domain_defaults($domain); |
%domdef = &Apache::lonnet::get_domain_defaults($domain); |
} |
} |
|
|
foreach my $tool ('aboutme','blog','portfolio') { |
foreach my $tool ('aboutme','blog','webdav','portfolio') { |
$userenv{'availabletools.'.$tool} = |
$userenv{'availabletools.'.$tool} = |
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload', |
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload', |
undef,\%userenv,\%domdef,\%is_adv); |
undef,\%userenv,\%domdef,\%is_adv); |
Line 13380 sub get_symb {
|
Line 13855 sub get_symb {
|
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); |
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))); |
if ($symb eq '') { |
if ($symb eq '') { |
if (!$silent) { |
if (!$silent) { |
$request->print("Unable to handle ambiguous references:$url:."); |
if (ref($request)) { |
|
$request->print("Unable to handle ambiguous references:$url:."); |
|
} |
return (); |
return (); |
} |
} |
} |
} |
Line 13444 sub build_release_hashes {
|
Line 13921 sub build_release_hashes {
|
return; |
return; |
} |
} |
|
|
|
sub update_content_constraints { |
|
my ($cdom,$cnum,$chome,$cid) = @_; |
|
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); |
|
my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); |
|
my %checkresponsetypes; |
|
foreach my $key (keys(%Apache::lonnet::needsrelease)) { |
|
my ($item,$name,$value) = split(/:/,$key); |
|
if ($item eq 'resourcetag') { |
|
if ($name eq 'responsetype') { |
|
$checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key} |
|
} |
|
} |
|
} |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (defined($navmap)) { |
|
my %allresponses; |
|
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) { |
|
my %responses = $res->responseTypes(); |
|
foreach my $key (keys(%responses)) { |
|
next unless(exists($checkresponsetypes{$key})); |
|
$allresponses{$key} += $responses{$key}; |
|
} |
|
} |
|
foreach my $key (keys(%allresponses)) { |
|
my ($major,$minor) = split(/\./,$checkresponsetypes{$key}); |
|
if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) { |
|
($reqdmajor,$reqdminor) = ($major,$minor); |
|
} |
|
} |
|
undef($navmap); |
|
} |
|
unless (($reqdmajor eq '') && ($reqdminor eq '')) { |
|
&Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid); |
|
} |
|
return; |
|
} |
|
|
|
sub parse_supplemental_title { |
|
my ($title) = @_; |
|
|
|
my ($foldertitle,$renametitle); |
|
if ($title =~ /&&&/) { |
|
$title = &HTML::Entites::decode($title); |
|
} |
|
if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) { |
|
$renametitle=$4; |
|
my ($time,$uname,$udom) = ($1,$2,$3); |
|
$foldertitle=&Apache::lontexconvert::msgtexconverted($4); |
|
my $name = &plainname($uname,$udom); |
|
$name = &HTML::Entities::encode($name,'"<>&\''); |
|
$renametitle = &HTML::Entities::encode($renametitle,'"<>&\''); |
|
$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '. |
|
$name.': <br />'.$foldertitle; |
|
} |
|
if (wantarray) { |
|
return ($title,$foldertitle,$renametitle); |
|
} |
|
return $title; |
|
} |
|
|
=pod |
=pod |
|
|
=back |
=back |