typo 5.1.3 → 5.1.98

data/app/controllers/admin/feedback_controller.rb

@@ -1,8 +1,8 @@
-require 'comment'
-require 'trackback'
-
 class Admin::FeedbackController < Admin::BaseController
 
+  cache_sweeper :blog_sweeper
+  before_filter :only_own_feedback, :only => [:delete]
+
   def index
     conditions = ['1 = 1', {}]
 
@@ -21,23 +21,84 @@ class Admin::FeedbackController < Admin::BaseController
       conditions.last.merge!(:status_confirmed => false)
     end
 
-    @pages, @feedback = paginate(:feedback,
-      :order => 'feedback.created_at desc',
-      :conditions => conditions,
-      :per_page => 40)
+    if params[:ham] == 'f'
+      conditions.first << ' AND state = :state '
+      conditions.last.merge!(:state => 'ham')
+    end
 
+    # no need params[:page] if empty of == 0, there are a crash otherwise
+    if params[:page].blank? || params[:page] == "0"
+      params.delete(:page)
+    end
+
+    @feedback = Feedback.paginate :page => params[:page], :order => 'feedback.created_at desc', :conditions => conditions, :per_page => 10
   end
 
+  def article
+    @article = Article.find(params[:id])
+    if params[:ham] && params[:spam].blank?
+      @comments = @article.comments.ham
+    end
+    if params[:spam] && params[:ham].blank?
+      @comments = @article.comments.spam
+    end
+    @comments ||= @article.comments
+  end
+  
   def delete
     if request.post?
       begin
-        Feedback.destroy(params[:id])
-        flash[:notice] = "Deleted"
+        @feedback.destroy
+        flash[:notice] = _("Deleted")
       rescue ActiveRecord::RecordNotFound
-        flash[:notice] = "Not found"
+        flash[:notice] = _("Not found")
       end
     end
-    redirect_to :action => 'index', :page => params[:page], :search => params[:search]
+    redirect_to :action => 'article', :id => @feedback.article.id
+  end
+
+  def create
+    @article = Article.find(params[:article_id])
+    @comment = @article.comments.build(params[:comment])
+
+    if request.post? and @comment.save
+      # We should probably wave a spam filter over this, but for now, just mark it as published.
+      @comment.mark_as_ham!
+      flash[:notice] = _('Comment was successfully created.')
+    end
+    redirect_to :action => 'article', :id => @article.id
+  end
+
+  def edit
+    @comment = Comment.find(params[:id])
+    @article = @comment.article
+    unless @article.access_by? current_user
+      redirect_to :action => 'index'
+      return
+    end
+  end
+
+  def update
+    comment = Comment.find(params[:id])
+    unless comment.article.access_by? current_user
+      redirect_to :action => 'index'
+      return
+    end
+    comment.attributes = params[:comment]
+    if request.post? and comment.save
+      flash[:notice] = _('Comment was successfully updated.')
+      redirect_to :action => 'article', :id => comment.article.id
+    else
+      redirect_to :action => 'edit', :id => comment.id
+    end
+  end
+
+  def preview
+    feedback = Feedback.find(params[:id])
+    render(:update) do |page|
+      page.replace_html("feedback_#{feedback.id}", feedback.body)
+    end
+    
   end
 
   def bulkops
@@ -45,13 +106,13 @@ class Admin::FeedbackController < Admin::BaseController
     items = Feedback.find(ids)
     @unexpired = true
 
-    case params[:commit]
+    case params[:bulkop]
     when 'Delete Checked Items'
       count = 0
       ids.each do |id|
         count += Feedback.delete(id) ## XXX Should this be #destroy?
       end
-      flash[:notice] = "Deleted #{count} item(s)"
+      flash[:notice] = _("Deleted %d item(s)",count)
 
       items.each do |i|
         i.invalidates_cache? or next
@@ -60,15 +121,15 @@ class Admin::FeedbackController < Admin::BaseController
       end
     when 'Mark Checked Items as Ham'
       update_feedback(items, :mark_as_ham!)
-      flash[:notice]= "Marked #{ids.size} item(s) as Ham"
+      flash[:notice]= _("Marked %d item(s) as Ham",ids.size)
     when 'Mark Checked Items as Spam'
       update_feedback(items, :mark_as_spam!)
