.github/workflows/rubyonrails.yml

@@ -0,0 +1,181 @@
+# Redmine plugin for Document Management System "Features"
+#
+# Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# GitHub CI script
+
+name: "GitHub CI"
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+jobs:
+  plugin_tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        engine: [mysql, postgresql, sqlite]
+        include:
+          - engine: mysql
+            # Database configuration for Redmine
+            database_configuration: >
+              test:
+                adapter: mysql2
+                database: test
+                username: redmine
+                password: redmine
+                encoding: utf8mb4
+                collation: utf8mb4_unicode_ci
+            # SQL commands to create a database for Redmine
+            sql1: CREATE DATABASE IF NOT EXISTS test CHARACTER SET utf8mb4;
+            sql2: CREATE USER 'redmine'@'localhost' IDENTIFIED BY 'redmine';
+            sql3: GRANT ALL PRIVILEGES ON test.* TO 'redmine'@'localhost';
+            # SQL client command
+            database_command: mysql -uroot -proot -e
+            # SQL service
+            database_service: mysql
+          - engine: postgresql
+            # Database configuration for Redmine
+            database_configuration: >
+              test:
+                adapter: postgresql
+                database: test
+                username: redmine
+                password: redmine
+                host: localhost
+            # SQL commands to create a database for Redmine
+            sql1: CREATE ROLE redmine LOGIN ENCRYPTED PASSWORD 'redmine' NOINHERIT VALID UNTIL 'infinity';
+            sql2: CREATE DATABASE test WITH ENCODING='UTF8' OWNER=redmine;
+            sql3: ALTER USER redmine CREATEDB;
+            # SQL client command
+            database_command:  sudo -u postgres psql -c
+            # SQL service
+            database_service: postgresql
+          - engine: sqlite
+            # Database configuration for Redmine
+            database_configuration: >
+              test:
+                adapter: sqlite3
+                database: db/redmine.sqlite3
+            # No database needed here. It's just a file.
+    runs-on: ubuntu-latest
+    env:
+      RAILS_ENV: test
+      NAME: redmine_dmsf
+    steps:
+      - name: Install dependencies
+        # Install necessary packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y litmus libreoffice subversion
+      - name: Clone Redmine
+        # Get the latest stable Redmine
+        run: svn export http://svn.redmine.org/redmine/branches/6.0-stable/ /opt/redmine
+      - name: Checkout code
+        uses: actions/checkout@v3        
+      - name: Link the plugin
+        # Link the plugin to the redmine folder
+        run: | 
+          ln -s $(pwd) /opt/redmine/plugins/redmine_dmsf
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1 # The latest major version
+        with:
+          bundler-cache: true
+          ruby-version: '3.2'
+      - name: Setup database
+        # Create the database
+        run: | 
+          echo "${{matrix.database_configuration}}" > /opt/redmine/config/database.yml      
+          if [[ "${{matrix.database_service}}" ]]; then
+            sudo systemctl start ${{matrix.engine}}
+          fi
+          if [[ "${{matrix.database_command}}" ]]; then
+            ${{matrix.database_command}} "${{matrix.sql1}}"
+            ${{matrix.database_command}} "${{matrix.sql2}}"
+            ${{matrix.database_command}} "${{matrix.sql3}}"
+          fi
+      - name: Install Redmine
+        # Install Redmine
+        run: |
+          cd /opt/redmine
+          echo "gem \"webrick\"" > Gemfile.local          
+          bundle config set --local without 'rmagick development xapian'
+          bundle install
+          bundle exec rake generate_secret_token
+          bundle exec rake db:migrate
+          bundle exec rake redmine:plugins:migrate
+          bundle exec rake redmine:load_default_data
+          bundle exec rake assets:precompile
+        env:
+          REDMINE_LANG: en
+      - name: Configure WebDAV
+        # Add configuration for WebDAV to work
+        run: |
+          cp /opt/redmine/config/additional_environment.rb.example /opt/redmine/config/additional_environment.rb
+          echo "config.log_level = :info" >> /opt/redmine/config/additional_environment.rb
+          echo "# Redmine DMSF's WebDAV" >> /opt/redmine/config/additional_environment.rb
+          echo "require \"#{Rails.root}/plugins/redmine_dmsf/lib/redmine_dmsf/webdav/custom_middleware\"" >> /opt/redmine/config/additional_environment.rb
+          echo "config.middleware.insert_before ActionDispatch::Cookies, RedmineDmsf::Webdav::CustomMiddleware" >> /opt/redmine/config/additional_environment.rb
+      - name: Standard tests
+        # Run the tests
+        run: |
+          cd /opt/redmine
+          bundle exec rake redmine:plugins:test:units
+          bundle exec rake redmine:plugins:test:functionals
+          bundle exec rake redmine:plugins:test:integration
+      - name: Helpers tests
+        run: |
+          cd /opt/redmine
+          ruby plugins/redmine_dmsf/test/helpers/dmsf_helper_test.rb
+          ruby plugins/redmine_dmsf/test/helpers/dmsf_queries_helper_test.rb
+      - name: Rubocop
+        # Run the Rubocop tests
+        run: |
+          cd /opt/redmine                    
+          bundle exec rubocop -c plugins/redmine_dmsf/.rubocop.yml plugins/redmine_dmsf/
+      - name: Litmus
+        # Prepare Redmine's environment for WebDAV testing
+        # Run Webrick server
+        # Run Litmus tests (Omit 'http' tests due to 'timeout waiting for interim response' and locks due to complex bogus conditional)
+        # Shutdown Webrick
+        # Clean up Redmine's environment from WebDAV testing
+        run: |
+          cd /opt/redmine
+          bundle exec rake redmine:dmsf_webdav_test_on
+          bundle exec rails server -u webrick -e test -d
+          sleep 5
+          litmus http://localhost:3000/dmsf/webdav/dmsf_test_project admin admin
+          kill $(pgrep -f webrick)
+          bundle exec rake redmine:dmsf_webdav_test_off
+        env:
+          TESTS: "basic copymove props"
+      - name: Cleanup
+        # Rollback plugin's changes to the database
+        # Stop the database engine
+        run: |
+          cd /opt/redmine
+          bundle exec rake redmine:plugins:migrate VERSION=0
+          if [[ "${{matrix.database_service}}" ]]; then
+            sudo systemctl stop ${{matrix.engine}}
+          fi
+      - name: Archive test.log
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: "test_${{matrix.engine}}.log"
+          path: /opt/redmine/log/test.log

.rubocop.yml

@@ -2,26 +2,24 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
-
-plugins:
-  - rubocop-rails
-  - rubocop-performance
 
 AllCops:
   TargetRubyVersion: 3.2
   TargetRailsVersion: 7.1
+
   SuggestExtensions: false
 
   NewCops: enable
@@ -29,6 +27,11 @@ AllCops:
   Exclude:
     - '**/vendor/**/*'
 
+# Enable extensions
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 # Rules for DMSF
 Layout/LineLength:
   Exclude:
@@ -80,9 +83,9 @@ Naming/AccessorMethodName:
   Exclude:
     - lib/dav4rack/resource.rb
 
-Naming/PredicatePrefix:
+Naming/PredicateName:
   Exclude:
-    - patches/attachable_patch.rb
+    - patches/attachable_patch.rb # Easy tests
 
 Style/HashSyntax:
   EnforcedShorthandSyntax: either
@@ -93,7 +96,7 @@ Style/ZeroLengthPredicate:
 
 Rails/BulkChangeTable:
   Exclude:
-    - db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb
+    - db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb # Easy tests
 
 Rails/DangerousColumnNames:
   Exclude:
@@ -108,8 +111,8 @@ Rails/SkipsModelValidations:
   Exclude:
     - app/helpers/dmsf_upload_helper.rb # touch is Okay
     - app/models/dmsf_workflow.rb # update doesn't work here
-    - lib/redmine_dmsf/patches/user_patch.rb
+    - patches/user_patch.rb
-    - lib/redmine_dmsf/patches/role_patch.rb
+    - patches/role_patch.rb
     - db/migrate/20170526144701_dmsf_attachable.rb
     - db/migrate/20170421101901_dmsf_file_container_rollback.rb
     - db/migrate/20170118142001_dmsf_file_container.rb
@@ -121,8 +124,8 @@ Rails/SkipsModelValidations:
 
 Rails/ThreeStateBooleanColumn:
   Exclude:
-    - db/migrate/04_dmsf_0_9_0.rb
+    - db/migrate/04_dmsf_0_9_0.rb # Easy tests
-    - db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb
+    - db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb # Easy tests
 
 Rails/UniqueValidationWithoutIndex:
   Exclude:

CHANGELOG.md

@@ -1,54 +1,6 @@
 Changelog for Redmine DMSF
 ==========================
 
-4.2.3 *2025-10-06*
-------------------
-
-    Redmine 6.1 compatibility
-
-* Bug: #11 - DMSF json API wrong pagination handling
-* Bug: #7 - Document edit via WebDAV sets workflow into undefined state
-
-4.2.2 *2025-07-22*
-------------------
-    Missing lock icons
-
-* Bug: #5 - Missing lock icons by locked objects
-
-4.2.1 *2025-07-10*
-------------------
-
-    Searching in multiple revisions
-
-IMPORTANT: Issue tracking numbering has been restarted after the movement to the new repository
-
-* Bug: #1 - Can't install 3.2.4 on redmine 5.0
-* Bug: #3 - Download CSV file leads to 404
-* New: #4 - Searching in multiple revisions
-
-4.2.0 *2025-07-04*
-------------------
-
-    SQL server compatibility
-    Change of the license from GNU GPL v2 to v3
-    PDF thumbnails
-
-NOTE: These issues are still from the original danmunn's repository
-
-* Bug: #1601 - Serialization of attached documents is wrong
-* Bug: #1600 - Different versions for different types of uploading
-* Bug: #1599 - Empty Trash => Error 500
-* New: #1597 - GNU GPL v2 -> v3
-* New: #1596 - Add a warning about searching in sub-folders
-* Bug: #1595 - DMSF WebDAV Configuration Fails on Redmine 6.0.5
-
-4.1.3 *2025-05-09*
-------------------
-
-    SQL server compatibility
-
-* Bug: #1595 - DMSF WebDAV Configuration Fails on Redmine 6.0.5
-
 4.1.2 *2025-04-02*
 ------------------
 
@@ -117,10 +69,15 @@ NOTE: These issues are still from the original danmunn's repository
 ------------------
 
     Multiple file upload fix
-    Uploaded file size fix
 
 * Bug: #1559 - Multiple files upload
 * Bug: #1558 - Deleting of uploaded files
+
+3.2.3 *2024-10-18*
+------------------
+ 
+    Uploaded file size fix
+
 * Bug: 1556 - Wrong file size when uploading documents
 
 3.2.2 *2024-10-09*

Gemfile

@@ -4,18 +4,19 @@
 #
 #  Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 source 'https://rubygems.org' do
   gem 'ox' # Dav4Rack
@@ -24,12 +25,14 @@ source 'https://rubygems.org' do
   gem 'zip-zip' unless Dir.exist?(File.expand_path('../../vault', __FILE__))
 
   # Redmine extensions
+  unless Dir.exist?(File.expand_path('../../easyproject', __FILE__))
     gem 'active_record_union'
     gem 'simple_enum'
     group :xapian do
       gem 'xapian-ruby'
     end
-  unless %w[easy_gantt custom_tables]
+  end
+  unless %w[easyproject easy_gantt custom_tables]
          .any? { |plugin| Dir.exist?(File.expand_path("../../#{plugin}", __FILE__)) }
     group :test do
       gem 'rails-controller-testing'

LICENSE.md

@@ -1,617 +1,339 @@
-# GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Version 3, 29 June 2007
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Copyright (C) 2007 Free Software Foundation, Inc.
+                            Preamble
-<https://fsf.org/>
 
-Everyone is permitted to copy and distribute verbatim copies of this
+  The licenses for most software are designed to take away your
-license document, but changing it is not allowed.
+freedom to share and change it.  By contrast, the GNU General Public
-
+License is intended to guarantee your freedom to share and change free
-## Preamble
+software--to make sure the software is free for all its users.  This
-
+General Public License applies to most of the Free Software
-The GNU General Public License is a free, copyleft license for
+Foundation's software and to any other program whose authors commit to
-software and other kinds of works.
+using it.  (Some other Free Software Foundation software is covered by
-
+the GNU Lesser General Public License instead.)  You can apply it to
-The licenses for most software and other practical works are designed
+your programs, too.
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom
-to share and change all versions of a program--to make sure it remains
-free software for all its users. We, the Free Software Foundation, use
-the GNU General Public License for most of our software; it applies
-also to any other work released this way by its authors. You can apply
-it to your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
+this service if you wish), that you receive source code or can get it
-want it, that you can change the software or use pieces of it in new
+if you want it, that you can change the software or use pieces of it
-free programs, and that you know you can do these things.
+in new free programs; and that you know you can do these things.
 
-To protect your rights, we need to prevent others from denying you
+  To protect your rights, we need to make restrictions that forbid
-these rights or asking you to surrender the rights. Therefore, you
+anyone to deny you these rights or to ask you to surrender the rights.
-have certain responsibilities if you distribute copies of the
+These restrictions translate to certain responsibilities for you if you
-software, or if you modify it: responsibilities to respect the freedom
+distribute copies of the software, or if you modify it.
-of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
+gratis or for a fee, you must give the recipients all the rights that
-freedoms that you received. You must make sure that they, too, receive
+you have.  You must make sure that they, too, receive or can get the
-or can get the source code. And you must show them these terms so they
+source code.  And you must show them these terms so they know their
-know their rights.
+rights.
 
