gluttonberg-core 2.6.4 → 3.0.0

data/app/controllers/gluttonberg/public/base_controller.rb

@@ -1,169 +1,116 @@
-# This Class is intended to be used to integrate an arbitrary controller into
-# the Gluttonberg front end. It provides access to the locale/dialect processing,
-# templating, page collections for generating navigations and injects a bunch of
-# other useful helpers.
+module Gluttonberg
+  # This Class is intended to be used to integrate an arbitrary controller into
+  # the Gluttonberg front end. It provides access to the locale/dialect processing,
+  # templating, page collections for generating navigations and injects a bunch of
+  # other useful helpers.
+  module Public
+    class BaseController < Gluttonberg::BaseController
+      # The included hook is used to create a bunch of class-ivars, which are used to
+      # store various configuration options.
+      #
+      # It also installs before and after hooks that have been declared elsewhere
+      # in this module.
 
+      attr_accessor :page, :locale
+      before_filter :retrieve_locale , :rails_locale
 
-class Gluttonberg::Public::BaseController < ActionController::Base
-    # The included hook is used to create a bunch of class-ivars, which are used to
-    # store various configuration options.
-    #
-    # It also installs before and after hooks that have been declared elsewhere
-    # in this module.
-    
-    attr_accessor :page, :locale  
-    before_filter :retrieve_locale , :rails_locale
-        
-    layout "public"
-    
-    helper_method :current_user_session, :current_user , :current_member_session , :current_member , :current_localization_slug
-    
-    if Rails.env == "production"    
-      rescue_from ActionView::MissingTemplate, :with => :not_found
-      rescue_from ActiveRecord::RecordNotFound, :with => :not_found
-      rescue_from ActionController::RoutingError, :with => :not_found
-      rescue_from CanCan::AccessDenied, :with => :access_denied
-    end
-    
-    before_filter :verify_site_access    
-    
-  protected
-    
-    def verify_site_access
-      unless action_name == "restrict_site_access"
-        setting = Gluttonberg::Setting.get_setting("restrict_site_access")
-        if !setting.blank? && cookies[:restrict_site_access] != "allowed"
-          if env['gluttonberg.page'].blank?
-            redirect_to restrict_site_access_path(:return_url => request.url)
+      layout "public"
+
+      helper_method :current_user_session, :current_user , :current_member_session , :current_member , :current_localization_slug
+      before_filter :verify_site_access
+
+      protected
+
+        # this makes sure that site is open for public otherwise it checks for 
+        # that admin user is logged in so that he/she can preview site
+        def verify_site_access
+          unless action_name == "restrict_site_access"
+            setting = Gluttonberg::Setting.get_setting("restrict_site_access", current_site_config_name)
+            if !setting.blank? && cookies[:restrict_site_access] != "allowed"
+              if env['GLUTTONBERG.PAGE'].blank?
+                return_url = request.url
+              else
+                return_url = env['GLUTTONBERG.PAGE'].current_localization.public_path
+              end
+              redirect_to restrict_site_access_path(:return_url => return_url)
+            end
+          end
+        end
+
+        # slug for current locale otherwise it sends default locale's slug
+        def rails_locale
+          if env['GLUTTONBERG.LOCALE'].blank?
+            I18n.locale = I18n.default_locale
           else
-            default_localization = Gluttonberg::PageLocalization.find(:first , :conditions => { :page_id => env['gluttonberg.page'].id , :locale_id => Gluttonberg::Locale.first_default.id } )
-            redirect_to restrict_site_access_path(:return_url => default_localization.public_path)
-          end  
+            I18n.locale = env['GLUTTONBERG.LOCALE'].slug || I18n.default_locale
+          end
         end
-      end  
-    end
-    
-    def rails_locale
-      if env['gluttonberg.locale'].blank?
-        I18n.locale = I18n.default_locale
-      else
-        I18n.locale = env['gluttonberg.locale'].slug || I18n.default_locale
-      end
-      
-    end
-    def current_user_session
-      return @current_user_session if defined?(@current_user_session)
-      @current_user_session = UserSession.find
-    end
 