-      flash[:notice]= "Marked #{ids.size} item(s) as Spam"
+      flash[:notice]= _("Marked %d item(s) as Spam",ids.size)
     when 'Confirm Classification of Checked Items'
       update_feedback(items, :confirm_classification!)
-      flash[:notice] = "Confirmed classification of #{ids.size} item(s)"
+      flash[:notice] = _("Confirmed classification of %s item(s)",ids.size)
     else
-      flash[:notice] = "Not implemented"
+      flash[:notice] = _("Not implemented")
     end
 
     redirect_to :action => 'index', :page => params[:page], :search => params[:search], :confirmed => params[:confirmed], :published => params[:published]
@@ -89,4 +150,14 @@ class Admin::FeedbackController < Admin::BaseController
     PageCache.sweep_all
     expire_fragment(/.*/)
   end
+
+  def only_own_feedback
+    @feedback = Feedback.find(params[:id])
+    unless @feedback.article.user_id == current_user.id
+      unless current_user.admin?
+        redirect_to :controller => 'admin/feedback', :action => :index
+      end
+    end
+  end
+
 end

data/app/controllers/admin/pages_controller.rb

@@ -2,34 +2,11 @@ require 'base64'
 
 class Admin::PagesController < Admin::BaseController
   layout "administration", :except => 'show'
-  def list
-    index
-    render :action => 'index'
-  end
+  cache_sweeper :blog_sweeper
 
   def index
-    conditions = "id > 0"
-
-    if params[:search]
-      @search = params[:search]
-
-      if @search[:published_at] and %r{(\d\d\d\d)-(\d\d)} =~ @search[:published_at]
-        conditions += " AND created_at LIKE '%#{@search[:published_at]}%'"
-      end
-
-      if @search[:user_id] and @search[:user_id].to_i > 0
-        conditions += " AND user_id = #{@search[:user_id].to_i}"
-      end
-      
-      if @search[:published] and @search[:published].to_s =~ /0|1/
-        conditions += " AND published = #{@search[:published].to_i}"
-      end
-      
-    else
-      @search = { :user_id => nil, :published_at => nil, :status => nil }
-    end
-    
-    @pages = Page.find(:all, :conditions => conditions)
+    @search = params[:search] ? params[:search] : {}
+    @pages = Page.search_paginate(@search, :page => params[:page], :per_page => 10)
     @page = Page.new(params[:page])
     @page.text_filter ||= this_blog.text_filter
   end
@@ -55,6 +32,7 @@ class Admin::PagesController < Admin::BaseController
   }
 
   def new
+    @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }
     @page = Page.new(params[:page])
     @page.user_id = current_user.id
     @page.text_filter ||= this_blog.text_filter
@@ -64,17 +42,18 @@ class Admin::PagesController < Admin::BaseController
       end
       @page.published_at = Time.now
       if @page.save
-        flash[:notice] = 'Page was successfully created.'
-        redirect_to :action => 'list'
+        flash[:notice] = _('Page was successfully created.')
+        redirect_to :action => 'index'
       end
     end
   end
 
   def edit
+    @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }
     @page = Page.find(params[:id])
     @page.attributes = params[:page]
     if request.post? and @page.save
-      flash[:notice] = 'Page was successfully updated.'
+      flash[:notice] = _('Page was successfully updated.')
       redirect_to :action => 'index'
     end
   end
@@ -83,7 +62,7 @@ class Admin::PagesController < Admin::BaseController
     @page = Page.find(params[:id])
     if request.post?
       @page.destroy
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 end

data/app/controllers/admin/profiles_controller.rb

@@ -1,19 +1,16 @@
 class Admin::ProfilesController < Admin::BaseController
 
+  cache_sweeper :blog_sweeper
+
   def index
-    list
-    render :action => 'list'
-  end
 
-  def list
-    @profiles = Profile.find :all
   end
 
   def new
     @profile = Profile.new(params[:profile])
     if request.post? and @profile.save
-      flash[:notice] = 'Profile was successfully created.'
-      redirect_to :action => 'list'
+      flash[:notice] = _('Profile was successfully created.')
+      redirect_to :action => 'index'
     end
   end
 
