Remove a superclass from DovecotMv that no longer exists.

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

diff --git a/lib/common/roundcube_plugin.rb b/lib/common/roundcube_plugin.rb
index 0f80f72dd5ab33bad582fe15298aa4287f7e4ed7..1f9805a3e9d079243da75859f6992d7688e6f266 100644 (file)
--- a/lib/common/roundcube_plugin.rb
+++ b/lib/common/roundcube_plugin.rb
@@ -32,11 +32,12 @@ module RoundcubePlugin
   end
 
 
-  protected;
-
-  def get_user_id(user)
-    user_id = nil
+  def list_users()
+    # Produce a list of Roundcube users. This is used in prune/rm, and
+    # is public because it is useful in testing.
+    usernames = []
 
+    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -46,30 +47,25 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT user_id FROM users WHERE username = $1;"
-
-      connection.query(sql_query, [user]) do |result|
-        if result.num_tuples > 0
-          user_id = result[0]['user_id']
-        end
+      sql_query = "SELECT username FROM users;"
+      connection.query(sql_query) do |result|
+        usernames = result.field_values('username')
       end
 
       connection.close()
-
     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    return user_id
+    return usernames
   end
 
+  protected;
 
-  # Used in both prune/rm.
-  def list_users()
-    usernames = []
+  def get_user_id(user)
+    user_id = nil
 
-    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -79,18 +75,23 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT username FROM users;"
-      connection.query(sql_query) do |result|
-        usernames = result.field_values('username')
+      sql_query = "SELECT user_id FROM users WHERE username = $1;"
+
+      connection.query(sql_query, [user]) do |result|
+        if result.num_tuples > 0
+          user_id = result[0]['user_id']
+        end
       end
 
       connection.close()
+
     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    return usernames
+    return user_id
   end
 
+
 end