cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into terms

Browse source 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
This commit is contained in:
Tom Hughes 2010-05-07 22:23:20 +01:00
commit 303e5d3eb9
36 changed files with 526 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/application_controller.rb
View file

@ -8,7 +8,14 @@ class ApplicationController < ActionController::Base
def authorize_web
if session[:user]
@user = User.find(session[:user], :conditions => {:visible => true})
@user = User.find(session[:user], :conditions => {:status => ["active", "confirmed", "suspended"]})
if @user.status == "suspended"
session[:user] = nil
session_expires_automatically
redirect_to :controller => "user", :action => "suspended"
end
elsif session[:token]
@user = User.authenticate(:token => session[:token])
session[:user] = @user.id

2
app/controllers/changeset_controller.rb
View file

@ -255,7 +255,7 @@ class ChangesetController < ApplicationController
conditions = conditions_nonempty
if params[:display_name]
user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
if user
if user.data_public? or user == @user

14
app/controllers/diary_entry_controller.rb
View file

@ -71,7 +71,7 @@ class DiaryEntryController < ApplicationController
def list
if params[:display_name]
@this_user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
@this_user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
if @this_user
@title = t 'diary_entry.list.user_title', :user => @this_user.display_name
@ -92,7 +92,7 @@ class DiaryEntryController < ApplicationController
@title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
:conditions => {
:users => { :visible => true },
:users => { :status => ["active", "confirmed"] },
:visible => true,
:language_code => params[:language]
},
@ -102,7 +102,7 @@ class DiaryEntryController < ApplicationController
@title = t 'diary_entry.list.title'
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
:conditions => {
:users => { :visible => true },
:users => { :status => ["active", "confirmed"] },
:visible => true
},
:order => 'created_at DESC',
@ -114,7 +114,7 @@ class DiaryEntryController < ApplicationController
request.format = :rss
if params[:display_name]
user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
if user
@entries = DiaryEntry.find(:all,
@ -133,7 +133,7 @@ class DiaryEntryController < ApplicationController
elsif params[:language]
@entries = DiaryEntry.find(:all, :include => :user,
:conditions => {
:users => { :visible => true },
:users => { :status => ["active", "confirmed"] },
:visible => true,
:language_code => params[:language]
},
@ -145,7 +145,7 @@ class DiaryEntryController < ApplicationController
else
@entries = DiaryEntry.find(:all, :include => :user,
:conditions => {
:users => { :visible => true },
:users => { :status => ["active", "confirmed"] },
:visible => true
},
:order => 'created_at DESC',
@ -157,7 +157,7 @@ class DiaryEntryController < ApplicationController
end
def view
user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
if user
@entry = DiaryEntry.find(:first, :conditions => {

2
app/controllers/trace_controller.rb
View file

@ -27,7 +27,7 @@ class TraceController < ApplicationController
# from display name, pick up user id if one user's traces only
display_name = params[:display_name]
if target_user.nil? and !display_name.blank?
target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
target_user = User.find(:first, :conditions => { :status => ["active", "confirmed"], :display_name => display_name })
if target_user.nil?
@title = t'trace.no_such_user.title'
@not_found_user = display_name

91
app/controllers/user_controller.rb
View file

@ -11,12 +11,12 @@ class UserController < ApplicationController
before_filter :require_allow_read_prefs, :only => [:api_details]
before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
before_filter :require_cookies, :only => [:login, :confirm]
before_filter :require_administrator, :only => [:activate, :deactivate, :hide, :unhide, :delete]
before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete]
before_filter :require_administrator, :only => [:set_status, :delete, :list]
before_filter :lookup_this_user, :only => [:set_status, :delete]
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'
@ -44,7 +44,7 @@ class UserController < ApplicationController
else
@user = User.new(params[:user])
@user.visible = true
@user.status = "pending"
@user.data_public = true
@user.description = "" if @user.description.nil?
@user.creation_ip = request.remote_ip
@ -89,9 +89,9 @@ class UserController < ApplicationController
set_locale
if @user.new_email.nil? or @user.new_email.empty?
flash.now[:notice] = t 'user.account.flash update success'
flash[:notice] = t 'user.account.flash update success'
else
flash.now[:notice] = t 'user.account.flash update success confirm needed'
flash[:notice] = t 'user.account.flash update success confirm needed'
begin
Notifier.deliver_email_confirm(@user, @user.tokens.create)
@ -99,6 +99,8 @@ class UserController < ApplicationController
# Ignore errors sending email
end
end
redirect_to :action => "account", :display_name => @user.display_name
end
else
if flash[:errors]
@ -121,7 +123,7 @@ class UserController < ApplicationController
@title = t 'user.lost_password.title'
if params[:user] and params[:user][:email]
user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
user = User.find_by_email(params[:user][:email], :conditions => {:status => ["pending", "active", "confirmed"]})
if user
token = user.tokens.create
@ -146,7 +148,7 @@ class UserController < ApplicationController
if params[:user]
@user.pass_crypt = params[:user][:pass_crypt]
@user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
@user.active = true
@user.status = "active"
@user.email_valid = true
if @user.save
@ -192,8 +194,10 @@ class UserController < ApplicationController
else
redirect_to :controller => 'site', :action => 'index'
end
elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
elsif User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
flash.now[:error] = t 'user.login.account not active'
elsif User.authenticate(:username => email_or_display_name, :password => pass, :suspended => true)
flash.now[:error] = t 'user.login.account suspended'
else
flash.now[:error] = t 'user.login.auth failure'
end
@ -226,7 +230,7 @@ class UserController < ApplicationController
token = UserToken.find_by_token(params[:confirm_string])
if token and !token.user.active?
@user = token.user
@user.active = true
@user.status = "active"
@user.email_valid = true
@user.save!
referer = token.referer
@ -251,7 +255,6 @@ class UserController < ApplicationController
@user = token.user
@user.email = @user.new_email
@user.new_email = nil
@user.active = true
@user.email_valid = true
if @user.save
flash[:notice] = t 'user.confirm_email.success'
@ -291,7 +294,7 @@ class UserController < ApplicationController
def make_friend
if params[:display_name]
name = params[:display_name]
new_friend = User.find_by_display_name(name, :conditions => {:visible => true})
new_friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
friend = Friend.new
friend.user_id = @user.id
friend.friend_user_id = new_friend.id
@ -317,7 +320,7 @@ class UserController < ApplicationController
def remove_friend
if params[:display_name]
name = params[:display_name]
friend = User.find_by_display_name(name, :conditions => {:visible => true})
friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
if @user.is_friends_with?(friend)
Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
@ -334,30 +337,9 @@ class UserController < ApplicationController
end
##
# activate a user, allowing them to log in
def activate
@this_user.update_attributes(:active => true)
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
##
# deactivate a user, preventing them from logging in
def deactivate
@this_user.update_attributes(:active => false)
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
##
# hide a user, marking them as logically deleted
def hide
@this_user.update_attributes(:visible => false)
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
##
# unhide a user, clearing the logically deleted flag
def unhide
@this_user.update_attributes(:visible => true)
# sets a user's status
def set_status
@this_user.update_attributes(:status => params[:status])
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
@ -367,14 +349,45 @@ class UserController < ApplicationController
@this_user.delete
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
##
# display a list of users matching specified criteria
def list
if request.post?
ids = params[:user].keys.collect { |id| id.to_i }
User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
User.update_all("status = 'deleted'", :id => ids) if params[:hide]
redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
else
conditions = Hash.new
conditions[:status] = params[:status] if params[:status]
conditions[:creation_ip] = params[:ip] if params[:ip]
@user_pages, @users = paginate(:users,
:conditions => conditions,
:order => :id,
:per_page => 50)
end
end
private
##
# require that the user is a administrator, or fill out a helpful error message
# and return them to the user page.
def require_administrator
unless @user.administrator?
if @user and not @user.administrator?
flash[:error] = t('user.filter.not_an_administrator')
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
if params[:display_name]
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
else
redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
end
elsif not @user
redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
end
end

2
app/models/diary_entry.rb
View file

@ -8,7 +8,7 @@ class DiaryEntry < ActiveRecord::Base
has_many :visible_comments, :class_name => "DiaryComment",
:include => :user,
:conditions => {
:users => { :visible => true },
:users => { :status => ["active", "confirmed" ] },
:visible => true
},
:order => "diary_comments.id"

15
app/models/spam_observer.rb Normal file
View file

@ -0,0 +1,15 @@
class SpamObserver < ActiveRecord::Observer
observe User, DiaryEntry, DiaryComment
def after_save(record)
case
when record.is_a?(User): user = record
when record.is_a?(DiaryEntry): user = record.user
when record.is_a?(DiaryComment): user = record.user
end
if user.status == "active" and user.spam_score > APP_CONFIG['spam_threshold']
user.update_attributes(:status => "suspended")
end
end
end

46
app/models/user.rb
View file

@ -3,10 +3,11 @@ class User < ActiveRecord::Base
has_many :traces, :conditions => { :visible => true }
has_many :diary_entries, :order => 'created_at DESC'
has_many :diary_comments, :order => 'created_at DESC'
has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC'
has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC'
has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC'
has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')"
has_many :tokens, :class_name => "UserToken"
has_many :preferences, :class_name => "UserPreference"
has_many :changesets
@ -55,8 +56,11 @@ class User < ActiveRecord::Base
user = token.user if token
end
if user
user = nil unless user.visible? and (user.active? or options[:inactive])
if user and
( user.status == "deleted" or
( user.status == "pending" and not options[:pending] ) or
( user.status == "suspended" and not options[:suspended] ) )
user = nil
end
token.update_attribute(:expiry, 1.week.from_now) if token and user
@ -106,7 +110,8 @@ class User < ActiveRecord::Base
bounds = gc.bounds(radius)
sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
nearby = User.find(:all,
:conditions => ["id != ? AND visible = ? AND data_public = ? AND #{sql_for_distance} <= ?", id, true, true, radius], :order => sql_for_distance, :limit => num)
:conditions => ["id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius],
:order => sql_for_distance, :limit => num)
else
nearby = []
end
@ -128,6 +133,18 @@ class User < ActiveRecord::Base
return false
end
##
# returns true if a user is visible
def visible?
["pending","active","confirmed"].include? self.status
end
##
# returns true if a user is active
def active?
["active","confirmed"].include? self.status
end
##
# returns true if the user has the moderator role, false otherwise
def moderator?
@ -153,8 +170,9 @@ class User < ActiveRecord::Base
active_blocks.detect { |b| b.needs_view? }
end
##
# delete a user - leave the account but purge most personal data
def delete
self.active = false
self.display_name = "user_#{self.id}"
self.description = ""
self.home_lat = nil
@ -162,8 +180,24 @@ class User < ActiveRecord::Base
self.image = nil
self.email_valid = false
self.new_email = nil
self.visible = false
self.status = "deleted"
self.save
end
##
# return a spam score for a user
def spam_score
changeset_score = self.changesets.find(:all, :limit => 10).length * 50
trace_score = self.traces.find(:all, :limit => 10).length * 50
diary_entry_score = self.diary_entries.inject(0) { |s,e| s += OSM.spam_score(e.body) }
diary_comment_score = self.diary_comments.inject(0) { |s,e| s += OSM.spam_score(e.body) }
score = OSM.spam_score(self.description) * 2
score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0
score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0
score -= changeset_score
score -= trace_score
return score.to_i
end
end

2
app/models/user_sweeper.rb
View file

@ -14,7 +14,7 @@ private
def expire_cache_for(old_record, new_record)
if old_record and
(new_record.nil? or
old_record.visible != new_record.visible or
old_record.visible? != new_record.visible? or
old_record.display_name != new_record.display_name)
old_record.diary_entries.each do |entry|
expire_action(:controller => 'diary_entry', :action => 'view', :display_name => old_record.display_name, :id => entry.id)

27
app/views/user/_user.html.erb Normal file
View file

@ -0,0 +1,27 @@
<% cl = cycle('table0', 'table1') %>
<tr class="<%= cl %>">
<td>
<%= user_thumbnail(user) %>
</td>
<td>
<p>
<% if user.creation_ip %>
<%= t 'user.list.summary',
:name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
:ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
:date => l(user.creation_time, :format => :friendly)
%>
<% else %>
<%= t 'user.list.summary_no_ip',
:name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
:date => l(user.creation_time, :format => :friendly)
%>
<% end %>
</p>
<%= htmlize(user.description) %>
</td>
<td>
<%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>
</td>
</tr>

44
app/views/user/list.html.erb Normal file
View file

@ -0,0 +1,44 @@
<% @title = t('user.list.title') %>
<h1><%= t('user.list.heading') %></h1>
<% unless @users.empty? %>
<% form_tag do %>
<%= hidden_field_tag :status, params[:status] if params[:status] %>
<%= hidden_field_tag :ip, params[:ip] if params[:ip] %>
<%= hidden_field_tag :page, params[:page] if params[:page] %>
<table id="user_list">
<tr>
<td colspan="2">
<%= t 'user.list.showing',
:page => @user_pages.current_page.number,
:first_item => @user_pages.current_page.first_item,
:last_item => @user_pages.current_page.last_item,
:items => @user_pages.item_count,
:count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
%>
<% if @user_pages.page_count > 1 %>
| <%= pagination_links_each(@user_pages, {}) { |n| link_to n, params.merge(:page => n) } %>
<% end %>
</td>
<td>
<%=
check_box_tag("user_all", "1", false, :onchange => update_page do |page|
@users.each do |user|
page << "$('user_#{user.id}').checked = $('user_all').checked;"
end
end)
%>
</td>
</tr>
<%= render :partial => 'user', :collection => @users %>
</table>
<div id="user_list_actions">
<%= submit_tag t('user.list.confirm'), :name => "confirm" %>
<%= submit_tag t('user.list.hide'), :name => "hide" %>
</div>
<% end %>
<% else %>
<p><%= t "user.list.empty" %></p>
<% end %>

5
app/views/user/suspended.html.erb Normal file
View file

@ -0,0 +1,5 @@
<% @title = t "user.suspended.title" %>
<h1><%= t "user.suspended.heading" %></h1>
<%= t "user.suspended.body", :webmaster => "webmaster@openstreetmap.org" %>

25
app/views/user/view.html.erb
View file

@ -59,19 +59,20 @@
<% end %>
<% if @user and @user.administrator? %>
<br/>
<% if @this_user.active? %>
<%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'deactivate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% else %>
<%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'activate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% if ["active", "confirmed"].include? @this_user.status %>
<%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'set_status', :status => 'pending', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% elsif ["pending"].include? @this_user.status %>
<%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% end %>
|
<% if @this_user.visible? %>
<%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'hide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
|
<%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% else %>
<%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'unhide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% if ["active", "suspended"].include? @this_user.status %>
<%= link_to t('user.view.confirm_user'), {:controller => 'user', :action => 'set_status', :status => 'confirmed', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% end %>
<% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %>
<%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'set_status', :status => 'deleted', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% else %>
<%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'set_status', :status => 'active', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %> |
<% end %>
<%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
<% end %>
</div>
@ -80,6 +81,8 @@
<% if @user and @user.administrator? %>
<p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>
<p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
<p><b><%= t 'user.view.status' %></b> <%= @this_user.status.capitalize %></p>
<p><b><%= t 'user.view.spam score' %></b> <%= @this_user.spam_score %></p>
<% end %>
<h3><%= t 'user.view.description' %></h3>