deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

enhanced password checking behavior in remove_orphaned_pages;

Browse source 
extracted password error to application
This commit is contained in:
Alexey Verkhovsky 2005-02-05 13:34:12 +00:00
parent 8b21b8286f
commit bc97b8d4f7
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/admin_controller.rb
View file

@ -44,9 +44,10 @@ class AdminController < ApplicationController
end
def edit_web
if @params['system_password']
system_password = @params['system_password']
if system_password
# form submitted
if wiki.authenticate(@params['system_password'])
if wiki.authenticate(system_password)
wiki.edit_web(
@web.address, @params['address'], @params['name'],
@params['markup'].intern,
@ -61,11 +62,7 @@ class AdminController < ApplicationController
)
redirect_show('HomePage', @params['address'])
else
if @params['system_password'].empty?
flash[:error] = 'Please enter the system password'
else
flash[:error] = 'You entered a wrong system password. Please enter the right one'
end
flash[:error] = password_error(system_password)
# and re-render the same template again
end
else