remove the todo that I addressed

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index dbcb38993b6b905f0e5be691147387488c6f5023..2db7fb76522a0342324d235367ae51d0c5932c97 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,17 @@
 class Acl < ActiveRecord::Base
-  def self.find_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["? & netmask = address", address]}) do
-      return self.find(:first, options)
+  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.find_all_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["? & netmask = address", address]}) do
-      return self.find(:all, options)
-    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