X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDBUpgrade2%2FBase.pm;h=024282f6534973e6d9b130c92a09274fcf491fce;hb=2b8804456d1d3ee249a70d98679ea3a934b25a39;hp=00df6d2e8c201de9aa0fd6104b034821ee02a91a;hpb=33bef43e6b9be16e2addc60c0ae628c241798631;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm index 00df6d2e8..024282f65 100644 --- a/SL/DBUpgrade2/Base.pm +++ b/SL/DBUpgrade2/Base.pm @@ -11,6 +11,7 @@ use File::Basename (); use File::Copy (); use File::Path (); use List::MoreUtils qw(uniq); +use SL::DBUtils qw(selectfirst_hashref_query); use version; use Rose::Object::MakeMethods::Generic ( @@ -97,7 +98,9 @@ sub add_print_templates { croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_"; } - return 1 unless my $template_dir = $::instance_conf->reload->get_templates; + # can't use Rose or InstanceConf here because defaults might not be fully upgraded yet. + my $defaults = selectfirst_hashref_query($::form, $::form->get_standard_dbh, "SELECT * FROM defaults"); + return 1 unless my $template_dir = $defaults->{template}; $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir"); foreach my $src_file (@files) { @@ -140,6 +143,26 @@ SQL $self->db_query(qq|ALTER TABLE $params{schema}."$params{table}" DROP CONSTRAINT "${_}"|) for map { $_->[0] } @{ $constraints }; } +sub convert_column_to_html { + my ($self, $table, $column) = @_; + + my $sth = $self->dbh->prepare(qq|UPDATE $table SET $column = ? WHERE id = ?|) || $self->dberror; + + 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}); + $new_content =~ s{\r}{}g; + $new_content =~ s{\n\n+}{
}g;
+ $new_content =~ s{\n}{
}g;
+ $new_content = "
${new_content}
" if $new_content; + + $sth->execute($new_content, $row->{id}) if $new_content ne $row->{$column}; + } + + $sth->finish; +} + 1; __END__ @@ -314,6 +337,11 @@ C