X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fdavical_plugin.rb;h=a1dcba07b690b1f07eace23804597d9c61db977b;hp=1cc06ce0dd397d7e4e26443aa68871b82511e8df;hb=72696d3f6e95ef773af9727e9c3459b9038b0fc2;hpb=483d14dc8228a81d12fb109d3ed6510e2d2b03c1

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index 1cc06ce..a1dcba0 100644
--- a/lib/common/davical_plugin.rb
+++ b/lib/common/davical_plugin.rb
@@ -5,8 +5,7 @@ module DavicalPlugin
   # is, we implement the Plugin interface.
   include Plugin
 
-  def initialize()
-    cfg = Configuration.new()
+  def initialize(cfg)
     @db_host = cfg.davical_dbhost
     @db_port = cfg.davical_dbport
     @db_opts = cfg.davical_dbopts
@@ -23,8 +22,8 @@ module DavicalPlugin
   end
 
 
-  def describe_account(account)
-    principal_id = self.get_principal_id(account)
+  def describe_user(user)
+    principal_id = self.get_principal_id(user)
 
     if principal_id.nil?
       return 'User not found'
@@ -36,7 +35,7 @@ module DavicalPlugin
 
   protected;
 
-  def get_principal_id(account)
+  def get_principal_id(user)
     principal_id = nil
 
     begin
@@ -53,7 +52,7 @@ module DavicalPlugin
       sql_query += "      ON principal.user_no = usr.user_no) "
       sql_query += "WHERE usr.username = $1;"
 
-      connection.query(sql_query, [account]) do |result|
+      connection.query(sql_query, [user]) do |result|
         if result.num_tuples > 0
           principal_id = result[0]['principal_id']
         end
@@ -82,7 +81,8 @@ module DavicalPlugin
                                   @db_user,
                                   @db_pass)
 
-      sql_query =  "SELECT username FROM usr"
+      # User #1 is the super-user, and not tied to an email address.
+      sql_query =  "SELECT username FROM usr WHERE user_no > 1"
 
       connection.query(sql_query) do |result|
         usernames = result.field_values('username')