# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2014-08-21 10:29:57
# Node ID fc78be8c614c9dab5332e0e09d6c494f63ef9f2e
# Parent  6d2339b98facaf7242b9e407e08336de3ef56c64

update mail functionality. Update syntax for mail gem (we might need more options for mail setting?)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -129,7 +129,7 @@
                     :login => user.login,
                     :password => user.password,
                     :activation_url => activation_url,
-                    :admin_email => admin_email
+                    :admin_email => GraderConfiguration['system.admin_email']
                   })
 
     logger.info mail_body
@@ -145,7 +145,7 @@
                     :contest_name => contest_name,
                     :login => user.login,
                     :password => user.password,
-                    :admin_email => admin_email
+                    :admin_email => GraderConfiguration['system.admin_email']
                   })
 
     logger.info mail_body
diff --git a/lib/mail_helper_methods.rb b/lib/mail_helper_methods.rb
--- a/lib/mail_helper_methods.rb
+++ b/lib/mail_helper_methods.rb
@@ -22,7 +22,18 @@
       body mail_body
     end
 
-    mail.delivery_settings = { :address => smtp_server }
+    mail_option = {
+      :address => smtp_server,
+#      :domain => nil,
+#      :port => 25,
+#      :user_name => nil,
+#      :password => nil,
+#      :authentication=>'plain',
+#      :enable_starttls_auto => true
+    }
+
+    mail.delivery_method :smtp, mail_option
+
     mail.deliver
   end