- Fixed autoregistration and enabled manual login

Continued fixing minor issues brought up on issue AdamLantos#18.
- Self-Registration form is working (although it is not used by my installations)
- Logout now returns to login screen allowing the user to change identity
- Locked users cannot log in

app/controllers/registration_controller.rb

@@ -8,6 +8,7 @@ class RegistrationController < ApplicationController
   def autoregistration_form
     @user = User.new :language => Setting.default_language
     set_default_attributes @user
+    logger.info "Hallo Welt"
   end
 
   def register
@@ -22,8 +23,7 @@ def register
   end
 
   def autoregistration_enabled
-    unless Setting.
-      plugin_redmine_http_auth['auto_registration'] == "true"
+    unless Setting.plugin_redmine_http_auth['auto_registration'] == "true"
 
       flash[:error] = l :error_autoregistration_disabled
       redirect_to home_url

app/views/registration/autoregistration_form.html.erb

@@ -1,27 +1,18 @@
 <h2><%=l(:label_autoregister)%></h2>
 
-<% form_tag({:action => 'register'}, :class => "tabular") do %>
+<%= labelled_form_for @user, :url => { :action => "register" } do |f| %>
 <%= error_messages_for 'user' %>
 
-<div class="box">
-<!--[form:user]-->
-<p><label for="user_login"><%=l(:field_login)%> <span class="required">*</span></label>
-<%= text_field 'user', 'login', :size => 25, :disabled => (readonly_attribute? 'login') %></p>
+<div class="box tabular">
+  <p><%= f.text_field :login, :size => 25, :required => true %></p>
+  <p><%= f.text_field :firstname, :required => true %></p>
+  <p><%= f.text_field :lastname, :required => true %></p>
+  <p><%= f.text_field :mail, :required => true %></p>
+  <p><%= f.select :language, lang_options_for_select %></p>
 
-<p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
-<%= text_field 'user', 'firstname', :disabled => (readonly_attribute? 'firstname')  %></p>
-
-<p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label>
-<%= text_field 'user', 'lastname', :disabled => (readonly_attribute? 'lastname')  %></p>
-
-<p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-<%= text_field 'user', 'mail', :disabled => (readonly_attribute? 'mail')  %></p>
-
-<p><label for="user_language"><%=l(:field_language)%></label>
-<%= select("user", "language", lang_options_for_select) %></p>
-
-<!--[eoform:user]-->
 </div>
 
 <%= submit_tag l(:button_submit) %>
 <% end %>
+
+

lib/redmine_http_auth/account_controller_patch.rb

@@ -0,0 +1,18 @@
+module RedmineHttpAuth
+  module AccountControllerPatch
+    def self.included(base)
+      base.class_eval do
+        # We're substituting the original function since redirect_to can only be called once and we need to change the target page
+	def logout
+          logout_user
+          if Setting.plugin_redmine_http_auth['enable'] == "true"
+            redirect_to signin_url
+          else
+            redirect_to home_url
+          end  
+        end
+      end
+    end
+  end
+end
+