-    def current_user
-      return @current_user if defined?(@current_user)
-      @current_user = current_user_session && current_user_session.record
-    end
+        def current_member_session
+          return @current_member_session if defined?(@current_member_session)
+          @current_member_session = MemberSession.find
+        end
 
-    def require_user
-      unless current_user
-        store_location
-        flash[:error] = "You must be logged in to access this page"
-        redirect_to login_url
-        return false
-      end
-      true
-    end
-    
-    def current_member_session
-      return @current_member_session if defined?(@current_member_session)
-      @current_member_session = MemberSession.find
-    end
+        def current_member
+          return @current_member if defined?(@current_member)
+          @current_member = current_member_session && current_member_session.record
+          if !@current_member.blank? && @current_member.can_login?
+          else
+             current_member_session.destroy unless current_member_session.blank?
+             @current_member = nil
+          end
+          @current_member
+        end
 
-    def current_member
-      return @current_member if defined?(@current_member)
-      @current_member = current_member_session && current_member_session.record
-      if !@current_member.blank? && @current_member.can_login?
-      else
-         current_member_session.destroy unless current_member_session.blank?
-         @current_member = nil
-      end  
-      @current_member
-    end
+        def require_member
+          if current_member.blank?
+            store_location
+            flash[:error] = "You must be logged in to access this page"
+            redirect_to member_login_path
+            return false
+          elsif current_member.profile_confirmed != true && controller_name != "members"
+            flash[:error] = "Your account has not been verified. Please check your email for your verification link. If you did not receive your verification email, Please click <a href='#{member_resend_confirmation_path}' >here</a> to resend it."
+            redirect_to member_profile_path
+            return false
+          end
+          true
+        end
 
-    def require_member
-      if current_member.blank?
-        store_location
-        flash[:error] = "You must be logged in to access this page"
-        redirect_to member_login_url
-        return false
-      elsif current_member.profile_confirmed != true && controller_name != "members"
-        flash[:error] = "Your account has not been verified. Please check your email for your verification link. If you did not receive your verification email, Please click <a href='#{member_resend_confirmation_path}' >here</a> to resend it."
-        redirect_to member_profile_url
-        return false
-      end
-      true
-    end
-    
-    def is_members_enabled 
-      unless Gluttonberg::Member.enable_members == true
-        raise ActiveRecord::RecordNotFound
-      end  
-    end
-    
-    def require_super_admin_user
-      return false unless require_user
-      
-      unless current_user.super_admin?
-        store_location
-        flash[:notice] = "You dont have privilege to access this page"
-        redirect_to admin_login_url
-        return false
-      end
-    end
-    
-    def store_location
-      @page = env['gluttonberg.page']
-      if @page.blank?
-        session[:return_to] = request.url
-      else
-        session[:return_to] = @page.public_path
-      end 
-    end
+        def is_members_enabled
+          unless Gluttonberg::Member.enable_members == true
+            raise ActiveRecord::RecordNotFound
+          end
+        end
 
-    def redirect_back_or_default(default)
-      redirect_to(session[:return_to] || default)
-      session[:return_to] = nil
-    end
-      
-    def retrieve_locale
-      @locale = env['gluttonberg.locale']
-    end
-    
-    # Exception handlers
-    def not_found
-      render :layout => "bare" , :template => 'gluttonberg/public/exceptions/not_found.html.haml' , :status => 404
-    end
-    
-    def access_denied
-      render :layout => "bare" , :template => 'gluttonberg/public/exceptions/access_denied.html.haml'
-    end
+        def store_location
+          @page = env['GLUTTONBERG.PAGE']
+          if @page.blank?
+            session[:return_to] = request.url
+          else
+            session[:return_to] = @page.public_path
+          end
+        end
 
-    # handle NotAcceptable exceptions (406)
-    def not_acceptable
-      render :layout => "bare" , :template => 'gluttonberg/public/exceptions/not_acceptable.html.haml'
-    end
-    
-    def internal_server_error
-      render :layout => "bare" , :template => 'gluttonberg/public/exceptions/internal_server_error.html.haml'
-    end
-    
-    def current_localization_slug
-       if @locale
-         @locale.slug
-       else
-         Gluttonberg::Locale.first_default.slug
-       end
-    end
+        def retrieve_locale
+          @locale = env['GLUTTONBERG.LOCALE']
+        end
 
