Merge branch 'master' into terms

Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css

diff --cc app/controllers/user_controller.rb
index 43a6db790bc8e25375f15bf0ef57778b31d9dc0f,222840a0610a60ed1117594c65e746eca7742ef5..8fdb89b227c628c78807a87535d42c5f961edb6e
--- 1/app/controllers/user_controller.rb
--- 2/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@@ -16,24 -16,8 +16,24 @@@ class UserController < ApplicationContr
  
    filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
  
-   cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+   cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
  
 +  def terms
 +    @title = t 'user.new.title'
 +    @user = User.new(params[:user])
 +
 +    @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || APP_CONFIG['default_legale']
 +    @text = OSM.legal_text_for_country(@legale)
 +
 +    if request.xhr?
 +      render :update do |page|
 +        page.replace_html "contributorTerms", :partial => "terms"
 +      end
 +    elsif @user.invalid?
 +      render :action => 'new'
 +    end
 +  end
 +
    def save
      @title = t 'user.new.title'
  

diff --cc config/application.yml
index 7b2c603f087ae364e24123293dd238442caa0c6f,a1fbd887a4e81410b765d2c86a0088c6ecfd4e61..d405709657166f85a59903e359d1da4269dbc199
--- 1/config/application.yml
--- 2/config/application.yml
+++ b/config/application.yml
@@@ -22,8 -22,8 +22,10 @@@ standard_settings: &standard_setting
    # Quova authentication details
    #quova_username: ""
    #quova_password: ""
+   # Spam threshold
+   spam_threshold: 50
 +  # Default legale (jurisdiction location) for contributor terms
 +  default_legale: GB
   
  development:
    <<: *standard_settings

diff --cc config/environment.rb
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc lib/osm.rb
index b5f3cb1aa4fa92aea0c32133c865c27b90615c00,46b90447781b23938a6cc3820403381c8ba30272..c92655aeea207b48393645e6bb9aeb4bcf478c4c
--- 1/lib/osm.rb
--- 2/lib/osm.rb
+++ b/lib/osm.rb
@@@ -508,10 -499,24 +509,30 @@@ module OS
      return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
    end
  
- 
+   # Return a spam score for a chunk of text
+   def self.spam_score(text)
+     link_count = 0
+     link_size = 0
+ 
+     doc = Nokogiri::HTML(text)
+ 
+     if doc.content.length > 0
+       doc.xpath("//a").each do |link|
+         link_count += 1
+         link_size += link.content.length
+       end
+ 
+       link_proportion = link_size.to_f / doc.content.length.to_f
+     else
+       link_proportion = 0
+     end
+ 
+     return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
+   end
++
 +  def self.legal_text_for_country(country_code)
 +    file_name = File.join(RAILS_ROOT, "config", "legales", country_code.to_s + ".yml")
 +    file_name = File.join(RAILS_ROOT, "config", "legales", APP_CONFIG['default_legale'] + ".yml") unless File.exist? file_name
 +    YAML::load_file(file_name)
 +  end
  end

diff --cc public/stylesheets/common.css
index 69bac58b5261ddd2ef93ada9d251a1a943e10aed,73f0fb788b1e4391c614c6ed4f78d28b702e2b79..2590c2d5f655a3d456bb320c7447643884e9b83a
--- 1/public/stylesheets/common.css
--- 2/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@@ -562,47 -562,27 +562,68 @@@ hr 
    color: gray;
  }
  
+ /* Rules for the user list */
+ 
+ #user_list {
+   width: 100%;
+   font-size: small;
+ }
+ 
+ #user_list tr {
+   vertical-align: center;
+ }
+ 
+ #user_list p {
+   margin-top: 0px;
+   margin-bottom: 0px;
+ }
+ 
+ #user_list_actions {
+   float: right;
+   margin-top: 10px;
+ }
+ 
 +/* Rules for the account confirmation page */
 +
 +div#contributorTerms {
 +  border: 1px solid black;
 +  padding: 4px;
 +  overflow: auto;
 +  width: 80%;
 +  height: 60%;
 +}
 +
 +div#contributorTerms p#first {
 +  margin-top: 0px;
 +}
 +
 +div#contributorTerms p#last {
 +  margin-bottom: 0px;
 +}
 +
 +div#contributorTerms ol {
 +  margin-bottom: 0px;
 +}
 +
 +div#contributorTerms img {
 +  display: block;
 +  margin-left: auto;
 +  margin-right: auto;
 +  margin-top: 10%;
 +}
 +
 +form#termsForm {
 +  width: 80%;
 +}
 +
 +form#termsForm div#buttons {
 +  float: right;
 +}
 +
 +form#termsForm input#agree {
 +  margin-left: 50px;
 +}
 +
  /* Rules for the account settings page */
  
  #accountForm td {