Fix broken nesting in lib/mv/plugins/postfixadmin.rb.

[mailshears.git] / lib / mv / plugins / postfixadmin.rb

diff --git a/lib/mv/plugins/postfixadmin.rb b/lib/mv/plugins/postfixadmin.rb
index 82ddf055c4b1bd747fb6f1319e344ad8b26c3055..9317b4b7d12d6c0dd64702793a072bc951e23178 100644 (file)
--- a/lib/mv/plugins/postfixadmin.rb
+++ b/lib/mv/plugins/postfixadmin.rb
@@ -8,25 +8,18 @@ class PostfixadminMv
   include PostfixadminPlugin
   include MvPlugin
 
-  def mv_user(user_from, user_to)
-    if not user_exists(user_from)
-      raise NonexistentUserError.new("source user #{user_from} does not exist")
-    end
-
-    user_to_parts = user_to.split('@')
-    localpart_to = user_to_parts[0]
-    domain_to = user_to_parts[1]
+  def mv_user(src, dst)
+    # It's obviously an error if the source user does not exist.
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
 
-    if domain_to.nil?
-      # There was no "@" in the destination user.
-      msg = "the destination user #{user_to} is not valid"
-      raise InvalidUserError.new(msg)
+    # And if the destination domain does not exist.
+    if not domain_exists(dst.domain())
+      raise NonexistentDomainError.new(dst.domain.to_s())
     end
 
-    if not domain_exists(domain_to)
-      msg = "destination domain #{domain_to} does not exist"
-      raise NonexistentDomainError.new(msg)
-    end
+    # But the destination *user* should *not* exist.
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
 
     mailbox_query  = 'UPDATE mailbox SET '
     mailbox_query += '  username=$1,'
@@ -46,31 +39,20 @@ class PostfixadminMv
 
     sql_queries = [mailbox_query, alias_query1, alias_query2]
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-      sql_queries.each do |sql_query|
-          varchar = 1043 # from pg_type.h
-          params = [{:value => user_to, :type => varchar},
-                    {:value => domain_to, :type => varchar},
-                    {:value => localpart_to, :type => varchar},
-                    {:value => user_from, :type => varchar}]
-        connection.query(sql_query, params)
-      end
+    sql_queries.each do |sql_query|
+      varchar = 1043 # from pg_type.h
+      params = [{:value => dst.to_s(), :type => varchar},
+                {:value => dst.domainpart(), :type => varchar},
+                {:value => dst.localpart(), :type => varchar},
+                {:value => src.to_s(), :type => varchar}]
 
-      connection.close()
-
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+      connection.query(sql_query, params)
     end
-  end
 
+    connection.close()
+  end
 
 end