Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
07fbf17af1
2 changed files with 4 additions and 3 deletions
|
@ -222,14 +222,15 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def authorization_needed?
|
||||
not %w(login authenticate feeds published atom_with_headlines atom_with_content s5 file blahtex_png).include?(action_name)
|
||||
not %w(login authenticate feeds published atom_with_headlines atom_with_content file blahtex_png).include?(action_name)
|
||||
end
|
||||
|
||||
def authorized?
|
||||
@web.nil? or
|
||||
@web.password.nil? or
|
||||
cookies[CGI.escape(@web_name)] == @web.password or
|
||||
password_check(params['password'])
|
||||
password_check(params['password']) or
|
||||
(@web.published? and action_name == 's5')
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -38,7 +38,7 @@ class FileController < ApplicationController
|
|||
end
|
||||
|
||||
def blahtex_png
|
||||
send_file(@web.blahtex_pngs_path + '/' + params['id'])
|
||||
send_file(@web.blahtex_pngs_path + '/' + params['id']) if check_authorized
|
||||
end
|
||||
|
||||
def delete
|
||||
|
|
Loading…
Add table
Reference in a new issue