-Developers that use the GNU GPL protect your rights with two steps:
+  We protect your rights with two steps: (1) copyright the software, and
-(1) assert copyright on the software, and (2) offer you this License
+(2) offer you this license which gives you legal permission to copy,
-giving you legal permission to copy, distribute and/or modify it.
+distribute and/or modify the software.
 
-For the developers' and authors' protection, the GPL clearly explains
+  Also, for each author's protection and ours, we want to make certain
-that there is no warranty for this free software. For both users' and
+that everyone understands that there is no warranty for this free
-authors' sake, the GPL requires that modified versions be marked as
+software.  If the software is modified by someone else and passed on, we
-changed, so that their problems will not be attributed erroneously to
+want its recipients to know that what they have is not the original, so
-authors of previous versions.
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-Some devices are designed to deny users access to install or run
+  Finally, any free program is threatened constantly by software
-modified versions of the software inside them, although the
+patents.  We wish to avoid the danger that redistributors of a free
-manufacturer can do so. This is fundamentally incompatible with the
+program will individually obtain patent licenses, in effect making the
-aim of protecting users' freedom to change the software. The
+program proprietary.  To prevent this, we have made it clear that any
-systematic pattern of such abuse occurs in the area of products for
+patent must be licensed for everyone's free use or not licensed at all.
-individuals to use, which is precisely where it is most unacceptable.
-Therefore, we have designed this version of the GPL to prohibit the
-practice for those products. If such problems arise substantially in
-other domains, we stand ready to extend this provision to those
-domains in future versions of the GPL, as needed to protect the
-freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish
-to avoid the special danger that patents applied to a free program
-could make it effectively proprietary. To prevent this, the GPL
-assures that patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-## TERMS AND CONDITIONS
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-### 0. Definitions.
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
 
-"This License" refers to version 3 of the GNU General Public License.
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
 
-"Copyright" also means copyright-like laws that apply to other kinds
+  1. You may copy and distribute verbatim copies of the Program's
-of works, such as semiconductor masks.
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
 
-"The Program" refers to any copyrightable work licensed under this
+You may charge a fee for the physical act of transferring a copy, and
-License. Each licensee is addressed as "you". "Licensees" and
+you may at your option offer warranty protection in exchange for a fee.
-"recipients" may be individuals or organizations.
 
-To "modify" a work means to copy from or adapt all or part of the work
+  2. You may modify your copy or copies of the Program or any portion
-in a fashion requiring copyright permission, other than the making of
+of it, thus forming a work based on the Program, and copy and
-an exact copy. The resulting work is called a "modified version" of
+distribute such modifications or work under the terms of Section 1
-the earlier work or a work "based on" the earlier work.
+above, provided that you also meet all of these conditions:
 
-A "covered work" means either the unmodified Program or a work based
+    a) You must cause the modified files to carry prominent notices
-on the Program.
+    stating that you changed the files and the date of any change.
 
-To "propagate" a work means to do anything with it that, without
+    b) You must cause any work that you distribute or publish, that in
-permission, would make you directly or secondarily liable for
+    whole or in part contains or is derived from the Program or any
-infringement under applicable copyright law, except executing it on a
+    part thereof, to be licensed as a whole at no charge to all third
-computer or modifying a private copy. Propagation includes copying,
+    parties under the terms of this License.
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
 
-To "convey" a work means any kind of propagation that enables other
+    c) If the modified program normally reads commands interactively
-parties to make or receive copies. Mere interaction with a user
+    when run, you must cause it, when started running for such
-through a computer network, with no transfer of a copy, is not
+    interactive use in the most ordinary way, to print or display an
-conveying.
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
 
-An interactive user interface displays "Appropriate Legal Notices" to
+These requirements apply to the modified work as a whole.  If
-the extent that it includes a convenient and prominently visible
+identifiable sections of that work are not derived from the Program,
-feature that (1) displays an appropriate copyright notice, and (2)
+and can be reasonably considered independent and separate works in
-tells the user that there is no warranty for the work (except to the
+themselves, then this License, and its terms, do not apply to those
-extent that warranties are provided), that licensees may convey the
+sections when you distribute them as separate works.  But when you
-work under this License, and how to view a copy of this License. If
+distribute the same sections as part of a whole which is a work based
-the interface presents a list of user commands or options, such as a
+on the Program, the distribution of the whole must be on the terms of
-menu, a prominent item in the list meets this criterion.
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
 
-### 1. Source Code.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
 
-The "source code" for a work means the preferred form of the work for
+In addition, mere aggregation of another work not based on the Program
-making modifications to it. "Object code" means any non-source form of
+with the Program (or with a work based on the Program) on a volume of
-a work.
+a storage or distribution medium does not bring the other work under
+the scope of this License.
 
-A "Standard Interface" means an interface that either is an official
+  3. You may copy and distribute the Program (or a work based on it,
-standard defined by a recognized standards body, or, in the case of
+under Section 2) in object code or executable form under the terms of
-interfaces specified for a particular programming language, one that
+Sections 1 and 2 above provided that you also do one of the following:
-is widely used among developers working in that language.
 
-The "System Libraries" of an executable work include anything, other
+    a) Accompany it with the complete corresponding machine-readable
-than the work as a whole, that (a) is included in the normal form of
+    source code, which must be distributed under the terms of Sections
-packaging a Major Component, but which is not part of that Major
+    1 and 2 above on a medium customarily used for software interchange; or,
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
 
-The "Corresponding Source" for a work in object code form means all
+    b) Accompany it with a written offer, valid for at least three
-the source code needed to generate, install, and (for an executable
+    years, to give any third party, for a charge no more than your
-work) run the object code and to modify the work, including scripts to
+    cost of physically performing source distribution, a complete
-control those activities. However, it does not include the work's
+    machine-readable copy of the corresponding source code, to be
-System Libraries, or general-purpose tools or generally available free
+    distributed under the terms of Sections 1 and 2 above on a medium
-programs which are used unmodified in performing those activities but
+    customarily used for software interchange; or,
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
 
-The Corresponding Source need not include anything that users can
+    c) Accompany it with the information you received as to the offer
-regenerate automatically from other parts of the Corresponding Source.
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
 
-The Corresponding Source for a work in source code form is that same
+The source code for a work means the preferred form of the work for
-work.
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
 
-### 2. Basic Permissions.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
 
-All rights granted under this License are granted for the term of
+  4. You may not copy, modify, sublicense, or distribute the Program
-copyright on the Program, and are irrevocable provided the stated
+except as expressly provided under this License.  Any attempt
-conditions are met. This License explicitly affirms your unlimited
+otherwise to copy, modify, sublicense or distribute the Program is
-permission to run the unmodified Program. The output from running a
+void, and will automatically terminate your rights under this License.
-covered work is covered by this License only if the output, given its
+However, parties who have received copies, or rights, from you under
-content, constitutes a covered work. This License acknowledges your
+this License will not have their licenses terminated so long as such
-rights of fair use or other equivalent, as provided by copyright law.
+parties remain in full compliance.
 
-You may make, run and propagate covered works that you do not convey,
+  5. You are not required to accept this License, since you have not
-without conditions so long as your license otherwise remains in force.
+signed it.  However, nothing else grants you permission to modify or
-You may convey covered works to others for the sole purpose of having
+distribute the Program or its derivative works.  These actions are
-them make modifications exclusively for you, or provide you with
+prohibited by law if you do not accept this License.  Therefore, by
-facilities for running those works, provided that you comply with the
+modifying or distributing the Program (or any work based on the
-terms of this License in conveying all material for which you do not
+Program), you indicate your acceptance of this License to do so, and
-control copyright. Those thus making or running the covered works for
+all its terms and conditions for copying, distributing or modifying
-you must do so exclusively on your behalf, under your direction and
+the Program or works based on it.
-control, on terms that prohibit them from making any copies of your
-copyrighted material outside their relationship with you.
 
-Conveying under any other circumstances is permitted solely under the
+  6. Each time you redistribute the Program (or any work based on the
-conditions stated below. Sublicensing is not allowed; section 10 makes
+Program), the recipient automatically receives a license from the
-it unnecessary.
+original licensor to copy, distribute or modify the Program subject to
-
+these terms and conditions.  You may not impose any further
-### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+restrictions on the recipients' exercise of the rights granted herein.
-
+You are not responsible for enforcing compliance by third parties to
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such
-circumvention is effected by exercising rights under this License with
-respect to the covered work, and you disclaim any intention to limit
-operation or modification of the work as a means of enforcing, against
-the work's users, your or third parties' legal rights to forbid
-circumvention of technological measures.
-
-### 4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-### 5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these
-conditions:
-
--   a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
--   b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under
-    section 7. This requirement modifies the requirement in section 4
-    to "keep intact all notices".
--   c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
--   d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-### 6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of
-sections 4 and 5, provided that you also convey the machine-readable
-Corresponding Source under the terms of this License, in one of these
-ways:
-
--   a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
--   b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the Corresponding
-    Source from a network server at no charge.
--   c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
--   d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
--   e) Convey the object code using peer-to-peer transmission,
-    provided you inform other peers where the object code and
-    Corresponding Source of the work are being offered to the general
-    public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal,
-family, or household purposes, or (2) anything designed or sold for
-incorporation into a dwelling. In determining whether a product is a
-consumer product, doubtful cases shall be resolved in favor of
-coverage. For a particular product received by a particular user,
-"normally used" refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way
-in which the particular user actually uses, or expects or is expected
-to use, the product. A product is a consumer product regardless of
-whether the product has substantial commercial, industrial or
-non-consumer uses, unless such uses represent the only significant
-mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to
-install and execute modified versions of a covered work in that User
-Product from a modified version of its Corresponding Source. The
-information must suffice to ensure that the continued functioning of
-the modified object code is in no case prevented or interfered with
-solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or
-updates for a work that has been modified or installed by the
-recipient, or for the User Product in which it has been modified or
-installed. Access to a network may be denied when the modification
-itself materially and adversely affects the operation of the network
-or violates the rules and protocols for communication across the
-network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-### 7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders
-of that material) supplement the terms of this License with terms:
-
--   a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
--   b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
--   c) Prohibiting misrepresentation of the origin of that material,
-    or requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
--   d) Limiting the use for publicity purposes of names of licensors
-    or authors of the material; or
--   e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
--   f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions
-    of it) with contractual assumptions of liability to the recipient,
-    for any liability that these contractual assumptions directly
-    impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions; the
-above requirements apply either way.
-
-### 8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-### 9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run
-a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-### 10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-### 11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned
-or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
 this License.
 
