@@ -14,7 +14,6 @@ direct_login: locale: en email_login: - direct_login: 0 hashed_password: 9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 username: Email Code Login locale: en test/fixtures/users.yml @@ -135,7 +135,7 @@ class FunkenloginController < ApplicationController Funkenloginmailer.template_root = File.join(File.dirname(__FILE__), '..', '..', 'config', 'locale', I18n.locale) # Send email logger.debug "FUNKENLOGIN: Sending email to '#{thisuser.email}' from '#{Funkenlogin::mail_from}'" - Funkenloginmailer.deliver_login_hash(thisuser.username, thisuser.hashed_code, thisuser.locale, thisuser.email, url_for(:controller => self.controller_name), fulldomain.join('.'), Time.current + Funkenlogin.code_timeout) + Funkenloginmailer.deliver_login_hash(thisuser.username, thisuser.hashed_code, thisuser.locale, thisuser.email, url_for(:controller => self.controller_name, :action => 'index', :id => nil), fulldomain.join('.'), Time.current + Funkenlogin.code_timeout) logger.debug "FUNKENLOGIN: Email delivered, say thank you and go idle :)" render :text => I18n.t('funkenlogin.email') and return else vendor/plugins/funkenlogin/app/controllers/funkenlogin_controller.rb @@ -14,7 +14,6 @@ direct_login: locale: en email_login: - direct_login: 0 hashed_password: 9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 username: Email Code Login locale: en vendor/plugins/funkenlogin/test/fixtures/users.yml 09a953a37b7d766a03c4bea40aba0882784ba042 Marius Maximus nom@ximus.de http://github.com/funkensturm/funkengallery_demo/commit/0e39ce79c6bad4b80a523ad7eae3ce3fd8a25e15 0e39ce79c6bad4b80a523ad7eae3ce3fd8a25e15 2009-02-28T07:34:11-08:00 2009-02-28T07:34:11-08:00 fix in funkenlogin direct_login IS NULL 5c3eac6be5027351929f9891d75b50b9aa42dc40 Marius Maximus nom@ximus.de