Changeset 34393 for main/trunk/greenstone2/perllib/unicode.pm
- Timestamp:
- 2020-09-15T20:19:33+12:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/unicode.pm
r33757 r34393 708 708 my ($text) = @_; 709 709 my $force_encode = 1; 710 return &base64_encode($text, $force_encode); 710 my $no_newlines = 1; 711 return &base64_encode($text, $force_encode, $no_newlines); 711 712 } 712 713 713 714 sub base64_encode { 714 my ($text, $force_encode ) = @_;715 my ($text, $force_encode, $no_newlines) = @_; 715 716 if($force_encode || !&conforms_to_mod_base64($text)) { 716 717 # return entity for underscore to underscore before encoding … … 722 723 $text =~ s/\+/\-/g; # + -> - 723 724 $text =~ s/\//\_/g; # / -> _ 725 726 # by default base64 encoding a long string introduces newlines to break long strings, 727 # see https://stackoverflow.com/questions/19952621/is-it-ok-to-remove-newline-in-base64-encoding 728 # Java doesn't like that 729 $text =~ s/\n//gs if $no_newlines; 724 730 } 725 731 return $text; … … 793 799 } 794 800 795 796 801 sub raw_filename_to_url_encoded 797 802 {
Note:
See TracChangeset
for help on using the changeset viewer.