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

20 files changed, 31 insertions, 31 deletions

diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml
index f75181f..b751fb3 100644
--- a/app/views/call_forwards/_form_core.html.haml
+++ b/app/views/call_forwards/_form_core.html.haml
@@ -9,7 +9,7 @@
 
   = f.input :source, :label => t('call_forwards.form.source.label'), :hint => conditional_hint('call_forwards.form.source.hint')
   - if GuiFunction.display?('depth_field_in_call_forward_form', current_user)
-    = f.input :depth, :collection => 1..MAX_CALL_FORWARD_DEPTH, :label => t('call_forwards.form.depth.label'), :hint => conditional_hint('call_forwards.form.depth.hint')
+    = f.input :depth, :collection => 1..GsParameter.get('MAX_CALL_FORWARD_DEPTH'), :label => t('call_forwards.form.depth.label'), :hint => conditional_hint('call_forwards.form.depth.hint')
   - else
     = f.hidden_field :depth
   = f.input :active, :label => t('call_forwards.form.active.label'), :hint => conditional_hint('call_forwards.form.active.hint')
diff --git a/app/views/callthroughs/_form_core.html.haml b/app/views/callthroughs/_form_core.html.haml
index 1f137d9..cf05e06 100644
--- a/app/views/callthroughs/_form_core.html.haml
+++ b/app/views/callthroughs/_form_core.html.haml
@@ -15,7 +15,7 @@
     = f.simple_fields_for :access_authorizations do |access_authorization|
       = render "access_authorizations/form_core", :f => access_authorization
 
-  - if CALLTHROUGH_HAS_WHITELISTS == true
+  - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
     - if @callthrough && @callthrough.whitelists.size > 0
       %h2= t('callthroughs.form.whitelists.label')
       - if !t('callthroughs.form.whitelists.hint').blank?
diff --git a/app/views/callthroughs/_index_core.html.haml b/app/views/callthroughs/_index_core.html.haml
index f1802d4..2071145 100644
--- a/app/views/callthroughs/_index_core.html.haml
+++ b/app/views/callthroughs/_index_core.html.haml
@@ -3,7 +3,7 @@
     %th= t('callthroughs.index.name')
     %th= t('callthroughs.index.phone_numbers')
     %th= t('callthroughs.index.access_authorized_phone_numbers')
-    - if CALLTHROUGH_HAS_WHITELISTS == true
+    - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
       %th= t('callthroughs.index.whitelist_phone_numbers')
 
   - reset_cycle
@@ -12,6 +12,6 @@
       %td= callthrough.name
       %td=render 'phone_numbers/listing', :phone_numbers => callthrough.phone_numbers
       %td=render 'phone_numbers/listing', :phone_numbers => callthrough.access_authorization_phone_numbers
-      - if CALLTHROUGH_HAS_WHITELISTS == true
+      - if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
         %td=render 'phone_numbers/listing', :phone_numbers => callthrough.whitelisted_phone_numbers
       =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => callthrough.tenant, :child => callthrough}
\ No newline at end of file
diff --git a/app/views/callthroughs/show.html.haml b/app/views/callthroughs/show.html.haml
index 55bd6eb..b9abca9 100644
--- a/app/views/callthroughs/show.html.haml
+++ b/app/views/callthroughs/show.html.haml
@@ -19,7 +19,7 @@
   %br
 = render :partial => 'shared/create_link', :locals => {:parent => @callthrough, :child_class => AccessAuthorization}
 
-- if CALLTHROUGH_HAS_WHITELISTS == true
+- if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
   %h2= t('callthroughs.form.whitelists.label')
   - if @callthrough.whitelisted_phone_numbers.count > 0
     = render 'whitelists/index_core', :whitelists => @callthrough.whitelists
