From 3062440d3c18127cdc7075b466a3b2917aedf49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Tue, 26 Nov 2024 06:55:42 +0100
Subject: [PATCH] Plugin settings 'Display notified recipients' does not apply!
 #1565

---
 app/models/dmsf_file.rb |  6 +++---
 lib/redmine_dmsf.rb     | 39 ++++++++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 8c25534b..b3f27b02 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -366,8 +366,8 @@ class DmsfFile < ApplicationRecord
     if !options[:titles_only] && RedmineDmsf::Plugin.xapian_available?
       database = nil
       begin
-        lang = RedmineDmsf.dmsf_stemming_lang.strip
-        databasepath = File.join(RedmineDmsf.dmsf_index_database.strip, lang)
+        lang = RedmineDmsf.dmsf_stemming_lang
+        databasepath = File.join(RedmineDmsf.dmsf_index_database, lang)
         database = Xapian::Database.new(databasepath)
       rescue StandardError => e
         Rails.logger.error "REDMINE_XAPIAN ERROR: Xapian database is not properly set, initiated or it's corrupted."
@@ -386,7 +386,7 @@ class DmsfFile < ApplicationRecord
         qp.stemmer = stemmer
         qp.database = database
 
-        case RedmineDmsf.dmsf_stemming_strategy.strip
+        case RedmineDmsf.dmsf_stemming_strategy
         when 'STEM_NONE'
           qp.stemming_strategy = Xapian::QueryParser::STEM_NONE
         when 'STEM_SOME'
diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb
index a2ecd8d5..5586c1ac 100644
--- a/lib/redmine_dmsf.rb
+++ b/lib/redmine_dmsf.rb
@@ -31,19 +31,23 @@ module RedmineDmsf
     end
 
     def dmsf_storage_directory
-      Setting.plugin_redmine_dmsf['dmsf_storage_directory'].presence || 'files/dmsf'
+      value = Setting.plugin_redmine_dmsf['dmsf_storage_directory'].presence || 'files/dmsf'
+      value.strip
     end
 
     def dmsf_index_database
-      Setting.plugin_redmine_dmsf['dmsf_index_database'].presence || File.expand_path('dmsf_index', Rails.root)
+      value = Setting.plugin_redmine_dmsf['dmsf_index_database'].presence || File.expand_path('dmsf_index', Rails.root)
+      value.strip
     end
 
     def dmsf_stemming_lang
-      Setting.plugin_redmine_dmsf['dmsf_stemming_lang'].presence || 'english'
+      value = Setting.plugin_redmine_dmsf['dmsf_stemming_lang'].presence || 'english'
+      value.strip
     end
 
     def dmsf_stemming_strategy
-      Setting.plugin_redmine_dmsf['dmsf_stemming_strategy'].presence || 'STEM_NONE'
+      value = Setting.plugin_redmine_dmsf['dmsf_stemming_strategy'].presence || 'STEM_NONE'
+      value.strip
     end
 
     def dmsf_webdav?
@@ -63,7 +67,8 @@ module RedmineDmsf
     end
 
     def dmsf_global_title_format
-      Setting.plugin_redmine_dmsf['dmsf_global_title_format'].presence || ''
+      value = Setting.plugin_redmine_dmsf['dmsf_global_title_format'].presence || ''
+      value.strip
     end
 
     def dmsf_columns
@@ -71,11 +76,13 @@ module RedmineDmsf
     end
 
     def dmsf_webdav_ignore
-      Setting.plugin_redmine_dmsf['dmsf_webdav_ignore'].presence || '^(\._|\.DS_Store$|Thumbs.db$)'
+      value = Setting.plugin_redmine_dmsf['dmsf_webdav_ignore'].presence || '^(\._|\.DS_Store$|Thumbs.db$)'
+      value.strip
     end
 
     def dmsf_webdav_disable_versioning
-      Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'].presence || '^\~\$|\.tmp$'
+      value = Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'].presence || '^\~\$|\.tmp$'
+      value.strip
     end
 
     def dmsf_keep_documents_locked?
@@ -95,11 +102,14 @@ module RedmineDmsf
     end
 
     def dmsf_documents_email_from
-      Setting.plugin_redmine_dmsf['dmsf_documents_email_from'].presence || "#{User.current.name} <#{User.current.mail}>"
+      value = Setting.plugin_redmine_dmsf['dmsf_documents_email_from'].presence ||
+              "#{User.current.name} <#{User.current.mail}>"
+      value.strip
     end
 
     def dmsf_documents_email_reply_to
-      Setting.plugin_redmine_dmsf['dmsf_documents_email_reply_to'].presence || ''
+      value = Setting.plugin_redmine_dmsf['dmsf_documents_email_reply_to'].presence || ''
+      value.strip
     end
 
     def dmsf_documents_email_links_only?
@@ -151,11 +161,12 @@ module RedmineDmsf
     end
 
     def dmsf_max_notification_receivers_info
-      Setting.plugin_redmine_dmsf['dmsf_max_notification_receivers_info'].positive?
+      Setting.plugin_redmine_dmsf['dmsf_max_notification_receivers_info'].to_i
     end
 
     def office_bin
-      Setting.plugin_redmine_dmsf['office_bin'].presence || ''
+      value = Setting.plugin_redmine_dmsf['office_bin'].presence || ''
+      value.strip
     end
 
     def dmsf_global_menu_disabled?
@@ -167,7 +178,8 @@ module RedmineDmsf
     end
 
     def dmsf_default_query
-      Setting.plugin_redmine_dmsf['dmsf_default_query'].presence || ''
+      value = Setting.plugin_redmine_dmsf['dmsf_default_query'].presence || ''
+      value.strip
     end
 
     def empty_minor_version_by_default?
@@ -187,7 +199,8 @@ module RedmineDmsf
     end
 
     def dmsf_webdav_authentication
-      Setting.plugin_redmine_dmsf['dmsf_webdav_authentication'].presence || 'Basic'
+      value = Setting.plugin_redmine_dmsf['dmsf_webdav_authentication'].presence || 'Basic'
+      value.strip
     end
   end
 end