-Each contributor grants you a non-exclusive, worldwide, royalty-free
+  7. If, as a consequence of a court judgment or allegation of patent
-patent license under the contributor's essential patent claims, to
+infringement or for any other reason (not limited to patent issues),
-make, use, sell, offer for sale, import and otherwise run, modify and
+conditions are imposed on you (whether by court order, agreement or
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the
-scope of its coverage, prohibits the exercise of, or is conditioned on
-the non-exercise of one or more of the rights that are specifically
-granted under this License. You may not convey a covered work if you
-are a party to an arrangement with a third party that is in the
-business of distributing software, under which you make payment to the
-third party based on the extent of your activity of conveying the
-work, and under which the third party grants, to any of the parties
-who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by
-you (or copies made from those copies), or (b) primarily for and in
-connection with specific products or compilations that contain the
-covered work, unless you entered into that arrangement, or that patent
-license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-### 12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
+excuse you from the conditions of this License.  If you cannot
-covered work so as to satisfy simultaneously your obligations under
+distribute so as to satisfy simultaneously your obligations under this
-this License and any other pertinent obligations, then as a
+License and any other pertinent obligations, then as a consequence you
-consequence you may not convey it at all. For example, if you agree to
+may not distribute the Program at all.  For example, if a patent
-terms that obligate you to collect a royalty for further conveying
+license would not permit royalty-free redistribution of the Program by
-from those to whom you convey the Program, the only way you could
+all those who receive copies directly or indirectly through you, then
-satisfy both those terms and this License would be to refrain entirely
+the only way you could satisfy both it and this License would be to
-from conveying the Program.
+refrain entirely from distribution of the Program.
 
-### 13. Use with the GNU Affero General Public License.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
 
-Notwithstanding any other provision of this License, you have
+It is not the purpose of this section to induce you to infringe any
-permission to link or combine any covered work with a work licensed
+patents or other property right claims or to contest validity of any
-under version 3 of the GNU Affero General Public License into a single
+such claims; this section has the sole purpose of protecting the
-combined work, and to convey the resulting work. The terms of this
+integrity of the free software distribution system, which is
-License will continue to apply to the part which is the covered work,
+implemented by public license practices.  Many people have made
-but the special requirements of the GNU Affero General Public License,
+generous contributions to the wide range of software distributed
-section 13, concerning interaction through a network will apply to the
+through that system in reliance on consistent application of that
-combination as such.
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
 
-### 14. Revised Versions of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
 
-The Free Software Foundation may publish revised and/or new versions
+  8. If the distribution and/or use of the Program is restricted in
-of the GNU General Public License from time to time. Such new versions
+certain countries either by patents or by copyrighted interfaces, the
-will be similar in spirit to the present version, but may differ in
+original copyright holder who places the Program under this License
-detail to address new problems or concerns.
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies that a certain numbered version of the GNU General Public
+specifies a version number of this License which applies to it and "any
-License "or any later version" applies to it, you have the option of
+later version", you have the option of following the terms and conditions
-following the terms and conditions either of that numbered version or
+either of that version or of any later version published by the Free
-of any later version published by the Free Software Foundation. If the
+Software Foundation.  If the Program does not specify a version number of
-Program does not specify a version number of the GNU General Public
+this License, you may choose any version ever published by the Free Software
-License, you may choose any version ever published by the Free
+Foundation.
-Software Foundation.
 
-If the Program specifies that a proxy can decide which future versions
+  10. If you wish to incorporate parts of the Program into other free
-of the GNU General Public License can be used, that proxy's public
+programs whose distribution conditions are different, write to the author
-statement of acceptance of a version permanently authorizes you to
+to ask for permission.  For software which is copyrighted by the Free
-choose that version for the Program.
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
 
-Later license versions may give you additional or different
+                            NO WARRANTY
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
 
-### 15. Disclaimer of Warranty.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
 
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-CORRECTION.
+POSSIBILITY OF SUCH DAMAGES.
 
-### 16. Limitation of Liability.
+                     END OF TERMS AND CONDITIONS
 
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+            How to Apply These Terms to Your New Programs
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-### 17. Interpretation of Sections 15 and 16.
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
 
-If the disclaimer of warranty and limitation of liability provided
+  To do so, attach the following notices to the program.  It is safest
-above cannot be given local legal effect according to their terms,
+to attach them to the start of each source file to most effectively
-reviewing courts shall apply local law that most closely approximates
+convey the exclusion of warranty; and each file should have at least
-an absolute waiver of all civil liability in connection with the
+the "copyright" line and a pointer to where the full notice is found.
-Program, unless a warranty or assumption of liability accompanies a
+
-copy of the Program in return for a fee.
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -0,0 +1,339 @@
+# Redmine DMSF Plugin 4.1.2
+
+[![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=master)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml)
+[![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
+
+Redmine DMSF is Document Management System Features plugin for Redmine issue tracking system; It is aimed to replace current Redmine's Documents module.
+
+Redmine DMSF now comes bundled with WebDAV functionality: if switched on within plugin settings this will be accessible from _/dmsf/webdav_.
+
+WebDAV functionality is provided through Dav4Rack library.
+
+The development has been supported by [Kontron](https://www.kontron.com) and has been released as open source thanks to their generosity.  
+Project home: <https://github.com/danmunn/redmine_dmsf>
+
+Redmine Document Management System "Features" plugin is distributed under GNU General Public License v2 (GPL).  
+Redmine is a flexible project management web application, released under the terms of the GNU General Public License v2 (GPL) at <https://www.redmine.org/>
+
+Further information about the GPL license can be found at
+<https://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC1>
+
+## Features
+
+  * Directory structure
+  * Document versioning / revision history 
+  * Document locking
+  * Multi (drag/drop depending on browser) upload/download  
+  * Direct document or document link sending via email
+  * Configurable document approval workflow
+  * Document access auditing
+  * Integration with Redmine's activity feed
+  * Wiki macros for a quick content linking
+  * Full read/write WebDAV functionality
+  * Optional document content full-text search
+  * Documents and folders' symbolic links  
+  * Trash bin
+  * Documents attachable to issues
+  * Office documents are displayed inline
+  * Editing of office documents
+  * REST API
+  * DMS Document revision as a custom field type
+  * Compatible with Redmine 6
+
+## Dependencies
+  
+  * Redmine 6.0 or higher
+
+### Full-text search (optional)
+
+#### Indexing
+
+If you want to use full-text search features, you must setup file content indexing.
+
+It is necessary to index DMSF files with omindex before searching attempts to receive some output:
+
+1. Change the configuration part of redmine_dmsf/extra/xapian_indexer.rb file according to your environment.
+   (The path to the index database set in xapian_indexer.rb must corresponds to the path set in the plugin's settings.)
+2. Run `ruby redmine_dmsf/extra/xapian_indexer.rb -v`
+
+This command should be run on regular basis (e.g. from cron)
+
+Example of cron job (once per hour at 8th minute):
+
+    8 * * * * root /usr/bin/ruby redmine_dmsf/extra/xapian_indexer.rb
+
+See redmine_dmsf/extra/xapian_indexer.rb for help.
+
+#### Searching
+
+If you want to use fulltext search abilities, install xapian packages. In case of using of Bitnami 
+stack or Ruby installed via RVM it might be necessary to install Xapian bindings from sources. See https://xapian.org
+ for details. 
+
+To index some files with omega you may have to install some other packages like
+xpdf, antiword, ...
+
+From Omega documentation:
+
+   * HTML (.html, .htm, .shtml, .shtm, .xhtml, .xhtm)
+   * PHP (.php) - our HTML parser knows to ignore PHP code
+   * text files (.txt, .text)
+   * SVG (.svg)
+   * CSV (Comma-Separated Values) files (.csv)
+   * PDF (.pdf) if pdftotext is available (comes with poppler or xpdf)
+   * PostScript (.ps, .eps, .ai) if ps2pdf (from ghostscript) and pdftotext (comes with poppler or xpdf) are available
+   * OpenOffice/StarOffice documents (.sxc, .stc, .sxd, .std, .sxi, .sti, .sxm, .sxw, .sxg, .stw) if unzip is available
+   * OpenDocument format documents (.odt, .ods, .odp, .odg, .odc, .odf, .odb, .odi, .odm, .ott, .ots, .otp, .otg, .otc, .otf, .oti, .oth) if unzip is available
+   * MS Word documents (.dot) if antiword is available (.doc files are left to libmagic, as they may actually be RTF (AbiWord saves RTF when asked to save as .doc, and Microsoft Word quietly loads RTF files with a .doc extension), or plain-text).
+   * MS Excel documents (.xls, .xlb, .xlt, .xlr, .xla) if xls2csv is available (comes with catdoc)
+   * MS Powerpoint documents (.ppt, .pps) if catppt is available (comes with catdoc)
+   * MS Office 2007 documents (.docx, .docm, .dotx, .dotm, .xlsx, .xlsm, .xltx, .xltm, .pptx, .pptm, .potx, .potm, .ppsx, .ppsm) if unzip is available
+   * Wordperfect documents (.wpd) if wpd2text is available (comes with libwpd)
+   * MS Works documents (.wps, .wpt) if wps2text is available (comes with libwps)
+   * MS Outlook message (.msg) if perl with Email::Outlook::Message and HTML::Parser modules is available
+   * MS Publisher documents (.pub) if pub2xhtml is available (comes with libmspub)
+   * AbiWord documents (.abw)
+   * Compressed AbiWord documents (.zabw)
+   * Rich Text Format documents (.rtf) if unrtf is available
+   * Perl POD documentation (.pl, .pm, .pod) if pod2text is available
+   * reStructured text (.rst, .rest) if rst2html is available (comes with docutils)
+   * Markdown (.md, .markdown) if markdown is available
+   * TeX DVI files (.dvi) if catdvi is available
+   * DjVu files (.djv, .djvu) if djvutxt is available
+   * XPS files (.xps) if unzip is available
+   * Debian packages (.deb, .udeb) if dpkg-deb is available
+   * RPM packages (.rpm) if rpm is available
+   * Atom feeds (.atom)
+   * MAFF (.maff) if unzip is available
+   * MHTML (.mhtml, .mht) if perl with MIME::Tools is available
+   * MIME email messages (.eml) and USENET articles if perl with MIME::Tools and HTML::Parser is available
+   * vCard files (.vcf, .vcard) if perl with Text::vCard is available
+    
+You can use following commands to install some of the required indexing tools:    
+
+On Debian use:
+
+```
+sudo apt-get install xapian-omega ruby-xapian libxapian-dev poppler-utils antiword unzip catdoc libwpd-tools \
+libwps-tools gzip unrtf catdvi djview djview3 uuid uuid-dev xz-utils libemail-outlook-message-perl
+```
+
+On Ubuntu use:
+
+```
+sudo apt-get install xapian-omega ruby-xapian libxapian-dev poppler-utils antiword  unzip catdoc libwpd-tools \
+libwps-tools gzip unrtf catdvi djview djview3 uuid uuid-dev xz-utils libemail-outlook-message-perl
+```
+
+On CentOS use:
+```
+sudo yum install xapian-core xapian-bindings-ruby libxapian-dev poppler-utils antiword unzip catdoc libwpd-tools \
+libwps-tools gzip unrtf catdvi djview djview3 uuid uuid-dev xz libemail-outlook-message-perl
+```
+
+## Inline displaying of office documents (optional)
+
+If LibreOffice binary `libreoffice` is present in the server, office documents (.odt, .ods,...) are displayed inline.
+The command must be runable by the web app's user. Test it in advance, e.g:
+
+`sudo -u www-data libreoffice --convert-to pdf my_document.odt`
+
+`libreoffice` package is available in the most of Linux distributions, e.g. on Debain based systems:
+
+```
+sudo apt install libreoffice liblibreoffice-java
+```            
+
+## Usage
+
+DMSF is designed to act as project module, so it must be checked as an enabled module within the project settings.
+
+Search will now automatically search DMSF content when a Redmine search is performed, additionally a "Documents" and "Folders" check box will be visible, allowing you to search DMSF content exclusively.
+
+## Linking DMSF object from Wiki entries (macros)
+
+You can link DMSF object from Wikis using a macro tag `{{ }}`. List of available macros with their description is 
+available from the wiki's toolbar.
+
+## Hooks
+
+You can implement these hooks in your plugin and extend DMSF functionality in certain events.
+
+E.g.
+
+    class DmsfUploadControllerHooks < Redmine::Hook::Listener
+
+        def dmsf_upload_controller_after_commit(context={}) 
+            context[:controller].flash[:info] = 'Okay'
+        end
+
+    end
+
+**dmsf_upload_controller_after_commit**
+
+Called after all uploaded files are committed.
+
+parameters: *files*
+
+**dmsf_helper_upload_after_commit**
+
+Called after an individual file is committed. The controller is not available.
+
+Parameters: *file*
+
+**dmsf_workflow_controller_before_approval**
+
+Called before an approval. If the hook returns false, the approval is not recorded.
+
+parameters: *revision*, *step_action*
+
+**dmsf_files_controller_before_view**
+
+Allows a preview of the file by an external plugin. If the hook returns true, the file is not sent by DMSF. It is 
+expected that the file is sent by the hook.
+
+parameters: *file*
+
+## Setup / Upgrade
+
+You can either clone the master branch or download the latest zipped version. Before installing ensure that the Redmine 
+instance is stopped.
+
+    git clone git@github.com:danmunn/redmine_dmsf.git
+       
+    wget https://github.com/danmunn/redmine_dmsf/archive/master.zip
+
+1. In case of upgrade **BACKUP YOUR DATABASE, ORIGINAL PLUGIN AND THE FOLDER WITH DOCUMENTS** first!!!
+2. Put redmine_dmsf plugin directory into plugins. The plugins sub-directory must be named just **redmine_dmsf**. In case
+   of need rename _redmine_dmsf-x.y.z_ to *redmine_dmsf*.
+3. **Go to the redmine directory** 
+
+    `cd redmine`
+
+4. Install dependencies: 
+
+    `bundle install`
+
+   4.1 In production environment
+
+        bundle config set --local without 'development test'
+        bundle install
+
+   4.2 Without Xapian fulltext search (on Windows)
+
+        bundle config set --local without 'xapian'
+        bundle install
+
+5. Initialize/Update database:
+
+   `RAILS_ENV=production bundle exec rake redmine:plugins:migrate NAME=redmine_dmsf`
+
+6. Install assets
+
+   `RAILS_ENV="production" bundle exec rake assets:precompile`
+
+7. The access rights must be set for web server, e.g.: 
+
+    `chown -R www-data:www-data plugins/redmine_dmsf`
+
+8. Restart the web server, e.g.: 
+
+    `systemctl restart apache2`
+
+9. You should configure the plugin via Redmine interface: Administration -> Plugins -> DMSF -> Configure. (You should check and then save the plugin's configuration after each upgrade.)
+10. Don't forget to grant permissions for DMSF in Administration -> Roles and permissions
+11. Assign DMSF permissions to appropriate roles.
+12. There are a few rake tasks:
+
+    I) To convert documents from the standard Redmine document module
+
+        Available options:
+
+            * project - id or identifier of a project (default to all projects)
+            * dry_run - perform just a check without any conversion
+            * issues - Convert also files attached to issues
+
+        Example:
+            
+            rake redmine:dmsf_convert_documents project=test RAILS_ENV="production"
+
+            (If you don't run the rake task as the web server user, don't forget to change the ownership of the imported files, e.g.
+              chown -R www-data:www-data /redmine/files/dmsf
+            afterwards)
+
+    II) To alert all users who are expected to do an approval in the current approval steps
+
+        Example:
+            
+            rake redmine:dmsf_alert_approvals RAILS_ENV="production"   
+                        
+    III) To create missing checksums for all document revisions
+            
+        Available options:
+        
+          * dry_run - test, no changes to the database          
+          * forceSHA256 - replace old MD5 with SHA256
+        
+        Example:
+        
+          bundle exec rake redmine:dmsf_create_digests RAILS_ENV="production"
+          bundle exec rake redmine:dmsf_create_digests forceSHA256=1 RAILS_ENV="production"
+          bundle exec rake redmine:dmsf_create_digests dry_run=1 RAILS_ENV="production"
+          
+    IV) To maintain DMSF
+        
+        * Remove all files with no database record from the document directory
+        * Remove all links project_id = -1 (added links to an issue which hasn't been created)
+        
+        Available options:
+        
+          * dry_run - No physical deletion but to list of all unused files only
+        
+        Example:
+        
+          rake redmine:dmsf_maintenance RAILS_ENV="production"
+          rake redmine:dmsf_maintenance dry_run=1 RAILS_ENV="production"
+
+### WebDAV
+
+In order to enable WebDAV module, it is necessary to put the following code into yor `config/additional_environment.rb`
+
+```ruby
+# Redmine DMSF's WebDAV
+require File.dirname(__FILE__) + '/plugins/redmine_dmsf/lib/redmine_dmsf/webdav/custom_middleware'
+config.middleware.insert_before ActionDispatch::Cookies, RedmineDmsf::Webdav::CustomMiddleware
+```
+
+### Installation in a sub-uri
+
+In order to documents and folders are available via WebDAV in case that the Redmine is configured to be run in a sub-uri 
+it's necessary to add the following configuration option into your `config/additional_environment.rb`:
+
+```ruby
+config.relative_url_root = '/redmine'
+```
+
+## Uninstalling DMSF
+
+Before uninstalling the DMSF plugin, please ensure that the Redmine instance is stopped.
+
+1. `cd [redmine-install-dir]`
+2. `rake redmine:plugins:migrate NAME=redmine_dmsf VERSION=0 RAILS_ENV=production`
+3. `rm plugins/redmine_dmsf -Rf`
+
+After these steps re-start your instance of Redmine.
+
+## Contributing
+
+If you've added something, why not share it. Fork the repository (github.com/danmunn/redmine_dmsf), 
+make the changes and send a pull request to the maintainers.
+
+Changes with tests, and full documentation are preferred.
+
+## Additional Documentation
+
+[CHANGELOG.md](CHANGELOG.md) - Project changelog
+
+---
+
+Special thanks to <a href="https://jetbrains.com"><img src="jetbrains-variant-3.svg" alt="JetBrains logo" width="59"  height="68"></a> for providing an excellent IDE.

after_init.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+# Redmine plugin for Document Management System "Features"
+#
+#  Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require 'redmine'
+require 'zip'
+require "#{File.dirname(__FILE__)}/lib/redmine_dmsf"
+
+def dmsf_init
+  # Administration menu extension
+  Redmine::MenuManager.map :admin_menu do |menu|
+    menu.push :dmsf_approvalworkflows, :dmsf_workflows_path,
+              caption: :label_dmsf_workflow_plural,
+              icon: 'workflows',
+              html: { class: 'icon icon-workflows' },
+              if: proc { |_| User.current.admin? }
+  end
+  # Project menu extension
+  Redmine::MenuManager.map :project_menu do |menu|
+    menu.push :dmsf, { controller: 'dmsf', action: 'show' },
+              caption: :menu_dmsf,
+              before: :documents,
+              param: :id,
+              html: { class: 'icon icon-dmsf' }
+    # New menu extension
+    next if defined?(EasyExtensions)
+
+    menu.push :dmsf_file, { controller: 'dmsf_upload', action: 'multi_upload' },
+              caption: :label_dmsf_new_top_level_document, parent: :new_object
+    menu.push :dmsf_folder, { controller: 'dmsf', action: 'new' },
+              caption: :label_dmsf_new_top_level_folder,
+              parent: :new_object
+  end
+  # Main menu extension
+  Redmine::MenuManager.map :top_menu do |menu|
+    menu.push :dmsf, { controller: 'dmsf', action: 'index' },
+              caption: :menu_dmsf,
+              html: { class: 'icon-dmsf', category: :rest_extension_modules },
+              if: proc {
+                User.current.allowed_to?(:view_dmsf_folders, nil, global: true) &&
+                  ActiveRecord::Base.connection.data_source_exists?('settings') &&
+                  !RedmineDmsf.dmsf_global_menu_disabled?
+              }
+  end
+
+  Redmine::AccessControl.map do |map|
+    map.project_module :dmsf do |pmap|
+      pmap.permission :view_dmsf_file_revision_accesses, {}, read: true
+      pmap.permission :view_dmsf_file_revisions, {}, read: true
+      pmap.permission :view_dmsf_folders, { dmsf: %i[show index] }, read: true
+      pmap.permission :user_preferences, { dmsf_state: [:user_pref_save] }, require: :member
+      pmap.permission(:view_dmsf_files,
+                      { dmsf: %i[entries_operation entries_email download_email_entries add_email append_email
+                                 autocomplete_for_user],
+                        dmsf_files: %i[show view thumbnail],
+                        dmsf_workflows: [:log] },
+                      read: true)
+      pmap.permission :email_documents,
+                      { dmsf_public_urls: [:create] }
+      pmap.permission :folder_manipulation,
+                      { dmsf: %i[new create delete edit save edit_root save_root lock unlock notify_activate
+                                 notify_deactivate restore drop copymove],
+                        dmsf_folder_permissions: %i[new append autocomplete_for_user],
+                        dmsf_context_menus: [:dmsf] }
+      pmap.permission :file_manipulation,
+                      { dmsf_files: %i[create_revision lock unlock delete_revision obsolete_revision
+                                       notify_activate notify_deactivate restore],
+                        dmsf_upload: %i[upload_files upload commit_files commit delete_dmsf_attachment
+                                        delete_dmsf_link_attachment multi_upload],
+                        dmsf_links: %i[new create destroy restore autocomplete_for_project autocomplete_for_folder],
+                        dmsf_context_menus: [:dmsf] }
+      pmap.permission :file_delete,
+                      { dmsf: %i[trash delete_entries empty_trash],
+                        dmsf_files: [:delete],
+                        dmsf_trash_context_menus: [:trash] }
+      pmap.permission :force_file_unlock, {}
+      pmap.permission :file_approval,
+                      { dmsf_workflows: %i[action new_action autocomplete_for_user start assign assignment] }
+      pmap.permission :manage_workflows,
+                      { dmsf_workflows: %i[index new create destroy show new_step add_step remove_step
+                                           reorder_steps update update_step delete_step edit] }
+      pmap.permission :display_system_folders, {}, read: true
+      # Watchers
+      pmap.permission :view_dmsf_file_watchers, {}, read: true
+      pmap.permission :add_dmsf_file_watchers, { watchers: %i[new create append autocomplete_for_user] }
+      pmap.permission :delete_dmsf_file_watchers, { watchers: :destroy }
+      pmap.permission :view_dmsf_folder_watchers, {}, read: true
+      pmap.permission :add_dmsf_folder_watchers, { watchers: %i[new create append autocomplete_for_user] }
+      pmap.permission :delete_dmsf_folder_watchers, { watchers: :destroy }
+      pmap.permission :view_project_watchers, {}, read: true
+      pmap.permission :add_project_watchers, { watchers: %i[new create append autocomplete_for_user] }
+      pmap.permission :delete_project_watchers, { watchers: :destroy }
+    end
+  end
+  # DMSF WebDAV digest token
+  Token.add_action :dmsf_webdav_digest, max_instances: 1, validity_time: nil
+end
+
+if defined?(EasyExtensions)
+  Rails.application.config.after_initialize do
+    dmsf_init
+
+    # Register panels for My page
+    EpmDmsfLockedDocuments.register_to_scope :user, plugin: :redmine_dmsf
+    EpmDmsfOpenApprovals.register_to_scope :user, plugin: :redmine_dmsf
+    EpmDmsfWatchedDocuments.register_to_scope :user, plugin: :redmine_dmsf
+  end
+else
+  dmsf_init
+end
+
+Rails.application.configure do
+  # Rubyzip configuration
+  Zip.unicode_names = true
+
+  # DMS custom fields
+  after_easy_init do
+    CustomFieldsHelper::CUSTOM_FIELDS_TABS << { name: 'DmsfFileRevisionCustomField', partial: 'custom_fields/index',
+                                                label: :dmsf }
+  end
+
+  # Searchable modules
+  after_easy_init do
+    Redmine::Search.map do |search|
+      search.register :dmsf_files
+      search.register :dmsf_folders
+    end
+  end
+
+  # Activities
+  after_easy_init do
+    Redmine::Activity.register :dmsf_file_revision_accesses, default: false
+    Redmine::Activity.register :dmsf_file_revisions
+  end
+
+  if defined?(EasyExtensions)
+    require "#{File.dirname(__FILE__)}/lib/redmine_dmsf/webdav/custom_middleware"
+    config.middleware.insert_before ActionDispatch::Cookies, RedmineDmsf::Webdav::CustomMiddleware
+  end
+end

app/controllers/dmsf_context_menus_controller.rb

@@ -4,20 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
-
-require "#{File.dirname(__FILE__)}/../../lib/redmine_dmsf/preview"
 
 # Context menu controller
 class DmsfContextMenusController < ApplicationController

app/controllers/dmsf_controller.rb

@@ -4,18 +4,19 @@
 #
 #  Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require "#{File.dirname(__FILE__)}/../../lib/redmine_dmsf/dmsf_zip"
 
@@ -30,7 +31,7 @@ class DmsfController < ApplicationController
                 except: %i[new create edit_root save_root add_email append_email autocomplete_for_user digest
                            reset_digest]
   before_action :find_parent, only: %i[new create delete]
-  before_action :permissions?
+  before_action :permissions
   # Also try to lookup folder by title if this is an API call
   before_action :find_folder_by_title, only: [:show]
   before_action :query, only: %i[expand_folder show trash empty_trash index]
@@ -50,7 +51,7 @@ class DmsfController < ApplicationController
   helper :context_menus
   helper :watchers
 
-  def permissions?
+  def permissions
     if !DmsfFolder.permissions?(@folder, allow_system: false)
       render_403
     elsif @folder && @project && (@folder.project != @project)
@@ -82,7 +83,7 @@ class DmsfController < ApplicationController
     @file_manipulation_allowed = User.current.allowed_to?(:file_manipulation, @project)
     @trash_enabled = @folder_manipulation_allowed && @file_manipulation_allowed
     @notifications = Setting.notified_events.include?('dmsf_legacy_notifications')
-    @query.dmsf_folder_id = @folder&.id
+    @query.dmsf_folder_id = @folder ? @folder.id : nil
     @query.deleted = false
     @query.sub_projects |= RedmineDmsf.dmsf_projects_as_subfolders?
     if @folder&.deleted? || (params[:folder_title].present? && !@folder)
@@ -92,10 +93,6 @@ class DmsfController < ApplicationController
     if @query.valid?
       respond_to do |format|
         format.html do
-          # Warn about searching in sub-folders
-          if @folder && params['set_filter'].present? && params['f'].present?
-            flash.now[:warning] = l(:notice_search_in_subfolders)
-          end
           @dmsf_count = @query.dmsf_count
           @dmsf_pages = Paginator.new @dmsf_count, per_page_option, params['page']
           render layout: !request.xhr?
@@ -363,7 +360,7 @@ class DmsfController < ApplicationController
 
   def lock
     if @folder.nil?
-      flash[:warning] = l(:warning_folder_unlockable)
+      flash[:warning] = l(:warning_foler_unlockable)
     elsif @folder.locked?
       flash[:warning] = l(:warning_folder_already_locked)
     else
@@ -375,7 +372,7 @@ class DmsfController < ApplicationController
 
   def unlock
     if @folder.nil?
-      flash[:warning] = l(:warning_folder_unlockable)
+      flash[:warning] = l(:warning_foler_unlockable)
     elsif !@folder.locked?
       flash[:warning] = l(:warning_folder_not_locked)
     elsif @folder.locks[0].user == User.current || User.current.allowed_to?(:force_file_unlock, @project)
@@ -759,7 +756,11 @@ class DmsfController < ApplicationController
 
   def query
     retrieve_default_query true
-    @query = retrieve_query DmsfQuery, true
+    @query = if defined?(EasyExtensions)
+               retrieve_query_without_easy_extensions DmsfQuery, true
+             else
+               retrieve_query DmsfQuery, true
+             end
   end
 
   def retrieve_default_query(use_session)

app/controllers/dmsf_files_controller.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Files controller
 class DmsfFilesController < ApplicationController
@@ -25,7 +26,7 @@ class DmsfFilesController < ApplicationController
   before_action :find_revision, only: %i[delete_revision obsolete_revision]
   before_action :find_folder, only: %i[delete create_revision]
   before_action :authorize
-  before_action :permissions?
+  before_action :permissions
 
   accept_api_auth :show, :view, :delete, :create_revision
 
@@ -38,7 +39,7 @@ class DmsfFilesController < ApplicationController
 
   include QueriesHelper
 
-  def permissions?
+  def permissions
     render_403 if @file && !DmsfFolder.permissions?(@file.dmsf_folder, allow_system: true, file: true)
     true
   end
@@ -81,7 +82,7 @@ class DmsfFilesController < ApplicationController
       send_file pdf_preview, filename: "#{basename}.pdf", type: 'application/pdf', disposition: 'inline'
     # Text preview
     elsif !api_request? && params[:download].blank? && (@file.size <= Setting.file_max_size_displayed.to_i.kilobyte) &&
-          (@file.text? || @file.markdown? || @file.textile?) && !@file.html? && formats.include?(:html)
+          (@file.text? || @file.markdown? || @file.textile?) && !@file.html?
       @content = File.read(@revision.disk_file, mode: 'rb')
       render action: 'document'
     # Offer the file for download
@@ -334,6 +335,7 @@ class DmsfFilesController < ApplicationController
   end
 
   def thumbnail
+    if @file.image?
       tbnail = @file.thumbnail(size: params[:size])
       if tbnail
         if stale?(etag: tbnail)
@@ -345,6 +347,9 @@ class DmsfFilesController < ApplicationController
       else
         head :not_found
       end
+    else
+      head :not_found
+    end
   end
 
   private

app/controllers/dmsf_folder_permissions_controller.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Folder permissions controller
 class DmsfFolderPermissionsController < ApplicationController
@@ -24,11 +25,11 @@ class DmsfFolderPermissionsController < ApplicationController
                 if: -> { params[:dmsf_folder_id].present? }
   before_action :find_project
   before_action :authorize
-  before_action :permissions?
+  before_action :permissions
 
   helper :dmsf
 
-  def permissions?
+  def permissions
     render_403 unless DmsfFolder.permissions?(@dmsf_folder)
     true
   end

app/controllers/dmsf_help_controller.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Help controller
 class DmsfHelpController < ApplicationController

app/controllers/dmsf_links_controller.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Links controller
 class DmsfLinksController < ApplicationController
@@ -25,7 +26,7 @@ class DmsfLinksController < ApplicationController
   before_action :find_link_project
   before_action :find_folder, only: [:destroy]
   before_action :authorize
-  before_action :permissions?
+  before_action :permissions
 
   protect_from_forgery except: :new
 
@@ -33,7 +34,7 @@ class DmsfLinksController < ApplicationController
 
   helper :dmsf
 
-  def permissions?
+  def permissions
     render_403 if @dmsf_link && !DmsfFolder.permissions?(@dmsf_link.dmsf_folder)
     true
   end

app/controllers/dmsf_public_urls_controller.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Public URL controller
 class DmsfPublicUrlsController < ApplicationController

app/controllers/dmsf_state_controller.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # State controller
 class DmsfStateController < ApplicationController

app/controllers/dmsf_upload_controller.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Upload controller
 class DmsfUploadController < ApplicationController
@@ -25,7 +26,7 @@ class DmsfUploadController < ApplicationController
   before_action :authorize, except: %i[upload delete_dmsf_attachment delete_dmsf_link_attachment]
   before_action :authorize_global, only: %i[upload delete_dmsf_attachment delete_dmsf_link_attachment]
   before_action :find_folder, except: %i[upload commit delete_dmsf_attachment delete_dmsf_link_attachment]
-  before_action :permissions?, except: %i[upload commit delete_dmsf_attachment delete_dmsf_link_attachment]
+  before_action :permissions, except: %i[upload commit delete_dmsf_attachment delete_dmsf_link_attachment]
 
   helper :custom_fields
   helper :dmsf_workflows
@@ -33,7 +34,7 @@ class DmsfUploadController < ApplicationController
 
   accept_api_auth :upload, :commit
 
-  def permissions?
+  def permissions
     render_403 unless DmsfFolder.permissions?(@folder)
     true
   end
@@ -75,6 +76,7 @@ class DmsfUploadController < ApplicationController
     @attachment.author = User.current
     @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
     @attachment.content_type = params[:content_type].presence
+    @attachment.skip_description_required = true if defined?(EasyExtensions)
     begin
       Attachment.skip_callback(:commit, :after, :reuse_existing_file_if_possible, raise: false)
       saved = @attachment.save
@@ -106,7 +108,7 @@ class DmsfUploadController < ApplicationController
 
     @folder = DmsfFolder.visible.find_by(id: attachments[:folder_id]) if attachments[:folder_id].present?
     # standard file input uploads
-    uploaded_files = attachments.slice('uploaded_file')
+    uploaded_files = attachments.select { |key, _| key == 'uploaded_file' }
     uploaded_files.each_value do |uploaded_file|
       upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file)
       next unless upload

app/controllers/dmsf_workflows_controller.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # WorkflowsController
 class DmsfWorkflowsController < ApplicationController
@@ -26,7 +27,7 @@ class DmsfWorkflowsController < ApplicationController
   before_action :find_model_object, except: %i[create new index assign assignment]
   before_action :find_project
   before_action :authorize_custom
-  before_action :permissions?, only: %i[new_action assignment start]
+  before_action :permissions, only: %i[new_action assignment start]
   before_action :approver_candidates, only: %i[remove_step show reorder_steps add_step]
   before_action :prevent_from_editing, only: %i[destroy remove_step update add_step update_step reorder_steps]
 
@@ -34,7 +35,7 @@ class DmsfWorkflowsController < ApplicationController
 
   helper :dmsf
 
-  def permissions?
+  def permissions
     revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id]) if params[:dmsf_file_revision_id].present?
     render_403 unless revision&.dmsf_file || DmsfFolder.permissions?(revision&.dmsf_file&.dmsf_folder)
     true