-    def localized_text(english , chineese)
-      (current_localization_slug == "cn" ? chineese : english ) 
-    end
+        # Exception handlers
+        def not_found
+          render :layout => "bare" , :template => 'exceptions/not_found' , :status => 404, :handlers => [:haml], :formats => [:html]
+        end
 
-end
+        def access_denied
+          render :layout => "bare" , :template => 'exceptions/access_denied' , :status => 403, :handlers => [:haml], :formats => [:html]
+        end
+
+        def current_localization_slug
+          if @locale
+            @locale.slug
+          else
+            Gluttonberg::Locale.first_default.slug
+          end
+        end
+    end
+  end #public
+end

data/app/controllers/gluttonberg/public/flag_controller.rb

@@ -3,13 +3,8 @@ module Gluttonberg
     class FlagController <  Gluttonberg::Public::BaseController
 
       def new
-        model = nil
-        if params[:flaggable_type].include?("Gluttonberg::")
-          model = Gluttonberg.const_get(params[:flaggable_type][13..-1])
-        else
-          model = Kernel.const_get(params[:flaggable_type])
-        end
-        @flaggable = model.find(params[:flaggable_id])
+        model = params[:flaggable_type].constantize
+        @flaggable = model.where(:id => params[:flaggable_id]).first
         respond_to do |format|
           format.html
         end

data/app/controllers/gluttonberg/public/gallery_controller.rb

@@ -1,2 +1,3 @@
 class GalleryController < ApplicationController
+  # CleaningRequired Remove this controller
 end

data/app/controllers/gluttonberg/public/member_password_resets_controller.rb

@@ -13,15 +13,15 @@ module Gluttonberg
       end
 
       def create
-        @member = Member.find_by_email(params[:gluttonberg_member][:email])
+        @member = Member.where(:email => params[:gluttonberg_member][:email]).first
         if @member
           @member.deliver_password_reset_instructions!(current_localization_slug)
           flash[:notice] = "Instructions to reset your password have been emailed to you. " +
           "Please check your email."
           redirect_to root_path
         else
-          flash[:notice] = "No member was found with that email address"
-          redirect_to root_path
+          flash[:error] = "No member was found with that email address"
+          render :new
         end
       end
 
@@ -34,25 +34,13 @@ module Gluttonberg
       def update
         @member.password = params[:gluttonberg_member][:password]
         @member.password_confirmation = params[:gluttonberg_member][:password_confirmation]
-        if @member.save
-          flash[:notice] = "Password successfully updated"
-          redirect_to root_path
-        else
-          render :edit
-        end
+        generic_update_reset_password(@member, root_path)
       end
 
       private
 
         def load_member_using_perishable_token
-          @member = Member.find_using_perishable_token(params[:id])
-          unless @member
-            flash[:notice] = "We're sorry, but we could not locate your account. " +
-            "If you are having issues try copying and pasting the URL " +
-            "from your email into your browser or restarting the " +
-            "reset password process."
-            redirect_to root_path
-          end
+          @member = generic_find_using_perishable_token(Member)
         end
 
     end

data/app/controllers/gluttonberg/public/members_controller.rb

@@ -16,11 +16,6 @@ module Gluttonberg
 
       def create
         @member = Member.new(params[:gluttonberg_member])
-        if Member.does_email_verification_required
-          @member.confirmation_key = Digest::SHA1.hexdigest(Time.now.to_s + rand(12341234).to_s)[1..24]
-        else
-          @member.profile_confirmed = true
-        end
         if @member && @member.save
           if Member.does_email_verification_required
             MemberNotifier.confirmation_instructions(@member.id,current_localization_slug).deliver
@@ -42,24 +37,23 @@ module Gluttonberg
           @member.profile_confirmed = true
           @member.save
           flash[:notice] = "Your registration is now complete."
-          redirect_to root_url
+          redirect_to root_path
         else
           flash[:notice] = "We're sorry, but we could not locate your account. " +
           "If you are having issues try copying and pasting the URL " +
           "from your email into your browser."
