typo 5.0.2 → 5.0.3.98

data/app/controllers/admin/dashboard_controller.rb

@@ -3,10 +3,18 @@ class Admin::DashboardController < Admin::BaseController
     comments
     lastposts
     popular
+    statistics
   end
   
   private
   
+  def statistics
+    @statposts = Article.count_published_articles
+    @statuserposts = current_user.articles.size
+    @statcomments = Comment.count(:all, :conditions => "state != 'spam'")
+    @statspam = Comment.count(:all, :conditions => { :state => 'spam' })
+  end
+  
   def comments
     @comments ||=
       Comment.find(:all,

data/app/controllers/admin/feedback_controller.rb

@@ -4,7 +4,7 @@ require 'trackback'
 class Admin::FeedbackController < Admin::BaseController
 
   def index
-    conditions = ['blog_id = :blog_id', {:blog_id => Blog.default.id}]
+    conditions = ['1 = 1', {}]
 
     if params[:search]
       conditions.first << ' and (url like :pattern or author like :pattern or title like :pattern or ip like :pattern or email like :pattern)'
@@ -26,7 +26,6 @@ class Admin::FeedbackController < Admin::BaseController
       :conditions => conditions,
       :per_page => 40)
 
-    render :action => 'list'
   end
 
   def delete

data/app/controllers/admin/pages_controller.rb

@@ -1,23 +1,35 @@
 require 'base64'
 
 class Admin::PagesController < Admin::BaseController
-  def index
-    list
-    render :action => 'list'
+  layout "administration", :except => 'show'
+  def list
+    index
+    render :action => 'index'
   end
 
-  def list
-    if params[:order] and params[:order] =~ /title|created_at|state/
-      if params[:sense] and params[:sense] == 'desc'
-        order = params[:order] + " asc"
-      else
-        order = params[:order] + " desc"        
+  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
-      order = 'title ASC'
+      @search = { :user_id => nil, :published_at => nil, :status => nil }
     end
-
-    @pages = Page.find(:all, :order => order)
+    
+    @pages = Page.find(:all, :conditions => conditions)
     @page = Page.new(params[:page])
     @page.text_filter ||= this_blog.text_filter
   end
@@ -26,13 +38,35 @@ class Admin::PagesController < Admin::BaseController
     @page = Page.find(params[:id])
   end
 
+  accents = { ['á','à','â','ä','ã','Ã','Ä','Â','À'] => 'a',
+    ['é','è','ê','ë','Ë','É','È','Ê'] => 'e',
+    ['í','ì','î','ï','I','Î','Ì'] => 'i',
+    ['ó','ò','ô','ö','õ','Õ','Ö','Ô','Ò'] => 'o',
+    ['œ'] => 'oe',
+    ['ß'] => 'ss',
+    ['ú','ù','û','ü','U','Û','Ù'] => 'u',
+    ['ç','Ç'] => 'c'
+  }
+
+  FROM, TO = accents.inject(['','']) { |o,(k,v)|
+    o[0] << k * '';
+    o[1] << v * k.size
+    o
+  }
+
   def new
     @page = Page.new(params[:page])
     @page.user_id = current_user.id
     @page.text_filter ||= this_blog.text_filter
-    if request.post? and @page.save
-      flash[:notice] = 'Page was successfully created.'
-      redirect_to :action => 'show', :id => @page.id
+    if request.post? 
+      if @page.name.blank?
+        @page.name = @page.title.tr(FROM, TO).gsub(/<[^>]*>/, '').to_url 
+      end
+      @page.published_at = Time.now
+      if @page.save
+        flash[:notice] = 'Page was successfully created.'
+        redirect_to :action => 'list'
+      end
     end
   end
 
@@ -52,13 +86,4 @@ class Admin::PagesController < Admin::BaseController
       redirect_to :action => 'list'
     end
   end
-
-  def preview
-    headers["Content-Type"] = "text/html; charset=utf-8"
-    @page = this_blog.pages.build(params[:page])
-    data = render_to_string(:layout => "minimal")
-    data = Base64.encode64(data).gsub("\n", '')
-    data = "data:text/html;charset=utf-8;base64,#{data}"
-    render :text => data
-  end
 end

data/app/controllers/admin/resources_controller.rb

@@ -69,15 +69,15 @@ class Admin::ResourcesController < Admin::BaseController
     render :inline => "<%= upload_progress.completed_percent rescue 0 %> % " + _("complete"), :layout => false
   end
 
-  def list
+  def index
     @r = Resource.new
     @itunes_category_list = @r.get_itunes_categories
-    @resources_pages, @resources = paginate :resource, :per_page => 15, :order_by => "created_at DESC", :parameter => 'page'
+    @resources_pages, @resources = paginate :resource, :per_page => 20, :order_by => "created_at DESC", :parameter => 'page'
   end
 
-  def index
-    list
-    render :action => 'list'
+  def list
+    index
+    render :action => 'index'
   end
 
   def destroy

data/app/controllers/admin/settings_controller.rb