@@ -21,8 +18,8 @@ class Admin::ProfilesController < Admin::BaseController
     @profile = Profile.find(params[:id])
     @profile.attributes = params[:profile]
     if request.post? and @profile.save
-      flash[:notice] = 'Profile was successfully updated.'
-      redirect_to :action => 'list'
+      flash[:notice] = _('Profile was successfully updated.')
+      redirect_to :action => 'index'
     end
   end
 
@@ -30,7 +27,7 @@ class Admin::ProfilesController < Admin::BaseController
     @profile = Profile.find(params[:id])
     if request.post?
       @profile.destroy if Profile.count > 1
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 end

data/app/controllers/admin/resources_controller.rb

@@ -1,12 +1,19 @@
 class Admin::ResourcesController < Admin::BaseController
   upload_status_for :file_upload, :status => :upload_status
 
+  cache_sweeper :blog_sweeper
+  
   def upload
     begin
       case request.method
         when :post
           file = params[:upload][:filename]
-          @up = Resource.create(:filename => file.original_filename, :mime => file.content_type.chomp, :created_at => Time.now)
+          unless file.content_type
+            mime = 'text/plain'
+          else
+            mime = file.content_type.chomp
+          end
+          @up = Resource.create(:filename => file.original_filename, :mime => mime, :created_at => Time.now)
 
           @up.write_to_disk(file)
 
@@ -25,7 +32,7 @@ class Admin::ResourcesController < Admin::BaseController
     @resource.itunes_metadata = false
     @resource.save(false)
     flash[:notice] = _('Metadata was successfully removed.')
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def update
@@ -50,7 +57,7 @@ class Admin::ResourcesController < Admin::BaseController
         flash[:error] << "<br />" + val
       end
     end
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def set_mime
@@ -61,10 +68,9 @@ class Admin::ResourcesController < Admin::BaseController
     else
       flash[:error] = _("Error occurred while updating Content Type.")
     end
-    redirect_to :action => "list"
+    redirect_to :action => "index"
   end
 
-
   def upload_status
     render :inline => "<%= upload_progress.completed_percent rescue 0 %> % " + _("complete"), :layout => false
   end
@@ -72,12 +78,7 @@ class Admin::ResourcesController < Admin::BaseController
   def index
     @r = Resource.new
     @itunes_category_list = @r.get_itunes_categories
-    @resources_pages, @resources = paginate :resource, :per_page => 20, :order_by => "created_at DESC", :parameter => 'page'
-  end
-
-  def list
-    index
-    render :action => 'index'
+    @resources = Resource.paginate :page => params[:page], :conditions => @conditions, :order => 'created_at DESC', :per_page => 10
   end
 
   def destroy
@@ -86,7 +87,7 @@ class Admin::ResourcesController < Admin::BaseController
       case request.method
         when :post
           @file.destroy
-          redirect_to :action => 'list'
+          redirect_to :action => 'index'
       end
     rescue
       raise

data/app/controllers/admin/settings_controller.rb

@@ -1,53 +1,20 @@
 class Admin::SettingsController < Admin::BaseController
 
+  cache_sweeper :blog_sweeper
+
   def index
     if this_blog.base_url.blank?
       this_blog.base_url = blog_base_url
     end
-    
-    if request.post?
-      self.update
-    end
-  end
-  
-  def read
-    if request.post?
-      self.update
-    end    
-  end
-  
-  def write
-    if request.post?
-      self.update
-    end    
-  end
-
-  def feedback
-    if request.post?
-      self.update
-    end    
-  end
-
-  def spam
-    if request.post?
-      self.update
-    end    
   end
   
-  def podcast
-    if request.post?
-      self.update
-    end    
-  end
-  
-  def import
-    if request.post
-      
-    end
-  end
+  def read; end
+  def write; end
+  def feedback; end
+  def seo; end
   
   def redirect
-    flash[:notice] = "Please review and save the settings before continuing"
+    flash[:notice] = _("Please review and save the settings before continuing")
     redirect_to :action => "index"
   end
 
@@ -58,7 +25,7 @@ class Admin::SettingsController < Admin::BaseController
         this_blog.save
         flash[:notice] = _('config updated.')
       end
