typo 5.2 → 5.2.98

data/app/helpers/admin/content_helper.rb

@@ -38,4 +38,70 @@ module Admin::ContentHelper
     end
     checkbox_for_collection(options, selected)
   end
+  
+  def auto_complete_result(entries, field, phrase = nil)
+    return unless entries
+    items = entries.map { |entry| content_tag("li", phrase ? highlight(entry[field], phrase) : h(entry[field])) }
+    content_tag("ul", items.uniq)
+  end
+  
+  def auto_complete_field(field_id, options = {})
+    function =  "var #{field_id}_auto_completer = new Ajax.Autocompleter("
+    function << "'#{field_id}', "
+    function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
+    function << "'#{url_for(options[:url])}'"
+    
+    js_options = {}
+    js_options[:tokens] = array_or_string_for_javascript(options[:tokens]) if options[:tokens]
+    js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
+    js_options[:indicator]  = "'#{options[:indicator]}'" if options[:indicator]
+    js_options[:select]     = "'#{options[:select]}'" if options[:select]
+    js_options[:paramName]  = "'#{options[:param_name]}'" if options[:param_name]
+    js_options[:frequency]  = "#{options[:frequency]}" if options[:frequency]
+    js_options[:method]     = "'#{options[:method].to_s}'" if options[:method]
+
+    { :after_update_element => :afterUpdateElement, 
+      :on_show => :onShow, :on_hide => :onHide, :min_chars => :minChars }.each do |k,v|
+      js_options[v] = options[k] if options[k]
+    end
+
+    function << (', ' + options_for_javascript(js_options) + ')')
+
+    javascript_tag(function)
+  end
+  
+  def text_field_with_auto_complete(object, method, tag_options = {}, completion_options = {})
+    (completion_options[:skip_style] ? "" : auto_complete_stylesheet) +
+    text_field(object, method, tag_options) +
+    content_tag("div", "", :id => "#{object}_#{method}_auto_complete", :class => "auto_complete") +
+    auto_complete_field("#{object}_#{method}", { :url => { :action => "auto_complete_for_#{object}_#{method}" } }.update(completion_options))
+  end
+
+  def auto_complete_stylesheet
+    content_tag('style', <<-EOT, :type => Mime::CSS)
+      div.auto_complete {
+        width: 350px;
+        background: #fff;
+      }
+      div.auto_complete ul {
+        border:1px solid #888;
+        margin:0;
+        padding:0;
+        width:100%;
+        list-style-type:none;
+      }
+      div.auto_complete ul li {
+        margin:0;
+        padding:3px;
+      }
+      div.auto_complete ul li.selected {
+        background-color: #ffb;
+      }
+      div.auto_complete ul strong.highlight {
+        color: #800; 
+        margin:0;
+        padding:0;
+      }
+    EOT
+  end
 end

data/app/helpers/admin/settings_helper.rb

@@ -15,9 +15,9 @@ module Admin::SettingsHelper
 	end
 	options
   end
-  
-  def sweep_cache_link
-    cache = this_blog.cache_option == "caches_action_with_params" ? "sweep" : "sweep_html"
-    link_to _("Sweep cache"), { :controller => "admin/cache",    :action => cache }
+
+  def robot_writable?
+    File.writable?"#{RAILS_ROOT}/public/robots.txt"
   end
-end
+
+end

data/app/helpers/application_helper.rb

@@ -18,7 +18,7 @@ module ApplicationHelper
     anchor = "##{anchor}" if anchor
     case item
     when Article
-      "<a href=\"#{article_path(item)}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
+      "<a href=\"#{item.permalink_url}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
     else
       "<a href=\"#{item.permalink_url}#{anchor}\" rel=\"#{nofollow}\" class=\"#{style}\">#{title}</a>"
     end
@@ -115,27 +115,9 @@ module ApplicationHelper
     text.strip_html
   end
 
-  def admin_tools_for(model)
-    type = model.class.to_s.downcase
-    tag = []
-    tag << content_tag("div",
-      link_to_remote('nuke', {
-          :url => feedback_path(model.id),
-          :method => :delete,
-          :confirm => _("Are you sure you want to delete this %s?", "#{type}" )
-        }, :class => "admintools") <<
-      link_to('edit', {
-        :controller => "admin/#{type.pluralize}",
-        :article_id => model.article.id,
-        :action => "edit", :id => model
-        }, :class => "admintools"),
-      :id => "admin_#{type}_#{model.id}", :style => "display: none")
-    tag.join(" | ")
-  end
-
   def onhover_show_admin_tools(type, id = nil)
     tag = []
