Overhaul everything to get consistent error reports.

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

diff --git a/lib/common/roundcube_plugin.rb b/lib/common/roundcube_plugin.rb
index 0f80f72dd5ab33bad582fe15298aa4287f7e4ed7..b1c74a6d7494420ea9908389317c9d03e39d64f9 100644 (file)
--- a/lib/common/roundcube_plugin.rb
+++ b/lib/common/roundcube_plugin.rb
@@ -1,4 +1,5 @@
 require 'common/plugin'
 require 'common/plugin'

+require 'common/user'

 
 module RoundcubePlugin
   # Code that all Roundcube plugins (Prune, Rm, Mv...) will share.
 
 module RoundcubePlugin
   # Code that all Roundcube plugins (Prune, Rm, Mv...) will share.


@@ -18,7 +19,7 @@ module RoundcubePlugin
 
   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 domain
+    return domain.to_s()

   end
 
   def describe_user(user)
   end
 
   def describe_user(user)


@@ -32,11 +33,12 @@ module RoundcubePlugin
   end
 
 
   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,
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,


@@ -46,30 +48,25 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
                                   @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()
       end
 
       connection.close()

-

     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 

-    return user_id
+    return usernames.map{ |u| User.new(u) }

   end
 
   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,
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,


@@ -79,18 +76,23 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
                                   @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.to_s()]) do |result|
+        if result.num_tuples > 0
+          user_id = result[0]['user_id']
+        end

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

+

     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
     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
 

+

 end
 end