Change server_settings to smtp_settings to avoid deprecation warning.

[rails.git] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 6520e027bc8b5a35b127fe9c15667d4964215235..328148fe18daf712f478e7372bd1cf7caeaf5640 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -7,48 +7,51 @@ class ApplicationController < ActionController::Base
   end
 
   def require_user
   end
 
   def require_user

-    redirect_to :controller => 'user', :action => 'login' unless @user
+    redirect_to :controller => 'user', :action => 'login', :next_controller => controller_name, :next_action => action_name unless @user

   end
 
   end
 

-  def authorize(realm='Web Password', errormessage="Could't authenticate you") \r
-    username, passwd = get_auth_data # parse from headers\r
-    # authenticate per-scheme
-    if username.nil?\r
-      @user = nil # no authentication provided - perhaps first connect (client should retry after 401)\r
-    elsif username == 'token' \r
-      @user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth\r
-    else\r
-      @user = User.authenticate(username, passwd) # basic auth\r
-    end\r
-    \r
-    # handle authenticate pass/fail\r
-    if @user
-      # user exists and password is correct ... horray! 
-      if @user.methods.include? 'lastlogin'         # note last login 
-        @session['lastlogin'] = user.lastlogin 
-        @user.last.login = Time.now 
-        @user.save() 
-        @session["User.id"] = @user.id 
-      end             
-    else 
-      # no auth, the user does not exist or the password was wrong
-      response.headers["Status"] = "Unauthorized" 
-      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
-      render_text(errormessage, 401) # :unauthorized
-    end 
+  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+    unless request.get?
+      username, passwd = get_auth_data # parse from headers
+      # authenticate per-scheme
+      if username.nil?
+        @user = nil # no authentication provided - perhaps first connect (client should retry after 401)
+      elsif username == 'token' 
+        @user = User.authenticate_token(passwd) # preferred - random token for user from db, passed in basic auth
+      else
+        @user = User.authenticate(username, passwd) # basic auth
+      end
+
+      # handle authenticate pass/fail
+      if @user
+        # user exists and password is correct ... horray! 
+        if @user.methods.include? 'lastlogin'         # note last login 
+          @session['lastlogin'] = user.lastlogin 
+          @user.last.login = Time.now 
+          @user.save() 
+          @session["User.id"] = @user.id 
+        end             
+      else 
+        # no auth, the user does not exist or the password was wrong
+        response.headers["Status"] = "Unauthorized" 
+        response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\"" 
+        render_text(errormessage, 401) # :unauthorized
+      end 
+    end

   end 
 
   end 
 

-  def get_xml_doc
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = API_VERSION
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-    return doc
+  # Report and error to the user
+  # (If anyone ever fixes Rails so it can set a http status "reason phrase",
+  #  rather than only a status code and having the web engine make up a 
+  #  phrase from that, we can also put the error message into the status
+  #  message. For now, rails won't let us)
+  def report_error(message)
+    render :nothing => true, :status => 400
+    # Todo: some sort of escaping of problem characters in the message
+    response.headers['Error'] = message

   end
 
   end
 

-  # extract authorisation credentials from headers, returns user = nil if none\r
+  # extract authorisation credentials from headers, returns user = nil if none

   private 
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
   private 
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 


@@ -59,7 +62,7 @@ class ApplicationController < ActionController::Base
     # only basic authentication supported
     if authdata and authdata[0] == 'Basic' 
       user, pass = Base64.decode64(authdata[1]).split(':')[0..1] 
     # only basic authentication supported
     if authdata and authdata[0] == 'Basic' 
       user, pass = Base64.decode64(authdata[1]).split(':')[0..1] 

-    end \r
+    end 

     return [user, pass] 
   end 
 
     return [user, pass] 
   end