@@ -1,4 +1,5 @@
 class Admin::SettingsController < Admin::BaseController
+
   def index
     if this_blog.base_url.blank?
       this_blog.base_url = blog_base_url
@@ -39,6 +40,12 @@ class Admin::SettingsController < Admin::BaseController
     end    
   end
   
+  def import
+    if request.post
+      
+    end
+  end
+  
   def redirect
     flash[:notice] = "Please review and save the settings before continuing"
     redirect_to :action => "index"

data/app/controllers/admin/sidebar_controller.rb

@@ -2,9 +2,8 @@ class Admin::SidebarController < Admin::BaseController
   def index
     @available = available
     # Reset the staged position based on the active position.
-    Sidebar.delete_all(['blog_id = ? and active_position is null',
-                         this_blog.id])
-    @active = this_blog.sidebars
+    Sidebar.delete_all('active_position is null')
+    @active = Sidebar.find(:all, :order => 'active_position ASC')
     flash[:sidebars] = @active.map {|sb| sb.id }
   end
 
@@ -24,7 +23,7 @@ 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!(:blog => this_blog)
+        @new_item = klass_for[name].create!
         @target = name
         array << @new_item.id
       elsif activemap.has_key?(name)
@@ -47,8 +46,7 @@ class Admin::SidebarController < Admin::BaseController
       position = 0
       params[:configure] ||= { }
       # Crappy workaround to rails update_all bug with PgSQL / SQLite
-#      this_blog.sidebars.update_all('active_position = null')
-      ActiveRecord::Base.connection.execute("update sidebars set active_position=null where blog_id = #{this_blog.id}")
+      ActiveRecord::Base.connection.execute("update sidebars set active_position=null")
       flash[:sidebars].each do |id|
         sidebar = Sidebar.find(id)
         sb_attribs = params[:configure][id.to_s] || {}
@@ -62,8 +60,7 @@ class Admin::SidebarController < Admin::BaseController
                                   :active_position => position)
         position += 1
       end
-      Sidebar.delete_all(['blog_id = ? and active_position is null',
-                          this_blog.id])
+      Sidebar.delete_all('active_position is null')
     end
     index
   end

data/app/controllers/admin/tags_controller.rb

@@ -0,0 +1,43 @@
+class Admin::TagsController < Admin::BaseController
+  
+  def list
+    index
+    render :action => 'index'
+  end
+  
+  def index
+    if params[:order] and params[:order] =~ /\A(?:name|display_name|article_counter)\Z/
+      if params[:sense] and params[:sense] == 'desc'
+        order = params[:order] + " asc"
+      else
+        order = params[:order] + " desc"
+      end
+    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)
+
+  end
+  
+  def edit
+    @tag = Tag.find(params[:id])
+    @tag.attributes = params[:tag]
+
+    if request.post? and @tag.save
+      flash[:notice] = 'Tag was successfully updated.'
+      redirect_to :action => 'list'
+    end
+  end
+    
+  def destroy
+    @tag = Tag.find(params[:id])
+    if request.post?
+      @tag.destroy
+      redirect_to :action => 'list'
+    end
+  end
+  
+end

data/app/controllers/admin/themes_controller.rb

@@ -16,6 +16,7 @@ class Admin::ThemesController < Admin::BaseController
     this_blog.theme = params[:theme]
     this_blog.save
     redirect_to :action => 'index'
+    zap_theme_caches
   end
 
   def editor

data/app/controllers/admin/trackbacks_controller.rb

@@ -2,12 +2,12 @@ class Admin::TrackbacksController < Admin::BaseController
 
   before_filter :get_article
 
-  def index
-    list
-    render :action => 'list'
+  def list
+    index
+    render :action => 'index'
   end
 
-  def list
+  def index
     @trackbacks = @article.trackbacks.find(:all, :order => "id DESC")
   end
 
@@ -15,15 +15,6 @@ class Admin::TrackbacksController < Admin::BaseController
     @trackback = @article.trackbacks.find(params[:id])
   end
 
-  def new
-    @trackback = @article.trackbacks.build(params[:trackback])
-
-    if request.post? and @trackback.save
-      flash[:notice] = 'Trackback was successfully created.'
-      redirect_to :action => 'show', :id => @trackback.id
-    end
-  end
-
   def edit
     @trackback = @article.trackbacks.find(params[:id])
     @trackback.attributes = params[:trackback]

data/app/controllers/admin/users_controller.rb

@@ -1,24 +1,19 @@
 class Admin::UsersController < Admin::BaseController
 
-  def index
-    list
-    render :action => 'list'
-  end
-
   def list
-    @users = User.find :all
+    index
+    render :action => 'index'
   end
 
-  def show
-    @user = User.find(params[:id], :include => [ :articles ])
-    @articles = @user.articles
+  def index
+    @users = User.find :all
   end
 
   def new
     @user = User.new(params[:user])
     setup_profiles
     if request.post? and @user.save
