diff lib/tasks/email.rake @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- a/lib/tasks/email.rake	Fri Jun 14 09:07:32 2013 +0100
+++ b/lib/tasks/email.rake	Fri Jun 14 09:28:30 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -29,6 +29,8 @@
                            create: create a user account
   no_permission_check=1    disable permission checking when receiving
                            the email
+  no_account_notice=1      disable new user account notification
+  default_group=foo,bar    adds created user to foo and bar groups
 
 Issue attributes control options:
   project=PROJECT          identifier of the target project
@@ -58,6 +60,8 @@
       options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
       options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
       options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
+      options[:no_account_notice] = ENV['no_account_notice'] if ENV['no_account_notice']
+      options[:default_group] = ENV['default_group'] if ENV['default_group']
 
       MailHandler.receive(STDIN.read, options)
     end
@@ -73,6 +77,8 @@
                            create: create a user account
   no_permission_check=1    disable permission checking when receiving
                            the email
+  no_account_notice=1      disable new user account notification
+  default_group=foo,bar    adds created user to foo and bar groups
 
 Available IMAP options:
   host=HOST                IMAP server host (default: 127.0.0.1)
@@ -129,6 +135,8 @@
       options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
       options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
       options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
+      options[:no_account_notice] = ENV['no_account_notice'] if ENV['no_account_notice']
+      options[:default_group] = ENV['default_group'] if ENV['default_group']
 
       Redmine::IMAP.check(imap_options, options)
     end
@@ -162,6 +170,8 @@
       options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
       options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
       options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
+      options[:no_account_notice] = ENV['no_account_notice'] if ENV['no_account_notice']
+      options[:default_group] = ENV['default_group'] if ENV['default_group']
 
       Redmine::POP3.check(pop_options, options)
     end