Replace 'account' with 'user' everywhere.

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

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 86273cba6e5d2a31f0fb617b24a88f9088d523cc..f7d116e0e783a08364701c97334668d04ca14d45 100644 (file)
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -12,15 +12,12 @@ class DavicalRm
   include RmPlugin
 
 
   include RmPlugin
 
 

-  def delete_domain(domain)
-    # DAViCal doesn't have a concept of domains.
-  end
-
-
-  def delete_account(account)
+  def delete_user(user)

     # Delete the given username. DAViCal uses foreign keys properly
     # and only supports postgres, so we let the ON DELETE CASCADE
     # trigger handle most of the work.
     # Delete the given username. DAViCal uses foreign keys properly
     # and only supports postgres, so we let the ON DELETE CASCADE
     # trigger handle most of the work.

+    raise NonexistentUserError.new(user) if not user_exists(user)
+

     sql_queries = ['DELETE FROM usr WHERE username = $1']
 
     begin
     sql_queries = ['DELETE FROM usr WHERE username = $1']
 
     begin


@@ -33,7 +30,7 @@ class DavicalRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
                                   @db_pass)
 
       sql_queries.each do |sql_query|

-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user])

       end
 
       connection.close()
       end
 
       connection.close()


@@ -45,4 +42,5 @@ class DavicalRm
 
   end
 
 
   end
 

+

 end
 end