@@ -1,15 +1,2 @@ class ApplicationController < ActionController::Base - before_filter :authenticate - - def authenticate - if local_request? - @user = User.find(:first) - else - @user = User.find_or_create(heroku_user.email.split(/@|\./)[0]) - - if !heroku_user.logged_in? and (WikiOptions[:allow_anonymous_read] == false) - redirect_to WikiOptions[:access_denied_url] + "?url=http://#{request.env['HTTP_HOST']}#{request.env['REQUEST_URI']}" - end - end - end end app/controllers/application.rb @@ -3,15 +3,6 @@ class FeedController < ApplicationController before_filter :since layout nil - def authenticate - unless WikiOptions[:allow_anonymous_read] - unless params[:key] && User.find_by_key(params[:key]) - render :nothing => true, :status => 403 # forbidden - return false - end - end - end - def page @feed = Page.find_by_title(params[:name]) feed app/controllers/feed_controller.rb @@ -5,6 +5,7 @@ class PageController < ApplicationController def show redirect_to(:action => "edit", :title => @title) and return if @revision.new_record? + @username = session[:user_name] @content = @revision.content.wikify if @revision.content end @@ -15,6 +16,7 @@ class PageController < ApplicationController def edit @content = @revision.content.wikify unless @revision.new_record? + @username = session[:user_name] render :action => "show" end @@ -26,19 +28,11 @@ class PageController < ApplicationController @content = @revision.content.wikify if @revision.content end - Anonymous = 'anonymous' - def save redirect_to :action => "show" and return if params[:cancel] - @user = User.find_or_create(session[:user_name]) if session[:user_name] - return unless check_write_access - - if WikiOptions[:allow_anonymous_write] - @user ||= User.find_or_create(params[:user][:name]) || Anonymous - end - - session[:user_name] = @user.name unless @user.name == Anonymous + @user = User.find_or_create(params[:user][:name]) + session[:user_name] = @user.name unless @user.name == 'anonymous' page_saved = @page.update_attributes(params[:page]) @@ -93,8 +87,6 @@ class PageController < ApplicationController end def save_tags - return unless check_write_access - if params[:save] && params[:edit_tags] @page.tag_with params[:edit_tags].split("\n").collect { |t| '"' + t.strip + '"' }.join(" ") end @@ -116,11 +108,6 @@ class PageController < ApplicationController redirect_to :action => "show" end - def logout - session[:user_name] = nil - redirect_to '/' - end - private def load_page @@ -135,12 +122,4 @@ class PageController < ApplicationController @revision ||= @page.revisions.find(:first) @revision ||= Revision.new end - - def check_write_access - if !@user and (WikiOptions[:allow_anonymous_write] == false) - redirect_to WikiOptions[:access_denied_url] - return false - end - return true - end end app/controllers/page_controller.rb @@ -96,7 +96,6 @@ module ApplicationHelper end def can_edit? - return true if @user - return WikiOptions[:allow_anonymous_write] + true end end app/helpers/application_helper.rb @@ -25,7 +25,7 @@ %> <%= links.join(" | ") %> </div> - <%= link_to(image_tag(Logo, :border => 0), { :controller => 'page', :title => '', :action => 'show' }, :id => "logo") %> + <%= link_to(image_tag('bitswiki.png', :border => 0), { :controller => 'page', :title => '', :action => 'show' }, :id => "logo") %> </div> <div id="content"> app/views/layouts/application.rhtml @@ -10,9 +10,7 @@ <p><%= check_box_tag :minor %> Minor</p> <% end %> - <% unless @user %> - <input type="text" name="user" value="anonymous" size="16" /> - <% end %> + <input type="text" name="user" value="<%= @username || 'anonymous' %>" size="16" /> <%= submit_tag "Save" %> </fieldset> app/views/page/edit.rhtml @@ -38,9 +38,7 @@ <%= check_box_tag "minor" %> Minor Edit <% end %> <div id="edit_actions"> - <% unless @user %> - Username: <%= text_field 'user', 'name', :value => 'anonymous', :size => 15 %> - <% end %> + Username: <%= text_field 'user', 'name', :value => (@username || 'anonymous'), :size => 15 %> <%= submit_tag "Save" %> <% # this isn't working properly because the cancel button resets the edit_content app/views/page/show.rhtml @@ -9,14 +9,7 @@ Rails::Initializer.run do |config| } end -Logo = "bitswiki.png" - ExternalLinks = { # "link text" => "url" } -WikiOptions = { - :allow_anonymous_read => true, - :allow_anonymous_write => true, - :access_denied_url => '/login' -} config/environment.rb 70cae545a4f2d455d3354fdb40739bf99969b8c8 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/bitswiki/commit/9cba39c3108d52e74dfa7d1de071d2f288eec1d4 9cba39c3108d52e74dfa7d1de071d2f288eec1d4 2009-04-06T16:40:02-07:00 2009-04-06T16:35:33-07:00 rip out all the authentication to keep it simple e4a0e0795b259c1b8745c3415f1abb64b814ed70 Adam Wiggins adam@heroku.com