X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Froundcube_db.rb;h=252ce32688cbb82faa81f42b5522ac8abf73cc7b;hp=e8165d1225f270629b857de08c87637b3ea8881b;hb=51f027b01e242737956c3ab5aecdd322d6ceeeed;hpb=ec3c9099a29f40d95f055ea0f7fb25a99d913de3

diff --git a/lib/rm/plugins/roundcube_db.rb b/lib/rm/plugins/roundcube_db.rb
index e8165d1..252ce32 100644
--- a/lib/rm/plugins/roundcube_db.rb
+++ b/lib/rm/plugins/roundcube_db.rb
@@ -1,40 +1,13 @@
 require 'pg'
 
-require 'common/plugin'
+require 'common/roundcube_db_plugin'
 require 'rm/rm_plugin'
 
-class RoundcubeDb
+class RoundcubeDbRm
 
-  include Plugin
+  include RoundcubeDbPlugin
   include RmPlugin
 
-  def initialize()
-    cfg = Configuration.new()
-    @db_host = cfg.roundcube_dbhost
-    @db_port = cfg.roundcube_dbport
-    @db_opts = cfg.roundcube_dbopts
-    @db_tty  = cfg.roundcube_dbtty
-    @db_name = cfg.roundcube_dbname
-    @db_user = cfg.roundcube_dbuser
-    @db_pass = cfg.roundcube_dbpass
-  end
-
-
-  def describe_domain(domain)
-    # Roundcube doesn't have a concept of domains.
-    return 'N/A'
-  end
-
-  def describe_account(account)
-    user_id = self.get_user_id(account)
-
-    if user_id.nil?
-      return 'User not found'
-    else
-      return "User ID: #{user_id}"
-    end
-  end
-
   def delete_domain(domain)
     # Roundcube doesn't have a concept of domains.
   end
@@ -78,78 +51,14 @@ class RoundcubeDb
   end
 
 
-  def get_leftover_domains(db_domains)
-    # Roundcube doesn't have a concept of domains.
-    return []
-  end
-
-
-  def get_leftover_accounts(db_accounts)
-    # Get a list of all users who have logged in to Roundcube.
-    rc_accounts = self.get_roundcube_usernames()
-    return rc_accounts - db_accounts
-  end
-
-
-  protected;
-
-  def get_user_id(account)
-    user_id = nil
-
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      sql_query = "SELECT user_id FROM users WHERE username = $1;"
-
-      connection.query(sql_query, [account]) 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 user_id
-  end
-
-
-
-  def get_roundcube_usernames()
-    usernames = []
 
-    # Just assume PostgreSQL for now.
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      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)
+  def get_domain_usernames(domain)
+    usernames = get_roundcube_usernames();
+    matches = usernames.select do |username|
+      username =~ /@#{domain}$/
     end
 
-    return usernames
+    return matches
   end
 
 end