-      flash[:notice] = 'User was successfully created.'
+      flash[:notice] = _('User was successfully created.')
       redirect_to :action => 'list'
     end
   end
@@ -28,8 +23,8 @@ class Admin::UsersController < Admin::BaseController
     setup_profiles
     @user.attributes = params[:user]
     if request.post? and @user.save
-      flash[:notice] = 'User was successfully updated.'
-      redirect_to :action => 'show', :id => @user.id
+      flash[:notice] = _('User was successfully updated.')
+      redirect_to :action => 'list'
     end
   end
 
@@ -44,5 +39,4 @@ class Admin::UsersController < Admin::BaseController
   def setup_profiles
     @profiles = Profile.find(:all, :order => 'id')
   end
-
 end

data/app/controllers/application.rb

@@ -26,24 +26,12 @@ class ApplicationController < ActionController::Base
     render :template => 'articles/error', :status => options[:status] || 404
   end
 
-  def current_user
-    if @current_user.nil?
-      @current_user = session[:user_id] && User.find(session[:user_id])
-    end
-    @current_user
-  end
-  helper_method :current_user
-
-  def authorized?
-    current_user && authorize?(current_user)
-  end
-
   def fire_triggers
     Trigger.fire
   end
 
   def load_lang
-    Localization.lang = this_blog.lang if this_blog.lang != 'en_US'
+    Localization.lang = this_blog.lang
   end
 
   def reset_local_cache
@@ -60,26 +48,16 @@ class ApplicationController < ActionController::Base
     $cache ||= SimpleCache.new 1.hour
   end
 
-  @@blog_id_for = Hash.new
-
   # The Blog object for the blog that matches the current request.  This is looked
   # up using Blog.find_blog and cached for the lifetime of the controller instance;
   # generally one request.
   def this_blog
-    @blog ||= if @@blog_id_for[blog_base_url]
-                Blog.find(@@blog_id_for[blog_base_url])
-              else
-                returning(Blog.find_blog(blog_base_url)) do |blog|
-                  @@blog_id_for[blog_base_url] = blog.id
-                end
-              end
+    @blog ||= Blog.default
   end
 
   helper_method :this_blog
 
-
   def reset_blog_ids
-    @@blog_id_for = {}
   end
 
   # The base URL for this request, calculated by looking up the URL for the main

data/app/controllers/articles_controller.rb

@@ -19,25 +19,9 @@ class ArticlesController < ContentController
   helper :'admin/base'
 
   def index
-    @articles = this_blog.requested_articles(params)
-
-    # Build page title, should probably be moved elsewhere
-    if params[:year]
-      date = Time.mktime(params[:year], params[:month], params[:day])
-      if params[:month]
-        if params[:day]
-          @page_title = "Archives for " + date.strftime("%A %d %B %Y")
-        else
-          @page_title = "Archives for " + date.strftime("%B %Y")
-        end
-      else
-        @page_title = "Archives for " + date.strftime("%Y")
-      end
-    end
-    if params[:page]
-      @page_title = 'Older posts,' if @page_title.blank?
-      @page_title << " page " << params[:page]
-    end
+    @articles = Article.find_all_by_date(*params.values_at(:year, :month, :day))
+
+    @page_title = index_title
 
     respond_to do |format|
       format.html { render_paginated_index }
@@ -73,7 +57,7 @@ class ArticlesController < ContentController
   ### Deprecated Actions ###
 
   def archives
-    @articles = this_blog.published_articles
+    @articles = Article.find_published
     @page_title = "Archives"
   end
 
@@ -84,7 +68,7 @@ class ArticlesController < ContentController
     end
 
     set_headers
-    @comment = this_blog.comments.build(params[:comment])
+    @comment = Comment.new(params[:comment])
     @controller = self
   end
 
@@ -101,7 +85,7 @@ class ArticlesController < ContentController
   end
 
   def view_page
-    if(@page = Page.find_by_name(params[:name].to_a.join('/')))
+    if(@page = Page.find_by_name(params[:name])) && @page.published?
       @page_title = @page.title
     else
       render :nothing => true, :status => 404
@@ -123,7 +107,7 @@ class ArticlesController < ContentController
       return true
     end
   end
-
+  
   alias_method :rescue_action_in_public, :error
 
   def render_error(object = '', status = 500)
@@ -144,4 +128,25 @@ class ArticlesController < ContentController
     @articles = @articles.slice(start..stop)
     render :action => 'index'
   end
+
+  def index_title
+    returning('') do |page_title|
+      page_title << formatted_date_selector('Archives for ')
+
+      if params[:page]
+        page_title << 'Older posts' if page_title.blank?
+        page_title << ", page " << params[:page]
+      end
+    end
+  end
+  
+  def formatted_date_selector(prefix = '')
+    return '' unless params[:year]
+    format = prefix
+    format << '%A %d ' if params[:day]
+    format << '%B ' if params[:month]
+    format << '%Y' if params[:year]
+
+    return(Time.mktime(*params.values_at(:year, :month, :day)).strftime(format))
+  end
 end