X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/beb0ef6357e426ab08349109d47c3726ed50042e..898cc828dd1f1167f85abbf35c8e3f0ed640ac1e:/app/models/acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 04f04d8f9..2db7fb765 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,3 +1,17 @@
 class Acl < ActiveRecord::Base
-  scope :address, lambda { |address| where("? & netmask = 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