alchemy_cms 2.8.3 → 2.9.0

data/app/controllers/alchemy/passwords_controller.rb

@@ -1,35 +0,0 @@
-module Alchemy
-  class PasswordsController < Devise::PasswordsController
-    include Ferret::Search
-    helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
-
-    before_filter { enforce_ssl if ssl_required? && !request.ssl? }
-    before_filter :set_translation
-
-    layout 'alchemy/login'
-
-    def new
-      build_resource(email: params[:email])
-    end
-
-  private
-
-    # Override for Devise method
-    def new_session_path(resource_name)
-      alchemy.login_path
-    end
-
-    def edit_password_url(resource, options={})
-      alchemy.edit_password_url(options)
-    end
-
-    def after_sign_in_path_for(resource_or_scope)
-      if permitted_to?(:index, :alchemy_admin_dashboard)
-        alchemy.admin_dashboard_path
-      else
-        alchemy.root_path
-      end
-    end
-
-  end
-end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,67 +0,0 @@
-module Alchemy
-  class UserSessionsController < Devise::SessionsController
-    # Necessary because this controller is also used for general login.
-    include Ferret::Search
-    helper 'Alchemy::Admin::Base', 'Alchemy::Pages'
-
-    before_filter(except: 'destroy') { enforce_ssl if ssl_required? && !request.ssl? }
-    before_filter :set_translation
-    before_filter :check_user_count, :only => :new
-
-    layout 'alchemy/login'
-
-    def new
-      super
-    end
-
-    def create
-      authenticate_user!
-      if user_signed_in?
-        store_screen_size
-        if session[:redirect_path].blank?
-          redirect_path = admin_dashboard_path
-        else
-          # We have to strip double slashes from beginning of path, because of strange rails/rack bug.
-          redirect_path = session[:redirect_path].gsub(/^\/{2,}/, '/')
-        end
-        redirect_to redirect_path, :notice => t(:signed_in, :scope => 'devise.sessions')
-      else
-        super
-      end
-    end
-
-    def leave
-      render layout: !request.xhr?
-    end
-
-    def destroy
-      cookies.clear
-      session.clear
-      super
-    end
-
-  private
-
-    def check_user_count
-      if User.count == 0
-        redirect_to signup_path
-      else
-        return true
-      end
-    end
-
-    def store_screen_size
-      session[:screen_size] = params[:user_screensize]
-    end
-
-    # Ovewriting the default of Devise
-    def after_sign_out_path_for(resource_or_scope)
-      if request.referer.blank? || request.referer.to_s =~ /admin/
-        root_path
-      else
-        request.referer
-      end
-    end
-
-  end
-end

data/app/controllers/alchemy/users_controller.rb

@@ -1,46 +0,0 @@
-module Alchemy
-  class UsersController < BaseController
-
-    before_filter { enforce_ssl if ssl_required? && !request.ssl? }
-    before_filter :set_translation
-    before_filter :check_user_count
-    before_filter :load_genders
-
-    layout 'alchemy/admin'
-
-    helper 'Alchemy::Admin::Base'
-
-    def new
-      @signup = true
-      @user = User.new(:roles => 'admin')
-    end
-
-    def create
-      @user = User.new(params[:user])
-      if @user.save
-        flash[:notice] = _t('Successfully signup admin user')
-        sign_in :user, @user
-        redirect_to admin_dashboard_path
-      else
-        @signup = true
-        render :new
-      end
-    rescue Errno::ECONNREFUSED => e
-      flash[:error] = _t(:signup_mail_delivery_error)
-      redirect_to admin_dashboard_path
-    end
-
-  private
-
-    def load_genders
-      @user_genders = User.genders_for_select
-    end
-
-    def check_user_count
-      if User.count > 0
-        redirect_to admin_dashboard_path
-      end
-    end
-
-  end
-end

data/app/mailers/alchemy/notifications.rb

@@ -1,33 +0,0 @@
-module Alchemy
-  class Notifications < ActionMailer::Base
-
-    default(from: Config.get(:mailer)['mail_from'])
-
-    def registered_user_created(user)
-      @user = user
-      @url = login_url
-      mail(
-        to: user.email,
-        subject: I18n.t("Your user credentials")
-      )
-    end
-
-    def admin_user_created(user)
-      @user = user
-      @url = admin_url
-      mail(
-        to: user.email,
-        subject: I18n.t("Your Alchemy Login")
-      )
-    end
-
-    def reset_password_instructions(user, opts={})
-      @user = user
-      mail(
-        to: user.email,
-        subject: I18n.t("Reset password instructions")
-      )
-    end
-
-  end
-end

