Bug 30055: Restore DefaultPatronSearchFields and fix extended attrs search

[srvgit] / about.pl

diff --git a/about.pl b/about.pl
index 344790c..55ffc37 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -24,25 +24,22 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use DateTime::TimeZone;
-use File::Spec;
-use File::Slurp;
-use List::MoreUtils qw/ any /;
-use LWP::Simple;
-use Module::Load::Conditional qw(can_load);
-use XML::Simple;
-use Config;
+use File::Slurp qw( read_file );
+use List::MoreUtils qw( any );
+use Module::Load::Conditional qw( can_load );
+use Config qw( %Config );
 use Search::Elasticsearch;
-use Try::Tiny;
+use Try::Tiny qw( catch try );
 use YAML::XS;
 use Encode;
 
-use C4::Output;
-use C4::Auth;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user get_user_subpermissions );
 use C4::Context;
 use C4::Installer::PerlModules;
 
 use Koha;
-use Koha::DateUtils qw(dt_from_string output_pref);
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Acquisition::Currencies;
 use Koha::BackgroundJob;
 use Koha::BiblioFrameworks;
@@ -58,9 +55,6 @@ use Koha::Filter::MARC::ViewPolicy;
 
 use C4::Members::Statistics;
 
-
-#use Smart::Comments '####';
-
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -68,7 +62,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         flagsrequired   => { catalogue => 1 },
-        debug           => 1,
     }
 );
 
@@ -199,7 +192,7 @@ my $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist = ( $AnonymousPatr
 
 my $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist = ( not $anonymous_patron and Koha::Patrons->search({ privacy => 2 })->count );
 
-my $warnPrefKohaAdminEmailAddress = not Email::Valid->address(C4::Context->preference('KohaAdminEmailAddress'));
+my $warnPrefKohaAdminEmailAddress = !Koha::Email->is_valid(C4::Context->preference('KohaAdminEmailAddress'));
 
 my $c = Koha::Items->filter_by_visible_in_opac->count;
 my @warnings = C4::Context->dbh->selectrow_array('SHOW WARNINGS');
@@ -326,6 +319,31 @@ if ( C4::Context->preference('ILLModule') ) {
     $template->param( warnILLConfiguration => $warnILLConfiguration );
 }
 
+{
+    # XSLT sysprefs
+    my @xslt_prefs = qw(
+        OPACXSLTDetailsDisplay
+        OPACXSLTListsDisplay
+        OPACXSLTResultsDisplay
+        XSLTDetailsDisplay
+        XSLTListsDisplay
+        XSLTResultsDisplay
+    );
+    my @warnXSLT;
+    for my $p ( @xslt_prefs ) {
+        my $xsl_filename = C4::XSLT::get_xsl_filename( $p );
+        next if -e $xsl_filename;
+        push @warnXSLT,
+          {
+            syspref  => $p,
+            value    => C4::Context->preference("$p"),
+            filename => $xsl_filename
+          };
+    }
+
+    $template->param( warnXSLT => \@warnXSLT ) if @warnXSLT;
+}
+
 if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) {
     # Check ES configuration health and runtime status
 
@@ -689,6 +707,7 @@ my $contributors =
   -e "$docdir" . "/contributors.yaml"
   ? YAML::XS::LoadFile( "$docdir" . "/contributors.yaml" )
   : {};
+delete $contributors->{_others_};
 for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
     for my $role ( keys %{ $teams->{team}->{$version} } ) {
         my $normalized_role = "$role";
@@ -726,10 +745,15 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
 my @people = map {
     { name => $_, ( $contributors->{$_} ? %{ $contributors->{$_} } : () ) }
 } sort {
-    my ($alast) = ( split( /\s/, $a ) )[-1];
-    my ($blast) = ( split( /\s/, $b ) )[-1];
-    lc($alast) cmp lc($blast)
-} keys %{$contributors};
+  my ($alast) = $a =~ /(\S+)$/;
+  my ($blast) = $b =~ /(\S+)$/;
+  my $cmp = lc($alast||"") cmp lc($blast||"");
+  return $cmp if $cmp;
+
+  my ($a2last) = $a =~ /(\S+)\s\S+$/;
+  my ($b2last) = $b =~ /(\S+)\s\S+$/;
+  lc($a2last||"") cmp lc($b2last||"");
+} keys %$contributors;
 
 $template->param( contributors => \@people );
 $template->param( maintenance_team => $teams->{team}->{$dev_team} );