Move domain removal into the plugins.

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

diff --git a/lib/common/roundcube_db_plugin.rb b/lib/common/roundcube_db_plugin.rb
index e4e9e7fb73471d4115cd6694527a43bb139cc293..df5413fdb0cc7a797dc2fd1f7070f3809b7f2abc 100644 (file)
--- a/lib/common/roundcube_db_plugin.rb
+++ b/lib/common/roundcube_db_plugin.rb
@@ -19,7 +19,7 @@ module RoundcubeDbPlugin
 
   def describe_domain(domain)
     # Roundcube doesn't have a concept of domains.
 
   def describe_domain(domain)
     # Roundcube doesn't have a concept of domains.

-    return 'N/A'
+    return domain

   end
 
   def describe_account(account)
   end
 
   def describe_account(account)


@@ -66,8 +66,8 @@ module RoundcubeDbPlugin
   end
 
 
   end
 
 

-  # Uses in both prune/rm.
-  def get_roundcube_usernames()
+  # Used in both prune/rm.
+  def list_users()

     usernames = []
 
     # Just assume PostgreSQL for now.
     usernames = []
 
     # Just assume PostgreSQL for now.