Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/controllers/application_controller.rb

@@ -42,10 +42,8 @@ class ApplicationController < ActionController::Base
   end
 
   def check_authorization    
-    if in_a_web? and authorization_needed? and not authorized?
+    redirect_to(:controller => 'wiki', :action => 'login',
-      redirect_to :controller => 'wiki', :action => 'login', :web => @web_name
+                :web => @web_name) if in_a_web? and authorization_needed? and not authorized?
-      return false
-    end
   end
 
   def connect_to_model
@@ -55,10 +53,8 @@ class ApplicationController < ActionController::Base
     @author = cookies['author'] || 'AnonymousCoward'
     if @web_name
       @web = @wiki.webs[@web_name]
-      if @web.nil?
+      render(:status => 404, :text => "Unknown web '#{@web_name}'",
-        render(:status => 404, :text => "Unknown web '#{@web_name}'", :layout => 'error')
+             :layout => 'error') if @web.nil?
-        return false 
-      end
     end
   end
 
@@ -252,7 +248,6 @@ class ApplicationController < ActionController::Base
       layout = false if %w(tex tex_list).include?(action_name)
       headers['Allow'] = 'POST'
       render(:status => 405, :text => 'You must use an HTTP POST', :layout => layout)
-      return false
     end
     return true
   end

app/controllers/file_controller.rb

@@ -88,17 +88,14 @@ class FileController < ApplicationController
   protected
   
   def check_authorized
-    if authorized? or @web.published?
+    unless authorized? or @web.published?
-      return true
-    else
       @hide_navigation  = true
       render(:status => 403, :text => 'This web is private', :layout => true)
-      return false
     end    
   end
 
   def check_allow_uploads
-    render(:status => 404, :text => "Web #{params['web'].inspect} not found", :layout => 'error') and return false unless @web
+    if @web
       if @web.allow_uploads? and authorized?
         return true
       else
@@ -106,6 +103,9 @@ class FileController < ApplicationController
         render(:status => 403, :text => 'File uploads are blocked by the webmaster', :layout => true)
         return false
       end
+    else
+      render(:status => 404, :text => "Web #{params['web'].inspect} not found", :layout => 'error')
+    end
   end
   
   private