small typeo

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d15604c751209bf140f0affde1a8e9b8c13dbbbb..fd6ea786675a3f9e0d7472298eb3fb5948bcae63 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -10,18 +10,18 @@ class ApplicationController < ActionController::Base
     redirect_to :controller => 'user', :action => 'login' unless @user
   end
 
-  def authorize(realm='Web Password', errormessage="Could't authenticate you") \r
-    username, passwd = get_auth_data # parse from headers\r
+  def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 
+    username, passwd = get_auth_data # parse from headers
     # 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 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 
@@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
     response.headers['Error'] = message
   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 
@@ -60,7 +60,7 @@ class ApplicationController < ActionController::Base
     # 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