'."\n";
}
sub end_data_table_row {
@@ -8471,13 +8296,21 @@ sub get_env_multiple {
sub ask_for_embedded_content {
my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
- my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges);
+ my (%subdependencies,%dependencies,%newfiles);
my $num = 0;
- my $numremref = 0;
- my $numinvalid = 0;
- my $numpathchg = 0;
- my $numexisting = 0;
- my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath);
+ my $upload_output;
+ foreach my $embed_file (keys(%{$allfiles})) {
+ unless ($embed_file =~ m{^\w+://} || $embed_file =~ m{^/}) {
+ my ($relpath,$fname);
+ if ($embed_file =~ m{/}) {
+ my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
+ $subdependencies{$path}{$fname} = 1;
+ } else {
+ $dependencies{$embed_file} = 1;
+ }
+ }
+ }
+ my ($url,$udom,$uname,$getpropath);
if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
my $current_path='/';
if ($env{'form.currentpath'}) {
@@ -8492,286 +8325,115 @@ sub ask_for_embedded_content {
$uname = $env{'user.name'};
$url = '/userfiles/portfolio';
}
- $toplevel = $url.'/';
$url .= $current_path;
$getpropath = 1;
- } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||
- ($actionurl eq '/adm/imsimport')) {
+ } elsif ($actionurl eq '/adm/upload') {
($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});
- $url = '/home/'.$uname.'/public_html/';
- $toplevel = $url;
+ $url = '/home/'.$uname.'/public_html';
if ($rest ne '') {
- $url .= $rest;
- }
- } elsif ($actionurl eq '/adm/coursedocs') {
- if (ref($args) eq 'HASH') {
- $url = $args->{'docs_url'};
- $toplevel = $url;
- }
- }
- my $now = time();
- foreach my $embed_file (keys(%{$allfiles})) {
- my $absolutepath;
- if ($embed_file =~ m{^\w+://}) {
- $newfiles{$embed_file} = 1;
- $mapping{$embed_file} = $embed_file;
- } else {
- if ($embed_file =~ m{^/}) {
- $absolutepath = $embed_file;
- $embed_file =~ s{^(/+)}{};
- }
- if ($embed_file =~ m{/}) {
- my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
- $path = &check_for_traversal($path,$url,$toplevel);
- my $item = $fname;
- if ($path ne '') {
- $item = $path.'/'.$fname;
- $subdependencies{$path}{$fname} = 1;
- } else {
- $dependencies{$item} = 1;
- }
- if ($absolutepath) {
- $mapping{$item} = $absolutepath;
- } else {
- $mapping{$item} = $embed_file;
- }
- } else {
- $dependencies{$embed_file} = 1;
- if ($absolutepath) {
- $mapping{$embed_file} = $absolutepath;
- } else {
- $mapping{$embed_file} = $embed_file;
- }
- }
+ $url .= '/'.$rest;
}
}
foreach my $path (keys(%subdependencies)) {
my %currsubfile;
- if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
+ if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
my @subdir_list = &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
foreach my $line (@subdir_list) {
my ($file_name,$rest) = split(/\&/,$line,2);
$currsubfile{$file_name} = 1;
}
- } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
+ } elsif ($actionurl eq '/adm/upload') {
if (opendir(my $dir,$url.'/'.$path)) {
my @subdir_list = grep(!/^\./,readdir($dir));
map {$currsubfile{$_} = 1;} @subdir_list;
}
}
foreach my $file (keys(%{$subdependencies{$path}})) {
- if ($currsubfile{$file}) {
- my $item = $path.'/'.$file;
- unless ($mapping{$item} eq $item) {
- $pathchanges{$item} = 1;
- }
- $existing{$item} = 1;
- $numexisting ++;
- } else {
- $newfiles{$path.'/'.$file} = 1;
+ unless ($currsubfile{$file}) {
+ $newfiles{$path.'/'.$file} = 1;
}
}
}
- my %currfile;
+ my (@dir_list,%currfile);
if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
my @dir_list = &Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);
foreach my $line (@dir_list) {
my ($file_name,$rest) = split(/\&/,$line,2);
$currfile{$file_name} = 1;
}
- } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
+ } elsif ($actionurl eq '/adm/upload') {
if (opendir(my $dir,$url)) {
- my @dir_list = grep(!/^\./,readdir($dir));
+ @dir_list = grep(!/^\./,readdir($dir));
map {$currfile{$_} = 1;} @dir_list;
}
}
foreach my $file (keys(%dependencies)) {
- if ($currfile{$file}) {
- unless ($mapping{$file} eq $file) {
- $pathchanges{$file} = 1;
- }
- $existing{$file} = 1;
- $numexisting ++;
- } else {
+ unless ($currfile{$file}) {
$newfiles{$file} = 1;
}
}
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
$upload_output .= &start_data_table_row().
- ''.$embed_file.' ';
- unless ($mapping{$embed_file} eq $embed_file) {
- $upload_output .= ''.&mt('changed from: [_1]',$mapping{$embed_file}).' ';
- }
- $upload_output .= '';
+ ' '.$embed_file.' ';
if ($args->{'ignore_remote_references'}
&& $embed_file =~ m{^\w+://}) {
$upload_output.=''.&mt("URL points to other server.").' ';
- $numremref++;
} elsif ($args->{'error_on_invalid_names'}
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
- $upload_output.=''.&mt('Invalid characters').' ';
- $numinvalid++;
+ $upload_output.=''.&mt("Invalid characters").' ';
+
} else {
- $upload_output .= &embedded_file_element('upload_embedded',$num,
- $embed_file,\%mapping,
- $allfiles,$codebase);
- $num++;
- }
- $upload_output .= ' '.&Apache::loncommon::end_data_table_row()."\n";
- }
- foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%existing)) {
- $upload_output .= &start_data_table_row().
- ''.$embed_file.' '.&mt('Already exists').' '.&mt('or').'
';
- }
- }
- return ($output,$num,$numpathchg);
-}
-
-sub embedded_file_element {
- my ($context,$num,$embed_file,$mapping,$allfiles,$codebase) = @_;
- return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
- (ref($codebase) eq 'HASH'));
- my $output;
- if ($context eq 'upload_embedded') {
- $output = ''
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
@@ -8832,24 +8492,10 @@ sub upload_embedded {
.' '.
- $path.$fname.' ').''.&mt('Uploaded [_1]',''.
+ $path.$fname.' ').'
';
}
}
- } elsif ($context eq 'coursedoc') {
- my $result =
- &Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc',
- $dirpath.'/'.$path);
- if ($result !~ m|^/uploaded/|) {
- $output .= ''
- .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
- ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
- .' '.
- $path.$fname.' ').''.
- $url.' ').''.$fname.' ').''.$output.'
';
- }
- $output .= &modify_html_form('upload_embedded',$actionurl,$hiddenstate,\%pathchange);
- $returnflag = 'ok';
- if (keys(%pathchange) > 0) {
- if ($context eq 'portfolio') {
- $output .= ''.&mt('or').'
';
- } elsif ($context eq 'testbank') {
- $output .= ''.&mt('Or [_1]continue[_2] the testbank import without modifying the reference(s).','',' ').'
';
- $returnflag = 'modify_orightml';
- }
- }
- return ($output.$footer,$returnflag);
-}
-
-sub modify_html_form {
- my ($context,$actionurl,$hiddenstate,$pathchange,$pathchgtable) = @_;
- my $end = 0;
- my $modifyform;
- if ($context eq 'upload_embedded') {
- return unless (ref($pathchange) eq 'HASH');
- if ($env{'form.number_embedded_items'}) {
- $end += $env{'form.number_embedded_items'};
- }
- if ($env{'form.number_pathchange_items'}) {
- $end += $env{'form.number_pathchange_items'};
- }
- if ($end) {
- for (my $i=0; $i<$end; $i++) {
- if ($i < $env{'form.number_embedded_items'}) {
- next unless($pathchange->{$i});
- }
- $modifyform .=
- &start_data_table_row().
- ''.$env{'form.embedded_ref_'.$i}.
- ' '.
- ''.$env{'form.embedded_orig_'.$i}.
- ' '.
- &end_data_table_row();
- }
- }
- } else {
- $modifyform = $pathchgtable;
- if (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank')) {
- $hiddenstate .= ''.&mt('Changes in content of HTML file required').' '."\n".
- ''.&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:').'
'."\n".
- ''.&mt('For consistency between the reference(s) and the location of the corresponding stored file within LON-CAPA.').' '."\n".
- ''.&mt('To change absolute paths to relative paths, or replace directory traversal via "../" within the original reference.').' '."\n".
- ' '."\n".''.
- &mt('LON-CAPA can make the required changes to your HTML file.').'
'."\n".
- ''."\n";
- }
- return;
-}
-
-sub modify_html_refs {
- my ($context,$dirpath,$uname,$udom,$dir_root) = @_;
- my $container;
- if ($context eq 'portfolio') {
- $container = $env{'form.container'};
- } elsif ($context eq 'coursedoc') {
- $container = $env{'form.primaryurl'};
- } else {
- $container = $env{'form.filename'};
- $container =~ s{^/priv/(\Q$uname\E)/(.*)}{/home/$1/public_html/$2};
- }
- my (%allfiles,%codebase,$output,$content);
- my @changes = &get_env_multiple('form.namechange');
- return unless (@changes > 0);
- if (($context eq 'portfolio') || ($context eq 'coursedoc')) {
- return unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/});
- $content = &Apache::lonnet::getfile($container);
- return if ($content eq '-1');
- } else {
- return unless ($container =~ /^\Q$dir_root\E/);
- if (open(my $fh,"<$container")) {
- $content = join('', <$fh>);
- close($fh);
- } else {
- return;
- }
- }
- my ($count,$codebasecount) = (0,0);
- my $mm = new File::MMagic;
- my $mime_type = $mm->checktype_contents($content);
- if ($mime_type eq 'text/html') {
- my $parse_result =
- &Apache::lonnet::extract_embedded_items($container,\%allfiles,
- \%codebase,\$content);
- if ($parse_result eq 'ok') {
- foreach my $i (@changes) {
- my $orig = &unescape($env{'form.embedded_orig_'.$i});
- my $ref = &unescape($env{'form.embedded_ref_'.$i});
- if ($allfiles{$ref}) {
- my $newname = $orig;
- my ($attrib_regexp,$codebase);
- my $attrib_regexp = &unescape($env{'form.embedded_attrib_'.$i});
- if ($attrib_regexp =~ /:/) {
- $attrib_regexp =~ s/\:/|/g;
- }
- 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);
- $count += $numchg;
- }
- if ($env{'form.embedded_codebase_'.$i} ne '') {
- my $codebase = &unescape($env{'form.embedded_codebase_'.$i});
- my $numchg = ($content =~ s/(codebase\s*=\s*["']?)\Q$codebase\E(["']?)/$1.$2/i); #' stupid emacs
- $codebasecount ++;
- }
- }
- }
- if ($count || $codebasecount) {
- my $saveresult;
- if ($context eq 'portfolio' || $context eq 'coursedoc') {
- my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
- if ($url eq $container) {
- my ($fname) = ($container =~ m{/([^/]+)$});
- $output = ''.&mt('Updated [quant,_1,reference] in [_2].',
- $count,''.
- $fname.' ').'
';
- } else {
- $output = ''.
- &mt('Error: update failed for: [_1].',
- ''.
- $container.' ').'
';
- }
- } else {
- if (open(my $fh,">$container")) {
- print $fh $content;
- close($fh);
- $output = ''.&mt('Updated [quant,_1,reference] in [_2].',
- $count,''.
- $container.' ').'
';
+ if ($context eq 'testbank') {
+ $output .= &mt('Embedded file uploaded successfully:').
+ ' '.
+ $orig_uploaded_filename.' '.
- &mt('Error: could not update [_1].',
- ''.
- $container.' ').'
';
+ $output .= ''.
+ &mt('View embedded file: [_1]',''.
+ $orig_uploaded_filename.' ').' '.
- &mt('Unable to upload [_1]. (size = [_2] bytes)',
+ &mt('Unable to upload [_1]. (size = [_2] bytes)',
''.$fname.' ',
$filesize).' ';
return ('zero_bytes',$msg);
}
@@ -9101,11 +8576,6 @@ sub check_for_upload {
$getpropath);
my $found_file = 0;
my $locked_file = 0;
- my @lockers;
- my $navmap;
- if ($env{'request.course.id'}) {
- $navmap = Apache::lonnavmaps::navmap->new();
- }
foreach my $line (@dir_list) {
my ($file_name,$rest)=split(/\&/,$line,2);
if ($file_name eq $fname){
@@ -9114,28 +8584,8 @@ sub check_for_upload {
$file_name = $group.$file_name;
}
$found_file = 1;
- if (&Apache::lonnet::is_locked($file_name,$udom,$uname,\@lockers) eq 'true') {
- foreach my $lock (@lockers) {
- if (ref($lock) eq 'ARRAY') {
- my ($symb,$crsid) = @{$lock};
- if ($crsid eq $env{'request.course.id'}) {
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- foreach my $part (@{$res->parts()}) {
- my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
- unless (($slot_status == $res->RESERVED) ||
- ($slot_status == $res->RESERVED_LOCATION)) {
- $locked_file = 1;
- }
- }
- } else {
- $locked_file = 1;
- }
- } else {
- $locked_file = 1;
- }
- }
- }
+ if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+ $locked_file = 1;
} else {
my @info = split(/\&/,$rest);
my $currsize = $info[6]/1000;
@@ -9174,48 +8624,6 @@ sub check_for_upload {
}
}
-sub check_for_traversal {
- my ($path,$url,$toplevel) = @_;
- my @parts=split(/\//,$path);
- my $cleanpath;
- my $fullpath = $url;
- for (my $i=0;$i<@parts;$i++) {
- next if ($parts[$i] eq '.');
- if ($parts[$i] eq '..') {
- $fullpath =~ s{([^/]+/)$}{};
- } else {
- $fullpath .= $parts[$i].'/';
- }
- }
- if ($fullpath =~ /^\Q$url\E(.*)$/) {
- $cleanpath = $1;
- } elsif ($fullpath =~ /^\Q$toplevel\E(.*)$/) {
- my $curr_toprel = $1;
- my @parts = split(/\//,$curr_toprel);
- my ($url_toprel) = ($url =~ /^\Q$toplevel\E(.*)$/);
- my @urlparts = split(/\//,$url_toprel);
- my $doubledots;
- my $startdiff = -1;
- for (my $i=0; $i<@urlparts; $i++) {
- if ($startdiff == -1) {
- unless ($urlparts[$i] eq $parts[$i]) {
- $startdiff = $i;
- $doubledots .= '../';
- }
- } else {
- $doubledots .= '../';
- }
- }
- if ($startdiff > -1) {
- $cleanpath = $doubledots;
- for (my $i=$startdiff; $i<@parts; $i++) {
- $cleanpath .= $parts[$i].'/';
- }
- }
- }
- $cleanpath =~ s{(/)$}{};
- return $cleanpath;
-}
=pod
@@ -11138,6 +10546,8 @@ sub construct_course {
############################################################
############################################################
+#SD
+# only Community and Course, or anything else?
sub course_type {
my ($cid) = @_;
if (!defined($cid)) {
@@ -11303,15 +10713,12 @@ sub init_user_environment {
my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
my ($tmp) = keys(%userenv);
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- # default remote control to off
- if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
} else {
undef(%userenv);
}
if (($userenv{'interface'}) && (!$form->{'interface'})) {
$form->{'interface'}=$userenv{'interface'};
}
- $env{'environment.remote'}=$userenv{'remote'};
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
# --------------- Do not trust query string to be put directly into environment
@@ -11343,14 +10750,12 @@ sub init_user_environment {
$initial_env{"browser.localres"} = $form->{'localres'};
}
- if ($public) {
- $initial_env{"environment.remote"} = "off";
- }
if ($form->{'interface'}) {
$form->{'interface'}=~s/\W//gs;
$initial_env{"browser.interface"} = $form->{'interface'};
$env{'browser.interface'}=$form->{'interface'};
}
+
my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef = &Apache::lonnet::get_domain_defaults($domain);
@@ -11443,36 +10848,6 @@ sub clean_symb {
return ($symb,$enc);
}
-sub build_release_hashes {
- my ($checkparms,$checkresponsetypes,$checkcrstypes,$anonsurvey,$randomizetry) = @_;
- return unless((ref($checkparms) eq 'HASH') && (ref($checkresponsetypes) eq 'HASH') &&
- (ref($checkcrstypes) eq 'HASH') && (ref($anonsurvey) eq 'HASH') &&
- (ref($randomizetry) eq 'HASH'));
- foreach my $key (keys(%Apache::lonnet::needsrelease)) {
- my ($item,$name,$value) = split(/:/,$key);
- if ($item eq 'parameter') {
- if (ref($checkparms->{$name}) eq 'ARRAY') {
- unless(grep(/^\Q$name\E$/,@{$checkparms->{$name}})) {
- push(@{$checkparms->{$name}},$value);
- }
- } else {
- push(@{$checkparms->{$name}},$value);
- }
- } elsif ($item eq 'resourcetag') {
- if ($name eq 'responsetype') {
- $checkresponsetypes->{$value} = $Apache::lonnet::needsrelease{$key}
- }
- } elsif ($item eq 'course') {
- if ($name eq 'crstype') {
- $checkcrstypes->{$value} = $Apache::lonnet::needsrelease{$key};
- }
- }
- }
- ($anonsurvey->{major},$anonsurvey->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'});
- ($randomizetry->{major},$randomizetry->{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'});
- return;
-}
-
=pod
=back