fat_free_crm 0.18.2 → 0.19.0

data/config/initializers/mime_types.rb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
-#
-# Fat Free CRM is freely distributable under the terms of MIT license.
-# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
-
-Mime::Type.register "application/vnd.ms-excel", :xls
+Mime::Type.register "application/vnd.msexcel", :xls

data/config/initializers/new_framework_defaults_5_2.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.2 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make Active Record use stable #cache_key alongside new #cache_version method.
+# This is needed for recyclable cache keys.
+# Rails.application.config.active_record.cache_versioning = true
+
+# Use AES-256-GCM authenticated encryption for encrypted cookies.
+# Also, embed cookie expiry in signed or encrypted cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 5.2.
+#
+# Existing cookies will be converted on read then written with the new scheme.
+# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
+
+# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
+# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
+# Rails.application.config.active_support.use_authenticated_message_encryption = true
+
+# Add default protection from forgery to ActionController::Base instead of in
+# ApplicationController.
+# Rails.application.config.action_controller.default_protect_from_forgery = true
+
+# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
+# 'f' after migrating old data.
+Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+
+# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
+# Rails.application.config.active_support.use_sha1_digests = true
+
+# Make `form_with` generate id attributes for any generated HTML tags.
+# Rails.application.config.action_view.form_with_generates_ids = true

data/config/initializers/relative_url_root.rb

@@ -7,6 +7,4 @@
 #------------------------------------------------------------------------------
 # Set relative url root for assets
 
-if Setting.base_url.present?
-  ActionController::Base.relative_url_root = Setting.base_url
-end
+ActionController::Base.relative_url_root = Setting.base_url if Setting.base_url.present?

data/config/initializers/session_store.rb

@@ -7,6 +7,4 @@
 #------------------------------------------------------------------------------
 # Be sure to restart your server when you modify this file.
 
-if FatFreeCRM.application?
-  Rails.application.config.session_store :cookie_store, key: '_fat_free_crm_session'
-end
+Rails.application.config.session_store :cookie_store, key: '_fat_free_crm_session' if FatFreeCRM.application?

data/config/initializers/wrap_parameters.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
-#
-# Fat Free CRM is freely distributable under the terms of MIT license.
-# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which
@@ -12,10 +7,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+  wrap_parameters format: [:json]
 end
 
 # To enable root element in JSON for ActiveRecord objects.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = true
-end
+# ActiveSupport.on_load(:active_record) do
+#   self.include_root_in_json = true
+# end

data/config/locales/fat_free_crm.en-GB.yml

@@ -593,10 +593,10 @@ en-GB:
 
   # Views -> Common.
   #----------------------------------------------------------------------------
-  add_note: Add Note
-  save_note: Save Note
-  add_note_help: Add a new note...
-  edit_note: Edit Note
+  add_note: Add Comment
+  save_note: Save Comment
+  add_note_help: Add a new comment...
+  edit_note: Edit Comment
   added_ago: added %{value}
   added_by: added %{time_ago} by %{user}
   back: Back
@@ -682,7 +682,7 @@ en-GB:
   notifications_tooltip: Subscribers will receive new comments via email
   subscribe_via_email: Subscribe via email
   disable_email_subscriptions: Disable email subscription
-  added_note: added note %{value}
+  added_note: added comment %{value}
 
   # Views -> Emails.
   #----------------------------------------------------------------------------

data/config/locales/fat_free_crm.en-US.yml

@@ -593,10 +593,10 @@ en-US:
 
   # Views -> Common.
   #----------------------------------------------------------------------------
-  add_note: Add Note
-  save_note: Save Note
-  add_note_help: Add a new note...
-  edit_note: Edit Note
+  add_note: Add Comment
+  save_note: Save Comment
+  add_note_help: Add a new comment...
+  edit_note: Edit Comment
   added_ago: added %{value}
   added_by: added %{time_ago} by %{user}
   back: Back
@@ -682,7 +682,7 @@ en-US:
   notifications_tooltip: Subscribers will receive new comments via email
   subscribe_via_email: Subscribe via email
   disable_email_subscriptions: Disable email subscription
-  added_note: added note %{value}
+  added_note: added comment %{value}
 
   # Views -> Emails.
   #----------------------------------------------------------------------------

data/config/locales/fat_free_crm.fr.yml

@@ -810,7 +810,7 @@ fr:
       mmddyy: ! '%e %b %Y'
   time:
     formats:
-      mmddhhss: ! '%b %e à %H:%M%'
+      mmddhhss: ! '%b %e à %H:%M'
       mmddyyyy_hhmm: ! '%d/%m/%Y à %H:%M'
 
   # will_paginate translations copied for 'en-US'

