layout 'site'
before_filter :authorize, :only => [:api_details, :api_gpx_files]
- before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend]
- before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend]
+ before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image]
+ before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image]
filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
redirect_to :controller => 'site', :action => 'index'
end
return
- elsif User.authenticate(:username => email_or_display_name, :password => pass, :invalid => true)
+ elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
else
flash[:notice] = "Sorry, couldn't log in with those details."
end
end
+ def upload_image
+ @user.image = params[:user][:image]
+ @user.save!
+ redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+ end
+
def api_details
render :text => @user.to_xml.to_s, :content_type => "text/xml"
end
if @this_user
@title = @this_user.display_name
else
- render :nothing => true, :status => :not_found
+ @not_found_user = params[:display_name]
+ render :action => 'no_such_user', :status => :not_found
end
end