Merge branch 'master' into openid

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c5df676757d1ca761f13453a463aaf16f67eee5d..5fa021bcf4e695c130c2e4094fe1ecb2ccdb68cc 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,10 @@
 module ApplicationHelper
   require 'rexml/document'
 
+  def sanitize(text)
+    Sanitize.clean(text, Sanitize::Config::OSM)
+  end
+
   def htmlize(text)
     return linkify(sanitize(simple_format(text)))
   end
@@ -40,20 +44,47 @@ module ApplicationHelper
     zoom = zoom || 14
     language = language || request.user_preferred_languages.join(',')
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
-    response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
 
-    if result = response.get_text("reversegeocode/result")
+    begin
+      Timeout::timeout(4) do
+        response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+      end
+    rescue Exception
+      response = nil
+    end
+
+    if response and result = response.get_text("reversegeocode/result")
       result.to_s
     else
       "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
     end
   end
 
+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_large.png", options
+    end
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_small.png", options
+    end
+  end
+
 private
 
   def javascript_strings_for_key(key)
     js = ""
-    value = t(key, :locale => "en")
+    value = I18n.t(key, :locale => "en")
 
     if value.is_a?(String)
       js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"