data/config/locales/fat_free_crm.ru.yml

@@ -699,6 +699,7 @@ ru:
   search_results_count:
     one: Найден %{count} результат.
     other: Найдено %{count} результатов.
+    many: Найдено %{count} результатов.
 
   # Views -> Comments.
   #----------------------------------------------------------------------------

data/config/routes.rb

@@ -10,12 +10,26 @@ Rails.application.routes.draw do
 
   root to: 'home#index'
 
+  # Deprecated: Compatibility with legacy Authlogic routes
+  get '/login',  to: redirect('/users/sign_in')
+  get '/signup', to: redirect('/users/sign_up')
+
+  devise_for :users, controllers: { registrations: 'registrations',
+                                    sessions: 'sessions',
+                                    passwords: 'passwords',
+                                    confirmations: 'confirmations' }
+
+  devise_scope :user do
+    resources :users, only: %i[index show] do
+      collection do
+        get :opportunities_overview
+      end
+    end
+  end
+
   get 'activities' => 'home#index'
-  get 'admin'      => 'admin/users#index',       :as => :admin
-  get 'login'      => 'authentications#new',     :as => :login
-  delete 'logout'  => 'authentications#destroy', :as => :logout
-  get 'profile'    => 'users#show',              :as => :profile
-  get 'signup'     => 'users#new',               :as => :signup
+  get 'admin'      => 'admin/users#index',       as: :admin
+  get 'profile'    => 'users#show',              as: :profile
 
   get '/home/options',  as: :options
   get '/home/toggle',   as: :toggle
@@ -23,10 +37,8 @@ Rails.application.routes.draw do
   match '/home/timezone', as: :timezone, via: %i[get put post]
   post '/home/redraw', as: :redraw
 
-  resource :authentication, except: %i[index edit]
   resources :comments,       except: %i[new show]
   resources :emails,         only: [:destroy]
-  resources :passwords,      only: %i[new create edit update]
 
   resources :accounts, id: /\d+/ do
     collection do
@@ -139,7 +151,7 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :users, id: /\d+/, except: %i[index destroy] do
+  resources :users, id: /\d+/, except: %i[index destroy create] do
     member do
       get :avatar
       get :password
@@ -149,7 +161,6 @@ Rails.application.routes.draw do
     end
     collection do
       match :auto_complete, via: %i[get post]
-      get :opportunities_overview
     end
   end
 

data/db/demo/users.yml

@@ -16,21 +16,18 @@
 #  yahoo               :string(32)
 #  google              :string(32)
 #  skype               :string(32)
-#  password_hash       :string(255)     default(""), not null
+#  encrypted_password       :string(255)     default(""), not null
 #  password_salt       :string(255)     default(""), not null
-#  persistence_token   :string(255)     default(""), not null
-#  perishable_token    :string(255)     default(""), not null
-#  last_login_at       :datetime
-#  current_login_at    :datetime
-#  last_login_ip       :string(255)
-#  current_login_ip    :string(255)
-#  login_count         :integer         default(0), not null
+#  last_sign_in_at       :datetime
+#  current_sign_in_at    :datetime
+#  last_sign_in_ip       :string(255)
+#  current_sign_in_ip    :string(255)
+#  sign_in_count         :integer         default(0), not null
 #  deleted_at          :datetime
 #  created_at          :datetime
 #  updated_at          :datetime
 #  admin               :boolean         default(FALSE), not null
 #  suspended_at        :datetime
-#  single_access_token :string(255)
 #
 
 <%
@@ -48,19 +45,17 @@ aaron:
   phone: (800)555-1210
   mobile: (800)555-1211
   admin: true
-  password_hash: 56d91c9f1a9c549304768982fd4e2d8bc2700b403b4524c0f14136dbbe2ce4cd923156ad69f9acce8305dba4e63faa884e61fb7a256cf8f5fc7c2ce176e68e8f
+  encrypted_password: 56d91c9f1a9c549304768982fd4e2d8bc2700b403b4524c0f14136dbbe2ce4cd923156ad69f9acce8305dba4e63faa884e61fb7a256cf8f5fc7c2ce176e68e8f
   password_salt: ce6e0200c96f4dd326b91f3967115a31421a0e7dcddc9ffb63a77f598a9fcb5326fe532dbd9836a2446e46840d398fa32c81f8f4da1a0fcfe931989e9639a013
-  persistence_token: d7cdeffd3625f7cb265b21126b85da7c930d47c4a708365c20eb857560055a6b57c9775becb8a957dfdb46df8aee17eb120a011b380e9cc0882f9dfaa2b7ba26
-  perishable_token: TarXlrOPfaokNOzls2U8
-  single_access_token: TarXlrOPfaokNOzls2U8
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 ben:
   id: 2
