X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fprune%2Fplugins%2Fagendav.rb;h=43b5c99e883cf4287438297308b43769345806aa;hp=15787734517c2345a19eb24e1e1a24e78bb657c0;hb=72696d3f6e95ef773af9727e9c3459b9038b0fc2;hpb=e3826d8926e11763837a591986d453e9ef5d9dec

diff --git a/lib/prune/plugins/agendav.rb b/lib/prune/plugins/agendav.rb
index 1578773..43b5c99 100644
--- a/lib/prune/plugins/agendav.rb
+++ b/lib/prune/plugins/agendav.rb
@@ -1,24 +1,24 @@
 require 'pg'
 
-require 'common/agendav_plugin'
 require 'prune/prune_plugin'
 require 'rm/plugins/agendav'
 
 class AgendavPrune < AgendavRm
 
-  include AgendavPlugin
   include PrunePlugin
 
   def get_leftover_domains(db_domains)
-    # AgenDAV doesn't have a concept of domains.
+    # AgenDAV doesn't have a concept of domains. We could parse the
+    # usernames to see what domains are present, but the point is
+    # moot: all leftover users will be pruned anyway.
     return []
   end
 
 
-  def get_leftover_accounts(db_accounts)
+  def get_leftover_users(db_users)
     # Get a list of all users who have logged in to AgenDAV.
-    ad_accounts = self.get_agendav_usernames()
-    return ad_accounts - db_accounts
+    ad_users = self.list_users()
+    return ad_users - db_users
   end
 
 end