X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb7c4f93e239c6ff6155b09ffe72a090be3af4f0..cd43529cc8d9b8c020117fd5d690a64f2f0464b9:/app/models/acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 3ff19d35f..e19c6988b 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,23 +1,9 @@
 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)
-    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
-  end
-
-private
-
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
+  def self.match(address, domain = nil)
+    if domain
+      condition = Acl.where("address >> ? OR domain = ?", address, domain)
     else
-      "?"
+      condition = Acl.where("address >> ?", address)
     end
   end
 end