@@ -76,7 +77,7 @@ class DmsfWorkflowsController < ApplicationController
                        { dmsf_file_revision: revision, step_action: params[:step_action] })
     if (result.blank? || result.first) && action.save
       if revision
-        if @dmsf_workflow.try_finish? revision, action, (params[:step_action].to_i / 10)
+        if @dmsf_workflow.try_finish revision, action, (params[:step_action].to_i / 10)
           if revision.dmsf_file
             begin
               revision.dmsf_file.unlock!(force_file_unlock_allowed: true) unless RedmineDmsf.dmsf_keep_documents_locked?
@@ -216,7 +217,6 @@ class DmsfWorkflowsController < ApplicationController
         revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
         begin
           if revision
-            @project ||= revision.dmsf_file.project
             revision.set_workflow(params[:dmsf_workflow_id], params[:action])
             revision.assign_workflow(params[:dmsf_workflow_id])
             if request.post?
@@ -414,8 +414,8 @@ class DmsfWorkflowsController < ApplicationController
     if request.put?
       if @assigned
         flash[:error] = l(:error_dmsf_workflow_assigned)
-      else
+      elsif !@dmsf_workflow.reorder_steps(params[:step].to_i, params[:dmsf_workflow][:position].to_i)
-        @dmsf_workflow.reorder_steps params[:step].to_i, params[:dmsf_workflow][:position].to_i
+        flash[:error] = l(:notice_cannot_renumber_steps)
       end
     end
     respond_to do |format|