-      redirect_to :action => 'index'
+      redirect_to :action => params[:from]
     end
   end
   
@@ -78,4 +45,4 @@ class Admin::SettingsController < Admin::BaseController
     end
   end
   
-end
+end

data/app/controllers/admin/sidebar_controller.rb

@@ -1,10 +1,11 @@
 class Admin::SidebarController < Admin::BaseController
+
   def index
     @available = available
     # Reset the staged position based on the active position.
     Sidebar.delete_all('active_position is null')
-    @active = Sidebar.find(:all, :order => 'active_position ASC')
-    flash[:sidebars] = @active.map {|sb| sb.id }
+    flash_sidebars
+    @active = Sidebar.find(:all, :order => 'active_position ASC') unless @active
   end
 
   def set_active
@@ -13,8 +14,9 @@ class Admin::SidebarController < Admin::BaseController
     klass_for = available.inject({}) do |hash, klass|
       hash.merge({ klass.short_name => klass })
     end
+
     # Get all already active plugins
-    activemap = flash[:sidebars].inject({}) do |h, sb_id|
+    activemap = flash_sidebars.inject({}) do |h, sb_id|
       sb = Sidebar.find(sb_id.to_i)
       sb ? h.merge(sb.html_id => sb_id) : h
     end
@@ -23,9 +25,9 @@ class Admin::SidebarController < Admin::BaseController
     # lay them out in a easy accessible sequential array
     flash[:sidebars] = params[:active].inject([]) do |array, name|
       if klass_for.has_key?(name)
-        @new_item = klass_for[name].create!
-        @target = name
-        array << @new_item.id
+        new_sidebar_id = klass_for[name].create.id
+        @new_item = Sidebar.find(new_sidebar_id)
+        array << new_sidebar_id
       elsif activemap.has_key?(name)
         array << activemap[name]
       else
@@ -35,7 +37,7 @@ class Admin::SidebarController < Admin::BaseController
   end
 
   def remove
-    flash[:sidebars] = flash[:sidebars].reject do |sb_id|
+    flash[:sidebars] = flash_sidebars.reject do |sb_id|
       sb_id == params[:id].to_i
     end
     @element_to_remove = params[:element]
@@ -47,7 +49,7 @@ class Admin::SidebarController < Admin::BaseController
       params[:configure] ||= { }
       # Crappy workaround to rails update_all bug with PgSQL / SQLite
       ActiveRecord::Base.connection.execute("update sidebars set active_position=null")
-      flash[:sidebars].each do |id|
+      flash_sidebars.each do |id|
         sidebar = Sidebar.find(id)
         sb_attribs = params[:configure][id.to_s] || {}
         # If it's a checkbox and unchecked, convert the 0 to false
@@ -62,10 +64,12 @@ class Admin::SidebarController < Admin::BaseController
       end
       Sidebar.delete_all('active_position is null')
     end
+    sweep_cache
     index
   end
 
   protected
+  
   def show_available
     render :partial => 'availables', :object => available
   end
@@ -73,5 +77,14 @@ class Admin::SidebarController < Admin::BaseController
   def available
     ::Sidebar.available_sidebars
   end
+
+  def flash_sidebars
+    unless flash[:sidebars]
+      active = Sidebar.find(:all, :order => 'active_position ASC')
+      flash[:sidebars] = active.map {|sb| sb.id }
+    end
+    flash[:sidebars]
+  end
+
   helper_method :available
 end

data/app/controllers/admin/tags_controller.rb

@@ -1,10 +1,7 @@
 class Admin::TagsController < Admin::BaseController
   
-  def list
-    index
-    render :action => 'index'
-  end
-  
+  cache_sweeper :blog_sweeper
+
   def index
     if params[:order] and params[:order] =~ /\A(?:name|display_name|article_counter)\Z/
       if params[:sense] and params[:sense] == 'desc'
@@ -15,11 +12,8 @@ class Admin::TagsController < Admin::BaseController
     else
       order = 'display_name ASC'
     end
-    
-    count = Tag.count
-    @tags_pages = Paginator.new(self, count, 20, params[:id])
-    @tags = Tag.find_all_with_article_counters(20 , order, @tags_pages.current.offset)
 
