alchemy_cms 2.1.12 → 2.2.rc1

data/app/controllers/alchemy/admin/trash_controller.rb

@@ -1,24 +1,24 @@
 module Alchemy
-	module Admin
-		class TrashController < Alchemy::Admin::BaseController
+  module Admin
+    class TrashController < Alchemy::Admin::BaseController
 
-			helper "alchemy/admin/elements"
+      helper "alchemy/admin/elements"
 
-			def index
-				@elements = Element.trashed
-				@page = Page.find_by_id(params[:page_id])
-				@allowed_elements = Element.all_for_page(@page)
-				@draggable_trash_items = {}
-				@elements.each { |e| @draggable_trash_items["element_#{e.id}"] = e.belonging_cellnames(@page) }
-				render :layout => false
-			end
+      def index
+        @elements = Element.trashed
+        @page = Page.find_by_id(params[:page_id])
+        @allowed_elements = Element.all_for_page(@page)
+        @draggable_trash_items = {}
+        @elements.each { |e| @draggable_trash_items["element_#{e.id}"] = e.belonging_cellnames(@page) }
+        render :layout => false
+      end
 
-			def clear
-				@page = Page.find_by_id(params[:page_id])
-				@elements = Element.trashed
-				@elements.map(&:destroy)
-			end
+      def clear
+        @page = Page.find_by_id(params[:page_id])
+        @elements = Element.trashed
+        @elements.map(&:destroy)
+      end
 
-		end
-	end
+    end
+  end
 end

data/app/controllers/alchemy/admin/users_controller.rb

@@ -1,81 +1,81 @@
 module Alchemy
-	module Admin
-		class UsersController < Alchemy::Admin::BaseController
+  module Admin
+    class UsersController < Alchemy::Admin::BaseController
 
-			filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy::User
-			filter_access_to [:index, :new, :create], :attribute_check => false
+      filter_access_to [:edit, :update, :destroy], :attribute_check => true, :load_method => :load_user, :model => Alchemy::User
+      filter_access_to [:index, :new, :create], :attribute_check => false
 
-			def index
-				if !params[:query].blank?
-					users = User.where([
-						"login LIKE ? OR email LIKE ? OR firstname LIKE ? OR lastname LIKE ?",
-						"%#{params[:query]}%",
-						"%#{params[:query]}%",
-						"%#{params[:query]}%",
-						"%#{params[:query]}%"
-					])
-				else
-					users = User.scoped
-				end
-				@users = users.page(params[:page] || 1).per(per_page_value_for_screen_size).order('login')
-			end
+      def index
+        if !params[:query].blank?
+          users = User.where([
+           "login LIKE ? OR email LIKE ? OR firstname LIKE ? OR lastname LIKE ?",
+           "%#{params[:query]}%",
+           "%#{params[:query]}%",
+           "%#{params[:query]}%",
+           "%#{params[:query]}%"
+         ])
+        else
+          users = User.scoped
+        end
+        @users = users.page(params[:page] || 1).per(per_page_value_for_screen_size).order('login')
+      end
 
-			def new
-				@user = User.new
-				@user_roles = User::ROLES.map { |role| [User.human_rolename(role), role]}
-				@user_genders = User.genders_for_select
-				render :layout => false
-			end
+      def new
+        @user = User.new
+        @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
+        @user_genders = User.genders_for_select
+        render :layout => false
+      end
 
-			def create
-				@user = User.new(params[:user], :as => current_user.role.to_sym)
-				if @user.save
-					if @user.role == "registered" && params[:send_credentials]
-						Notifications.registered_user_created(@user).deliver
-					elsif params[:send_credentials]
-						Notifications.admin_user_created(@user).deliver
-					end
-				end
-				render_errors_or_redirect(
-					@user,
-					admin_users_path,
-					t("User created", :name => @user.name)
-				)
-			end
+      def create
+        @user = User.new(params[:user], :as => current_user.role.to_sym)
+        if @user.save
+          if @user.role == "registered" && params[:send_credentials]
+            Notifications.registered_user_created(@user).deliver
+          elsif params[:send_credentials]
+            Notifications.admin_user_created(@user).deliver
+          end
+        end
+        render_errors_or_redirect(
+          @user,
+          admin_users_path,
+          t("User created", :name => @user.name)
+        )
+      end
 