-    tag << %{ onmouseover="if (getCookie('is_admin') == 'yes') { Element.show('admin_#{[type, id].compact.join('_')}'); }" }
+    tag << %{ onmouseover="if (getCookie('typo_user_profile') == 'admin') { Element.show('admin_#{[type, id].compact.join('_')}'); }" }
     tag << %{ onmouseout="Element.hide('admin_#{[type, id].compact.join('_')}');" }
     tag
   end
@@ -208,16 +190,17 @@ module ApplicationHelper
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.blank? }
   #{ meta_tag 'description', @description unless @description.blank? }
+  #{ meta_tag 'robots', 'noindex, follow' unless @noindex.nil? }
   <meta name="generator" content="Typo #{TYPO_VERSION}">
   #{ meta_tag 'keywords', @keywords unless @keywords.blank? }
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="#{ url_for :controller => '/xml', :action => 'rsd' }" />
-  <link rel="alternate" type="application/atom+xml" title="Atom" href="#{ @auto_discovery_url_atom }" />
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="#{ @auto_discovery_url_rss }" />
+  <link rel="alternate" type="application/atom+xml" title="Atom" href="#{ feed_atom }" />
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="#{ feed_rss }" />
   #{ stylesheet_link_tag 'coderay.css', :media => 'all' }
   #{ stylesheet_link_tag 'user-styles.css', :media => 'all' }
   #{ javascript_include_tag "lang/" + Localization.lang.to_s }
   #{ javascript_include_tag "cookies" }
-  #{javascript_tag "window._token = '#{form_authenticity_token}'"}
+  #{ javascript_tag "window._token = '#{form_authenticity_token}'"}
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }
   #{ javascript_include_tag "typo" }
@@ -227,4 +210,13 @@ module ApplicationHelper
     HTML
     ).chomp
   end
+
+  def feed_atom
+    url_for(:format => :atom, :only_path => false)
+  end
+
+  def feed_rss
+    url_for(:format => :rss, :only_path => false)
+  end
+
 end

data/app/helpers/articles_helper.rb

@@ -1,2 +1,17 @@
 module ArticlesHelper
+  def feed_atom
+    if params[:action] == 'search'
+      url_for(:only_path => false,:format => :atom, :q => params[:q])
+    else
+      super
+    end
+  end
+
+  def feed_rss
+    if params[:action] == 'search'
+      url_for(:only_path => false,:format => :rss, :q => params[:q])
+    else
+      super
+    end
+  end
 end

data/app/helpers/redirect_helper.rb

@@ -1,2 +1,13 @@
 module RedirectHelper
+  def template_path
+    'articles'
+  end
+
+  def feed_rss
+    @article.feed_url(:rss20)
+  end
+
+  def feed_atom
+    @article.feed_url(:atom)
+  end
 end

data/app/helpers/sidebar_helper.rb

@@ -3,7 +3,6 @@ module SidebarHelper
     (sidebars.blank? ? Sidebar.find(:all, :order => 'active_position ASC') : sidebars).inject('') do |acc, sb|
       @sidebar = sb
       sb.parse_request(contents, params)
-      controller.response.lifetime = sb.lifetime if sb.lifetime
       acc + render_sidebar(sb)
     end
   end

data/app/models/article.rb

@@ -109,25 +109,43 @@ class Article < Content
   }
 
   def stripped_title
-    self.title.tr(FROM, TO).gsub(/<[^>]*>/, '').to_url
+    CGI.escape(self.title.tr(FROM, TO).gsub(/<[^>]*>/, '').to_url)
+  end
+
+  def year_url
+    published_at.year.to_s
+  end
+
+  def month_url
+    sprintf("%.2d", published_at.month)
+  end
+
+  def day_url
+    sprintf("%.2d", published_at.day)
+  end
+
+  def title_url
+    permalink.to_s
   end
 
   def permalink_url_options(nesting = false)
