Replace swfobject 1.5 with swfobject 2

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

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index 3b56c257be32b822864b08f984c959d8f549fc27..d02313497ef61408eb1667852c95abaa4e386366 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -1,6 +1,8 @@
 # Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
   before_filter :authorize
 # Update and read user preferences, which are arbitrayr key/val pairs
 class UserPreferenceController < ApplicationController
   before_filter :authorize

+  before_filter :require_allow_read_prefs, :only => [:read_one, :read]
+  before_filter :require_allow_write_prefs, :except => [:read_one, :read]

 
   def read_one
     pref = UserPreference.find(@user.id, params[:preference_key])
 
   def read_one
     pref = UserPreference.find(@user.id, params[:preference_key])


@@ -52,8 +54,11 @@ class UserPreferenceController < ApplicationController
 
   # update the entire set of preferences
   def update
 
   # update the entire set of preferences
   def update

-    p = XML::Parser.new
-    p.string = request.raw_post
+    begin
+      p = XML::Parser.string(request.raw_post)
+    rescue LibXML::XML::Error, ArgumentError => ex
+      raise OSM::APIBadXMLError.new("preferences", xml, ex.message)
+    end

     doc = p.parse
 
     prefs = []
     doc = p.parse
 
     prefs = []