There's now 3 account activation strategies (available in application settings):

* activation by email: the user receives an email containing a link to active his account
* manual activation: an email is sent to administrators for account approval (default)
* automatic activation: the user can log in as soon as he has registered

git-svn-id: http://redmine.rubyforge.org/svn/trunk@915 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/settings/edit.rhtml

@@ -78,7 +78,12 @@
 <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
 
 <p><label><%= l(:setting_self_registration) %></label>
-<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
+<%= select_tag 'settings[self_registration]',
+      options_for_select( [[l(:label_disabled), "0"],
+                           [l(:label_registration_activation_by_email), "1"],
+                           [l(:label_registration_manual_activation), "2"],
+                           [l(:label_registration_automatic_activation), "3"]
+                          ], Setting.self_registration ) %></p>
 
 <p><label><%= l(:label_password_lost) %></label>
 <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>