data/app/models/alchemy/page/users.rb

@@ -1,25 +0,0 @@
-module Alchemy
-  module Page::Users
-
-    extend ActiveSupport::Concern
-
-    # Returns the name of the creator of this page.
-    def creator_name
-      return I18n.t('unknown') if creator.nil?
-      creator.name
-    end
-
-    # Returns the name of the last updater of this page.
-    def updater_name
-      return I18n.t('unknown') if updater.nil?
-      updater.name
-    end
-
-    # Returns the name of the user currently editing this page.
-    def locker_name
-      return I18n.t('unknown') if locker.nil?
-      locker.name
-    end
-
-  end
-end

data/app/models/alchemy/user.rb

@@ -1,183 +0,0 @@
-require 'userstamp'
-require 'acts-as-taggable-on'
-
-module Alchemy
-  class User < ActiveRecord::Base
-
-    model_stamper
-    stampable(:stamper_class_name => 'Alchemy::User')
-
-    begin
-      devise(*Config.get(:devise_modules))
-    rescue NameError => e
-      abort <<-WARN
-You enabled the encryptable devise module, but did not have the `devise-encryptable` gem installed!
-Please add the `devise-encryptable` gem into your Gemfile.
-WARN
-    end
-
-    acts_as_taggable
-
-    attr_accessible(
-      :firstname,
-      :lastname,
-      :login,
-      :email,
-      :gender,
-      :language,
-      :password,
-      :password_confirmation,
-      :roles,
-      :send_credentials,
-      :tag_list
-    )
-
-    attr_accessor :send_credentials
-
-    has_many :folded_pages
-
-    validates_uniqueness_of :login
-    validates_presence_of :roles
-
-    # Unlock all locked pages before destroy and before the user gets logged out.
-    before_destroy :unlock_pages!
-    Warden::Manager.before_logout do |user, auth, opts|
-      if user
-        user.unlock_pages!
-      end
-    end
-
-    after_save :deliver_welcome_mail, if: -> { send_credentials == '1' }
-
-    scope :admins, where(arel_table[:roles].matches("%admin%")) # not pleased with that approach
-    # mysql regexp word matching would be much nicer, but it's not included in SQLite functions per se.
-    # scope :admins, where("#{table_name}.roles REGEXP '[[:<:]]admin[[:>:]]'")
-
-    scope :logged_in, lambda { where("last_request_at > ?", logged_in_timeout.seconds.ago) }
-    scope :logged_out, lambda { where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago) }
-
-    ROLES = Config.get(:user_roles)
-
-    class << self
-      def human_rolename(role)
-        I18n.t("user_roles.#{role}")
-      end
-
-      def genders_for_select
-        [
-          [I18n.t('male'), 'male'],
-          [I18n.t('female'), 'female']
-        ]
-      end
-
-      def logged_in_timeout
-        Config.get(:auto_logout_time).minutes.to_i
-      end
-    end
-
-    def role_symbols
-      roles.map(&:to_sym)
-    end
-
-    def role
-      roles.first
-    end
-
-    def roles
-      read_attribute(:roles).split(' ')
-    end
-
-    def roles=(roles_string)
-      if roles_string.is_a? Array
-        write_attribute(:roles, roles_string.join(' '))
-      elsif roles_string.is_a? String
-        write_attribute(:roles, roles_string)
-      end
-    end
-
-    def add_role(role)
-      self.roles = self.roles.push(role.to_s).uniq
-    end
-
-    # Returns true if the user ahs admin role
-    def is_admin?
-      has_role? 'admin'
-    end
-    alias_method :admin?, :is_admin?
-
-    # Returns true if the user has the given role.
-    def has_role?(role)
-      roles.include? role.to_s
-    end
-
-    # Calls unlock on all locked pages
-    def unlock_pages!
-      pages_locked_by_me.map(&:unlock!)
-    end
-
-    # Returns all pages locked by user.
-    #
-    # A page gets locked, if the user requests to edit the page.
-    #
-    def pages_locked_by_me
-      Page.where(:locked => true).where(:locked_by => self.id).order(:updated_at)
-    end
-    alias_method :locked_pages, :pages_locked_by_me
-
-    # Returns the firstname and lastname as a string
-    #
-    # If both are blank, returns the login
-    #
-    # @option options :flipped (false)
-    #   Flip the firstname and lastname
-    #
-    def fullname(options = {})
-      if lastname.blank? && firstname.blank?
-        login
-      else
-        options = {:flipped => false}.merge(options)
-        fullname = options[:flipped] ? "#{lastname}, #{firstname}" : "#{firstname} #{lastname}"
-        fullname.squeeze(" ").strip
-      end
-    end
-    alias_method :name, :fullname
-
-    # Returns true if the last request not longer ago then the logged_in_time_out
-    def logged_in?
-      raise "Can not determine the records login state because there is no last_request_at column" if !respond_to?(:last_request_at)
-      !last_request_at.nil? && last_request_at > logged_in_timeout.seconds.ago
-    end
-
-    # Opposite of logged_in?
-    def logged_out?
-      !logged_in?
-    end
-
-    def human_roles_string
-      roles.map do |role|
-        self.class.human_rolename(role)
-      end.to_sentence
-    end
-
-    def store_request_time!
-      update_attribute(:last_request_at, Time.now)
-    end
-
-  private
-
-    def logged_in_timeout
-      self.class.logged_in_timeout
-    end
-
-    # Delivers a welcome mail depending from user's role.
-    #
-    def deliver_welcome_mail
-      if has_role?('author') || has_role?('editor') || has_role?('admin')
-        Notifications.admin_user_created(self).deliver
-      else
-        Notifications.registered_user_created(self).deliver
-      end
-    end
-
-  end
-end