diff --git a/app/views/conferences/_form_core.html.haml b/app/views/conferences/_form_core.html.haml
index 04754de..f8d6c8e 100644
--- a/app/views/conferences/_form_core.html.haml
+++ b/app/views/conferences/_form_core.html.haml
@@ -5,7 +5,7 @@
     = f.input :end, :label => t('conferences.form.end.label'), :hint => conditional_hint('conferences.form.end.hint'), :include_blank => true, :start_year => Time.now.year, :end_year => Time.now.year + 2
   = f.input :description, :label => t('conferences.form.description.label'), :hint => conditional_hint('conferences.form.description.hint')
   = f.input :pin, :label => t('conferences.form.pin.label'), :hint => conditional_hint('conferences.form.pin.hint')
-  = f.input :max_members, :collection => 1..MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE, :include_blank => false, :label => t('conferences.form.max_members.label'), :hint => conditional_hint('conferences.form.max_members.hint')
+  = f.input :max_members, :collection => 1..GsParameter.get('MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE'), :include_blank => false, :label => t('conferences.form.max_members.label'), :hint => conditional_hint('conferences.form.max_members.hint')
   = f.input :open_for_anybody, :label => t('conferences.form.open_for_anybody.label'), :hint => conditional_hint('conferences.form.open_for_anybody.hint')
   = f.input :announce_new_member_by_name, :label => t('conferences.form.announce_new_member_by_name.label'), :hint => conditional_hint('conferences.form.announce_new_member_by_name.hint')
   = f.input :announce_left_member_by_name, :label => t('conferences.form.announce_left_member_by_name.label'), :hint => conditional_hint('conferences.form.announce_left_member_by_name.hint')
\ No newline at end of file
diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index a11715d..5f53802 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -48,8 +48,8 @@
     %use_proxy_number_guessing{:perm => 'RW'}= 'off'
     %guess_number{:perm => 'RW'}= 'off'
     %guess_start_length{:perm => 'RW'}= '3'
-    %ieee8021x_eap_md5_username{:perm => 'RW'}= PROVISIONING_IEEE8021X_EAP_USERNAME
-    %ieee8021x_eap_md5_password{:perm => 'RW'}= PROVISIONING_IEEE8021X_EAP_PASSWORD
+    %ieee8021x_eap_md5_username{:perm => 'RW'}= GsParameter.get('PROVISIONING_IEEE8021X_EAP_USERNAME')
+    %ieee8021x_eap_md5_password{:perm => 'RW'}= GsParameter.get('PROVISIONING_IEEE8021X_EAP_PASSWORD')
 
     - 0.upto(9) do |ringer_idx|
       %internal_ringer_text{:idx => ringer_idx, :perm => 'RW'}= "Ringer#{(ringer_idx+1)}"
diff --git a/app/views/config_snom/state_settings.xml.haml b/app/views/config_snom/state_settings.xml.haml
index ac0e872..6be1efc 100644
--- a/app/views/config_snom/state_settings.xml.haml
+++ b/app/views/config_snom/state_settings.xml.haml
@@ -1,5 +1,5 @@
 !!! XML
-%SnomIPPhoneMenu{:state => 'relevant', :title => "Gemeinschaft #{GEMEINSCHAFT_VERSION}"}
+%SnomIPPhoneMenu{:state => 'relevant', :title => "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"}
   %MenuItem{:name => '$(lang:menu100_phone_book)'}
     %URL= "#{@base_url}/#{@sip_account_ids.first}/phone_book.xml"
   %Menu{:name => '$(lang:menu100_call_lists)'}
diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml
index 5e79115..2e148f3 100644
--- a/app/views/gemeinschaft_setups/new.de.html.haml
+++ b/app/views/gemeinschaft_setups/new.de.html.haml
@@ -1,4 +1,4 @@
-- title "Konfiguration einer Gemeinschaft #{GEMEINSCHAFT_VERSION} Installation"
+- title "Konfiguration einer Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} Installation"
 
 = simple_form_for(@gemeinschaft_setup) do |f|
   = f.error_notification
diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml
index f5f0e81..ab5a70f 100644
--- a/app/views/gemeinschaft_setups/new.html.haml
+++ b/app/views/gemeinschaft_setups/new.html.haml
@@ -1,4 +1,4 @@
-- title "Configure a new Gemeinschaft #{GEMEINSCHAFT_VERSION} server"
+- title "Configure a new Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} server"
 
 = simple_form_for(@gemeinschaft_setup) do |f|
   = f.error_notification
diff --git a/app/views/hunt_groups/_form_core.html.haml b/app/views/hunt_groups/_form_core.html.haml
index 10a0111..53d44d1 100644
--- a/app/views/hunt_groups/_form_core.html.haml
+++ b/app/views/hunt_groups/_form_core.html.haml
@@ -1,4 +1,4 @@
 .inputs
   = f.input :name, :label => t('hunt_groups.form.name.label'), :hint => conditional_hint('hunt_groups.form.name.hint')
-  = f.input :strategy, :as => :select, :label => t('hunt_groups.form.strategy.label'), :hint => conditional_hint('hunt_groups.form.strategy.hint'), :include_blank => false, :collection => HUNT_GROUP_STRATEGIES.map {|x| [I18n.t('hunt_groups.strategies.' + x), x] }
-  = f.input :seconds_between_jumps, :collection => VALID_SECONDS_BETWEEN_JUMPS_VALUES, :label => t('hunt_groups.form.seconds_between_jumps.label'), :hint => conditional_hint('hunt_groups.form.seconds_between_jumps.hint')
\ No newline at end of file
+  = f.input :strategy, :as => :select, :label => t('hunt_groups.form.strategy.label'), :hint => conditional_hint('hunt_groups.form.strategy.hint'), :include_blank => false, :collection => GsParameter.get('HUNT_GROUP_STRATEGIES').map {|x| [I18n.t('hunt_groups.strategies.' + x), x] }
+  = f.input :seconds_between_jumps, :collection => GsParameter.get('VALID_SECONDS_BETWEEN_JUMPS_VALUES'), :label => t('hunt_groups.form.seconds_between_jumps.label'), :hint => conditional_hint('hunt_groups.form.seconds_between_jumps.hint')
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 2c7faec..c1a56f2 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -33,7 +33,7 @@
       %footer#main
         %ul
           %li
-            %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GEMEINSCHAFT_VERSION}
+            %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
           - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
             %li
               %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting
diff --git a/app/views/page/beginners_intro.de.html.haml b/app/views/page/beginners_intro.de.html.haml
index 8d129db..4bd5b11 100644
--- a/app/views/page/beginners_intro.de.html.haml
+++ b/app/views/page/beginners_intro.de.html.haml
@@ -1,4 +1,4 @@
-- title "Erste Schritte mit Gemeinschaft #{GEMEINSCHAFT_VERSION}!"
+- title "Erste Schritte mit Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!"
 
 %p
   Sie müssen als erstes mindestens zwei neue SIP-Accounts anlegen. Dabei haben Sie die Wahl zwischen folgenden Varianten:
@@ -29,5 +29,5 @@
 %p
   Komfortabler ist der Betrieb von im Provisioning unterstützen Telefone. Diese können Sie beim Anlegen direkt mit einem bestimmten SIP-Account verknüpfen. Danach müssen Sie nur noch die Provisioningdaten per Hand ins Telefon eintragen oder ein paar Einstellungen in Ihrem DHCP-Server vornehmen. Hilfe dazu finden Sie im #{link_to 'Wiki', 'https://github.com/amooma/GS5/wiki'} und der #{link_to 'Mailingliste', 'https://groups.google.com/group/gs5-users/'}.
 %p
-  Folgende Telefone werden in der Version #{GEMEINSCHAFT_VERSION} vom automatischen Provisioning unterstützt: 
+  Folgende Telefone werden in der Version #{GsParameter.get('GEMEINSCHAFT_VERSION')} vom automatischen Provisioning unterstützt: 
   = nicely_joined_with_commata(PhoneModel.order(:name).map{|phone_model| "#{phone_model.to_s}"})
