typo 5.5 → 6.0.4

data/app/controllers/admin/settings_controller.rb

@@ -1,76 +0,0 @@
-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
-    load_settings
-  end
-  
-  def read; load_settings end
-  def write; load_settings end
-  def feedback; load_settings end
-  
-  def seo
-    load_settings
-    if File.exists? "#{RAILS_ROOT}/public/robots.txt"
-      @setting.robots = ""
-      file = File.readlines("#{RAILS_ROOT}/public/robots.txt")
-      file.each do |line|
-        @setting.robots << line
-      end
-    end
-  end
-  
-  def redirect
-    flash[:notice] = _("Please review and save the settings before continuing")
-    redirect_to :action => "index"
-  end
-
-  def update
-    if request.post?
-      Blog.transaction do
-        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
-        this_blog.save
-        flash[:notice] = _('config updated.')
-      end
-      
-      save_robots unless params[:setting][:robots].blank?
-      
-      redirect_to :action => params[:from]
-    end
-  rescue ActiveRecord::RecordInvalid
-    render :action => params[:from]
-  end
-  
-  def update_database
-    @current_version = Migrator.current_schema_version
-    @needed_version = Migrator.max_schema_version
-    @support = Migrator.db_supports_migrations?
-    @needed_migrations = Migrator.available_migrations[@current_version..@needed_version].collect do |mig|
-      mig.scan(/\d+\_([\w_]+)\.rb$/).flatten.first.humanize
-    end
-  end
-
-  def migrate
-    if request.post?
-      Migrator.migrate
-      redirect_to :action => 'update_database'
-    end
-  end
-  
-  private
-  def load_settings
-    @setting = this_blog
-  end
-  
-  def save_robots
-    if File.writable? "#{RAILS_ROOT}/public/robots.txt"
-      robots = File.new("#{RAILS_ROOT}/public/robots.txt", "r+")
-      robots.write(params[:setting][:robots])
-      robots.close
-    end
-  end
-end

data/app/controllers/admin/sidebar_controller.rb

@@ -1,102 +0,0 @@
-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')
-    flash_sidebars
-    begin
-      @active = Sidebar.find(:all, :order => 'active_position ASC') unless @active
-    rescue
-      # Avoiding the view to crash
-      @active = []
-      flash[:error] = _("It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually")
-    end
-  end
-
-  def set_active
-    # Get all available plugins
-
-    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|
-      sb = Sidebar.find(sb_id.to_i)
-      sb ? h.merge(sb.html_id => sb_id) : h
-    end
-
-    # Figure out which plugins are referenced by the params[:active] array and
-    # lay them out in a easy accessible sequential array
-    flash[:sidebars] = params[:active].inject([]) do |array, name|
-      if klass_for.has_key?(name)
-        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
-        array
-      end
-    end
-  end
-
-  def remove
-    flash[:sidebars] = flash_sidebars.reject do |sb_id|
-      sb_id == params[:id].to_i
-    end
-    @element_to_remove = params[:element]
-  end
-
-  def publish
-    Sidebar.transaction do
-      position = 0
-      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|
-        sidebar = Sidebar.find(id)
-        sb_attribs = params[:configure][id.to_s] || {}
-        # If it's a checkbox and unchecked, convert the 0 to false
-        # This is ugly.  Anyone have an improvement?
-        sidebar.fields.each do |field|
-          sb_attribs[field.key] = field.canonicalize(sb_attribs[field.key])
-        end
-
-        sidebar.update_attributes(:config => sb_attribs,
-                                  :active_position => position)
-        position += 1
-      end
-      Sidebar.delete_all('active_position is null')
-    end
-    sweep_cache
-    index
-  end
-
-  protected
-  
-  def show_available
-    render :partial => 'availables', :object => available
-  end
-
-  def available
-    ::Sidebar.available_sidebars
-  end
-
-  def flash_sidebars
-    unless flash[:sidebars]
-      begin
-        active = Sidebar.find(:all, :order => 'active_position ASC')
-        flash[:sidebars] = active.map {|sb| sb.id }
-      rescue
-        # Avoiding the view to crash
-        @active = []
-        flash[:error] = _("It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually")
-      end
-    end
-    flash[:sidebars]
-  end
-
-  helper_method :available
-end

