Moved to GsParemeter.get and set defaults for a couple of validations.

15 files changed, 50 insertions, 50 deletions

diff --git a/app/controllers/api/rows_controller.rb b/app/controllers/api/rows_controller.rb
index 6e815eb..543aebe 100644
--- a/app/controllers/api/rows_controller.rb
+++ b/app/controllers/api/rows_controller.rb
@@ -84,7 +84,7 @@ class Api::RowsController < ApplicationController
   private
 
   def check_remote_ip_address_whitelist
-    if !(REMOTE_IP_ADDRESS_WHITELIST.empty? or REMOTE_IP_ADDRESS_WHITELIST.include?(ENV['REMOTE_ADDR']))
+    if !(GsParameter.get('REMOTE_IP_ADDRESS_WHITELIST').empty? or GsParameter.get('REMOTE_IP_ADDRESS_WHITELIST').include?(ENV['REMOTE_ADDR']))
       redirect_to root_url
     end
   end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c675f5c..e4165f3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -54,8 +54,8 @@ class ApplicationController < ActionController::Base
   # Generate a new random PIN
   #
   def random_pin
-    if MINIMUM_PIN_LENGTH > 0
-      (1..MINIMUM_PIN_LENGTH).map{|i| (0 .. 9).to_a.sample}.join
+    if GsParameter.get('MINIMUM_PIN_LENGTH') > 0
+      (1..GsParameter.get('MINIMUM_PIN_LENGTH')).map{|i| (0 .. 9).to_a.sample}.join
     end
   end
   
diff --git a/app/controllers/call_forwards_controller.rb b/app/controllers/call_forwards_controller.rb
index 5321b35..001ed60 100644
--- a/app/controllers/call_forwards_controller.rb
+++ b/app/controllers/call_forwards_controller.rb
@@ -21,10 +21,10 @@ class CallForwardsController < ApplicationController
 
   def new
     @call_forward = @phone_number.call_forwards.build
-    @call_forward.depth = DEFAULT_CALL_FORWARD_DEPTH
+    @call_forward.depth = GsParameter.get('DEFAULT_CALL_FORWARD_DEPTH')
     @call_forward.active = true
     @call_forwarding_destinations = call_forwarding_destination_types()
-    @call_forward.destination = CALLFORWARD_DESTINATION_DEFAULT.to_s if defined?(CALLFORWARD_DESTINATION_DEFAULT)
+    @call_forward.destination = GsParameter.get('CALLFORWARD_DESTINATION_DEFAULT').to_s if defined?(GsParameter.get('CALLFORWARD_DESTINATION_DEFAULT'))
 
     @available_call_forward_cases = []
     CallForwardCase.all.each do |available_call_forward_case|
diff --git a/app/controllers/call_histories_controller.rb b/app/controllers/call_histories_controller.rb
index f956f88..f711f34 100644
--- a/app/controllers/call_histories_controller.rb
+++ b/app/controllers/call_histories_controller.rb
@@ -22,7 +22,7 @@ class CallHistoriesController < ApplicationController
     
     @call_histories = calls.paginate(
       :page => @pagination_page_number,
-      :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+      :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
     )
 
     @calls_count = calls.count
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 302a23b..6091b46 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -19,7 +19,7 @@ class ConferencesController < ApplicationController
     @conference.start = nil
     @conference.end = nil
     @conference.open_for_anybody = true
-    @conference.max_members = DEFAULT_MAX_CONFERENCE_MEMBERS
+    @conference.max_members = GsParameter.get('DEFAULT_MAX_CONFERENCE_MEMBERS')
     @conference.pin = random_pin
 
     @conference.open_for_anybody = true
diff --git a/app/controllers/config_siemens_controller.rb b/app/controllers/config_siemens_controller.rb
index c09dfcf..b7fa107 100644
--- a/app/controllers/config_siemens_controller.rb
+++ b/app/controllers/config_siemens_controller.rb
@@ -64,8 +64,8 @@ class ConfigSiemensController < ApplicationController
     if mac_address
       @phone = Phone.find_by_mac_address(mac_address.gsub(':','').upcase)
 
