Add a real rm test.

[mailshears.git] / lib / common / postfixadmin_plugin.rb

diff --git a/lib/common/postfixadmin_plugin.rb b/lib/common/postfixadmin_plugin.rb
index 7a1985202cc343af0301518dc9a9e94abf03c799..5556d5a7c23a15866a0a7fb17e6cbb77f2a21f1d 100644 (file)
--- a/lib/common/postfixadmin_plugin.rb
+++ b/lib/common/postfixadmin_plugin.rb
@@ -17,9 +17,9 @@ module PostfixadminPlugin
   end
 
 
-  def describe_account(account)
+  def describe_user(user)
     # There's no other unique identifier in PostfixAdmin
-    return account
+    return user
   end
 
 
@@ -58,7 +58,7 @@ module PostfixadminPlugin
 
 
   def list_users()
-    accounts = []
+    users = []
 
     # Just assume PostgreSQL for now.
     begin
@@ -74,7 +74,7 @@ module PostfixadminPlugin
       # deliver to that address; it's not an alias."
       sql_query = 'SELECT username FROM mailbox;'
       connection.query(sql_query) do |result|
-        accounts = result.field_values('username')
+        users = result.field_values('username')
       end
       connection.close()
     rescue PGError => e
@@ -82,7 +82,7 @@ module PostfixadminPlugin
       raise DatabaseError.new(e)
     end
 
-    return accounts
+    return users
   end