data/app/controllers/admin/tags_controller.rb

@@ -1,37 +0,0 @@
-class Admin::TagsController < Admin::BaseController
-
-  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'
-        order = params[:order] + " asc"
-      else
-        order = params[:order] + " desc"
-      end
-    else
-      order = 'display_name ASC'
-    end
-
-    @tags = Tag.paginate(:page => params[:page], :order => :display_name, :per_page => this_blog.admin_display_elements)
-  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 => 'index'
-    end
-  end
-
-  def destroy
-    @tag = Tag.find(params[:id])
-    if request.post?
-      @tag.destroy
-      redirect_to :action => 'index'
-    end
-  end
-
-end

data/app/controllers/admin/textfilters_controller.rb

@@ -1,8 +0,0 @@
-class Admin::TextfiltersController < Admin::BaseController
-
-  def macro_help
-    @macro = TextFilter.available_filters.find { |filter| filter.short_name == params[:id] }
-    render :text => BlueCloth.new(@macro.help_text).to_html
-  end
-
-end

data/app/controllers/admin/themes_controller.rb

@@ -1,121 +0,0 @@
-class Admin::ThemesController < Admin::BaseController
-  require 'open-uri'
-  require 'time'
-  require 'rexml/document'
-
-  cache_sweeper :blog_sweeper
-
-  def index
-    @themes = Theme.find_all
-    @themes.each do |theme|
-      theme.description_html = TextFilter.filter_text(this_blog, theme.description, nil, [:markdown,:smartypants])
-    end
-    @active = this_blog.current_theme
-  end
-
-  def preview
-    send_file "#{Theme.themes_root}/#{params[:theme]}/preview.png", :type => 'image/png', :disposition => 'inline', :stream => false
-  end
-
-  def switchto
-    this_blog.theme = params[:theme]
-    this_blog.save
-    zap_theme_caches
-    this_blog.current_theme(:reload)
-    flash[:notice] = _("Theme changed successfully")
-    require "#{this_blog.current_theme.path}/helpers/theme_helper.rb" if File.exists? "#{this_blog.current_theme.path}/helpers/theme_helper.rb"
-    redirect_to :action => 'index'
-  end
-
-  def editor
-    case params[:type].to_s
-    when "stylesheet"
-      path = this_blog.current_theme.path + "/stylesheets/"
-      if params[:file] =~ /css$/
-        filename = params[:file]
-      else
-        flash[:error] = _("You are not authorized to open this file")
-        return
-      end
-    when "layout"
-      path = this_blog.current_theme.path + "/layouts/"
-      if params[:file] =~ /rhtml$|erb$/
-        filename = params[:file]
-      else
-        flash[:error] = _("You are not authorized to open this file")
-        return
-      end
-    end
-
-    if path and filename
-      if File.exists? path + filename
-        if File.writable? path + filename
-          case request.method
-          when :post
-            theme = File.new(path + filename, "r+")
-            theme.write(params[:theme_body])
-            theme.close
-            flash[:notice] = _("File saved successfully")
-            zap_theme_caches
-          end
-        else
-          flash[:notice] = _("Unable to write file")
-        end
-        @file = ""
-        file = File.readlines(path + filename, "r")
-        file.each do |line|
-          @file << line
-        end
-      end
-    end
-  end
-
-  def catalogue
-    # Data get by this URI is a JSON formatted
-    # The return is a list. All element represent a item
-    # Each item is a hash with this key :
-    #  * uid
-    #  * download_uri
-    #  * name
-    #  * author
-    #  * description
-    #  * tags
-    #  * screenshot_uri
-    url = "http://www.dev411.com/typo/themes_2-1.txt"
-    open(url) do |http|
-      @themes = parse_catalogue_by_json(http.read)
-    end
-  rescue OpenURI::HTTPError
-    @themes = []
-    @error = true
-  end
-
-  protected
-
-  def zap_theme_caches
-    FileUtils.rm_rf(%w{stylesheets javascript images}.collect{|v| page_cache_directory + "/#{v}/theme"})
-  end
-
-  private
-  
-  class ThemeItem < Struct.new(:image, :name, :url, :author, :description)
-    def to_s; name; end
-  end
-
-  def parse_catalogue_by_json(body)
-    items_json = JSON.parse(body)
-    items = []
-    items_json.each do |elem|
-      next unless elem['download_uri'] # No display theme without download URI
-      item = ThemeItem.new
-      item.image = elem['screenshot_uri']
-      item.url = elem['download_uri']
-      item.name = elem['name']
-      item.author = elem['author']
-      item.description = elem['description']
-      items << item
-    end
-    items
-    items.sort_by { |item| item.name }
-  end
-end

