Bug 23473: Allow overwrite of passwords during import

[srvgit] / about.pl

diff --git a/about.pl b/about.pl
index 18293b5..f0ae48d 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -37,7 +37,7 @@ use YAML qw/LoadFile/;
 use C4::Output;
 use C4::Auth;
 use C4::Context;
-use C4::Installer;
+use C4::Installer::PerlModules;
 
 use Koha;
 use Koha::DateUtils qw(dt_from_string output_pref);
@@ -230,35 +230,6 @@ if ( ! C4::Context->config('tmp_path') ) {
     }
 }
 
-# Test QueryParser configuration sanity
-if ( C4::Context->preference( 'UseQueryParser' ) ) {
-    # Get the QueryParser configuration file name
-    my $queryparser_file          = C4::Context->config( 'queryparser_config' );
-    my $queryparser_fallback_file = '/etc/koha/searchengine/queryparser.yaml';
-    # Check QueryParser is functional
-    my $QParser = C4::Context->queryparser();
-    my $queryparser_error = {};
-    if ( ! defined $QParser || ref($QParser) ne 'Koha::QueryParser::Driver::PQF' ) {
-        # Error initializing the QueryParser object
-        # Get the used queryparser.yaml file path to report the user
-        $queryparser_error->{ fallback } = ( defined $queryparser_file ) ? 0 : 1;
-        $queryparser_error->{ file }     = ( defined $queryparser_file )
-                                                ? $queryparser_file
-                                                : $queryparser_fallback_file;
-        # Report error data to the template
-        $template->param( QueryParserError => $queryparser_error );
-    } else {
-        # Check for an absent queryparser_config entry in koha-conf.xml
-        if ( ! defined $queryparser_file ) {
-            # Not an error but a warning for the missing entry in koha-conf-xml
-            push @xml_config_warnings, {
-                    error => 'queryparser_entry_missing',
-                    file  => $queryparser_fallback_file
-            };
-        }
-    }
-}
-
 # Test Zebra facets configuration
 if ( !defined C4::Context->config('use_zebra_facets') ) {
     push @xml_config_warnings, { error => 'use_zebra_facets_entry_missing' };
@@ -456,12 +427,9 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs;
 # Circ rule warnings
 {
     my $dbh   = C4::Context->dbh;
-    my $units = $dbh->selectall_arrayref(
-        q|SELECT branchcode, categorycode, itemtype, lengthunit FROM issuingrules WHERE lengthunit NOT IN ( 'days', 'hours' ); |,
-        { Slice => {} }
-    );
+    my $units = Koha::CirculationRules->search({ rule_name => 'lengthunit', rule_value => { -not_in => ['days', 'hours'] } });
 
-    if (@$units) {
+    if ( $units->count ) {
         $template->param(
             warnIssuingRules => 1,
             ir_units         => $units,
@@ -561,6 +529,7 @@ foreach my $pm_type(@pm_types) {
                 current => ($pm_type eq 'current_pm' ? 1 : 0),
                 require => $stats->{'required'},
                 reqversion => $stats->{'min_ver'},
+                maxversion => $stats->{'max_ver'}
             }
         );
     }