\n";
+ my ($def,$name,%hash) = @_;
+ my $selectform = "\n";
my @keys;
- if (exists($hashref->{'select_form_order'})) {
- @keys=@{$hashref->{'select_form_order'}};
+ if (exists($hash{'select_form_order'})) {
+ @keys=@{$hash{'select_form_order'}};
} else {
- @keys=sort(keys(%{$hashref}));
+ @keys=sort(keys(%hash));
}
foreach my $key (@keys) {
$selectform.=
'&').'" '.
($key eq $def ? 'selected="selected" ' : '').
- ">".$hashref->{$key}." \n";
+ ">".$hash{$key}."\n";
}
$selectform.=" ";
return $selectform;
@@ -1912,9 +1888,9 @@ sub display_filter {
&mt('Filter [_1]',
&select_form($env{'form.displayfilter'},
'displayfilter',
- {'currentfolder' => 'Current folder/page',
+ ('currentfolder' => 'Current folder/page',
'containing' => 'Containing phrase',
- 'none' => 'None'})).
+ 'none' => 'None'))).
''.&mt('History').' ';
- my (%typeparts,%lasthidden);
+ my %typeparts;
my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});
foreach my $key (sort(keys(%lasthash))) {
my ($ign,@parts) = split(/\./,$key);
if ($#parts > 0) {
my $data=$parts[-1];
- next if ($data eq 'foilorder');
pop(@parts);
if ($data eq 'type') {
unless ($showsurv) {
my $id = join(',',@parts);
$typeparts{$ign.'.'.$id} = $lasthash{$key};
- if (($lasthash{$key} eq 'anonsurvey') || ($lasthash{$key} eq 'anonsurveycred')) {
- $lasthidden{$ign.'.'.$id} = 1;
- }
}
delete($lasthash{$key});
} else {
@@ -3454,6 +3423,7 @@ sub get_previous_attempt {
}
}
$prevattempts.=&end_data_table_header_row();
+ my %lasthidden;
if ($getattempt eq '') {
for ($version=1;$version<=$returnhash{'version'};$version++) {
my @hidden;
@@ -3461,6 +3431,11 @@ sub get_previous_attempt {
foreach my $id (keys(%typeparts)) {
if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
push(@hidden,$id);
+ $lasthidden{$id} = 1;
+ } elsif ($lasthidden{$id}) {
+ if (exists($returnhash{$version.':'.$id.'.award'})) {
+ delete($lasthidden{$id});
+ }
}
}
}
@@ -3468,7 +3443,6 @@ sub get_previous_attempt {
''.&mt('Transaction [_1]',$version).' ';
if (@hidden) {
foreach my $key (sort(keys(%lasthash))) {
- next if ($key =~ /\.foilorder$/);
my $hide;
foreach my $id (@hidden) {
if ($key =~ /^\Q$id\E/) {
@@ -3497,7 +3471,6 @@ sub get_previous_attempt {
}
} else {
foreach my $key (sort(keys(%lasthash))) {
- next if ($key =~ /\.foilorder$/);
my $value = &format_previous_attempt_value($key,
$returnhash{$version.':'.$key});
$prevattempts.=''.$value.' ';
@@ -3509,7 +3482,6 @@ sub get_previous_attempt {
my @currhidden = keys(%lasthidden);
$prevattempts.=&start_data_table_row().''.&mt('Current').' ';
foreach my $key (sort(keys(%lasthash))) {
- next if ($key =~ /\.foilorder$/);
if (%typeparts) {
my $hidden;
foreach my $id (@currhidden) {
@@ -3565,29 +3537,6 @@ sub format_previous_attempt_value {
$value = &Apache::lonlocal::locallocaltime($value);
} elsif (ref($value) eq 'ARRAY') {
$value = '('.join(', ', @{ $value }).')';
- } elsif ($key =~ /answerstring$/) {
- my %answers = &Apache::lonnet::str2hash($value);
- my @anskeys = sort(keys(%answers));
- if (@anskeys == 1) {
- my $answer = $answers{$anskeys[0]};
- if ($answer =~ m{\0}) {
- $answer =~ s{\0}{,}g;
- }
- my $tag_internal_answer_name = 'INTERNAL';
- if ($anskeys[0] eq $tag_internal_answer_name) {
- $value = $answer;
- } else {
- $value = $anskeys[0].'='.$answer;
- }
- } else {
- foreach my $ans (@anskeys) {
- my $answer = $answers{$ans};
- if ($answer =~ m{\0}) {
- $answer =~ s{\0}{,}g;
- }
- $value .= $ans.'='.$answer.''
+ '
'
.$content
.'
'
}
@@ -4591,9 +4539,6 @@ Inputs:
=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
no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,
@@ -4611,7 +4556,7 @@ other decorations will be returned.
sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
- $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
+ $no_nav_bar,$bgcolor,$args)=@_;
my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -4653,8 +4598,6 @@ sub bodytag {
}
if (!$realm) { $realm=' '; }
-# Set messages
- my $messages=&domainlogo($domain);
my $extra_body_attr = &make_attr_string($forcereg,\%design);
@@ -4672,7 +4615,7 @@ sub bodytag {
} else {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
}
-
+
my $titleinfo = '
'.$title.' ';
#
# Extra info if you are the DC
@@ -4688,11 +4631,9 @@ sub bodytag {
$role = '
('.$role.') ' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- if ($env{'environment.remote'} ne 'on') {
- # No Remote
if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- return $bodytag;
- }
+ return $bodytag;
+ }
if ($env{'request.state'} eq 'construct') { $forcereg=1; }
@@ -4710,10 +4651,6 @@ sub bodytag {
$realm $dc_info
$name $role
|;
@@ -4735,7 +4672,7 @@ sub bodytag {
$bodytag .= Apache::lonmenu::serverform();
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
if ($env{'request.state'} eq 'construct') {
- $bodytag .= &Apache::lonmenu::innerregister($forcereg,'',
+ $bodytag .= &Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});
} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg);
@@ -4748,48 +4685,11 @@ sub bodytag {
}
return $bodytag;
- }
-
-#
-# Top frame rendering, Remote is up
-#
-
- my $imgsrc = $img;
- if ($img =~ /^\/adm/) {
- $imgsrc = &lonhttpdurl($img);
- }
- my $upperleft=''.&mt('Switch to Inline Menu Mode').' ');
-
- if ($dc_info) {
- $dc_info = qq|($dc_info) |;
- }
-
- unless ($env{'form.inhibitmenu'}) {
- $bodytag .= qq|$name $role
- $realm $dc_info
|;
- }
-
- return(<
-$upperleft
- $messages
-$titleinfo $dc_info $menu
-'.
+ return ' '.
''.
&mt('(More ...)').' '.
''.$dc_info.'
';
@@ -4816,22 +4716,8 @@ sub make_attr_string {
delete($attr_ref->{$key});
}
}
- $attr_ref->{'onload'} =
- &Apache::lonmenu::loadevents(). $on_load;
- $attr_ref->{'onunload'}=
- &Apache::lonmenu::unloadevents().$on_unload;
- }
-
-# Accessibility font enhance
- if ($env{'browser.fontenhance'} eq 'on') {
- my $style;
- foreach my $key (keys(%{$attr_ref})) {
- if (lc($key) eq 'style') {
- $style.=$attr_ref->{$key}.';';
- delete($attr_ref->{$key});
- }
- }
- $attr_ref->{'style'}=$style.'; font-size: x-large;';
+ $attr_ref->{'onload'} = $on_load;
+ $attr_ref->{'onunload'}= $on_unload;
}
my $attr_string;
@@ -4929,6 +4815,7 @@ sub standard_css {
$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
: '0 3px 0 4px';
+
return < legend {
#LC_nav_bar {
float: left;
- background-color: $pgbg_or_bgcolor;
margin: 0 0 2px 0;
}
@@ -6161,7 +6021,6 @@ fieldset > legend {
padding: 0;
font-weight: bold;
text-align: center;
- background-color: $pgbg_or_bgcolor;
}
#LC_nav_bar em {
@@ -6177,12 +6036,6 @@ fieldset > legend {
ol.LC_primary_menu {
float: right;
margin: 0;
- background-color: $pgbg_or_bgcolor;
-}
-
-ol.LC_primary_menu a.LC_new_message {
- font-weight:bold;
- color: darkred;
}
ol#LC_PathBreadcrumbs {
@@ -6205,28 +6058,9 @@ ol.LC_primary_menu a {
text-decoration: none;
}
-ol.LC_docs_parameters {
- margin-left: 0;
- padding: 0;
- list-style: none;
-}
-
-ol.LC_docs_parameters li {
- margin: 0;
- padding-right: 20px;
- display: inline;
-}
-
-ol.LC_docs_parameters li:before {
- content: "\\002022 \\0020";
-}
-
-li.LC_docs_parameters_title {
- font-weight: bold;
-}
-
-ol.LC_docs_parameters li.LC_docs_parameters_title:before {
- content: "";
+ol.LC_primary_menu a.LC_new_message {
+ font-weight:bold;
+ color: darkred;
}
ul#LC_secondary_menu {
@@ -6237,7 +6071,6 @@ ul#LC_secondary_menu {
padding: 0;
margin: 0;
width: 100%;
- text-align: left;
}
ul#LC_secondary_menu li {
@@ -6347,7 +6180,7 @@ ul.LC_TabContentBigger li a {
text-align: center;
display: block;
text-decoration: none;
- outline: none;
+ outline: none;
}
ul.LC_TabContentBigger li.active a {
@@ -6374,6 +6207,7 @@ ul.LC_TabContentBigger li.active b {
cursor:default;
}
+
ul.LC_CourseBreadcrumbs {
background: $sidebg;
line-height: 32px;
@@ -6542,14 +6376,6 @@ a#LC_content_toolbar_firsthomework {
background-image:url(/res/adm/pages/open-first-problem.gif);
}
-a#LC_content_toolbar_launchnav {
- background-image:url(/res/adm/pages/start-navigation.gif);
-}
-
-a#LC_content_toolbar_closenav {
- background-image:url(/res/adm/pages/close-navigation.gif);
-}
-
a#LC_content_toolbar_everything {
background-image:url(/res/adm/pages/show-all.gif);
}
@@ -6691,8 +6517,8 @@ sub headtag {
if (!$args->{'frameset'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}
- if ($args->{'force_register'}) {
- $result .= &Apache::lonmenu::registerurl(1);
+ if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
+ $result .= Apache::lonxml::display_title();
}
if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}
@@ -6718,7 +6544,7 @@ ADDMETA
$result .= ' LON-CAPA '.$title.' '
.'
- rather than
- dicsussion -> if true will get discussion from
- lonxml::xmlend
- (you can pass the target and parser arguments
- through optional 'target' and 'parser' args
- to this routine)
-
-=cut
-
sub end_page {
my ($args) = @_;
$env{'internal.end_page'}++;
@@ -7061,12 +6836,12 @@ sub simple_error_page {
sub start_data_table {
my ($add_class) = @_;
my $css_class = (join(' ','LC_data_table',$add_class));
- &start_data_table_count();
+ &start_data_table_count();
return ''."\n";
}
sub end_data_table {
- &end_data_table_count();
+ &end_data_table_count();
return '
'."\n";;
}
@@ -7245,8 +7020,7 @@ role status: active, previous or future.
sub check_user_status {
my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
- my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
- my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra);
+ my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
my @uroles = keys %userinfo;
my $srchstr;
my $active_chk = 'none';
@@ -7829,7 +7603,7 @@ sub get_secgrprole_info {
}
sub user_picker {
- my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
+ my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
my $currdom = $dom;
my %curr_selected = (
srchin => 'dom',
@@ -7920,15 +7694,10 @@ sub user_picker {
$srchtypesel .= "\n \n";
my ($newuserscript,$new_user_create);
- my $context_dom = $env{'request.role.domain'};
- if ($context eq 'requestcrs') {
- if ($env{'form.coursedom'} ne '') {
- $context_dom = $env{'form.coursedom'};
- }
- }
+
if ($forcenewuser) {
if (ref($srch) eq 'HASH') {
- if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $context_dom) {
+ if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
if ($cancreate) {
$new_user_create = '';
+ $upload_output .= $state;
+ $upload_output .= 'Upload embedded files :'.$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].'
- ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
- .' '.
- $path.$fname.' ').''
- .&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].'
,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
- .' '.
- $path.$fname.' ').''.&mt('Uploaded [_1]',''.
+ $path.$fname.' ').'
';
}
} else {
# Save the file
@@ -8892,189 +8396,18 @@ sub upload_embedded {
&mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
''.
- $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);
- $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 '') {
- $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)',
- ''.$fname.' ',
- $filesize).' ';
- return ('zero_bytes',$msg);
- }
- $filesize = $filesize/1000; #express in k (1024?)
+ my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
my $getpropath = 1;
my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
$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);
+ my ($file_name)=split(/\&/,$line,2);
if ($file_name eq $fname){
$file_name = $path.$file_name;
if ($group ne '') {
$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;
- }
- }
- }
- } else {
- my @info = split(/\&/,$rest);
- my $currsize = $info[6]/1000;
- if ($currsize < $filesize) {
- my $extra = $filesize - $currsize;
- if (($current_disk_usage + $extra) > $disk_quota) {
- my $msg = ''.
- &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded if existing (smaller) file with same name (size = [_3] kilobytes) is replaced.',
- ''.$fname.' ',$filesize,$currsize).' '.
- '';
- $msg .= &mt(' A file by that name: [_1] was found in [_2].',''.$fname.' ',$port_path.$env{'form.currentpath'});
+ $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].',''.$fname.' ',$port_path.$env{'form.currentpath'});
$msg .= ' ';
- return ('existingfile',$msg);
+ $msg .= ''.$fname.' ', $port_path.$env{'form.currentpath'});
+ return ('file_exists',$msg);
}
}
}
-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
@@ -11152,6 +10396,8 @@ sub construct_course {
############################################################
############################################################
+#SD
+# only Community and Course, or anything else?
sub course_type {
my ($cid) = @_;
if (!defined($cid)) {
@@ -11317,15 +10563,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
@@ -11357,28 +10600,21 @@ 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);
foreach my $tool ('aboutme','blog','portfolio') {
$userenv{'availabletools.'.$tool} =
- &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
- undef,\%userenv,\%domdef,\%is_adv);
+ &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
}
foreach my $crstype ('official','unofficial','community') {
$userenv{'canrequest.'.$crstype} =
&Apache::lonnet::usertools_access($username,$domain,$crstype,
- 'reload','requestcourses',
- \%userenv,\%domdef,\%is_adv);
+ 'reload','requestcourses');
}
$env{'user.environment'} = "$lonids/$cookie.id";
@@ -11457,36 +10693,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