@@ -74,19 +69,17 @@ ben:
   phone: (800)555-1220
   mobile: (800)555-1221
   admin: true
-  password_hash: 3b23bde6e4f766450a36f30c5076db4164ab4edf957fe602858086feb833251149a2505b8ec00330fa6d9b531ff32ec7619b2b413b5c5380007c4a021f3546c2
+  encrypted_password: 3b23bde6e4f766450a36f30c5076db4164ab4edf957fe602858086feb833251149a2505b8ec00330fa6d9b531ff32ec7619b2b413b5c5380007c4a021f3546c2
   password_salt: fce13d8b784003b4fb8d030866b5c3a003a914b9d52832d02b5f85db53413bcc8dd078d3e57e6c50b9bb8e8eb520e04a5f79cfb089a8bbe224e15e840b0dc594
-  persistence_token: 8d3789d1486d8aa421d5e7ca0c670badecf0e3b876dab5cf6de21fa867023d379f79e2d823cbdfc2a512d12e62b5343a62c4fc69f065c7c4850de424880399c5
-  perishable_token: VyiXHtZ4HsFS62xCnK4I
-  single_access_token: VyiXHtZ4HsFS62xCnK4I
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 cindy:
   id: 3
@@ -100,19 +93,17 @@ cindy:
   phone: (800)555-1230
   mobile: (800)555-1231
   admin: true
-  password_hash: f323dc706086eeffee9997239f6fdfbd13ef0f62b0817cea1ef199912a64601e05e3a6c9074d2248b22e9e4ce5c817a9d9339839c2ae9502c9c1350f267f7b1f
+  encrypted_password: f323dc706086eeffee9997239f6fdfbd13ef0f62b0817cea1ef199912a64601e05e3a6c9074d2248b22e9e4ce5c817a9d9339839c2ae9502c9c1350f267f7b1f
   password_salt: bc41b1a96c66ac155c79cf68ff3a16dd97d4730bc3476575fcab3c2ae7751776cc48e6faa036961be40ed04a27690b6f5189234968d4a6fff981105f040d9014
-  persistence_token: 3f391c651f5f7edca17a34b044b7e1ac866625903dd9567bfbfe5eea74c9f571d502cae8fae83ca29eba7df2f2cd1ed0d71d380f680eaaeabaaf194a4009cba1
-  perishable_token: eRGJ2agxeuuds5qlJSqY
-  single_access_token: eRGJ2agxeuuds5qlJSqY
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 dan:
   id: 4
@@ -126,19 +117,17 @@ dan:
   phone: (800)555-1240
   mobile: (800)555-1241
   admin: true
-  password_hash: 508f242629443dae3777e945d59213e7f81084be9f8c71b6d06b81295e9ffac145a3c2a8870cc17598e2a7908e2107f838d29ae275cfbe4a135c67c4f27e2e58
+  encrypted_password: 508f242629443dae3777e945d59213e7f81084be9f8c71b6d06b81295e9ffac145a3c2a8870cc17598e2a7908e2107f838d29ae275cfbe4a135c67c4f27e2e58
   password_salt: e01633b1b2396fa3be0f689b87d68a55a831c043faffba0401131338e6aab5a8492a0b47a6947f0d96dd7188f51ecc530a2d72603802c7b409f1c42ce138de0b
-  persistence_token: a521f06f9a3ebacf0bab032cd46544d17d6bdbb9c2d1b413d9aa7c663da563e51a447e63f6af2d852d58d0c126411935ffea446fbad77549b77b99645c0b488d
-  perishable_token: fniVMOjbZLRnKhd2DLIx
-  single_access_token: fniVMOjbZLRnKhd2DLIx
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 elizabeth:
   id: 5
@@ -152,19 +141,17 @@ elizabeth:
   phone: (800)555-1250
   mobile: (800)555-1251
   admin: true
-  password_hash: 5e90a6f2f5be66010c8a0eb6f2089780f453d1400e3aa4d271520f8e2a2e26d00d98d3ae2ba36854b897cbbe1f51343f4e9ce96dd4da8705ba3db5bd8b0ed0e7
+  encrypted_password: 5e90a6f2f5be66010c8a0eb6f2089780f453d1400e3aa4d271520f8e2a2e26d00d98d3ae2ba36854b897cbbe1f51343f4e9ce96dd4da8705ba3db5bd8b0ed0e7
   password_salt: 80caf26a2981892f70acbc0ddb8fdd19c789163bfdefa3809355aef4bd989c8c6aa251c05b0923ef307e7b5269b6efdca380b0c28b8bf8f72ee5385a8557ed9b