\ No newline at end of file
diff --git a/app/views/page/beginners_intro.html.haml b/app/views/page/beginners_intro.html.haml
index 6227142..08af174 100644
--- a/app/views/page/beginners_intro.html.haml
+++ b/app/views/page/beginners_intro.html.haml
@@ -1,4 +1,4 @@
-- title "First steps with Gemeinschaft #{GEMEINSCHAFT_VERSION}!"
+- title "First steps with Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}!"
 
 %p
   You have to create at least two new SIP accounts. You have the choice of two different versions:
@@ -29,5 +29,5 @@
 %p
   More comfortable is the use of auto provisioned phones. They can be linked to SIP accounts. After creating them in the WebGUI you have to set the Provisioning URL in the phone or setup your DHCP server to give them this data. You'll find help in our #{link_to 'Wiki', 'https://github.com/amooma/GS5/wiki'} or in our #{link_to 'mailinglist', 'https://groups.google.com/group/gs5-users/'}.
 %p
-  In version #{GEMEINSCHAFT_VERSION} the following phones can be used for provisioning: 
+  In version #{GsParameter.get('GEMEINSCHAFT_VERSION')} the following phones can be used for provisioning: 
   = nicely_joined_with_commata(PhoneModel.order(:name).map{|phone_model| "#{phone_model.to_s}"})
\ No newline at end of file
diff --git a/app/views/page/index.de.html.haml b/app/views/page/index.de.html.haml
index 2928319..d5dd096 100644
--- a/app/views/page/index.de.html.haml
+++ b/app/views/page/index.de.html.haml
@@ -1,4 +1,4 @@
-- title "Gemeinschaft #{GEMEINSCHAFT_VERSION}"
+- title "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
 
 %div
   %h3 Aktueller Mandant
diff --git a/app/views/page/index.html.haml b/app/views/page/index.html.haml
index 9621395..f55ab37 100644
--- a/app/views/page/index.html.haml
+++ b/app/views/page/index.html.haml
@@ -1,4 +1,4 @@
-- title "Gemeinschaft #{GEMEINSCHAFT_VERSION}"
+- title "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
 
 %div
   %h3 Current tenant
diff --git a/app/views/phones/_form_core.html.haml b/app/views/phones/_form_core.html.haml
index e0c664b..b09ee35 100644
--- a/app/views/phones/_form_core.html.haml
+++ b/app/views/phones/_form_core.html.haml
@@ -9,7 +9,7 @@
       :javascript
         $(".fallback_sip_account_dropdown").hide()  
 
-  - if defined? NIGHTLY_REBOOT_OF_PHONES && NIGHTLY_REBOOT_OF_PHONES == true
+  - if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true
     = f.input :nightly_reboot, :label => t('phones.form.nightly_reboot.label'), :hint => conditional_hint('phones.form.nightly_reboot.hint')
   - if defined? PROVISIONING_KEY_LENGTH && PROVISIONING_KEY_LENGTH > 0
     = f.input :provisioning_key_active, :label => t('phones.form.provisioning_key_active.label'), :hint => conditional_hint('phones.form.provisioning_key_active.hint')
diff --git a/app/views/phones/show.html.haml b/app/views/phones/show.html.haml
index a7ee952..f20facd 100644
--- a/app/views/phones/show.html.haml
+++ b/app/views/phones/show.html.haml
@@ -16,7 +16,7 @@
     %strong= t('phones.show.fallback_sip_account_id') + ":"
     = @phone.fallback_sip_account
 
-- if defined? NIGHTLY_REBOOT_OF_PHONES && NIGHTLY_REBOOT_OF_PHONES == true
+- if defined? GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') && GsParameter.get('NIGHTLY_REBOOT_OF_PHONES') == true
   %p
     %strong= t('phones.show.nightly_reboot') + ":"
     = @phone.nightly_reboot
diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml
index b9b47d5..d125e58 100644
--- a/app/views/tenants/_admin_area.de.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -102,10 +102,10 @@
     = render "phone_books/index_core", :phone_books => @tenant.phone_books
     = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneBook}    
 
-- if STRICT_INTERNAL_EXTENSION_HANDLING == true
+- if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true
   %h3= t('phone_number_ranges.index.page_title')
 
-  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(INTERNAL_EXTENSIONS).try(:phone_numbers).try(:count).to_i == 0
+  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(GsParameter.get('INTERNAL_EXTENSIONS')).try(:phone_numbers).try(:count).to_i == 0
     Der Mandant 
     = "\"#{@tenant}\""
     wurde erst vor 
@@ -114,5 +114,5 @@
     = pluralize(Delayed::Job.count, 'Hintergrundprozesse')
     \. Bitte warten Sie noch ein paar Minuten und laden anschließend diese Seite erneut.
   - else
-    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => SERVICE_NUMBERS))
+    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => GsParameter.get('SERVICE_NUMBERS')))
     =render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneNumberRange}
diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index d648143..afd50b5 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -102,15 +102,15 @@
     = render "phone_books/index_core", :phone_books => @tenant.phone_books
     = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneBook} 
 
-- if STRICT_INTERNAL_EXTENSION_HANDLING == true
+- if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true
   %h3= t('phone_number_ranges.index.page_title')
 
-  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(INTERNAL_EXTENSIONS).try(:phone_numbers).try(:count).to_i == 0
+  - if @tenant.created_at > (Time.now - 15.minutes) && Delayed::Job.count > 0 && @tenant.phone_number_ranges.find_by_name(GsParameter.get('INTERNAL_EXTENSIONS')).try(:phone_numbers).try(:count).to_i == 0
     This tenant was created 
     = distance_of_time_in_words_to_now(@tenant.created_at)
     ago. There are still 
     = pluralize(Delayed::Job.count, 'background job')
     not finished. This can take a couple of minutes. Please reload this page later.
   - else
-    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => SERVICE_NUMBERS))
+    =render 'phone_number_ranges/index_core', :phone_number_ranges => (@tenant.phone_number_ranges + @tenant.country.phone_number_ranges.where(:name => GsParameter.get('SERVICE_NUMBERS')))
     =render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => PhoneNumberRange}
diff --git a/app/views/tenants/_form.html.haml b/app/views/tenants/_form.html.haml
index 2ca8a69..1641e78 100644
--- a/app/views/tenants/_form.html.haml
+++ b/app/views/tenants/_form.html.haml
@@ -11,13 +11,13 @@
   = f.input :from_field_voicemail_email, :label => t('tenants.form.from_field_voicemail_email.label'), :hint => conditional_hint('tenants.form.from_field_voicemail_email.hint')
   = f.input :from_field_pin_change_email, :label => t('tenants.form.from_field_pin_change_email.label'), :hint => conditional_hint('tenants.form.from_field_pin_change_email.hint')
 
-  - if STRICT_INTERNAL_EXTENSION_HANDLING == true || STRICT_DID_HANDLING == true 
+  - if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true || GsParameter.get('STRICT_DID_HANDLING') == true 
     %h2= t('tenants.form.phone_numbers')
     %p= t('tenants.form.intro')
     
-    - if STRICT_INTERNAL_EXTENSION_HANDLING == true  
+    - if GsParameter.get('STRICT_INTERNAL_EXTENSION_HANDLING') == true  
       = f.input :internal_extension_ranges, :label => t('tenants.form.internal_extension_ranges.label'), :hint => conditional_hint('tenants.form.internal_extension_ranges.hint')
-    - if STRICT_DID_HANDLING == true
+    - if GsParameter.get('STRICT_DID_HANDLING') == true
       = f.input :did_list, :label => t('tenants.form.did_list.label'), :hint => conditional_hint('tenants.form.did_list.hint')
 
   .actions