Bug 18925: Move maxissueqty and maxonsiteissueqty to circulation_rules

[koha.git] / C4 / Installer.pm

diff --git a/C4/Installer.pm b/C4/Installer.pm
index e8692a1..a1c4714 100644 (file)
--- a/C4/Installer.pm
+++ b/C4/Installer.pm
@@ -76,7 +76,7 @@ sub new {
     $self->{'user'}     = C4::Context->config("user");
     $self->{'password'} = C4::Context->config("pass");
     $self->{'tls'} = C4::Context->config("tls");
-    if ($self->{'tls'} eq 'yes'){
+    if( $self->{'tls'} && $self->{'tls'} eq 'yes' ) {
         $self->{'ca'} = C4::Context->config('ca');
         $self->{'cert'} = C4::Context->config('cert');
         $self->{'key'} = C4::Context->config('key');
@@ -152,15 +152,15 @@ sub marc_framework_sql_list {
         map {
             my $name = substr( $_, 0, -4 );
             open my $fh, "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
-            my $lines = <$fh>;
-            $lines =~ s/\n|\r/<br \/>/g;
-            $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) );
+            my $line = <$fh>;
+            $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) );
+            my @lines = split /\n/, $line;
             my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
             push @frameworklist,
               {
                 'fwkname'        => $name,
                 'fwkfile'        => "$dir/$requirelevel/$_",
-                'fwkdescription' => $lines,
+                'fwkdescription' => \@lines,
                 'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
                 'mandatory'      => $mandatory,
               };
@@ -229,15 +229,15 @@ sub sample_data_sql_list {
         map {
             my $name = substr( $_, 0, -4 );
             open my $fh , "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
-            my $lines = <$fh>;
-            $lines =~ s/\n|\r/<br \/>/g;
-            $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) );
+            my $line = <$fh>;
+            $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) );
+            my @lines = split /\n/, $line;
             my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
             push @frameworklist,
               {
                 'fwkname'        => $name,
                 'fwkfile'        => "$dir/$requirelevel/$_",
-                'fwkdescription' => $lines,
+                'fwkdescription' => \@lines,
                 'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
                 'mandatory'      => $mandatory,
               };
@@ -326,7 +326,7 @@ sub load_sql_in_order {
     push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql";
     push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql";
     push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/audio_alerts.sql";
-    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/mandatory/refund_lost_item_fee_rules.sql";
+    push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/account_offset_types.sql";
     foreach my $file (@fnames) {
         #      warn $file;
         undef $/;