Merge pull request #837 from internetee/registry-795

Registry 795

app/jobs/update_whois_record_job.rb

@@ -51,4 +51,4 @@ class UpdateWhoisRecordJob < Que::Job
   def delete_blocked(name)
     delete_reserved(name)
   end
-end
+end

app/models/whois_record.rb

@@ -36,6 +36,7 @@ class WhoisRecord < ActiveRecord::Base
     registrant = domain.registrant
 
     @disclosed = []
+    h[:disclaimer] = disclaimer_text if disclaimer_text.present?
     h[:name]       = domain.name
     h[:status]     = domain.statuses.map { |x| status_map[x] || x }
     h[:registered] = domain.registered_at.try(:to_s, :iso8601)
@@ -120,4 +121,10 @@ class WhoisRecord < ActiveRecord::Base
   def destroy_whois_record
     Whois::Record.where(name: name).delete_all
   end
+
+  private
+
+  def disclaimer_text
+    Setting.registry_whois_disclaimer
+  end
 end

app/views/admin/settings/index.haml

@@ -99,6 +99,7 @@
           = render 'setting_row', var: :registry_state
           = render 'setting_row', var: :registry_zip
           = render 'setting_row', var: :registry_country_code
+          = render 'setting_row', var: :registry_whois_disclaimer
 
   .row
     .col-md-12.text-right

app/views/for_models/whois.erb

@@ -1,3 +1,6 @@
+<%- if json['disclaimer'].present? -%>
+<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
+<%- end -%>
 Estonia .ee Top Level Domain WHOIS server
 
 Domain:
@@ -23,18 +26,18 @@ changed: <%= json['registrant_changed'].to_s.tr('T',' ').sub('+', ' +') %>
 <%- if json['admin_contacts'].present? -%>
 Administrative contact:
 <%- for contact in json['admin_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed
 <%- end -%>
 
 <%- end -%>
 <% if json['tech_contacts'].present? %>
 Technical contact:
 <%- for contact in json['tech_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed
 <%- end -%>
 
 <%- end -%>