-			def edit
-				@user_roles = User::ROLES.map { |role| [User.human_rolename(role), role]}
-				@user_genders = User.genders_for_select
-				render :layout => false
-			end
+      def edit
+        @user_roles = User::ROLES.map { |role| [User.human_rolename(role), role] }
+        @user_genders = User.genders_for_select
+        render :layout => false
+      end
 
-			def update
-				# User is fetched via before filter
-				@user.update_attributes(params[:user], :as => current_user.role.to_sym)
-				Notifications.admin_user_created(@user).deliver if params[:send_credentials]
-				render_errors_or_redirect(
-					@user,
-					admin_users_path,
-					t("User updated", :name => @user.name)
-				)
-			end
+      def update
+        # User is fetched via before filter
+        @user.update_attributes(params[:user], :as => current_user.role.to_sym)
+        Notifications.admin_user_created(@user).deliver if params[:send_credentials]
+        render_errors_or_redirect(
+          @user,
+          admin_users_path,
+          t("User updated", :name => @user.name)
+        )
+      end
 
-			def destroy
-				# User is fetched via before filter
-				name = @user.name
-				if @user.destroy
-					flash[:notice] = t("User deleted", :name => name)
-				end
-				@redirect_url = admin_users_path
-				render :action => :redirect
-			end
+      def destroy
+        # User is fetched via before filter
+        name = @user.name
+        if @user.destroy
+          flash[:notice] = t("User deleted", :name => name)
+        end
+        @redirect_url = admin_users_path
+        render :action => :redirect
+      end
 
-		protected
+      protected
 
-			def load_user
-				@user = User.find(params[:id])
-			end
+      def load_user
+        @user = User.find(params[:id])
+      end
 
-		end
-	end
+    end
+  end
 end

data/app/controllers/alchemy/attachments_controller.rb

@@ -1,30 +1,30 @@
 module Alchemy
-	class AttachmentsController < Alchemy::BaseController
-	
-		# sends file inline. i.e. for viewing pdfs/movies in browser
-		def show
-			@attachment = Attachment.find(params[:id])
-			send_file(
-				@attachment.public_filename,
-				{
-					:name => @attachment.filename,
-					:type => @attachment.content_type,
-					:disposition => 'inline'
-				}
-			)
-		end
-	
-		# sends file as attachment. aka download
-		def download
-			@attachment = Attachment.find(params[:id])
-			send_file(
-				@attachment.full_filename, {
-					:name => @attachment.filename,
-					:type => @attachment.content_type,
-					:disposition => 'attachment'
-				}
-			)
-		end
+  class AttachmentsController < Alchemy::BaseController
 
-	end
+    # sends file inline. i.e. for viewing pdfs/movies in browser
+    def show
+      @attachment = Attachment.find(params[:id])
+      send_file(
+        @attachment.public_filename,
+        {
+          :name => @attachment.filename,
+          :type => @attachment.content_type,
+          :disposition => 'inline'
+        }
+      )
+    end
+
+    # sends file as attachment. aka download
+    def download
+      @attachment = Attachment.find(params[:id])
+      send_file(
+        @attachment.full_filename, {
+          :name => @attachment.filename,
+          :type => @attachment.content_type,
+          :disposition => 'attachment'
+        }
+      )
+    end
+
+  end
 end

data/app/controllers/alchemy/base_controller.rb

@@ -1,158 +1,162 @@
 # This is the main Alchemy controller all other controllers inheret from.
 module Alchemy