app/errors/dmsf_access_error.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Access error
 class DmsfAccessError < StandardError

app/errors/dmsf_email_max_file_size_error.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Max file size error
 class DmsfEmailMaxFileSizeError < StandardError

app/errors/dmsf_file_not_found_error.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Not found error
 class DmsfFileNotFoundError < StandardError

app/errors/dmsf_lock_error.rb

@@ -4,18 +4,19 @@
 #
 # Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Lock error
 class DmsfLockError < StandardError

app/errors/dmsf_parent_error.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Parent error
 class DmsfParentError < StandardError

app/errors/dmsf_zip_max_files_error.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File count exceeded
 class DmsfZipMaxFilesError < StandardError

app/helpers/dmsf_files_helper.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Files helper
 module DmsfFilesHelper

app/helpers/dmsf_folder_permissions_helper.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Folders permissions helper
 module DmsfFolderPermissionsHelper

app/helpers/dmsf_helper.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'tmpdir'
 require 'csv'
@@ -24,6 +25,14 @@ require 'csv'
 module DmsfHelper
   include Redmine::I18n
 
+  unless defined?(EasyExtensions)
+
+    def late_javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
+      javascript_tag content_or_options_with_block, html_options, &block
+    end
+
+  end
+
   def self.temp_filename(filename)
     filename = sanitize_filename(filename)
     timestamp = DateTime.current.strftime('%y%m%d%H%M%S')
@@ -78,7 +87,9 @@ module DmsfHelper
   def email_entry_tmp_file_path(entry)
     sanitized_entry = DmsfHelper.sanitize_filename(entry)
     file_name = "#{RedmineDmsf::DmsfZip::FILE_PREFIX}#{sanitized_entry}.zip"
-    Rails.root.join 'tmp', file_name
+    # rubocop:disable Rails/FilePath
+    File.join(Rails.root.to_s, 'tmp', file_name)
+    # rubocop:enable Rails/FilePath
   end
 
   # Extracts the variable part of the temp file name to be used as identifier in the
@@ -86,6 +97,6 @@ module DmsfHelper
   def tmp_entry_identifier(zipped_content)
     path = Pathname.new(zipped_content)
     zipped_file = path.basename(path.extname).to_s
-    zipped_file.delete_prefix RedmineDmsf::DmsfZip::FILE_PREFIX
+    zipped_file.delete_prefix(RedmineDmsf::DmsfZip::FILE_PREFIX)
   end
 end

app/helpers/dmsf_links_helper.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Links helper
 module DmsfLinksHelper

app/helpers/dmsf_queries_helper.rb

@@ -4,18 +4,19 @@
 #
 #  Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Queries helper
 module DmsfQueriesHelper
@@ -30,61 +31,54 @@ module DmsfQueriesHelper
       case item.type
       when 'file'
         file = DmsfFile.find_by(id: item.id)
-        if !item.deleted? && file&.locked?
+        if file&.locked?
           return content_tag(:span, val) +
-                 link_to(sprite_icon('unlock', nil, icon_only: true, size: '12'),
+                 content_tag('span', sprite_icon('unlock', nil, icon_only: true, size: '12'),
-                         unlock_dmsf_files_path(id: file,
+                             title: l(:title_locked_by_user, user: file.locked_by))
-                                                back_url: dmsf_folder_path(id: file.project,
-                                                                           folder_id: file.dmsf_folder)),
-                         title: l(:title_locked_by_user, user: file.locked_by), class: 'icon icon-unlock')
         end
       when 'folder'
         folder = DmsfFolder.find_by(id: item.id)
-        if !item.deleted? && folder&.locked?
+        if folder&.locked?
           return content_tag(:span, val) +
-                 link_to(sprite_icon('unlock', nil, icon_only: true, size: '12'),
+                 content_tag('span', sprite_icon('unlock', nil, icon_only: true, size: '12'),
-                         unlock_dmsf_path(id: folder.project,
+                             title: l(:title_locked_by_user, user: folder.locked_by))
-                                          folder_id: folder.id,
-                                          back_url: dmsf_folder_path(id: folder.project,
-                                                                     folder_id: folder.dmsf_folder)),
-                         title: l(:title_locked_by_user, user: folder.locked_by), class: 'icon icon-unlock')
         end
       end
       content_tag(:span, val) + content_tag(:span, '', class: 'icon icon-none')
     when :id
       case item.type
       when 'file'
-        if item.deleted?
+        if item&.deleted&.positive?
           h(value)
         else
           link_to h(value), dmsf_file_path(id: item.id)
         end
       when 'file-link'
-        if item.deleted?
+        if item&.deleted&.positive?
           h(item.revision_id)
         else
           link_to h(item.revision_id), dmsf_file_path(id: item.revision_id)
         end
       when 'folder'
         if item.id
-          if item.deleted?
+          if item&.deleted&.positive?
             h(value)
           else
             link_to h(value), edit_dmsf_path(id: item.project_id, folder_id: item.id)
           end
-        elsif item.deleted?
+        elsif item&.deleted&.positive?
           h(item.project_id)
         else
           link_to h(item.project_id), edit_root_dmsf_path(id: item.project_id)
         end
       when 'folder-link'
         if item.id
-          if item.deleted?
+          if item&.deleted&.positive?
             h(item.revision_id)
           else
             link_to h(item.revision_id), edit_dmsf_path(id: item.project_id, folder_id: item.revision_id)
           end
-        elsif item.deleted?
+        elsif item&.deleted&.positive?
           h(item.project_id)
         else
           link_to h(item.project_id), edit_root_dmsf_path(id: item.project_id)
@@ -110,8 +104,7 @@ module DmsfQueriesHelper
       when 'project'
         tag = h("[#{value}]")
         tag = if item.project.module_enabled?(:dmsf)
-                link_to(sprite_icon('folder', nil, icon_only: true), dmsf_folder_path(id: item.project),
+                link_to(sprite_icon('folder', nil, icon_only: true), dmsf_folder_path(id: item.project)) +
-                        class: 'icon icon-folder') +
                   link_to(tag, dmsf_folder_path(id: item.project), class: 'dmsf-label')
               else
                 sprite_icon 'folder', tag
@@ -131,9 +124,9 @@ module DmsfQueriesHelper
           ) + tag
           tag = content_tag('div', tag, class: 'row-control dmsf-row-control')
         end
-        tag += content_tag('div', item.filename, class: 'dmsf-filename')
+        tag += content_tag('div', item.filename, class: 'dmsf-filename', title: l(:title_filename_for_download))
         if item.project.watched_by?(User.current)
