typo 5.2 → 5.2.98

data/app/controllers/comments_controller.rb

@@ -1,24 +1,32 @@
 class CommentsController < FeedbackController
   before_filter :check_request_type, :only => [:create]
+  before_filter :get_article, :only => [:create, :preview]
 
   def create
     @comment = @article.with_options(new_comment_defaults) do |art|
       art.add_comment(params[:comment].symbolize_keys)
     end
 
+    unless current_user.nil? or session[:user_id].nil?
+      # maybe useless, but who knows ?
+      if current_user.id == session[:user_id]
+        @comment.user_id = current_user.id
+      end
+    end
+
     set_comment_cookies
 
     if @comment.save
       if request.xhr?
         render :partial => '/articles/comment', :object => @comment
       else
-        redirect_to article_path(@article)
+        redirect_to @article.permalink_url
       end
     else
       if request.xhr?
         render :partial => '/articles/comment_failed', :object => @comment
       else
-        redirect_to article_path(@article)
+        redirect_to @article.permalink_url
       end      
     end
   end
@@ -36,7 +44,7 @@ class CommentsController < FeedbackController
     set_headers
     @comment = Comment.new(params[:comment])
 
-    unless Article.find_by_params_hash(params).comments_closed?
+    unless @article.comments_closed?
       render :template => 'articles/comment_preview'
     else
       render :text => 'Comment are closed'
@@ -48,7 +56,7 @@ class CommentsController < FeedbackController
   def get_feedback
     @comments = \
       if params[:article_id]
-        Article.find_by_params_hash(params).published_comments
+        Article.find(params[:article_id]).published_comments
       else
         Comment.find_published(:all, this_blog.rss_limit_params.merge(:order => 'created_at DESC'))
       end
@@ -61,7 +69,7 @@ class CommentsController < FeedbackController
       :user       => @current_user,
       :user_agent => request.env['HTTP_USER_AGENT'],
       :referrer   => request.env['HTTP_REFERER'],
-      :permalink  => article_path(@article) }
+      :permalink  => @article.permalink_url }
   end
 
   def set_headers
@@ -81,4 +89,8 @@ class CommentsController < FeedbackController
     end
     add_to_cookies(:url, @comment.url)
   end
+
+  def get_article
+    @article = Article.find(params[:article_id])
+  end
 end

data/app/controllers/content_controller.rb

@@ -19,26 +19,8 @@ class ContentController < ApplicationController
   end
 
   include LoginSystem
-#  model :user
   before_filter :setup_themer
   helper :theme
-#  before_filter :auto_discovery_defaults
-
-  def self.caches_action_with_params(*actions)
-    super
-    around_filter ExpiryFilter.new, :only => actions
-  end
-
-  def self.cache_page(content, path)
-    begin
-      # Don't cache the page if there are any questionmark characters in the url
-      unless path =~ /\?\w+/ or path =~ /page\d+$/
-        super(content,path)
-      end
-    rescue # if there's a caching error, then just return the content.
-      content
-    end
-  end
 
   protected
 

data/app/controllers/feedback_controller.rb

@@ -2,18 +2,34 @@ class FeedbackController < ApplicationController
   helper :theme
 
   session :new_session => false
-  before_filter :login_required, :only => [:update, :destroy]
-  before_filter :get_article, :only => [:create, :update, :show]
+  before_filter :get_article, :only => [:create]
 
   cache_sweeper :blog_sweeper
 
+  # Used only by comments. Maybe need move to comments controller
+  # or use it in our code with send some feed about trackback
+  #
+  # Redirect to article with good anchor with /comments?article_id=xxx ou
+  # /trackacks?article_id=xxx
+  #
+  # If no article_id params, so no page found. TODO: See all
+  # comments/trackbacks with paginate ?
+  #
+  # If /comments.rss|atom or /trabacks.atom|rss see a feed about all comments
+  # or trackback
+  #
+  # If article_id params in feed see only this comment|feedback on this
+  # article.
+  #
+  # TODO: It's usefull but use anywhere. Create some extension in xml_sidebar
+  # to define this feed.
   def index
     @page_title = self.class.name.to_s.sub(/Controller$/, '')
     respond_to do |format|
       format.html do
         if params[:article_id]
