X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FDBUpgrade2%2FBase.pm;h=cd698c5e59b8d9b0c4cbecc3a878233858665bbc;hb=1b112bd36f0b592a999276b6eb8c90b2a5827998;hp=024282f6534973e6d9b130c92a09274fcf491fce;hpb=ac4921aa8a932435696edaadfc35a3eac5217e9c;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm index 024282f65..cd698c5e5 100644 --- a/SL/DBUpgrade2/Base.pm +++ b/SL/DBUpgrade2/Base.pm @@ -12,6 +12,7 @@ use File::Copy (); use File::Path (); use List::MoreUtils qw(uniq); use SL::DBUtils qw(selectfirst_hashref_query); +use SL::Presenter::EscapedText qw(escape); use version; use Rose::Object::MakeMethods::Generic ( @@ -30,9 +31,10 @@ sub execute_script { die $EVAL_ERROR; } + my $auth = $file_name =~ m{/Pg-upgrade2-auth/} ? 'Auth::' : ''; my $package = delete $params{tag}; $package =~ s/[^a-zA-Z0-9_]+/_/g; - $package = "SL::DBUpgrade2::${package}"; + $package = "SL::DBUpgrade2::${auth}${package}"; $package->new(%params)->run; } @@ -151,7 +153,7 @@ sub convert_column_to_html { foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) { next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{[a-z]+>$})); - my $new_content = "" . $::request->presenter->escape($row->{$column}); + my $new_content = "" . escape($row->{$column}); $new_content =~ s{\r}{}g; $new_content =~ s{\n\n+}{
}g;
$new_content =~ s{\n}{
}g;