-    {:year                         => published_at.year,
-     :month                        => sprintf("%.2d", published_at.month),
-     :day                          => sprintf("%.2d", published_at.day),
-     :controller                   => 'articles',
-     :action                       => 'show',
-     (nesting ? :article_id : :id) => permalink}
+    format_url = blog.permalink_format.dup
+    format_url.gsub!('%year%', year_url)
+    format_url.gsub!('%month%', month_url)
+    format_url.gsub!('%day%', day_url)
+    format_url.gsub!('%title%', title_url)
+    if format_url[0,1] == '/'
+      format_url[1..-1]
+    else
+      format_url
+    end
   end
 
   def permalink_url(anchor=nil, only_path=true)
     @cached_permalink_url ||= {}
 
     @cached_permalink_url["#{anchor}#{only_path}"] ||= \
-      blog.with_options(permalink_url_options) do |b|
-        b.url_for(:anchor => anchor, :only_path => only_path)
-      end
+      blog.url_for(permalink_url_options, :anchor => anchor, :only_path => only_path)
   end
 
   def param_array
@@ -148,11 +166,32 @@ class Article < Content
   end
 
   def trackback_url
-    blog.url_for(permalink_url_options(true).merge(:controller => 'trackbacks', :action => 'index'))
+    blog.url_for("trackbacks?article_id=#{self.id}", :only_path => true)
+  end
+
+  def permalink_by_format(format=nil)
+    if format.nil?
+      permalink_url
+    elsif format.to_sym == :rss
+      feed_url(:rss)
+    elsif format.to_sym == :atom
+      feed_url(:atom)
+    else
+      raise UnSupportedFormat
+    end
+  end
+
+  def comment_url
+    blog.url_for("comments?article_id=#{self.id}")
+  end
+
+  def preview_comment_url
+    blog.url_for("comments/preview?article_id=#{self.id}")
   end
 
   def feed_url(format = :rss20)
-    blog.url_for(:controller => 'xml', :action => 'feed', :type => 'article', :format => format, :id => id)
+    format_extension = format.to_s.gsub(/\d/,'')
+    permalink_url + ".#{format_extension}"
   end
 
   def edit_url
@@ -177,7 +216,7 @@ class Article < Content
   def really_send_pings(serverurl = blog.base_url, articleurl = nil)
     return unless blog.send_outbound_pings
 
-    articleurl ||= permalink_url(nil, false)
+    articleurl ||= permalink_url(nil)
 
     weblogupdatesping_urls = blog.ping_urls.gsub(/ +/,'').split(/[\n\r]+/)
     pingback_or_trackback_urls = self.html_urls
@@ -223,57 +262,30 @@ class Article < Content
     end
   end
 
-  # Find all articles on a certain date
-  def self.find_all_by_date(year, month = nil, day = nil)
-    if !year.blank?
-      find_published(:all,
-                     :conditions => { :published_at =>
-                       time_delta(year,month,day) })
-    else
-      find_published(:all)
-    end
-  end
-
-  # Find one article on a certain date
-
-  def self.find_by_date(year, month, day)
-    find_all_by_date(year, month, day).first
-  end
-
   def self.find_by_published_at
     super(:published_at)
   end
 
-  def self.date_from(params_hash)
-    params_hash[:article_year] \
-      ? params_hash.values_at(:article_year, :article_month, :article_day, :article_id) \
-      : params_hash.values_at(:year, :month, :day, :id)
-  end
-
   # Finds one article which was posted on a certain date and matches the supplied dashed-title
-  def self.find_by_permalink(year, month=nil, day=nil, title=nil)
-    unless month
-      case year
-      when Hash
-        year, month, day, title = date_from(year)
-      when Array
-        year, month, day, title = year
-      end
+  # params is a Hash
+  def self.find_by_permalink(params)
+    date_range = self.time_delta(params[:year], params[:month], params[:day])
+    req_params = {}
+    if params[:title]
+      req_params[:permalink] = params[:title]
     end
-    date_range = self.time_delta(year, month, day)
-    find_published(:first,
-                   :conditions => { :permalink => title,
-                                    :published_at => date_range }) \
-      or raise ActiveRecord::RecordNotFound
+
+    if date_range
+      req_params[:published_at] = date_range
+    end
+    return nil if req_params.empty? # no search if no params send
+
+    find_published(:first, :conditions => req_params) or raise ActiveRecord::RecordNotFound
   end
 
   def self.find_by_params_hash(params = {})
-    params[:id] ||= params[:article_id]
-    if params[:id]
-      find_by_permalink(params)
-    else
-      find_by_date(*date_from(params))
-    end
+    params[:title] ||= params[:article_id]
+    find_by_permalink(params)
   end
 
   # Fulltext searches the body of published articles