-          article = Article.find_by_params_hash(params)
-          redirect_to "#{article_path(article)}\##{@page_title.underscore}"
+          article = Article.find(params[:article_id])
+          redirect_to "#{article.permalink_url}\##{@page_title.underscore}"
         else
           render :text => 'this space left blank'
         end
@@ -23,46 +39,11 @@ class FeedbackController < ApplicationController
     end
   end
 
-  def show
-    @feedback = @article.feedback.find_by_guid(params[:id])
-
-    respond_to do |format|
-      format.html do
-        redirect_to article_path(@article) + "\##{dom_id(@feedback)}"
-      end
-    end
-  end
-
-  def create
-    raise "Subclass responsibility"
-  end
-
-  def update
-    raise "Subclass responsibility"
-  end
-
-  def destroy
-    fb = Feedback.find(params[:id]).destroy
-
-    respond_to do |format|
-      format.html { redirect_to article_path(article) }
-      format.js do
-        render :update do |page|
-          page.visual_effect(:puff, "#{fb.class.to_s.underscore}-#{fb.id}")
-        end
-      end
-    end
-  end
-
   protected
 
-  def get_article
-    @article = this_blog.requested_article(params)
-  end
-
   def get_feedback
     if params[:article_id]
-      this_blog.requested_article(params).published_feedback
+      Article.find(params[:article_id]).published_feedback
     else
       this_blog.published_feedback.find(:all, this_blog.rss_limit_params.merge(:order => 'created_at DESC'))
     end

data/app/controllers/grouping_controller.rb

@@ -4,12 +4,7 @@ class GroupingController < ContentController
   cache_sweeper :blog_sweeper
 
   cached_pages = [:index, :show]
-
-  if Blog.default && Blog.default.cache_option == "caches_action_with_params"
-    caches_action_with_params *cached_pages
-  else
-    caches_page *cached_pages
-  end
+  caches_page *cached_pages
 
   class << self
     def grouping_class(klass = nil)
@@ -28,6 +23,7 @@ class GroupingController < ContentController
   end
 
   def index
+    set_noindex
     self.groupings = grouping_class.paginate(:page => params[:page], :per_page => 100)
     @page_title = "#{self.class.to_s.sub(/Controller$/,'')}"
     @keywords = ""
@@ -37,12 +33,13 @@ class GroupingController < ContentController
   end
 
   def show
+    set_noindex
     grouping = grouping_class.find_by_permalink(params[:id])
     @page_title = "#{self.class.to_s.sub(/Controller$/,'').singularize} #{params[:id]}, #{_('everything about')} #{params[:id]}"
     @page_title << " page " << params[:page] if params[:page]
     @description = (grouping.description.blank?) ? "" : grouping.description
     @keywords = (grouping.keywords.blank?) ? "" : grouping.keywords
-    @articles = grouping.articles.paginate(:page => params[:page], :conditions => { :published => true})
+    @articles = grouping.articles.paginate(:page => params[:page], :conditions => { :published => true}, :per_page => 10)
     render_articles
   end
 
@@ -92,4 +89,13 @@ class GroupingController < ContentController
     articles = collection[0,this_blog.limit_rss_display]
     render :partial => template.sub(%r{^(?:articles/)?}, 'articles/'), :object => articles
   end
+  
+  private
+  def set_noindex
+    # irk there must be a better way to do this
+    @noindex = 1 if (grouping_class.to_s.downcase == "tag" and this_blog.index_tags == false)
+    @noindex = 1 if (grouping_class.to_s.downcase == "category" and this_blog.index_categories == false)
+    @noindex = 1 unless params[:page].blank?
+  end
+
 end

data/app/controllers/redirect_controller.rb

@@ -1,15 +1,85 @@
 class RedirectController < ContentController
-  session :off
+  before_filter :verify_config
+
+  layout :theme_layout
+
+  cache_sweeper :blog_sweeper
+
+  caches_page :redirect
+
+  helper :'admin/base'
+
+  def self.controller_path
+    'articles'
+  end
 
   def redirect
