Guard against non-numeric lat and lons in nodes and notes

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 8eeb2310a77674545fa68c2c1d5d8f7deb75e7e0..2db7fb76522a0342324d235367ae51d0c5932c97 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,3 +1,17 @@
 class Acl < ActiveRecord::Base
-  scope :address, lambda { |address| where("address >> ?", address) }
+  def self.match(address, domain = nil)
+    if domain
+      condition = Acl.where("address >>= ? OR domain = ?", address, domain)
+    else
+      condition = Acl.where("address >>= ?", address)
+    end
+  end
+
+  def self.no_account_creation(address, domain = nil)
+    self.match(address, domain).where(:k => "no_account_creation").exists?
+  end
+
+  def self.no_trace_download(address, domain = nil)
+    self.match(address, domain).where(:k => "no_trace_download").exists?
+  end
 end