X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fpostfixadmin.rb;h=94526bcd25bfc058a1c05bd92081caeb16fa5caa;hp=3883e866103e71dff7cf75ecb37681cebca7ca11;hb=41b5e74bedf1def1ef22cd77ed26d87fae859a13;hpb=7f8654ed6582062a295e1be75ae70e99de41b323

diff --git a/lib/rm/plugins/postfixadmin.rb b/lib/rm/plugins/postfixadmin.rb
index 3883e86..94526bc 100644
--- a/lib/rm/plugins/postfixadmin.rb
+++ b/lib/rm/plugins/postfixadmin.rb
@@ -9,11 +9,11 @@ class PostfixadminRm
   include RmPlugin
 
 
-  def delete_account(account)
-    raise NonexistentAccountError.new(account) if not user_exists(account)
+  def delete_user(user)
+    raise NonexistentUserError.new(user) if not user_exists(user)
 
     sql_queries = ['DELETE FROM alias WHERE address = $1;']
-    # Wipe out any aliases pointed at our account.
+    # Wipe out any aliases pointed at our user.
     sql_queries << "UPDATE alias SET goto=REPLACE(goto, $1, '');"
     sql_queries << 'DELETE FROM mailbox WHERE username = $1;'
     sql_queries << 'DELETE FROM quota WHERE username = $1;'
@@ -33,7 +33,7 @@ class PostfixadminRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user])
       end
 
       # The earlier alias update query will leave things like