-    if (params[:from].first == 'articles')
-      path = request.path.sub('/articles', '')
-      url_root = self.class.relative_url_root
-      path = url_root + path unless url_root.nil?
-      redirect_to path, :status => 301
-      return
+    part = this_blog.permalink_format.split('/')
+    part.delete('') # delete all par of / where no data. Avoid all // or / started
+    params[:from].delete('')
+    if params[:from].last =~ /\.atom$/
+      params[:format] = 'atom'
+      params[:from].last.gsub!(/\.atom$/, '')
+    elsif params[:from].last =~ /\.rss$/
+      params[:format] = 'rss'
+      params[:from].last.gsub!(/\.rss$/, '')
+    end
+    zip_part = part.zip(params[:from])
+    article_params = {}
+    zip_part.each do |asso|
+      ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
+        if asso[0] =~ /(.*)#{format_string}(.*)/
+          before_format = $1
+          after_format = $2
+          next if asso[1].nil?
+          result =  asso[1].gsub(before_format, '')
+          result.gsub!(after_format, '')
+          article_params[format_string.gsub('%', '').to_sym] = result
+        end
+      end
     end
+    begin
+      @article = this_blog.requested_article(article_params)
+    rescue
+      #Not really good. 
+      # TODO :Check in request_article type of DATA made in next step
+    end
+    return show_article if @article
 
+    # Redirect old version with /:year/:month/:day/:title to new format.
+    # because it's change
+    ["%year%/%month%/%day%/%title%".split('/'), "articles/%year%/%month%/%day%/%title%".split('/')].each do |part|
+      part.delete('') # delete all par of / where no data. Avoid all // or / started
+      params[:from].delete('')
+      zip_part = part.zip(params[:from])
+      article_params = {}
+      zip_part.each do |asso|
+        ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
+          if asso[0] =~ /(.*)#{format_string}(.*)/
+            before_format = $1
+            after_format = $2
+            next if asso[1].nil?
+            result =  asso[1].gsub(before_format, '')
+            result.gsub!(after_format, '')
+            article_params[format_string.gsub('%', '').to_sym] = result
+          end
+        end
+      end
+      begin
+        @article = this_blog.requested_article(article_params)
+      rescue
+        #Not really good. 
+        # TODO :Check in request_article type of DATA made in next step
+      end
+      if @article
+        redirect_to @article.permalink_url, :status => 301
+        return
+      end
+    end
+
+
+    # see how manage all by this redirect to redirect in different possible
+    # way maybe define in a controller in admin part in insert in this table
     r = Redirect.find_by_from_path(params[:from].join("/"))
 
     if(r)
@@ -21,4 +91,51 @@ class RedirectController < ContentController
       render :text => "Page not found", :status => 404
     end
   end
+
+
+  private
+
+  # See an article We need define @article before
+  def show_article
+    @comment      = Comment.new
+    @page_title   = @article.title
+    article_meta
+    
+    auto_discovery_feed
+    respond_to do |format|
+      format.html { render :template => '/articles/read' }
+      format.atom { render_feed('atom') }
+      format.rss  { render_feed('rss20') }
+      format.xml  { render_feed('atom') }
+    end
+  rescue ActiveRecord::RecordNotFound
+    error("Post not found...")
+  end
+
+  def render_feed(type)
+    render :partial => "/articles/#{type}_feed", :object => @article.published_feedback 
+  end
+
+  def article_meta
+    @keywords = ""
+    @keywords << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @keywords << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?  
+    @description = "#{@article.title}, " 
+    @description << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @description << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?
+    @description << " #{this_blog.blog_name}"
+  end
+
+  # Test in fist time if we need create some data
+  # Use only in bootstraping
+  def verify_config
+    if User.count == 0
+      redirect_to :controller => "accounts", :action => "signup"
+    elsif ! this_blog.configured?
+      redirect_to :controller => "admin/settings", :action => "redirect"
+    else
+      return true
+    end
+  end
+
 end

data/app/controllers/trackbacks_controller.rb