-          tag += link_to(sprite_icon('unwatch', nil, icon_only: true, size: '12'),
+          tag += link_to(sprite_icon('fav', nil, icon_only: true, size: '12'),
                          watch_path(object_type: 'project', object_id: item.project.id),
                          title: l(:button_unwatch),
                          method: 'delete',
@@ -142,12 +135,12 @@ module DmsfQueriesHelper
         tag
       when 'folder'
         if item&.deleted?
-          tag = content_tag(:span, sprite_icon('folder', h(value)), class: 'icon icon-folder')
+          tag = sprite_icon('folder', h(value))
         else
           tag = link_to(sprite_icon('folder', nil,
                                     icon_only: true,
                                     css_class: item.system ? 'dmsf-system' : ''),
-                        dmsf_folder_path(id: item.project, folder_id: item.id), class: 'icon icon-folder')
+                        dmsf_folder_path(id: item.project, folder_id: item.id))
           tag += link_to(h(value), dmsf_folder_path(id: item.project, folder_id: item.id), class: 'dmsf-label')
           unless filter_any?
             path = expand_folder_dmsf_path
@@ -167,7 +160,7 @@ module DmsfQueriesHelper
         end
         tag += content_tag('div', item.filename, class: 'dmsf-filename', title: l(:title_filename_for_download))
         if !item&.deleted? && item.watched_by?(User.current)
-          tag += link_to(sprite_icon('unwatch', nil, icon_only: true, size: '12'),
+          tag += link_to(sprite_icon('fav', nil, icon_only: true, size: '12'),
                          watch_path(object_type: 'dmsf_folder', object_id: item.id),
                          title: l(:button_unwatch),
                          method: 'delete',
@@ -176,20 +169,19 @@ module DmsfQueriesHelper
         tag
       when 'folder-link'
         if item&.deleted?
-          tag = content_tag(:span, sprite_icon('folder', h(value)), class: 'icon icon-folder')
+          tag = sprite_icon('folder', h(value))
         else
           # For links, we use revision_id containing dmsf_folder.id in fact
           tag = link_to(sprite_icon('folder', nil, icon_only: true, css_class: 'dmsf-gray'),
-                        dmsf_folder_path(id: item.project, folder_id: item.revision_id), class: 'icon icon-folder')
+                        dmsf_folder_path(id: item.project, folder_id: item.revision_id))
           tag += link_to(h(value), dmsf_folder_path(id: item.project, folder_id: item.revision_id), class: 'dmsf-label')
           tag = content_tag('span', '', class: 'dmsf-expander') + tag unless filter_any?
         end
         tag + content_tag('div', item.filename, class: 'dmsf-filename', title: l(:label_target_folder))
       when 'file', 'file-link'
         icon_name = icon_for_mime_type(Redmine::MimeType.css_class_of(item.filename))
-        icon_class = icon_class_for_mime_type(item.filename)
         if item&.deleted?
-          tag = content_tag(:span, sprite_icon(icon_name, h(value)), class: "icon #{icon_class}")
+          tag = sprite_icon(icon_name, h(value))
         else
           # For links, we use revision_id containing dmsf_file.id in fact
           file_view_url = url_for(
@@ -197,8 +189,7 @@ module DmsfQueriesHelper
           )
           content_type = Redmine::MimeType.of(item.filename)
           content_type = 'application/octet-stream' if content_type.blank?
-          options = { class: "dmsf-label icon #{icon_class}",
+          options = { class: 'dmsf-label', 'data-downloadurl': "#{content_type}:#{h(value)}:#{file_view_url}" }
-                      'data-downloadurl': "#{content_type}:#{h(value)}:#{file_view_url}" }
           unless previewable?(item.filename, content_type)
             options[:target] = '_blank'
             options[:rel] = 'noopener'
@@ -209,7 +200,6 @@ module DmsfQueriesHelper
                                     css_class: item.type == 'file-link' ? 'dmsf-gray' : ''),
                         file_view_url,
                         options)
-          options[:class] = 'dmsf-label'
           tag += link_to(h(value), file_view_url, options)
           tag = content_tag('span', '', class: 'dmsf-expander') + tag unless filter_any?
         end
@@ -218,7 +208,7 @@ module DmsfQueriesHelper
         filename = revision ? revision.formatted_name(member) : item.filename
         tag += content_tag('div', filename, class: 'dmsf-filename', title: l(:title_filename_for_download))
         if (item.type == 'file') && !item&.deleted? && revision.dmsf_file&.watched_by?(User.current)
-          tag += link_to(sprite_icon('unwatch', nil, icon_only: true, size: '12'),
+          tag += link_to(sprite_icon('fav', nil, icon_only: true, size: '12'),
                          watch_path(object_type: 'dmsf_file', object_id: item.id),
                          title: l(:button_unwatch),
                          method: 'delete',
@@ -227,13 +217,12 @@ module DmsfQueriesHelper
         tag
       when 'url-link'
         if item&.deleted?
-          tag = content_tag(:span, sprite_icon('link', h(value)), class: 'icon icon-link')
+          tag = sprite_icon('link', h(value))
         else
           tag = link_to(sprite_icon('link', nil, icon_only: true, css_class: 'dmsf-gray'),
                         item.filename,
                         target: '_blank',
-                        rel: 'noopener',
+                        rel: 'noopener')
-                        class: 'icon icon-link')
           tag += link_to(h(value), item.filename, target: '_blank', rel: 'noopener')
           tag = content_tag('span', '', class: 'dmsf-expander') + tag unless filter_any?
         end
@@ -312,15 +301,4 @@ module DmsfQueriesHelper
       Redmine::MimeType.is_type?('text', filename) || Redmine::SyntaxHighlighting.filename_supported?(filename)
     end
   end
-
-  def icon_class_for_mime_type(mime)
-    case Redmine::MimeType.of(mime)
-    when 'application/pdf'
-      'icon-pdf'
-    when 'text/plain'
-      'icon-txt'
-    else
-      'icon-file'
-    end
-  end
 end

app/helpers/dmsf_upload_helper.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Upload helper
 module DmsfUploadHelper
@@ -98,6 +99,10 @@ module DmsfUploadHelper
             end
             FileUtils.mv committed_file[:tempfile_path], new_revision.disk_file(search_if_not_exists: false)
             FileUtils.chmod 'u=wr,g=r', new_revision.disk_file(search_if_not_exists: false)
+            if defined?(EasyExtensions)
+              # We need to trigger Xapian indexing after the file is moved to its target destination
+              file.touch
+            end
             file.last_revision = new_revision
             files.push file
             container.dmsf_file_added file if container && !new_object

app/helpers/dmsf_workflows_helper.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflows helper
 module DmsfWorkflowsHelper
@@ -61,7 +62,7 @@ module DmsfWorkflowsHelper
 
   def dmsf_workflows_for_select(project, dmsf_workflow_id)
     options = [['', -1]]
-    DmsfWorkflow.active.sorted.where(['project_id = ? OR project_id IS NULL', project&.id]).find_each do |wf|
+    DmsfWorkflow.active.sorted.where(['project_id = ? OR project_id IS NULL', project.id]).find_each do |wf|
       options << if wf.project_id
                    [wf.name, wf.id]
                  else

app/models/dmsf_file.rb

@@ -4,21 +4,20 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
-
 require "#{File.dirname(__FILE__)}/../../lib/redmine_dmsf/lockable"
-require "#{File.dirname(__FILE__)}/../../lib/redmine_dmsf/plugin"
 require 'English'
 
 # File
@@ -51,56 +50,22 @@ class DmsfFile < ApplicationRecord
               case_sensitive: true
             }
 
