X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Froundcube_db.rb;fp=lib%2Frm%2Fplugins%2Froundcube_db.rb;h=3e18e8e4b8a5c2bbb8db7555ba8745773ed8f5b5;hp=f2621df8cffeee6c4384b9deb134e799ba64b77d;hb=e3826d8926e11763837a591986d453e9ef5d9dec;hpb=a6ae98f0423603445b621a8eaa17443c8d590b45

diff --git a/lib/rm/plugins/roundcube_db.rb b/lib/rm/plugins/roundcube_db.rb
index f2621df..3e18e8e 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 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
@@ -93,38 +66,6 @@ class RoundcubeDbRm
 
   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 = []