@@ -29,9 +29,9 @@ class TrackbacksController < FeedbackController
   def get_feedback
     @trackbacks =
       if params[:article_id]
-        Article.find_by_params_hash(params).published_trackbacks
+        Article.find(params[:article_id]).published_trackbacks
       else
-        this_blog.published_trackbacks.find(:all, this_blog.rss_limit_params(:order => 'created_at DESC'))
+        Trackback.find_published(:all, this_blog.rss_limit_params.merge(:order => 'created_at DESC'))
       end
   end
 

data/app/controllers/xml_controller.rb

@@ -25,7 +25,7 @@ class XmlController < ApplicationController
     when 'comments'
       head :moved_permanently, :location => formatted_admin_comments_url(@format)
     when 'article'
-      head :moved_permanently, :location => formatted_article_url(Article.find(params[:id]), @format)
+      head :moved_permanently, :location => Article.find(params[:id]).permalink_by_format(@format)
     when 'category', 'tag', 'author'
       head :moved_permanently, \
         :location => self.send("formatted_#{params[:type]}_url", params[:id], @format)
@@ -36,6 +36,7 @@ class XmlController < ApplicationController
       # make sure we have our own copy to modify.
       @feed_title = this_blog.blog_name.dup
       @link = this_blog.base_url
+      @self_url = url_for(params)
 
       if respond_to?("prep_#{params[:type]}")
         self.send("prep_#{params[:type]}")
@@ -43,6 +44,7 @@ class XmlController < ApplicationController
         render :text => 'Unsupported action', :status => 404
         return
       end
+
       respond_to do |format|
         format.googlesitemap
         format.atom
@@ -133,7 +135,7 @@ class XmlController < ApplicationController
   def prep_sitemap
     fetch_items(:articles, 'created_at DESC', 1000)
     fetch_items(:pages, 'created_at DESC', 1000)
-    @items += Category.find_all_with_article_counters(1000)
-    @items += Tag.find_all_with_article_counters(1000)
+    @items += Category.find_all_with_article_counters(1000) unless this_blog.index_categories == false
+    @items += Tag.find_all_with_article_counters(1000) unless this_blog.index_tags == false
   end
 end

data/app/helpers/admin/base_helper.rb

@@ -66,6 +66,12 @@ module Admin::BaseHelper
     end
   end
 
+  def text_filter_options_with_id
+    TextFilter.find(:all).collect do |filter|
+      [ filter.description, filter.id ]
+    end
+  end
+
   def alternate_class
     @class = @class != '' ? '' : 'class="shade"'
   end
@@ -127,11 +133,13 @@ module Admin::BaseHelper
   end
 
   def t_textarea(object_name, method, options)
-    if current_user.editor == 2
-      fckeditor_textarea(object_name, method, options)
-    else
-      text_area(object_name, method, options)
-    end
+    return fckeditor_textarea(object_name, method, options) if current_user.editor == 'visual'
+    text_area(object_name, method, options)
+  end
+
+  def alternate_editor
+    return 'visual' if current_user.editor == 'simple'
+    return 'simple'
   end
   
   def collection_select_with_current(object, method, collection, value_method, text_method, current_value, prompt=false)
@@ -174,7 +182,7 @@ module Admin::BaseHelper
   end
   
   def macro_help_popup(macro, text)
-    unless current_user.editor == 2
+    unless current_user.editor == 'visual'
       "<a href=\"#{url_for :controller => 'textfilters', :action => 'macro_help', :id => macro.short_name}\" onclick=\"return popup(this, 'Typo Macro Help')\">#{text}</a>"
     end    
   end
@@ -198,4 +206,13 @@ module Admin::BaseHelper
     result << "</table>"
   end
   
+  def build_editor_link(label, action, id, update, editor)
+    link = link_to_remote(label, 
+            :url => { :action => action, 'editor' => editor}, 
+            :loading => "new Element.show('update_spinner_#{id}')",
+            :success => "new Element.toggle('update_spinner_#{id}')",
+            :update => "#{update}")
+    link << image_tag("spinner-blue.gif", :id => "update_spinner_#{id}", :style => 'display:none;')
+  end
+  
 end