@@ -313,6 +325,10 @@ class Article < Content
     !(allow_comments? && in_feedback_window?)
   end
 
+  def pings_closed?
+    !(allow_pings? && in_feedback_window?)
+  end
+
   # check if time to comment is open or not
   def in_feedback_window?
     self.blog.sp_article_auto_close.zero? ||
@@ -539,7 +555,8 @@ class Article < Content
     self.notify_users.uniq!
   end
 
-  def self.time_delta(year, month = nil, day = nil)
+  def self.time_delta(year = nil, month = nil, day = nil)
+    return nil if year.nil? && month.nil? && day.nil?
     from = Time.mktime(year, month || 1, day || 1)
 
     to = from.next_year

data/app/models/blog.rb

@@ -68,7 +68,7 @@ class Blog < CachedModel
   setting :ping_urls,                  :string, "http://blogsearch.google.com/ping/RPC2\nhttp://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
   setting :send_outbound_pings,        :boolean, true
   setting :email_from,                 :string, 'typo@example.com'
-  setting :editor,                     :integer, 2
+  setting :editor,                     :integer, 'visual'
   setting :cache_option,               :string, 'caches_page'
   setting :allow_signup,               :integer, 0
 
@@ -76,11 +76,18 @@ class Blog < CachedModel
   setting :meta_description,           :string, ''
   setting :meta_keywords,              :string, ''
   setting :google_analytics,           :string, ''
+  setting :feedburner_url,             :string, ''
   setting :rss_description,            :boolean, false
-  
+  setting :permalink_format,           :string, '/%year%/%month%/%day%/%title%'
+  setting :robots,                     :string, ''
+  setting :index_categories,           :boolean, true
+  setting :index_tags,                 :boolean, true
   #deprecation warning for plugins removal
   setting :deprecation_warning,        :integer, 1
 
+
+  validate :permalink_has_identifier
+
   def initialize(*args)
     super
     # Yes, this is weird - PDC
@@ -102,16 +109,17 @@ class Blog < CachedModel
   def self.default
     find(:first, :order => 'id')
   rescue
-    logger.warn 'You have not Blog install.'
+    logger.warn 'You have no blog installed.'
     nil
   end
 
+  # In settings with :article_id
   def ping_article!(settings)
     unless global_pings_enabled? && settings.has_key?(:url) && settings.has_key?(:article_id)
       throw :error, "Invalid trackback or trackbacks not enabled"
     end
     settings[:blog_id] = self.id
-    article = requested_article(settings)
+    article = Article.find(settings[:article_id])
     unless article.allow_pings?
       throw :error, "Trackback not saved"
     end
@@ -139,9 +147,14 @@ class Blog < CachedModel
   #
   # It also uses our new RouteCache, so repeated URL generation requests should be
   # fast, as they bypass all of Rails' route logic.
-  def url_for(options = {}, *extra_params)
+  def url_for(options = {}, extra_params = {})
     case options
-    when String then options # They asked for 'url_for "/some/path"', so return it unedited.
+    when String
+      url_generated = ''
+      url_generated = self.base_url if extra_params[:only_path]
+      url_generated += "/#{options}" # They asked for 'url_for "/some/path"', so return it unedited.
+      url_generated += "##{extra_params[:anchor]}" if extra_params[:anchor]
+      url_generated
     when Hash
       unless RouteCache[options]
         options.reverse_merge!(:only_path => true, :controller => '',
@@ -208,10 +221,6 @@ class Blog < CachedModel
     Article.find_by_params_hash(params)
   end
 
-  def requested_articles(params)
-    Article.find_all_by_date(*params.values_at(:year, :month, :day))
-  end
-
   def articles_matching(query, args={})
     Article.search(query, args)
   end
@@ -222,5 +231,17 @@ class Blog < CachedModel
       ? {} \
       : {:limit => limit}
   end
+
+  def permalink_has_identifier
+    unless permalink_format =~ /(%year%|%month%|%day%|%title%)/
+      errors.add(:permalink_format, _('You need a Format of permalink with an identifier : %%month%%, %%year%%, %%day%%, %%title%%'))
+    end
+
+    # A permalink can be finish by .atom or .rss. it's reserved to feed
+    if permalink_format =~ /\.(atom|rss)$/
+      errors.add(:permalink_format, _("Can't finish by .rss or .atom. It's reserved to be use by feed"))
+    end
+  end
+
 end