Replace 'account' with 'user' everywhere.

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

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 6aa6d9191216d59f635238836bfe7e05ad68d49e..0f4e790f6f4007f124eed570db7d52651f767d8a 100644 (file)
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -9,13 +9,10 @@ class AgendavRm
   include RmPlugin
 
 
-  def delete_domain(domain)
-    # AgenDAV doesn't have a concept of domains.
-  end
-
-  def delete_account(account)
+  def delete_user(user)
     # Delete the given username and any records in other tables
     # belonging to it.
+    raise NonexistentUserError.new(user) if not user_exists(user)
 
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
     sql_queries << 'DELETE FROM shared WHERE user_from = $1;'
@@ -30,7 +27,7 @@ class AgendavRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user])
       end
 
       connection.close()
@@ -42,14 +39,4 @@ class AgendavRm
 
   end
 
-
-  def get_domain_usernames(domain)
-    usernames = get_agendav_usernames();
-    matches = usernames.select do |username|
-      username =~ /@#{domain}$/
-    end
-
-    return matches
-  end
-
 end