-	class BaseController < ApplicationController
-
-		include Alchemy::Modules
-
-		protect_from_forgery
-
-		before_filter :set_language
-		before_filter :mailer_set_url_options
-
-		helper_method :current_server, :current_user, :t
-
-		# Returns a host string with the domain the app is running on.
-		def current_server
-			# For local development server
-			if request.port != 80
-				"http://#{request.host}:#{request.port}"
-			# For remote production server
-			else
-				"http://#{request.host}"
-			end
-		end
-
-		def configuration(name)
-			return Alchemy::Config.get(name)
-		end
-
-		def multi_language?
-			Language.published.count > 1
-		end
-
-		def current_user
-			return @current_user if defined?(@current_user)
-			@current_user = current_user_session && current_user_session.record
-		end
-
-		def current_user_session
-			return @current_user_session if defined?(@current_user_session)
-			@current_user_session = UserSession.find
-		end
-
-		def logged_in?
-			!current_user.blank?
-		end
-
-		# Overriding +I18n+s default +t+ helper, so we can pass it through +Alchemy::I18n+
-		def t(key, *args)
-			::Alchemy::I18n.t(key, *args)
-		end
-
-	private
-
-		# Sets the language for rendering pages in pages controller
-		def set_language
-			if params[:lang].blank? and session[:language_id].blank?
-				set_language_to_default
-			elsif !params[:lang].blank?
-				set_language_from(params[:lang])
-				::I18n.locale = params[:lang]
-			end
-		end
-
-		def set_language_from(language_code_or_id)
-			if language_code_or_id.is_a?(String) && language_code_or_id.match(/^\d+$/)
-				language_code_or_id = language_code_or_id.to_i
-			end
-			case language_code_or_id.class.name
-				when "String"
-					@language = Language.find_by_code(language_code_or_id)
-				when "Fixnum"
-					@language = Language.find(language_code_or_id)
-			end
-			store_language_in_session(@language)
-		end
-
-		def set_language_to_default
-			@language = Language.get_default
-			if @language
-				store_language_in_session(@language)
-			else
-				raise "No Default Language found! Did you run `rake alchemy:db:seed` task?"
-			end
-		end
-
-		def store_language_in_session(language)
-			if language
-				session[:language_code] = language.code
-				session[:language_id] = language.id
-			else
-				logger.warn "!!!! Language not found for #{language.inspect}. Setting to default!"
-				set_language_to_default
-			end
-		end
-
-		def store_location
-			session[:redirect_path] = request.path
-		end
-
-		def mailer_set_url_options
-			ActionMailer::Base.default_url_options[:host] = request.host_with_port
-		end
-
-		def hashified_options
-			return nil if params[:options].blank?
-			if params[:options].is_a?(String)
-				Rack::Utils.parse_query(params[:options])
-			else
-				params[:options]
-			end
-		end
-
-		def layout_for_page
-			if !params[:layout].blank? && params[:layout] != 'none'
-				params[:layout]
-			elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
-				'application'
-			else
-				'alchemy/pages'
-			end
-		end
-
-	protected
-
-		def permission_denied
-			if current_user
-				if current_user.role == 'registered'
-					redirect_to alchemy.root_path
-				else
-					if request.referer == alchemy.login_url
-						render :file => File.join(Rails.root.to_s, 'public', '422.html'), :status => 422, :layout => false
-					elsif request.xhr?
-						respond_to do |format|
-							format.js {
-								render :js => "Alchemy.growl('#{t('You are not authorized')}', 'warning'); Alchemy.enableButton('button.button, a.button, input.button');"
-							}
-							format.html {
-								render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
-							}
-						end
-					else
-						flash[:error] = t('You are not authorized')
-						redirect_to alchemy.admin_dashboard_path
-					end
-				end
-			else
-				flash[:info] = t('Please log in')
-				if request.xhr?
-					render :action => :permission_denied
-				else
-					store_location
-					redirect_to alchemy.login_path
-				end
-			end
-		end
-
-	end
+  class BaseController < ApplicationController
+
+    include Alchemy::Modules
+
+    protect_from_forgery
+
+    before_filter :set_language
+    before_filter :mailer_set_url_options
+
+    helper_method :current_server, :current_user, :t
+
+    # Returns a host string with the domain the app is running on.
+    def current_server
+      # For local development server
+      if request.port != 80
+        "http://#{request.host}:#{request.port}"
+        # For remote production server
+      else
+        "http://#{request.host}"
+      end
+    end
+
+    def configuration(name)
+      return Alchemy::Config.get(name)
+    end
+
+    def multi_language?
+      Language.published.count > 1
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      @current_user = current_user_session && current_user_session.record
+    end
+
+    def current_user_session
+      return @current_user_session if defined?(@current_user_session)
+      @current_user_session = UserSession.find
+    end
+
+    def logged_in?
+      !current_user.blank?
+    end
+
+    def raise_not_found_error
+      raise ActionController::RoutingError.new('Not Found')
+    end
+
+    # Overriding +I18n+s default +t+ helper, so we can pass it through +Alchemy::I18n+
+    def t(key, *args)
+      ::Alchemy::I18n.t(key, *args)
+    end
+
+    private
+
+    # Sets the language for rendering pages in pages controller
+    def set_language
+      if params[:lang].blank? and session[:language_id].blank?
+        set_language_to_default
+      elsif !params[:lang].blank?
+        set_language_from(params[:lang])
+        ::I18n.locale = params[:lang]
+      end
+    end
+
+    def set_language_from(language_code_or_id)
+      if language_code_or_id.is_a?(String) && language_code_or_id.match(/^\d+$/)
+        language_code_or_id = language_code_or_id.to_i
+      end
+      case language_code_or_id.class.name
+      when "String"
+        @language = Language.find_by_code(language_code_or_id)
+      when "Fixnum"
+        @language = Language.find(language_code_or_id)
+      end
+      store_language_in_session(@language)
+    end
+
+    def set_language_to_default
+      @language = Language.get_default
+      if @language
+        store_language_in_session(@language)
+      else
+        raise "No Default Language found! Did you run `rake alchemy:db:seed` task?"
+      end
+    end
+
+    def store_language_in_session(language)
+      if language
+        session[:language_code] = language.code
+        session[:language_id] = language.id
+      else
+        logger.warn "!!!! Language not found for #{language.inspect}. Setting to default!"
+        set_language_to_default
+      end
+    end
+
+    def store_location
+      session[:redirect_path] = request.path
+    end
+
+    def mailer_set_url_options
+      ActionMailer::Base.default_url_options[:host] = request.host_with_port
+    end
+
+    def hashified_options
+      return nil if params[:options].blank?
+      if params[:options].is_a?(String)
+        Rack::Utils.parse_query(params[:options])
+      else
+        params[:options]
+      end
+    end
+
+    def layout_for_page
+      if !params[:layout].blank? && params[:layout] != 'none'
+        params[:layout]
+      elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
+        'application'
+      else
+        'alchemy/pages'
+      end
+    end
+
+    protected
+
+    def permission_denied
+      if current_user
+        if current_user.role == 'registered'
+          redirect_to alchemy.root_path
+        else
+          if request.referer == alchemy.login_url
+            render :file => File.join(Rails.root.to_s, 'public', '422.html'), :status => 422, :layout => false
+          elsif request.xhr?
+            respond_to do |format|
+              format.js {
+                render :js => "Alchemy.growl('#{t('You are not authorized')}', 'warning'); Alchemy.enableButton('button.button, a.button, input.button');"
+              }
+              format.html {
+                render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
+              }
+            end
+          else
+            flash[:error] = t('You are not authorized')
+            redirect_to alchemy.admin_dashboard_path
+          end
+        end
+      else
+        flash[:info] = t('Please log in')
+        if request.xhr?
+          render :action => :permission_denied
+        else
+          store_location
+          redirect_to alchemy.login_path
+        end
+      end
+    end
+
+  end
 end