-  persistence_token: f60bf40210246af4e7f85f1010e1b592a9862827015f506328b54afd7e487f760e3b382231dfc25dee3353f014cce419705f0453aa96b9b566065b2db7b93c1c
-  perishable_token: EtPRtOAiXBm2XDYHtjMC
-  single_access_token: EtPRtOAiXBm2XDYHtjMC
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 frank:
   id: 6
@@ -178,19 +165,17 @@ frank:
   phone: (800)555-1260
   mobile: (800)555-1261
   admin: true
-  password_hash: 1471e9dc79b636f465a529d89460fcefc8dbb0d2a14308349bd060d00dab4d35f1d91d201dbe37da4aa8c18a4430a09a6bca5babe05fb18ef3f02342dcf4e4ca
+  encrypted_password: 1471e9dc79b636f465a529d89460fcefc8dbb0d2a14308349bd060d00dab4d35f1d91d201dbe37da4aa8c18a4430a09a6bca5babe05fb18ef3f02342dcf4e4ca
   password_salt: 805983077fdba9438de1d84007e093f658620211e1d0087d33662a5ca387b04206d098e152aeea896ab65aa026ac1fb9ce69dbe22a45fb9b21c3b6dcad4909f3
-  persistence_token: 6158edf71b5cdd674f9d86082f7c580ac27277fcaa9ea6732d2eefdaac09f20fa4554307c028fa294c2f2d4fbb6035f118048dffa351768d8cb9125285d06baf
-  perishable_token: SnxgLcY4wRMVKoa1jPLK
-  single_access_token: SnxgLcY4wRMVKoa1jPLK
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 george:
   id: 7
@@ -204,19 +189,17 @@ george:
   phone: (800)555-1270
   mobile: (800)555-1271
   admin: true
-  password_hash: 23ed19767095ab24c1c560393b5a577455ab49d595781f931905f0df072533c485b1902337ffb426dae1e70889557f5b531da8e7b782a0575cc7bd419d6a91b9
+  encrypted_password: 23ed19767095ab24c1c560393b5a577455ab49d595781f931905f0df072533c485b1902337ffb426dae1e70889557f5b531da8e7b782a0575cc7bd419d6a91b9
   password_salt: 80b5c87fb4c9fa5c50815016bc0160eb08c4e22e88fee558b5e739557d5178c61b06fcbebf6c4c62f37f0f7984ccc0d025e2f073880cd655b57542343e4981b6
-  persistence_token: 5eaccdebf683a87050df34e45c5e3aa9d884b132be4e1bc1d759924814518fa9d29adfe8556ad6e7223ec692a481d4f96772796ee835f3b14a7e86cba222abd6
-  perishable_token: SYFLlZ466jZ04ylTnvXv
-  single_access_token: SYFLlZ466jZ04ylTnvXv
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>
 
 heather:
   id: 8
@@ -230,16 +213,14 @@ heather:
   phone: (800)555-1280
   mobile: (800)555-1281
   admin: true
-  password_hash: cdd2e9ec69c553c1f690b885c1cd1fd4e976c94a28693b793eba41796b0a96ce6f7cdd05ded8a84b30a96a37d18ad7fddd7435314bd612d033ead1c43bcde4d2
+  encrypted_password: cdd2e9ec69c553c1f690b885c1cd1fd4e976c94a28693b793eba41796b0a96ce6f7cdd05ded8a84b30a96a37d18ad7fddd7435314bd612d033ead1c43bcde4d2
   password_salt: 729ab318245afa827a8c29e36c885c7b0d07e15193727b68a7cf5edac517e4d6fcafa4e5ddfff9c9305d3ccd37ef735823ba66ba8e2876fd2b06c7c27f3c9482
-  persistence_token: 6fd550c1ec1d422c3077f497fb3a886dbd9e24b10d0148ef1d8a0e477395594c7217857906fcab5deedadda246c932e39131837ff023c28d4902cb5990e6c87a
-  perishable_token: a0HA6LWqvfc1h0aj0wqG
-  single_access_token: a0HA6LWqvfc1h0aj0wqG
-  last_login_at: <%= login = Date.today - rand(15).days %>
-  current_login_at:
-  last_login_ip: 127.0.0.1
-  current_login_ip: 127.0.0.1
-  login_count: <%= 1 + rand(100) %>
+  last_sign_in_at: <%= login = Date.today - rand(15).days %>
+  current_sign_in_at:
+  last_sign_in_ip: 127.0.0.1
+  current_sign_in_ip: 127.0.0.1
+  sign_in_count: <%= 1 + rand(100) %>
   deleted_at:
   created_at: <%= login - rand(5).days %>
   updated_at: <%= login + rand(5).days %>
+  confirmed_at: <%= Time.now.utc %>