From 53e7094097f295fd43002b5f66aa01c779327be4 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Fri, 15 Jan 2016 13:53:55 +0100
Subject: [PATCH] Safer access to settings parameters values

---
 app/models/dmsf_file.rb                    | 4 ++--
 app/views/settings/_dmsf_settings.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index ec446bde..0bf67a4b 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -98,7 +98,7 @@ class DmsfFile < ActiveRecord::Base
 
   def self.storage_path
     unless @@storage_path.present?
-      @@storage_path = Setting.plugin_redmine_dmsf['dmsf_storage_directory'].strip
+      @@storage_path = Setting.plugin_redmine_dmsf['dmsf_storage_directory'].strip if Setting.plugin_redmine_dmsf['dmsf_storage_directory'].present?
       @@storage_path = Pathname(Redmine::Configuration['attachments_storage_path']).join('dmsf') if @@storage_path.blank? && Redmine::Configuration['attachments_storage_path'].present?
       @@storage_path = Rails.root.join('files/dmsf').to_s if @@storage_path.blank?
       Dir.mkdir(@@storage_path) unless File.exists?(@@storage_path)
@@ -437,4 +437,4 @@ class DmsfFile < ActiveRecord::Base
     end
   end
  
-end
\ No newline at end of file
+end
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 96141360..43bbaba7 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -53,7 +53,7 @@
 <p>
   <%=  content_tag(:label, "#{l(:label_file_storage_directory)}:") %>
   <% 
-    storage_dir = @settings['dmsf_storage_directory'].strip
+    storage_dir = @settings['dmsf_storage_directory'].strip if @settings['dmsf_storage_directory'].present?
     storage_dir = "#{Rails.root}/files/dmsf" if storage_dir.blank?
   %>
   <%= text_field_tag 'settings[dmsf_storage_directory]', storage_dir, :size => 50 %>
@@ -178,4 +178,4 @@
     &nbsp;&nbsp;STEM_ALL: <%= l(:note_stem_all) %><br/>    
     <%= l(:note_stemming_applied) %>
   </em>
-</p>
\ No newline at end of file
+</p>