-          redirect_to root_url
+          redirect_to root_path
         end
       end
 
       def resend_confirmation
         if current_member.confirmation_key.blank?
-          confirmation_key = Digest::SHA1.hexdigest(Time.now.to_s + rand(12341234).to_s)[1..24]
-          current_member.confirmation_key = confirmation_key
+          current_member.generate_confirmation_key
           current_member.save
         end
         MemberNotifier.confirmation_instructions(current_member.id,current_localization_slug).deliver if current_member && !current_member.profile_confirmed
         flash[:notice] = "Please check your email for a confirmation."
-        redirect_to member_profile_url
+        redirect_to member_profile_path
       end
 
       def update
@@ -88,10 +82,6 @@ module Gluttonberg
         end
       end
 
-
-
-      protected
-
     end
   end
-end
+end

data/app/controllers/gluttonberg/public/pages_controller.rb

@@ -3,16 +3,15 @@ module Gluttonberg
     class PagesController < Gluttonberg::Public::BaseController
       before_filter :retrieve_page , :only => [ :show ]
 
-      # If localized template file exist then render that file otherwise render non-localized template
+      # If localized template file exist then render
+      # that file otherwise render non-localized template
+      # for ajax request do not render layout
       def show
-        if Gluttonberg::Member.enable_members == true && !@page.is_public?
-          return unless require_member
-          unless current_member.does_member_have_access_to_the_page?(page)
-            raise CanCan::AccessDenied
-          end
+        return unless verify_page_access
+        if current_user && params[:preview].to_s == "true"
+          Gluttonberg::AutoSave.load_version(@page.current_localization)
         end
-
-        template = page.view
+        template = @page.view
         template_path = "pages/#{template}"
 
         if locale && File.exists?(File.join(Rails.root,  "app/views/pages/#{template}.#{locale.slug}.html.haml" ) )
@@ -28,7 +27,7 @@ module Gluttonberg
       end
 
       def restrict_site_access
-        setting = Gluttonberg::Setting.get_setting("restrict_site_access")
+        setting = Gluttonberg::Setting.get_setting("restrict_site_access", current_site_config_name)
         if setting == params[:password]
           cookies[:restrict_site_access] = "allowed"
           redirect_to( params[:return_url] || "/")
@@ -41,16 +40,18 @@ module Gluttonberg
         end
       end
 
+      # Html version of site sitemap
       def sitemap
         begin
           SitemapGenerator::Interpreter.respond_to?(:run)
         rescue
-          render :layout => "bare" , :template => 'gluttonberg/public/exceptions/not_found.html.haml' , :status => 404
+          render :layout => "bare" , :template => 'exceptions/not_found' , :status => 404, :handlers => [:haml], :formats => [:html]
         end
       end
 
+      # serve CMS based css to public
       def stylesheets
-        @stylesheet = Stylesheet.find(:first , :conditions => { :slug => params[:id] })
+        @stylesheet = Stylesheet.where(:slug => params[:id]).first
         unless params[:version].blank?
           @version = params[:version]
           @stylesheet.revert_to(@version)
@@ -63,17 +64,27 @@ module Gluttonberg
       end
 
       def error_404
-        render :layout => "bare" , :template => 'gluttonberg/public/exceptions/not_found.html.haml' , :status => 404
+        render :layout => "bare" , :template => 'exceptions/not_found' , :status => 404, :handlers => [:haml], :formats => [:html]
       end
 
 
       private
         def retrieve_page
-          @page = env['gluttonberg.page']
+          @page = env['GLUTTONBERG.PAGE']
           unless( current_user &&( authorize! :manage, Gluttonberg::Page) )
             @page = nil if @page.blank? || !@page.published?
           end
-          raise ActiveRecord::RecordNotFound  if @page.blank?
+          raise ActiveRecord::RecordNotFound if @page.blank?
+        end
+
+        def verify_page_access
+          if Gluttonberg::Member.enable_members == true && !@page.is_public?
+            return false unless require_member
+            unless current_member.does_member_have_access_to_the_page?(@page)
+              raise CanCan::AccessDenied
+            end
+          end
+          true
         end
 
     end