data/app/controllers/admin/users_controller.rb

@@ -1,47 +0,0 @@
-class Admin::UsersController < Admin::BaseController
-
-  cache_sweeper :blog_sweeper
-
-  def index
-    @users = User.paginate :page => params[:page], :order => 'login asc', :per_page => this_blog.admin_display_elements
-  end
-
-  def new
-    @user = User.new(params[:user])
-    @user.text_filter = TextFilter.find_by_name(this_blog.text_filter)
-    setup_profiles
-    @user.name = @user.login
-    if request.post? and @user.save
-      flash[:notice] = _('User was successfully created.')
-      redirect_to :action => 'index'
-    end
-  end
-
-  def edit
-    @user = params[:id] ? User.find_by_id(params[:id]) : current_user
-
-    setup_profiles
-    @user.attributes = params[:user]
-    if request.post? and @user.save
-      if @user.id = current_user.id
-        current_user = @user
-      end
-      flash[:notice] = _('User was successfully updated.')
-      redirect_to :action => 'index'
-    end
-  end
-
-  def destroy
-    @user = User.find(params[:id])
-    if request.post?
-      @user.destroy if User.count > 1
-      redirect_to :action => 'index'
-    end
-  end
-
-  private
-
-  def setup_profiles
-    @profiles = Profile.find(:all, :order => 'id')
-  end
-end

data/app/controllers/application_controller.rb

@@ -1,78 +0,0 @@
-# The filters added to this controller will be run for all controllers in the application.
-# Likewise will all the methods added be available for all controllers.
-class ApplicationController < ActionController::Base
-  include ::LoginSystem
-  protect_from_forgery :only => [:edit, :update, :delete]
-  
-  before_filter :reset_local_cache, :fire_triggers, :load_lang
-  after_filter :reset_local_cache
-
-  class << self
-    unless self.respond_to? :template_root
-      def template_root
-        ActionController::Base.view_paths.last
-      end
-    end
-
-    # Log all path in file path_cache in Rails.root
-    # When we sweep all cache. We just need delete this file
-    def cache_page_with_log_page(content, path)
-      return unless perform_caching
-      cache_page_without_log_page(content, path)
-    end
-    alias_method_chain :cache_page, :log_page
-  end
-
-  protected
-
-  def setup_themer
-    # Ick!
-    self.view_paths = ::ActionController::Base.view_paths.dup.unshift("#{RAILS_ROOT}/themes/#{this_blog.theme}/views")
-  end
-
-  def error(message = "Record not found...", options = { })
-    @message = message.to_s
-    render :template => 'articles/error', :status => options[:status] || 404
-  end
-
-  def fire_triggers
-    Trigger.fire
-  end
-
-  def load_lang
-    Localization.lang = this_blog.lang
-    # Check if for example "en_UK" locale exesists if not check for "en" locale
-    if I18n.available_locales.include?(this_blog.lang.to_sym)
-      I18n.locale = this_blog.lang
-    elsif I18n.available_locales.include?(this_blog.lang[0..1].to_sym)
-      I18n.locale = this_blog.lang[0..1]
-    end
-    # _("Localization.rtl") 
-  end
-
-  def reset_local_cache
-    if !session
-      session :session => new
-    end
-    @current_user = nil
-  end
-
-  # Helper method to get the blog object.
-  def this_blog
-    @blog ||= Blog.default
-  end
-
-  helper_method :this_blog
-
-  # The base URL for this request, calculated by looking up the URL for the main
-  # blog index page.
-  def blog_base_url
-    url_for(:controller => '/articles').gsub(%r{/$},'')
-  end
-
-  def add_to_cookies(name, value, path=nil, expires=nil)
-    cookies[name] = { :value => value, :path => path || "/#{controller_name}",
-                       :expires => 6.weeks.from_now }
-  end
-end
-