-  acts_as_event(
+  acts_as_event title: proc { |o| o.name },
-    title: proc { |o|
-      @searched_revision = nil
-      o.dmsf_file_revisions.visible.each do |r|
-        key = "DmsfFile-#{o.id}-#{r.id}"
-        @desc = Redmine::Search.cache_store.fetch(key)
-        next unless @desc
-
-        Redmine::Search.cache_store.delete key
-        @searched_revision = r
-        break
-      end
-      if @searched_revision && (@searched_revision != o.last_revision)
-        "#{o.name} (r#{@searched_revision.id})"
-      else
-        o.name
-      end
-    },
                 description: proc { |o|
-      unless @desc
+                  desc = Redmine::Search.cache_store.fetch("DmsfFile-#{o.id}")
+                  if desc
+                    Redmine::Search.cache_store.delete("DmsfFile-#{o.id}")
+                  else
                     # Set desc to an empty string if o.description is nil
-        @desc = o.description.nil? ? +'' : +o.description
+                    desc = o.description.nil? ? +'' : +o.description
-        @desc += ' / ' if o.description.present? && o.last_revision.comment.present?
+                    desc += ' / ' if o.description.present? && o.last_revision.comment.present?
-        @desc += o.last_revision.comment if o.last_revision.comment.present?
+                    desc += o.last_revision.comment if o.last_revision.comment.present?
                   end
-      @desc
+                  desc
                 },
-    url: proc { |o|
+                url: proc { |o| { controller: 'dmsf_files', action: 'view', id: o } },
-      if @searched_revision
+                datetime: proc { |o| o.updated_at },
-        { controller: 'dmsf_files', action: 'view', id: o.id, download: @searched_revision.id,
+                author: proc { |o| o.last_revision.user }
-          filename: o.name }
-      else
-        { controller: 'dmsf_files', action: 'view', id: o.id, filename: o.name }
-      end
-    },
-    datetime: proc { |o|
-      if @searched_revision
-        @searched_revision.updated_at
-      else
-        o.updated_at
-      end
-    },
-    author: proc { |o|
-      if @searched_revision
-        @searched_revision.user
-      else
-        o.last_revision.user
-      end
-    }
-  )
   acts_as_watchable
   acts_as_searchable(
     columns: [
@@ -449,21 +414,20 @@ class DmsfFile < ApplicationRecord
           filename = dochash['url']
           next unless filename
 
-          dmsf_attrs = filename.scan(%r{^\d{4}/\d{2}/(\d{12}_(\d+)_.*)$})
+          dmsf_attrs = filename.scan(%r{^([^/]+/[^_]+)_(\d+)_(.*)$})
           id_attribute = 0
           id_attribute = dmsf_attrs[0][1] if dmsf_attrs.length.positive?
           next if dmsf_attrs.empty? || id_attribute.to_i.zero?
+          next unless results.none? { |f| f.id.to_s == id_attribute }
 
           dmsf_file = DmsfFile.visible.where(limit_options).find_by(id: id_attribute)
+
           next unless dmsf_file && DmsfFolder.permissions?(dmsf_file.dmsf_folder) &&
                       user.allowed_to?(:view_dmsf_files, dmsf_file.project) &&
                       (project_ids.blank? || project_ids.include?(dmsf_file.project_id))
 
-          rev_id = DmsfFileRevision.where(dmsf_file_id: dmsf_file.id, disk_filename: dmsf_attrs[0][0])
-                                   .pick(:id)
           if dochash['sample']
-            Redmine::Search.cache_store.write("DmsfFile-#{dmsf_file.id}-#{rev_id}",
+            Redmine::Search.cache_store.write("DmsfFile-#{dmsf_file.id}", dochash['sample'].force_encoding('UTF-8'))
-                                              dochash['sample'].force_encoding('UTF-8'))
           end
           break if options[:limit].present? && results.count >= options[:limit]
 
@@ -534,7 +498,7 @@ class DmsfFile < ApplicationRecord
   end
 
   def thumbnailable?
-    Redmine::Thumbnail.convert_available? && (image? || (pdf? && Redmine::Thumbnail.gs_available?))
+    image? && Redmine::Thumbnail.convert_available?
   end
 
   def previewable?
@@ -605,17 +569,15 @@ class DmsfFile < ApplicationRecord
   end
 
   def assigned?(user)
-    return false unless last_revision&.dmsf_workflow
+    if last_revision&.dmsf_workflow
-
       last_revision.dmsf_workflow.next_assignments(last_revision.id).each do |assignment|
         return true if assignment.user == user
       end
+    end
     false
   end
 
   def custom_value(custom_field)
-    return nill unless last_revision
-
     last_revision.custom_field_values.each do |cv|
       return cv if cv.custom_field == custom_field
     end
@@ -627,6 +589,8 @@ class DmsfFile < ApplicationRecord
   end
 
   def thumbnail(options = {})
+    return unless image?
+
     size = options[:size].to_i
     if size.positive?
       # Limit the number of thumbnails per image
@@ -639,7 +603,7 @@ class DmsfFile < ApplicationRecord
     size = 100 unless size.positive?
     target = File.join(Attachment.thumbnails_storage_path, "#{id}_#{last_revision.digest}_#{size}.thumb")
     begin
-      Redmine::Thumbnail.generate last_revision.disk_file.to_s, target, size, pdf?
+      Redmine::Thumbnail.generate last_revision.disk_file.to_s, target, size
     rescue StandardError => e
       Rails.logger.error do
         %(An error occured while generating thumbnail for #{last_revision.disk_file} to #{target}\n
@@ -661,10 +625,61 @@ class DmsfFile < ApplicationRecord
   def container
     return unless dmsf_folder&.system && dmsf_folder.title&.match(/(^\d+)/)
 
-    id = Regexp.last_match(1).to_i
+    issue_id = Regexp.last_match(1)
-    case dmsf_folder.dmsf_folder&.title
+    parent = dmsf_folder.dmsf_folder
-    when '.Issues'
+    Regexp.last_match(1).constantize.visible.find_by(id: issue_id) if parent&.title&.match(/^\.(.+)s/)
-      Issue.visible.find_by id: id
+  end
+
+  if defined?(EasyExtensions)
+    include Redmine::Utils::Shell
+
+    def sheet?
+      case File.extname(last_revision&.disk_filename)
+      when '.ods', # LibreOffice
+        '.xls', '.xlsx', '.xlsm' # MS Office
+        true
+      else
+        false
+      end
+    end
+
+    def content
+      if File.exist?(last_revision.disk_file)
+        if File.size?(last_revision.disk_file) < 5.megabytes
+          tmp = Rails.root.join('tmp')
+          if sheet?
+            cmd = "#{shell_quote(RedmineDmsf::Preview::OFFICE_BIN)} --convert-to 'csv' \
+                   --outdir #{shell_quote(tmp.to_s)} #{shell_quote(last_revision.disk_file)}"
+            text_file = tmp.join(last_revision.disk_filename).sub_ext('.csv')
+          elsif office_doc?
+            cmd = "#{shell_quote(RedmineDmsf::Preview::OFFICE_BIN)} --convert-to 'txt:Text (encoded):UTF8' \
+                   --outdir #{shell_quote(tmp.to_s)} #{shell_quote(last_revision.disk_file)}"
+            text_file = tmp.join(last_revision.disk_filename).sub_ext('.txt')
+          elsif pdf?
+            text_file = tmp.join(last_revision.disk_filename).sub_ext('.txt')
+            cmd = "pdftotext -q #{shell_quote(last_revision.disk_file)} #{shell_quote(text_file.to_s)}"
+          elsif text?
+            return File.read(last_revision.disk_file)
+          end
+          if cmd
+            if system(cmd) && File.exist?(text_file)
+              text = File.read(text_file)
+              FileUtils.rm_f text_file
+              return text
+            else
+              Rails.logger.error "Conversion to text failed (#{$CHILD_STATUS}):\nCommand: #{cmd}"
+            end
+          end
+        else
+          Rails.logger.warn "File #{last_revision.disk_file} is to big to be indexed (>5MB)"
+        end
+      end
+      description
+    rescue StandardError => e
+      Rails.logger.warn e.message
+      ''
+    ensure
+      FileUtils.rm_f(text_file) if text_file.present?
     end
   end
 

app/models/dmsf_file_revision.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File revision
 class DmsfFileRevision < ApplicationRecord
@@ -118,12 +119,16 @@ class DmsfFileRevision < ApplicationRecord
     remove_extension(filename).gsub(/_+/, ' ')
   end
 
+  def self.easy_activity_custom_project_scope(scope, options, _)
+    scope.where(dmsf_files: { project_id: options[:project_ids] })
+  end
+
   def delete(commit: false, force: true)
     if dmsf_file.locked_for_user?
       errors.add :base, l(:error_file_is_locked)
       return false
     end
-    if !commit && !force && (dmsf_file.dmsf_file_revisions.length <= 1)
+    if !commit && (!force && (dmsf_file.dmsf_file_revisions.length <= 1))
       errors.add :base, l(:error_at_least_one_revision_must_be_present)
       return false
     end
@@ -265,15 +270,6 @@ class DmsfFileRevision < ApplicationRecord
     wf.assign(id) if wf && id
   end
 
-  def reset_workflow
-    self.workflow = nil
-    self.dmsf_workflow_id = nil
-    self.dmsf_workflow_assigned_by_user_id = nil
-    self.dmsf_workflow_assigned_at = nil
-    self.dmsf_workflow_started_by_user_id = nil
-    self.dmsf_workflow_started_at = nil
-  end
-
   def increase_version(version_to_increase)
     # Patch version
     self.patch_version = case version_to_increase

app/models/dmsf_file_revision_access.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File revision access
 class DmsfFileRevisionAccess < ApplicationRecord

app/models/dmsf_file_revision_access_query.rb

@@ -5,18 +5,20 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File revision access query
 class DmsfFileRevisionAccessQuery < Query

app/models/dmsf_file_revision_custom_field.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Custom field
 class DmsfFileRevisionCustomField < CustomField

app/models/dmsf_folder.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require "#{File.dirname(__FILE__)}/../../lib/redmine_dmsf/lockable"
 
@@ -117,19 +118,31 @@ class DmsfFolder < ApplicationRecord
     if folder&.system
       return false unless allow_system || User.current.allowed_to?(:display_system_folders, folder.project)
 
-      return false if (folder.title != '.Issues') && !folder.issue&.visible?(User.current)
+      if ['.Issues', '.CRM cases'].exclude?(folder.title) &&
+         !folder.issue&.visible?(User.current) &&
+         !folder.easy_crm_case&.visible?(User.current)
+        return false
+      end
     end
     # Permissions to the folder?
     if folder.dmsf_folder_permissions.any?
       role_ids = User.current.roles_for_project(folder.project).map(&:id)
       role_permission_ids = folder.dmsf_folder_permissions.roles.map(&:object_id)
-      return true if role_ids.intersect?(role_permission_ids)
+      if RUBY_VERSION < '3.1' # intersect? method added in Ruby 3.1, though we support 2.7 too
+        return true if role_ids.intersection(role_permission_ids).any?
+      elsif role_ids.intersect?(role_permission_ids)
+        return true
+      end
 
       principal_ids = folder.dmsf_folder_permissions.users.map(&:object_id)
       return true if principal_ids.include?(User.current.id)
 
       user_group_ids = User.current.groups.map(&:id)
-      principal_ids.intersect? user_group_ids
+      if RUBY_VERSION < '3.1' # intersect? method added in Ruby 3.1, though we support 2.7 too
+        principal_ids.intersection(user_group_ids).any?
+      else
+        principal_ids.intersect?(user_group_ids)
+      end
     else
       DmsfFolder.permissions? folder.dmsf_folder, allow_system: allow_system, file: file
     end
@@ -473,6 +486,19 @@ class DmsfFolder < ApplicationRecord
     @issue
   end
 
+  def easy_crm_case
+    if @easy_crm_case.nil? && system
+      case_id = title.to_i
+      begin
+        ecc = 'EasyCrmCase'.constantize
+      rescue NameError => _e
+        ecc = nil
+      end
+      @easy_crm_case = EasyCrmCase.find_by(id: case_id) if ecc && case_id.positive?
+    end
+    @easy_crm_case
+  end
+
   def update_from_params(params)
     # Attributes
     self.title = params[:dmsf_folder][:title].scrub.strip

app/models/dmsf_folder_permission.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Folder permission
 class DmsfFolderPermission < ApplicationRecord

app/models/dmsf_link.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Link class
 class DmsfLink < ApplicationRecord
@@ -110,7 +111,7 @@ class DmsfLink < ApplicationRecord
     link.name = name
     link.external_url = external_url
     link.project_id = project.id
-    link.dmsf_folder_id = folder&.id
+    link.dmsf_folder_id = folder ? folder.id : nil
     link.user = User.current
     link.save!
     link

app/models/dmsf_lock.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'simple_enum'
 

app/models/dmsf_mailer.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'mailer'
 

app/models/dmsf_public_url.rb

@@ -5,18 +5,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Public URL
 class DmsfPublicUrl < ApplicationRecord

app/models/dmsf_query.rb

@@ -4,18 +4,20 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Query
 class DmsfQuery < Query
@@ -26,7 +28,7 @@ class DmsfQuery < Query
 
   # Standard columns
   self.available_columns = [
-    QueryColumn.new(:id, sortable: 'id', caption: :label_column_id),
+    QueryColumn.new(:id, sortable: 'id', caption: +'#'),
     DmsfQueryTitleColumn.new(:title, sortable: 'title', frozen: true, caption: :label_column_title),
     QueryColumn.new(:size, sortable: 'size', caption: :label_column_size),
     DmsfQueryModifiedColumn.new(:modified, sortable: 'updated', caption: :label_column_modified),

app/models/dmsf_query_modified_column.rb

@@ -4,18 +4,20 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'query'
 

app/models/dmsf_query_title_column.rb

@@ -4,18 +4,20 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'query'
 

app/models/dmsf_query_version_column.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 require 'query'
 

app/models/dmsf_upload.rb

@@ -4,18 +4,19 @@
 #
 #  Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Upload
 class DmsfUpload

app/models/dmsf_workflow.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflow
 class DmsfWorkflow < ApplicationRecord
@@ -109,6 +110,7 @@ class DmsfWorkflow < ApplicationRecord
         end
       end
     end
+    true
   end
 
   def delegates(query, dmsf_workflow_step_assignment_id, dmsf_file_revision_id)
@@ -185,7 +187,7 @@ class DmsfWorkflow < ApplicationRecord
     end
   end
 
-  def try_finish?(revision, action, user_id)
+  def try_finish(revision, action, user_id)
     case action.action
     when DmsfWorkflowStepAction::ACTION_APPROVE
       assignments = next_assignments(revision.id)
@@ -215,7 +217,7 @@ class DmsfWorkflow < ApplicationRecord
   def copy_to(project, name = nil)
     new_wf = dup
     new_wf.name = name if name
-    new_wf.project_id = project&.id
+    new_wf.project_id = project ? project.id : nil
     new_wf.author = User.current
     if new_wf.save
       dmsf_workflow_steps.each do |step|

app/models/dmsf_workflow_step.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflow step
 class DmsfWorkflowStep < ApplicationRecord

app/models/dmsf_workflow_step_action.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflow step action
 class DmsfWorkflowStepAction < ApplicationRecord

app/models/dmsf_workflow_step_assignment.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflow step assignment
 class DmsfWorkflowStepAssignment < ApplicationRecord

app/models/epm_dmsf_locked_documents.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Redmine plugin for Document Management System "Features"
+#
+# Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+# My locked documents - My page panel
+class EpmDmsfLockedDocuments < EasyPageModule
+  def category_name
+    @category_name ||= 'easy_dms'
+  end
+
+  def get_show_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def get_edit_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def registered_in_plugin
+    'redmine_dmsf'
+  end
+end

app/models/epm_dmsf_open_approvals.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Redmine plugin for Document Management System "Features"
+#
+# Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+# My open approvals - My page panel
+class EpmDmsfOpenApprovals < EasyPageModule
+  def category_name
+    @category_name ||= 'easy_dms'
+  end
+
+  def get_show_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def get_edit_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def registered_in_plugin
+    'redmine_dmsf'
+  end
+end

app/models/epm_dmsf_watched_documents.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Redmine plugin for Document Management System "Features"
+#
+# Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+# My open approvals - My page panel
+class EpmDmsfWatchedDocuments < EasyPageModule
+  def category_name
+    @category_name ||= 'easy_dms'
+  end
+
+  def get_show_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def get_edit_data(_settings, _user, _page_context = {})
+    {}
+  end
+
+  def registered_in_plugin
+    'redmine_dmsf'
+  end
+end

app/validators/dmsf_file_extension_validator.rb

@@ -4,28 +4,29 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File extension validator according to the Redmine whitelist and blacklist for file upload.
 class DmsfFileExtensionValidator < ActiveModel::EachValidator
   include Redmine::I18n
 
   def validate_each(record, attribute, value)
-    return unless attribute.to_s == 'name'
+    return true unless attribute.to_s == 'name'
 
     extension = File.extname(value)
-    return if Attachment.valid_extension?(extension)
+    return true if Attachment.valid_extension?(extension)
 
     record.errors.add(:base, l(:error_attachment_extension_not_allowed, extension: extension))
   end

app/validators/dmsf_file_name_validator.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # File name validator
 class DmsfFileNameValidator < ActiveModel::EachValidator

app/validators/dmsf_folder_parent_validator.rb

@@ -4,18 +4,19 @@
 #
 # Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Folder parent validator
 class DmsfFolderParentValidator < ActiveModel::EachValidator
@@ -25,9 +26,10 @@ class DmsfFolderParentValidator < ActiveModel::EachValidator
     while folder
       if folder == record
         record.errors.add attribute, :invalid
-        return
+        return false
       end
       folder = folder.dmsf_folder
     end
+    true
   end
 end

app/validators/dmsf_max_file_size_validator.rb

@@ -4,29 +4,33 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Max file size validator
 class DmsfMaxFileSizeValidator < ActiveModel::EachValidator
   include Redmine::I18n
 
   def validate_each(record, attribute, value)
-    return unless value && (value > Setting.attachment_max_size.to_i.kilobytes)
+    if value && (value > Setting.attachment_max_size.to_i.kilobytes)
-
       record.errors.add attribute,
                         l(:error_attachment_too_big, max_size: ActiveSupport::NumberHelper.number_to_human_size(
                           Setting.attachment_max_size.to_i.kilobytes
                         ))
+      false
+    else
+      true
+    end
   end
 end

app/validators/dmsf_url_validator.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # URL validator
 class DmsfUrlValidator < ActiveModel::EachValidator

app/validators/dmsf_workflow_name_validator.rb

@@ -4,18 +4,19 @@
 #
 # Vít Jonáš <vit.jonas@gmail.com>, Karel Pičman <karel.picman@kontron.com>
 #
-# This file is part of Redmine DMSF plugin.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+# This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# along with this program; if not, write to the Free Software
-# more details.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 
 # Workflow name validator
 class DmsfWorkflowNameValidator < ActiveModel::EachValidator

app/views/dmsf/_add_email.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <h3 class="title"><%= l(:label_email_address_add) %></h3>
@@ -22,7 +23,7 @@
 <%= form_tag(append_email_dmsf_path(id: @project), remote: true, method: :post, id: 'new-user-form') do %>
   <%= hidden_field_tag :project_id, @project.id %>
   <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
-  <%= javascript_tag "observeSearchfield('user_search', 'users_for_users', '#{ escape_javascript url_for(
+  <%= late_javascript_tag "observeSearchfield('user_search', 'users_for_users', '#{ escape_javascript url_for(
     controller: 'dmsf', action: 'autocomplete_for_user') }')" %>
   <div id="users_for_watcher">
     <%= render_principals_for_new_email @principals %>

app/views/dmsf/_custom_fields.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% if object %>

app/views/dmsf/_description.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% if @project %>

app/views/dmsf/_digest.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <p>

app/views/dmsf/_main.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% html_title l(:dmsf) %>
@@ -31,6 +32,17 @@
                     class: 'icon icon-add', data: { cy: 'button__create-folder--dmsf' } %>
       <% end %>
     <% end %>
+    <% if defined?(EasyExtensions) %>
+      <%= render partial: 'dmsf_context_menus/main', locals: {
+          folder_manipulation_allowed: @folder_manipulation_allowed,
+          system_folder: @system_folder,
+          folder: @folder,
+          project: @project,
+          locked: @locked,
+          file_manipulation_allowed: @file_manipulation_allowed,
+          trash_enabled: @trash_enabled,
+          notifications: @notifications } %>
+    <% else %>
       <%= actions_dropdown do %>
         <%= render partial: 'dmsf_context_menus/main', locals: {
             folder_manipulation_allowed: @folder_manipulation_allowed,
@@ -42,6 +54,7 @@
             trash_enabled: @trash_enabled,
             notifications: @notifications} %>
       <% end %>
+    <% end %>
   </div>
 <% end %>
 
@@ -91,6 +104,24 @@
   <% end %>
 <% end %>
 
-<% javascript_tag do %>
+<% if defined?(EasyExtensions) %>
+  <%= late_javascript_tag do %>
+    $(function() {
+      $("p.buttons").addClass("filter-buttons form-actions");
+      let buttonApply = $("p.filter-buttons > a.icon-checked");
+      buttonApply.addClass("button-positive");
+      buttonApply.text("<%= l('easy_query.button_apply.issue') %>");
+      let buttonClear = $("p.filter-buttons > a.icon-reload");
+      buttonClear.addClass("button-negative");
+      buttonClear.text("<%= l('easy_query.label.default_filters') %>");
+      $("p.filter-buttons > a.icon-save").addClass("button");
+      $("p.filter-buttons > a.icon-edit").addClass("button");
+      $("p.filter-buttons > a.icon-del").addClass("button");
+      $("#query_form_with_buttons > p.buttons").show();
+    });
+  <% end %>
+<% end %>
+
+<% late_javascript_tag do %>
   "$('#ajax-indicator').hide();"
 <% end %>

app/views/dmsf/_path.html.erb

@@ -3,21 +3,22 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
-<h2 class="dmsf-header">
+<h2>
   <% if folder %>    
     <%= link_to l(:link_documents), dmsf_folder_path(id: @project) %>
     <% folder.dmsf_path.each do |path_element| %>

app/views/dmsf/_query_list.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% query_options = nil unless defined?(query_options) %>
@@ -27,9 +28,15 @@
     <table class="list dmsf odd-even <%= query.css_classes %> context-menu-container" data-hascontextmenu="true">
       <thead>
       <tr>
+        <% if defined?(EasyExtensions) %>
+          <%# Easy checkbox %>
+          <%= content_tag :th, link_to_function('', 'EASY.contextMenu.toggleIssuesSelection($(this))',
+               title: "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", class: 'icon icon-checked') %>
+        <% else %>
           <th class="checkbox hide-when-print">
             <%= check_box_tag 'check_all', '', false, class: 'toggle-selection', title: "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
           </th>
+        <% end %>
         <% query.inline_columns.each do |column| %>
           <%= column_header(query, column, query_options) %>
         <% end %>

app/views/dmsf/_query_rows.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% options = {} %>
@@ -39,21 +40,24 @@
       <%= check_box_tag('ids[]', "#{node.type}-#{node.id}", false, id: nil) unless node.system %>
     </td>
     <% query.inline_columns.each do |column| %>
-      <% classes = column.css_classes.to_s.dup %>
+      <%= content_tag 'td', column_content(column, node), class: column.css_classes %>
-      <%  classes << ' dmsf-gray' if node.type.match?(/link$/) %>
-      <%  classes << ' dmsf-system' if node.system %>
-      <%= content_tag 'td', column_content(column, node), class: classes %>
     <% end %>
     <td class="buttons">
       <% unless node.system %>
+        <% if defined?(EasyExtensions) %>
+          <%= link_to '', '#', title: l(:button_actions),
+                      class: 'icon-only icon-actions js-contextmenu icon-more-horiz',
+                      data: { cy: "icon__more_horiz--#{node.type}_#{node.id}" } %>
+        <% else %>
           <%= link_to_context_menu %>
         <% end %>
+      <% end %>
     </td>
   </tr>
 <% end %>
 
 <% unless query.deleted || query&.project.nil? %>
-  <%= javascript_tag do %>
+  <%= late_javascript_tag do %>
     $(function() {
       $("table.dmsf tr").removeClass("ui-draggable-dragging ui-droppable-active ui-droppable-hover ui-draggable-handle");
       $(".dmsf-draggable").draggable({

app/views/dmsf/_sidebar.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <%= render_sidebar_queries DmsfQuery, @project %>

app/views/dmsf/add_email.js.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-# more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 %>
 
 var modal = $('#ajax-modal');

app/views/dmsf/append_email.js.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
- # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-# Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-# Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-# more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-# <https://www.gnu.org/licenses/>.
 %>
 
 let to = $('#email_to');

app/views/dmsf/autocomplete_for_user.js.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 $('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_email(@principals)) %>');

app/views/dmsf/copymove.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn  <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <%= render partial: '/dmsf/path', locals: { folder: @folder, filename: nil, title: nil } %>
@@ -56,7 +57,7 @@
   <% end %>
 <% end %>
 
-<%= javascript_tag do %>
+<%= late_javascript_tag do %>
   $('#move_button').click(function(event) {
     $('input#copy_entries').remove()
   });

app/views/dmsf/digest.js.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 $('#ajax-modal').html('<%= escape_javascript render partial: 'digest' %>');

app/views/dmsf/drop.js.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 throw new Error("<%= j flash[:error] %>");

app/views/dmsf/edit.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% html_title l(:dmsf) %>
@@ -33,6 +34,21 @@
                                  back_url: edit_dmsf_url(id: @project, folder_id: @folder)),
         title: l(:title_lock_file), class: 'icon icon-lock' %>
     <% end %>
+    <% if defined?(EasyExtensions) %>
+      <%= render partial: 'dmsf_context_menus/folder',
+                 locals: { dmsf_folder: @folder,
+                           locked: @folder.locked?,
+                           allowed: true,
+                           dmsf_link: nil,
+                           project: @project,
+                           folder: @folder.dmsf_folder,
+                           edit: true,
+                           unlockable: @folder.unlockable? && (!@folder.locked_for_user? || User.current.allowed_to?(:force_file_unlock, @project)),
+                           email_allowed: User.current.allowed_to?(:email_documents, @project),
+                           notifications: @notifications,
+                           back_url: edit_dmsf_url(id: @project, folder_id: @folder)
+                 } %>
+    <% else %>
       <%= actions_dropdown do %>
         <%= render partial: 'dmsf_context_menus/folder',
                    locals: { dmsf_folder: @folder,
@@ -49,6 +65,7 @@
                    } %>
       <% end %>
     <% end %>
+  <% end %>
 </div>
 
 <% create = @pathfolder == @parent %>

app/views/dmsf/edit_root.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn  <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% html_title(l(:dmsf)) %>

app/views/dmsf/email_entries.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% html_title l(:dmsf) %>

app/views/dmsf/index.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <%= render partial: 'main', locals: {} %>

app/views/dmsf/query_rows.js.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 // Add rows

app/views/dmsf/show.api.rsb

@@ -1,6 +1,6 @@
 api.dmsf do
 
-  api.array :dmsf_nodes, api_meta(total_count: @query.dmsf_nodes().count, limit: @limit, offset: @offset) do
+  api.array :dmsf_nodes, api_meta(total_count: @query.dmsf_nodes(offset: @offset, limit: @limit).count) do
     @query.dmsf_nodes(offset: @offset, limit: @limit).each do |node|
       api.node do
         api.id node.id

app/views/dmsf/show.html.erb

@@ -3,18 +3,19 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <%= render partial: 'main', locals: {} %>

app/views/dmsf/trash.html.erb

@@ -3,25 +3,26 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% html_title l(:dmsf) %>
 
 <div class="contextual">
   <% if @file_delete_allowed %>
-    <%= link_to sprite_icon('del', l(:label_empty_trash_bin)),  empty_trash_path(id: @project), method: :delete %>
+    <%= delete_link empty_trash_path(id: @project), {}, l(:label_empty_trash_bin) %>
   <% end %>
 </div>
 
@@ -40,3 +41,21 @@
 <% content_for :sidebar do %>
   <%= render partial: 'dmsf/sidebar' %>
 <% end %>
+
+<% if defined?(EasyExtensions) %>
+  <%= late_javascript_tag do %>
+    $(function() {
+      $("p.buttons").addClass("filter-buttons form-actions");
+      let buttonApply = $("p.filter-buttons > a.icon-checked");
+      buttonApply.addClass("button-positive");
+      buttonApply.text("<%= l('easy_query.button_apply.issue') %>");
+      let buttonClear = $("p.filter-buttons > a.icon-reload");
+      buttonClear.addClass("button-negative");
+      buttonClear.text("<%= l('easy_query.label.default_filters') %>");
+      $("p.filter-buttons > a.icon-save").addClass("button");
+      $("p.filter-buttons > a.icon-edit").addClass("button");
+      $("p.filter-buttons > a.icon-del").addClass("button");
+      $("#query_form_with_buttons > p.buttons").show();
+    });
+  <% end %>
+<% end %>

app/views/dmsf_context_menus/_approval_workflow.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% workflows_available = DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', project&.id]).exists? %>

app/views/dmsf_context_menus/_file.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_file_trash.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_folder.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% unless edit %>

app/views/dmsf_context_menus/_folder_trash.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_main.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% if folder_manipulation_allowed && !system_folder %>

app/views/dmsf_context_menus/_multiple.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_multiple_trash.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_project.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_revision_actions.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <%= link_to_function sprite_icon('group', l(:title_download_entries)),

app/views/dmsf_context_menus/_revisions.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% if notifications %>

app/views/dmsf_context_menus/_url.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <li>

app/views/dmsf_context_menus/_watch.html.erb

@@ -3,24 +3,26 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
+  # Watch/unwatch menu's item
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% watched = object.watched_by?(User.current) %>
 <% css = [watcher_css([object]), watched ? 'icon icon-fav' : 'icon icon-fav-off'].join(' ') %>
-<% icon = watched ? 'unwatch' : 'watch' %>
+<% text = sprite_icon('fav', watched ? l(:button_unwatch) : l(:button_watch)) %>
-<% text = watched ? l(:button_unwatch) : l(:button_watch) %>
 <% url = watch_path(object_type: object.class.to_s.underscore, object_id: object.id) %>
 <% method = watched ? 'delete' : 'post' %>
-<%= context_menu_link sprite_icon(icon, text), url, method: method, class: css, disabled: !User.current.logged? %>
+<%= context_menu_link text, url, method: method, class: css, disabled: !User.current.logged? %>

app/views/dmsf_context_menus/dmsf.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <ul>
@@ -38,7 +39,7 @@
   <% end %>
 </ul>
 
-<%= javascript_tag do %>
+<%= late_javascript_tag do %>
   $('#dmsf-cm-delete').click(function (event) {
     $('#context-menu').hide();
   });

app/views/dmsf_context_menus/trash.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <ul>
@@ -31,7 +32,7 @@
                                                     allowed_restore: @allowed_restore }) %>
   <% end %>
 </ul>
-<%= javascript_tag do %>
+<%= late_javascript_tag do %>
   $('#dmsf-cm-delete').click(function (event) {
     $('#context-menu').hide();
   });

app/views/dmsf_files/_file_new_revision.html.erb

@@ -3,21 +3,22 @@
   #
   # Vít Jonáš <vit.jonas@gmail.com>, Daniel Munn <dan.munn@munnster.co.uk>, Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
-<div id="dmsf_new_revision" class="box tabular">
+<div class="box tabular">
     <strong><%= l(:heading_new_revision) %>
       <a href="#" id="new_revision_form_content_toggle" data-cy="toggle__new_revision_from_content--dmsf">[+]</a>
     </strong>
@@ -67,7 +68,7 @@
           <%= label_tag 'file_upload', l(:label_new_content) %>
           <span class="dmsf-uploader">
             <%= render partial: 'dmsf_upload/form',
-                     locals: { multiple: false, container: nil, awf: false } %>
+                     locals: { multiple: false, container: nil, description: false, awf: false } %>
           </span>
         </p>
         <p>

app/views/dmsf_files/_link.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% cls = link ? 'dmsf-gray' : '' %>
@@ -26,6 +27,7 @@
     file_view_url,
     target: '_blank',
     rel: 'noopener',
+    class: 'icon icon-file',
     title: h(dmsf_file.last_revision.try(:tooltip)),
     'data-downloadurl' => "#{dmsf_file.last_revision.detect_content_type}:#{h(dmsf_file.name)}:#{file_view_url}" %>
 </td>
@@ -91,7 +93,7 @@
                else
                  dmsf_file_path(id: dmsf_file, commit: 'yes', back_url: issue_path(@issue))
                end %>
-      <%= delete_link url, {}, '' %>
+      <%= delete_link url %>
     <% end %>
     <% # Approval workflow %>
     <% wf = DmsfWorkflow.find_by(id: dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id %>

app/views/dmsf_files/_links.html.erb

@@ -3,18 +3,19 @@
   #
   # Karel Pičman <karel.picman@kontron.com>
   #
-  # This file is part of Redmine DMSF plugin.
+  # This program is free software; you can redistribute it and/or
+  # modify it under the terms of the GNU General Public License
+  # as published by the Free Software Foundation; either version 2
+  # of the License, or (at your option) any later version.
   #
-  # Redmine DMSF plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General
+  # This program is distributed in the hope that it will be useful,
-  # Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
-  # later version.
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
   #
-  # Redmine DMSF plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+  # You should have received a copy of the GNU General Public License
-  # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  # along with this program; if not, write to the Free Software
-  # more details.
+  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  #
-  # You should have received a copy of the GNU General Public License along with Redmine DMSF plugin. If not, see
-  # <https://www.gnu.org/licenses/>.
 %>
 
 <% if links.present? %>