Use cache store for sessions when memcached is not available

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 68da97dce58461b32f56aa8f942cf582b3ec94f2..ce0c5d67bb68d37945d0d42213e92d3ef1f08373 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
   require 'rexml/document'
 
   def sanitize(text)
-    Sanitize.clean(text, Sanitize::Config::OSM)
+    Sanitize.clean(text, Sanitize::Config::OSM).html_safe
   end
 
   def htmlize(text)
@@ -10,11 +10,15 @@ module ApplicationHelper
   end
 
   def linkify(text)
-    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
+    if text.html_safe?
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+    else
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+    end
   end
 
   def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
+    chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c|
       c < 127 ? c.chr : "&##{c.to_s};"
     end
 
@@ -37,16 +41,62 @@ module ApplicationHelper
     js << javascript_strings_for_key("javascripts")
     js << "</script>\n"
 
-    return js
+    return raw(js)
+  end
+
+  def style_rules
+    css = ""
+
+    css << ".hidden { display: none }";
+    css << ".hide_unless_logged_in { display: none }" unless @user;
+    css << ".hide_if_logged_in { display: none }" if @user;
+    css << ".hide_if_user_#{@user.id} { display: none }" if @user;
+    css << ".show_if_user_#{@user.id} { display: inline }" if @user;
+    css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
+
+    return content_tag(:style, css, :type => "text/css")
+  end
+
+  def if_logged_in(tag = :div, &block)
+    content_tag(tag, capture(&block), :class => "hide_unless_logged_in")
+  end
+
+  def if_not_logged_in(tag = :div, &block)
+    content_tag(tag, capture(&block), :class => "hide_if_logged_in")
+  end
+
+  def if_user(user, tag = :div, &block)
+    if user
+      content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")
+    end
+  end
+
+  def unless_user(user, tag = :div, &block)
+    if user
+      content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")
+    else
+      content_tag(tag, capture(&block))
+    end
+  end
+
+  def if_administrator(tag = :div, &block)
+    content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)
     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
+      response = OSM::Timer.timeout(4) do
+        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)}"
@@ -56,20 +106,22 @@ module ApplicationHelper
   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
+    image_tag user.image.url(:large), options
   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 
-    if user.image
-      image_tag url_for_file_column(user, "image"), options
+    image_tag user.image.url(:small), options
+  end
+
+  def preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor
+      @user.preferred_editor
     else
-      image_tag "anon_small.png", options
+      DEFAULT_EDITOR
     end
   end