Force new users to enter their email address twice to try and avoid so

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 97d551776b92809f8ac91e22fde49bce31acd690..d3f1ce7f65808dee854c4407b3fe4dc952739e1f 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,7 +1,11 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  after_filter :compress_output

 
   def create
     if request.put?
 
   def create
     if request.put?


@@ -9,67 +13,91 @@ class NodeController < ApplicationController
 
       if node
         node.user_id = @user.id
 
       if node
         node.user_id = @user.id

-        if node.save_with_history
-
-          render :text => node.id
-        else
-          render :text => 'truesrgtsrtfgsar', :status => 500
-#          render :nothing => true, :status => 500
-        end
-        return
+        node.visible = true
+        node.save_with_history!

 
 

+        render :text => node.id.to_s, :content_type => "text/plain"

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :bad_request

       end
       end

+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-
-          render :text => 'FFFFFFFFFF ', :status => 500
-#    render :nothing => true, :status => 500 # something went very wrong

   end
 
   end
 

-  def rest
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
-      return
-    end
-
-    node = Node.find(params[:id])
-
-    case request.method
-
-    when :get
-      render :text => node.to_xml.to_s
-      return
-
-    when :delete
+  def read
+    begin
+      node = Node.find(params[:id])

 
       if node.visible
 
       if node.visible

-        node.visible = 0
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+       else
+        render :text => "", :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end

 
 

-        node.save_with_history
+  def update
+    begin
+      node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
+
+      if new_node and new_node.id == node.id
+        node.user_id = @user.id
+        node.latitude = new_node.latitude 
+        node.longitude = new_node.longitude
+        node.tags = new_node.tags
+        node.visible = true
+        node.save_with_history!

 
         render :nothing => true
       else
 
         render :nothing => true
       else

-        render :nothing => true, :status => 410
+        render :nothing => true, :status => :bad_request

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end

 
 

-    when :put
+  def delete
+    begin
+      node = Node.find(params[:id])

 
 

-      new_node = Node.from_xml(request.raw_post)
-
-      new_node.timestamp = Time.now
-      new_node.user_id = @user.id
+      if node.visible
+        if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
+          render :text => "", :status => :precondition_failed
+        elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
+          render :text => "", :status => :precondition_failed
+        else
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history!

 
 

-      if node.id == new_node.id and new_node.save_with_history
-        render :text => node.id
+          render :nothing => true
+        end

       else
       else

-        render :nothing => true, :status => 500
+        render :text => "", :status => :gone

       end
       end

-      return
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

-

   end
 
   end
 

+  def nodes
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
+
+    if ids.length > 0
+      doc = OSM::API.new.get_xml_doc

 
 

+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
+  end

 end
 end