data/app/views/alchemy/admin/users/_table.html.erb

@@ -1,69 +0,0 @@
-<table>
-  <tr>
-    <td class="label"><%= f.label 'gender' %></td>
-    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => _t('Please choose')}, :class => 'alchemy_selectbox long', :autofocus => true -%></td>
-  </tr>
-  <tr>
-    <td class="label"><%= f.label 'firstname' %></td>
-    <td class="input"><%= f.text_field 'firstname', :class => 'thin_border long' %></td>
-  </tr>
-  <tr>
-    <td class="label"><%= f.label 'lastname' %></td>
-    <td class="input"><%= f.text_field 'lastname', :class => 'thin_border long' %></td>
-  </tr>
-  <tr>
-    <td class="label mandatory"><%= f.label 'login' %></td>
-    <td class="input"><%= f.text_field 'login', :class => 'thin_border long', :required => true, :autofocus => true %></td>
-  </tr>
-  <tr>
-    <td class="label mandatory"><%= f.label 'email' %></td>
-    <td class="input"><%= f.email_field 'email', :class => 'thin_border long', :required => true %></td>
-  </tr>
-  <tr>
-    <td class="label"><%= f.label 'language' %></td>
-    <td class="select"><%= f.select 'language', translations_for_select, {}, {:class => 'alchemy_selectbox long'} %></td>
-  </tr>
-  <tr>
-    <td class="label mandatory"><%= f.label 'password' %></td>
-    <td class="input mandatory"><%= f.password_field 'password', :class => 'thin_border long', :autocomplete => "off", :required => action_name == 'signup' %></td>
-  </tr>
-  <tr>
-    <td class="label mandatory"><%= f.label 'password_confirmation' %></td>
-    <td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border long', :autocomplete => "off", :required => action_name == 'signup' %></td>
-  </tr>
-  <% if @signup %>
-  <%= f.hidden_field :roles %>
-  <% elsif permitted_to? :update_roles %>
-  <tr>
-    <td class="label"><%= f.label 'roles' %></td>
-    <td id="user_roles">
-    <% Alchemy::User::ROLES.each do |role| %>
-      <label>
-        <%= check_box_tag 'user[roles][]', role, @user.has_role?(role) %>
-        <%= Alchemy::User.human_rolename(role) %>
-      </label>
-    <% end %>
-    </td>
-  </tr>
-  <% end %>
-  <% unless @signup %>
-  <tr>
-    <td class="label"><%= f.label :tag_list %></td>
-    <td class="input">
-      <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => @user %>
-    </td>
-  </tr>
-  <% end %>
-  <tr>
-    <td>&nbsp;</td>
-    <td class="checkbox long">
-      <%= f.check_box(:send_credentials, checked: @user.new_record?) %>
-      <%= f.label(:send_credentials) %>
-    </td>
-  </tr>
-  <tr>
-    <td class="submit" colspan="2">
-      <%= f.button _t(:save), :class => 'button' %>
-    </td>
-  </tr>
-</table>