Replace 'account' with 'user' everywhere.

[mailshears.git] / lib / prune / plugins / agendav.rb

diff --git a/lib/prune/plugins/agendav.rb b/lib/prune/plugins/agendav.rb
index 15787734517c2345a19eb24e1e1a24e78bb657c0..43b5c99e883cf4287438297308b43769345806aa 100644 (file)
--- a/lib/prune/plugins/agendav.rb
+++ b/lib/prune/plugins/agendav.rb
@@ -1,24 +1,24 @@
 require 'pg'
 
 require 'pg'
 

-require 'common/agendav_plugin'

 require 'prune/prune_plugin'
 require 'rm/plugins/agendav'
 
 class AgendavPrune < AgendavRm
 
 require 'prune/prune_plugin'
 require 'rm/plugins/agendav'
 
 class AgendavPrune < AgendavRm
 

-  include AgendavPlugin

   include PrunePlugin
 
   def get_leftover_domains(db_domains)
   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
 
 
     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.
     # 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
   end
 
 end