[Koha-patches] [PATCH] Bug 8702: System preferences search does not allow accented letters

[Fridolyn SOMERS]

---
 admin/preferences.pl                               |    5 ++++-
 .../prog/en/includes/prefs-admin-search.inc        |    2 +-
 .../prog/en/includes/sysprefs-admin-search.inc     |    2 +-
 .../prog/en/modules/admin/preferences.tt           |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/admin/preferences.pl b/admin/preferences.pl
index b1ad005..db91e76 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -297,7 +297,10 @@ my @TABS;
 if ( $op eq 'search' ) {
     my $searchfield = $input->param( 'searchfield' );
 
-    $searchfield =~ s/[^a-zA-Z0-9_ -]//g;
+    $searchfield =~ s/\p{IsC}//g;
+    $searchfield =~ s/\s+/ /;
+    $searchfield =~ s/^\s+//;
+    $searchfield =~ s/\s+$//;
 
     $template->param( searchfield => $searchfield );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index ad13bec..06b0752 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -6,7 +6,7 @@
 	    <form action="/cgi-bin/koha/admin/preferences.pl">
         <input type="hidden" name="tab" value="[% last_tab %]" />
         <input type="hidden" name="op" value="search" />
-        <input type="text" size="40" name="searchfield" value="[% searchfield %]" />
+        <input type="text" size="40" name="searchfield" value="[% searchfield |html %]" />
         <input type="submit" class="submit" value="Search" />
     </form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
index fa9fc4b..aa654c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
@@ -4,7 +4,7 @@
 	<div id="syspref_search" class="residentsearch">
 	<p class="tip">System preference search:</p>
 	    <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
-        <input type="text" size="40" name="searchfield" value="[% searchfield %]" />
+        <input type="text" size="40" name="searchfield" value="[% searchfield |html %]" />
 		<input type="hidden" value="all" name="tab" />
         <input type="submit" name="ok" class="submit" value="Search" />
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 875b863..9591003 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -42,7 +42,7 @@
     [% END %]
     [% IF ( search_not_found ) %]
     <div class="dialog alert">
-        No system preferences matched your search for <strong>[% searchfield %]</strong>. You can try a different search or <a href="/cgi-bin/koha/admin/preferences.pl?tab=[% last_tab %]">return to where you were before.</a>
+        No system preferences matched your search for <strong>[% searchfield |html %]</strong>. You can try a different search or <a href="/cgi-bin/koha/admin/preferences.pl?tab=[% last_tab %]">return to where you were before.</a>
     </div>
     [% END %]
     [% FOREACH TAB IN TABS %]
-- 
1.7.9.5