X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..2a2a204125383729223083f203a04e9e6eff873d:/app/models/acl.rb?ds=inline

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 3ff19d35f..529ccbe3b 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,23 +1,23 @@
 class Acl < ActiveRecord::Base
-  def self.find_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do
-      return self.find(:first, options)
+  validates :k, :presence => true
+
+  def self.match(address, domain = nil)
+    if domain
+      Acl.where("address >>= ? OR domain = ?", address, domain)
+    else
+      Acl.where("address >>= ?", address)
     end
   end
 
-  def self.find_all_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["#{inet_aton} & netmask = address", address]}) do
-      return self.find(:all, options)
-    end
+  def self.no_account_creation(address, domain = nil)
+    match(address, domain).where(:k => "no_account_creation").exists?
   end
 
-private
+  def self.no_note_comment(address, domain = nil)
+    match(address, domain).where(:k => "no_note_comment").exists?
+  end
 
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
-    else
-      "?"
-    end
+  def self.no_trace_download(address, domain = nil)
+    match(address, domain).where(:k => "no_trace_download").exists?
   end
 end