+    @tags = Tag.paginate(:page => params[:page], :order => :display_name, :per_page => 10)
   end
   
   def edit
@@ -27,8 +21,8 @@ class Admin::TagsController < Admin::BaseController
     @tag.attributes = params[:tag]
 
     if request.post? and @tag.save
-      flash[:notice] = 'Tag was successfully updated.'
-      redirect_to :action => 'list'
+      flash[:notice] = _('Tag was successfully updated.')
+      redirect_to :action => 'index'
     end
   end
     
@@ -36,8 +30,8 @@ class Admin::TagsController < Admin::BaseController
     @tag = Tag.find(params[:id])
     if request.post?
       @tag.destroy
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
   
-end
+end

data/app/controllers/admin/textfilters_controller.rb

@@ -1,106 +1,8 @@
 class Admin::TextfiltersController < Admin::BaseController
-  def list
-    index
-    render :action => 'index'
-  end
-
-  def index
-    @textfilters = TextFilter.find(:all, :order => "id DESC")
-    @textfilter_map = TextFilter.filters_map
-    @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }
-  end
-
-  def show
-    @textfilter = TextFilter.find(params[:id])
-    @textfilters = TextFilter.filters_map
-    @help_text = @textfilter.help
-  end
-
-  def show_help
-    @textfilter = TextFilter.find(params[:id])
-    @help_text = @textfilter.help
-  end
 
   def macro_help
     @macro = TextFilter.available_filters.find { |filter| filter.short_name == params[:id] }
-    @help_text = BlueCloth.new(@macro.help_text).to_html
+    render :text => BlueCloth.new(@macro.help_text).to_html
   end
 
-  def new
-    @textfilter = TextFilter.new(params[:textfilter])
-    @textfilter.filters ||= []
-    @textfilter.params ||= {}
-
-    setup_defaults
-
-    if request.post?
-      @textfilter.attributes = params[:textfilter]
-      if params.has_key?(:filter)
-        @textfilter.filters = params[:filter].keys.collect {|k| k.to_sym }
-      end
-      if request.post? and @textfilter.save
-        flash[:notice] = 'TextFilter was successfully updated.'
-        redirect_to :action => 'show', :id => @textfilter.id
-      end
-    end
-  end
-
-  def edit
-    @textfilter = TextFilter.find(params[:id])
-
-    setup_defaults
-
-    if request.post?
-      @textfilter.attributes = params[:textfilter]
-      if params.has_key?(:filter)
-        @textfilter.filters = params[:filter].keys.collect {|k| k.to_sym }
-      end
-      @textfilter.params = params[:params]
-      if request.post? and @textfilter.save
-        flash[:notice] = 'TextFilter was successfully updated.'
-        redirect_to :action => 'show', :id => @textfilter.id
-      end
-    end
-  end
-
-  def destroy
-    @textfilter = TextFilter.find(params[:id])
-    if request.post?
-      @textfilter.destroy
-      redirect_to :action => 'list'
-    end
-  end
-
-  def preview
-    headers["Content-Type"] = "text/html; charset=utf-8"
-    @textfilter = params[:textfilter]
-    render :layout => false
-  end
-
-  private
-
-  def setup_defaults
-    types=TextFilter.available_filter_types
-
-    @markup_options = types['markup'].collect {|f| [f.short_name, f.display_name]}.sort_by{|f| f[0]}
-    @postprocess_options = types['postprocess'].collect do |f|
-      [f.short_name, f.display_name, f.description, @textfilter.filters.include?(f.short_name.to_sym)]
-    end.sort_by {|f| f[0]}
-
-    @filterparams = Hash.new
-    @filterdescriptions = Hash.new
-    @filterhelp = Hash.new
-    @filteroptions = Hash.new
-
-    (types['macropre']+types['macropost']+types['postprocess']).each do |f|
-      f.default_config.each do |key,value|
-        @filterparams[key] = value[:default]
-        @filterdescriptions[key] = value[:description]
-        @filterhelp[key] = value[:help]
-        @filteroptions[key] = value[:options]
-      end
-    end
-
-    @filterparams.update(@textfilter.params)
-  end
 end