Replace 'account' with 'user' everywhere.

[mailshears.git] / lib / rm / plugins / agendav.rb

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index bb34295614a0fdfa47936021ecfc4a54a25b3b26..0f4e790f6f4007f124eed570db7d52651f767d8a 100644 (file)
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -1,45 +1,18 @@
 require 'pg'
 
 require 'pg'
 

-require 'common/plugin'
+require 'common/agendav_plugin'

 require 'rm/rm_plugin'
 
 class AgendavRm
 
 require 'rm/rm_plugin'
 
 class AgendavRm
 

-  include Plugin
+  include AgendavPlugin

   include RmPlugin
 
   include RmPlugin
 

-  def initialize()
-    cfg = Configuration.new()
-    @db_host = cfg.agendav_dbhost
-    @db_port = cfg.agendav_dbport
-    @db_opts = cfg.agendav_dbopts
-    @db_tty  = cfg.agendav_dbtty
-    @db_name = cfg.agendav_dbname
-    @db_user = cfg.agendav_dbuser
-    @db_pass = cfg.agendav_dbpass
-  end
-
-
-  def describe_domain(domain)
-    # AgenDAV doesn't have a concept of domains.
-    return 'N/A'
-  end
-
-  def describe_account(account)
-    if self.user_exists(account)
-      return "Username: #{account}"
-    else
-      return 'User not found'
-    end
-  end

 
 

-  def delete_domain(domain)
-    # AgenDAV doesn't have a concept of domains.
-  end
-
-  def delete_account(account)
+  def delete_user(user)

     # Delete the given username and any records in other tables
     # belonging to it.
     # Delete the given username and any records in other tables
     # belonging to it.

+    raise NonexistentUserError.new(user) if not user_exists(user)

 
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
     sql_queries << 'DELETE FROM shared WHERE user_from = $1;'
 
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
     sql_queries << 'DELETE FROM shared WHERE user_from = $1;'


@@ -54,7 +27,7 @@ class AgendavRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
                                   @db_pass)
 
       sql_queries.each do |sql_query|

-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user])

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


@@ -66,55 +39,4 @@ class AgendavRm
 
   end
 
 
   end
 

-
-  def get_leftover_domains(db_domains)
-    # AgenDAV 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 AgenDAV.
-    ad_accounts = self.get_agendav_usernames()
-    return ad_accounts - db_accounts
-  end
-
-
-  protected;
-
-  def user_exists(account)
-    ad_users = get_agendav_usernames()
-    return ad_users.include?(account)
-  end
-
-  def get_agendav_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 prefs)'
-      sql_query += 'UNION'
-      sql_query += '(SELECT user_from FROM shared);'
-
-      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)
-    end
-
-    return usernames
-  end
-

 end
 end