-      if ! @phone && PROVISIONING_AUTO_ADD_PHONE
-        tenant = Tenant.where(:id => PROVISIONING_AUTO_TENANT_ID).first
+      if ! @phone && GsParameter.get('PROVISIONING_AUTO_ADD_PHONE')
+        tenant = Tenant.where(:id => GsParameter.get('PROVISIONING_AUTO_TENANT_ID')).first
         if ! tenant
           render(
             :status => 404,
@@ -91,12 +91,12 @@ class ConfigSiemensController < ApplicationController
           return
         end
 
-        if ! PROVISIONING_AUTO_ADD_SIP_ACCOUNT
+        if ! GsParameter.get('PROVISIONING_AUTO_ADD_SIP_ACCOUNT')
           return
         end
 
         caller_name_index = 0
-        sip_account_last = tenant.sip_accounts.where('caller_name LIKE ?', "#{PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX}%").sort { |item1, item2| 
+        sip_account_last = tenant.sip_accounts.where('caller_name LIKE ?', "#{GsParameter.get('PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX')}%").sort { |item1, item2| 
           item1.caller_name.gsub(/[^0-9]/, '').to_i <=> item2.caller_name.gsub(/[^0-9]/, '').to_i
         }.last
 
@@ -106,18 +106,18 @@ class ConfigSiemensController < ApplicationController
         caller_name_index = caller_name_index + 1
 
         @sip_account = tenant.sip_accounts.build
-        @sip_account.caller_name = "#{PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX}#{caller_name_index}"
-        @sip_account.call_waiting = CALL_WAITING
-        @sip_account.clir = DEFAULT_CLIR_SETTING
-        @sip_account.clip = DEFAULT_CLIP_SETTING
+        @sip_account.caller_name = "#{GsParameter.get('PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX')}#{caller_name_index}"
+        @sip_account.call_waiting = GsParameter.get('CALL_WAITING')
+        @sip_account.clir = GsParameter.get('DEFAULT_CLIR_SETTING')
+        @sip_account.clip = GsParameter.get('DEFAULT_CLIP_SETTING')
         @sip_account.voicemail_pin = random_pin
-        @sip_account.callforward_rules_act_per_sip_account = CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT
+        @sip_account.callforward_rules_act_per_sip_account = GsParameter.get('CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT')
         @sip_account.hotdeskable = false
         loop do
-          @sip_account.auth_name = SecureRandom.hex(DEFAULT_LENGTH_SIP_AUTH_NAME)
+          @sip_account.auth_name = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_AUTH_NAME'))
           break unless SipAccount.exists?(:auth_name => @sip_account.auth_name)
         end
-        @sip_account.password = SecureRandom.hex(DEFAULT_LENGTH_SIP_PASSWORD)
+        @sip_account.password = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_PASSWORD'))
 
         if ! @sip_account.save
           render(
@@ -439,7 +439,7 @@ class ConfigSiemensController < ApplicationController
       @new_settings << ['XML-app-debug-prog-name', 2,  '']
       @new_settings << ['XML-app-num-tabs', 2,  '3']
       @new_settings << ['XML-app-restart', 2,  'true']
-      @new_settings << ['XML-app-tab1-display-name', 2,  "Gemeinschaft #{GEMEINSCHAFT_VERSION}"]
+      @new_settings << ['XML-app-tab1-display-name', 2,  "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"]
       @new_settings << ['XML-app-tab1-name', 2,  'menu']
       @new_settings << ['XML-app-tab2-display-name', 2,  'Status']
       @new_settings << ['XML-app-tab2-name', 2,  'menu_status']
@@ -816,7 +816,7 @@ class ConfigSiemensController < ApplicationController
 
     auto_reload_time = 60
 
-    SIEMENS_HISTORY_RELOAD_TIMES.each_pair do |time_range, reload_value|
+    GsParameter.get('SIEMENS_HISTORY_RELOAD_TIMES').each_pair do |time_range, reload_value|
       if time_range === Time.now.localtime.hour
         auto_reload_time = reload_value
       end
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb
index 9a06a99..123f2cd 100644
--- a/app/controllers/config_snom_controller.rb
+++ b/app/controllers/config_snom_controller.rb
@@ -34,8 +34,8 @@ class ConfigSnomController < ApplicationController
         @phone = Phone.where({ :mac_address => @mac_address }).first
       end
 
-      if ! @phone && PROVISIONING_AUTO_ADD_PHONE
-        tenant = Tenant.where(:id => PROVISIONING_AUTO_TENANT_ID).first
+      if ! @phone && GsParameter.get('PROVISIONING_AUTO_ADD_PHONE')
+        tenant = Tenant.where(:id => GsParameter.get('PROVISIONING_AUTO_TENANT_ID')).first
         if ! tenant
           render(
             :status => 404,
@@ -94,12 +94,12 @@ class ConfigSnomController < ApplicationController
           return
         end
 
-        if ! PROVISIONING_AUTO_ADD_SIP_ACCOUNT
+        if ! GsParameter.get('PROVISIONING_AUTO_ADD_SIP_ACCOUNT')
           return
         end
 
         caller_name_index = 0
-        sip_account_last = tenant.sip_accounts.where('caller_name LIKE ?', "#{PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX}%").sort { |item1, item2| 
+        sip_account_last = tenant.sip_accounts.where('caller_name LIKE ?', "#{GsParameter.get('PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX')}%").sort { |item1, item2| 
           item1.caller_name.gsub(/[^0-9]/, '').to_i <=> item2.caller_name.gsub(/[^0-9]/, '').to_i
         }.last
 
@@ -109,18 +109,18 @@ class ConfigSnomController < ApplicationController
         caller_name_index = caller_name_index + 1
 
         @sip_account = tenant.sip_accounts.build
-        @sip_account.caller_name = "#{PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX}#{caller_name_index}"
-        @sip_account.call_waiting = CALL_WAITING
-        @sip_account.clir = DEFAULT_CLIR_SETTING
-        @sip_account.clip = DEFAULT_CLIP_SETTING
+        @sip_account.caller_name = "#{GsParameter.get('PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX')}#{caller_name_index}"
+        @sip_account.call_waiting = GsParameter.get('CALL_WAITING')
+        @sip_account.clir = GsParameter.get('DEFAULT_CLIR_SETTING')
+        @sip_account.clip = GsParameter.get('DEFAULT_CLIP_SETTING')
         @sip_account.voicemail_pin = random_pin
-        @sip_account.callforward_rules_act_per_sip_account = CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT
+        @sip_account.callforward_rules_act_per_sip_account = GsParameter.get('CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT')
         @sip_account.hotdeskable = false
         loop do
-          @sip_account.auth_name = SecureRandom.hex(DEFAULT_LENGTH_SIP_AUTH_NAME)
+          @sip_account.auth_name = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_AUTH_NAME'))
           break unless SipAccount.exists?(:auth_name => @sip_account.auth_name)
         end
-        @sip_account.password = SecureRandom.hex(DEFAULT_LENGTH_SIP_PASSWORD)
+        @sip_account.password = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_PASSWORD'))
 
         if ! @sip_account.save
           render(
diff --git a/app/controllers/fax_accounts_controller.rb b/app/controllers/fax_accounts_controller.rb
index ce03bc5..031080e 100644
--- a/app/controllers/fax_accounts_controller.rb
+++ b/app/controllers/fax_accounts_controller.rb
@@ -15,8 +15,8 @@ class FaxAccountsController < ApplicationController
   def new
     @fax_account = @parent.fax_accounts.build
     @fax_account.name = generate_a_new_name(@parent, @fax_account)
-    @fax_account.days_till_auto_delete = DAYS_TILL_AUTO_DELETE
-    @fax_account.retries = DEFAULT_NUMBER_OF_RETRIES
+    @fax_account.days_till_auto_delete = GsParameter.get('DAYS_TILL_AUTO_DELETE')
+    @fax_account.retries = GsParameter.get('DEFAULT_NUMBER_OF_RETRIES')
     @fax_account.station_id = @parent.to_s
     @fax_account.phone_numbers.build
     if @parent.class == User && !@parent.email.blank?
diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index e871862..73a748c 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -21,7 +21,7 @@ class GemeinschaftSetupsController < ApplicationController
   def create
     if @gemeinschaft_setup.save
       super_tenant = Tenant.create(
-                                    :name => SUPER_TENANT_NAME,
+                                    :name => GsParameter.get('SUPER_TENANT_NAME'),
                                     :country_id  => @gemeinschaft_setup.country.id, 
                                     :language_id => @gemeinschaft_setup.language_id,
                                     :description => t('gemeinschaft_setups.initial_setup.super_tenant_description'),
diff --git a/app/controllers/gs_nodes_controller.rb b/app/controllers/gs_nodes_controller.rb
index 3667775..17c9e8b 100644
--- a/app/controllers/gs_nodes_controller.rb
+++ b/app/controllers/gs_nodes_controller.rb
@@ -70,7 +70,7 @@ class GsNodesController < ApplicationController
       @request_class = '';
     end
 
-    @node = GsNode.where(:ip_address => HOMEBASE_IP_ADDRESS).first
+    @node = GsNode.where(:ip_address => GsParameter.get('HOMEBASE_IP_ADDRESS')).first
     
     if @request_class.blank? || @request_class == "tenants"
       @tenants = Tenant.where('updated_at > ?', @newer_as)
diff --git a/app/controllers/phone_book_entries_controller.rb b/app/controllers/phone_book_entries_controller.rb
index 823d50e..9cc9f18 100644
--- a/app/controllers/phone_book_entries_controller.rb
+++ b/app/controllers/phone_book_entries_controller.rb
@@ -71,7 +71,7 @@ class PhoneBookEntriesController < ApplicationController
                           order([ :last_name, :first_name, :organization ]).
                           paginate(
                             :page => @pagination_page_number,
-                            :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                            :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                           )
   end
 
diff --git a/app/controllers/phone_books_controller.rb b/app/controllers/phone_books_controller.rb
index 54e7889..5f2d61f 100644
--- a/app/controllers/phone_books_controller.rb
+++ b/app/controllers/phone_books_controller.rb
@@ -22,7 +22,7 @@ class PhoneBooksController < ApplicationController
                             order([ :last_name, :first_name ]).
                             paginate(
                               :page => @pagination_page_number,
-                              :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                              :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                             )
     else
       # search by name
@@ -39,7 +39,7 @@ class PhoneBooksController < ApplicationController
                             order([ :last_name, :first_name ]).
                             paginate(
                               :page => @pagination_page_number,
-                              :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                              :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                             )
     end
   end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index f92ae1c..81b04e0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -36,7 +36,7 @@ class SessionsController < ApplicationController
 
   private
   def redirect_to_https
-    if GUI_REDIRECT_HTTPS and ! request.ssl?
+    if GsParameter.get('GUI_REDIRECT_HTTPS') and ! request.ssl?
       redirect_to :protocol => "https://"
     end
   end
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb
index 8292a74..4d042b3 100644
--- a/app/controllers/sip_accounts_controller.rb
+++ b/app/controllers/sip_accounts_controller.rb
@@ -15,11 +15,11 @@ class SipAccountsController < ApplicationController
   def new
     @sip_account = @parent.sip_accounts.build
     @sip_account.caller_name = @parent
-    @sip_account.call_waiting = CALL_WAITING
-    @sip_account.clir = DEFAULT_CLIR_SETTING
-    @sip_account.clip = DEFAULT_CLIP_SETTING
+    @sip_account.call_waiting = GsParameter.get('CALL_WAITING')
+    @sip_account.clir = GsParameter.get('DEFAULT_CLIR_SETTING')
+    @sip_account.clip = GsParameter.get('DEFAULT_CLIP_SETTING')
     @sip_account.voicemail_pin = random_pin
-    @sip_account.callforward_rules_act_per_sip_account = CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT
+    @sip_account.callforward_rules_act_per_sip_account = GsParameter.get('CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT')
     if @parent.class == User
       @sip_account.hotdeskable = true
     end
@@ -27,11 +27,11 @@ class SipAccountsController < ApplicationController
     # Make sure that we don't use an already taken auth_name
     #  
     loop do
-      @sip_account.auth_name = SecureRandom.hex(DEFAULT_LENGTH_SIP_AUTH_NAME)
+      @sip_account.auth_name = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_AUTH_NAME'))
       
       break unless SipAccount.exists?(:auth_name => @sip_account.auth_name)
     end
-    @sip_account.password = SecureRandom.hex(DEFAULT_LENGTH_SIP_PASSWORD)
+    @sip_account.password = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_PASSWORD'))
   end
 
   def create
@@ -39,13 +39,13 @@ class SipAccountsController < ApplicationController
 
     if @sip_account.auth_name.blank?
       loop do
-        @sip_account.auth_name = SecureRandom.hex(DEFAULT_LENGTH_SIP_AUTH_NAME)
+        @sip_account.auth_name = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_AUTH_NAME'))
         
         break unless SipAccount.exists?(:auth_name => @sip_account.auth_name)
       end
     end
     if @sip_account.password.blank?
-      @sip_account.password = SecureRandom.hex(DEFAULT_LENGTH_SIP_PASSWORD)
+      @sip_account.password = SecureRandom.hex(GsParameter.get('DEFAULT_LENGTH_SIP_PASSWORD'))
     end
     
     if @sip_account.save
diff --git a/app/controllers/voicemail_messages_controller.rb b/app/controllers/voicemail_messages_controller.rb
index 58f5265..dfe0ae4 100644
--- a/app/controllers/voicemail_messages_controller.rb
+++ b/app/controllers/voicemail_messages_controller.rb
@@ -24,17 +24,17 @@ class VoicemailMessagesController < ApplicationController
     if @type == 'read'
       @voicemail_messages = @sip_account.voicemail_messages.where('read_epoch > 0').order('created_epoch DESC').paginate(
                             :page => @pagination_page_number,
-                            :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                            :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                           )
     elsif @type == 'unread'
       @voicemail_messages = @sip_account.voicemail_messages.where(:read_epoch => 0).order('created_epoch DESC').paginate(
                             :page => @pagination_page_number,
-                            :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                            :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                           )
     else
       @voicemail_messages = @sip_account.voicemail_messages.order('created_epoch DESC').paginate(
                             :page => @pagination_page_number,
-                            :per_page => DEFAULT_PAGINATION_ENTRIES_PER_PAGE
+                            :per_page => GsParameter.get('DEFAULT_PAGINATION_ENTRIES_PER_PAGE')
                           )
     end
   end