Replace 'account' with 'user' everywhere.

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

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index c8a67261c16c23cad6da901128cd281e7e384076..a1dcba07b690b1f07eace23804597d9c61db977b 100644 (file)
--- 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
 
   # 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
     @db_host = cfg.davical_dbhost
     @db_port = cfg.davical_dbport
     @db_opts = cfg.davical_dbopts


@@ -23,8 +22,8 @@ module DavicalPlugin
   end
 
 
   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'
 
     if principal_id.nil?
       return 'User not found'


@@ -36,7 +35,7 @@ module DavicalPlugin
 
   protected;
 
 
   protected;
 

-  def get_principal_id(account)
+  def get_principal_id(user)

     principal_id = nil
 
     begin
     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;"
 
       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
         if result.num_tuples > 0
           principal_id = result[0]['principal_id']
         end