kit_cms 2.3.20 → 2.3.22

data/app/controllers/api_controller.rb

@@ -0,0 +1,34 @@
+class ApiController < ActionController::Base
+  include DomainController
+
+  before_filter :set_system, :except=>[:not_found_404]
+  before_filter :offline, :except=>[:not_found_404, :down_for_maintenance]
+
+  after_filter :clear_session
+
+  def clear_session
+    session.clear
+    request.session_options[:skip] = true
+  end
+
+  def protect_against_forgery?
+  end
+
+  rescue_from Exception, :with => :respond_error
+
+  def respond_error(exception)
+    head :internal_server_error
+
+    logger.error exception.message
+  end
+
+  def offline
+    message = Preference.get_cached(_sid, "down_for_maintenance_message")
+    if message
+      head :service_unavailable, :message=>message
+      return false
+    end
+  end
+
+end
+

data/app/controllers/calendar_controller.rb

@@ -19,7 +19,7 @@ class CalendarController < KitController
     item.save
 
     unless current_user.admin?  
-        Notification.moderation_required("Ticket Sales", "Ticket sales set up for #{@calendar_entry.calendar.name}.  View: #{Preference.get_cached(_sid, 'host')}/admin/calendar_entries/#{@calendar_entry.id}", _sid).deliver
+        Notification.moderation_required("Ticket Sales", "Ticket sales set up for #{item.calendar.name}.  View: #{Preference.get_cached(_sid, 'host')}/admin/calendar_entries/#{item.id}", _sid).deliver if params[:item_model]=="CalendarEntry"
     end      
     redirect_to (params[:redirect] || "/") and return
   end

data/app/controllers/form_controller.rb

@@ -15,7 +15,7 @@ class FormController < KitController
       search_size = (params[:per] || "25").to_i
       the_page = (params[:page] || "1").to_i 
 
-      search = Tire.search "kit_#{app_name.downcase}_form_submissions" do 
+      search = Tire.search "#{index_name}_form_submissions" do 
         query do
           boolean do 
             must do 
@@ -39,7 +39,7 @@ class FormController < KitController
       @results = nil
     end
 
-    kit_render "search", :layout=>"application"
+    kit_render "search", :layout=>Layout.preference(_sid, "forum-search")
   end
 
 
@@ -85,7 +85,7 @@ class FormController < KitController
 
     if @form.notify.not_blank?
       @form.notify.split(',').each do |recipient|
-        Notification.form_submission(sub_id, _sid, recipient).deliver
+        Notification.form_submission(sub.id, _sid, recipient).deliver
       end
     end
 

data/app/controllers/forum_controller.rb

@@ -1,8 +1,6 @@
 include ActionView::Helpers::TextHelper
 
 class ForumController < KitController
-  append_view_path Layout.resolver
-  layout "forums"
   before_filter :load_forum_user_options, :only => [:topic_index, :thread, :search, :add_post, :recent, :im_on, :favourites, :thread_last_unread, :index]
 
   before_filter :is_moderator
@@ -10,13 +8,13 @@ class ForumController < KitController
   before_filter :post_order, :only=>[:thread]
 
   def test
-    kit_render "test", :layout=>get_layout('index')
+    kit_render "test", :layout_o=>get_layout('index')
   end
 
   def moderate
     redirect_to "/users/sign_in" and return unless @mod
     @topic_posts = TopicPost.sys(_sid).order("id desc").where(:is_visible=>1).page(params[:page]).per(25)  
-    kit_render "moderate", :layout=>get_layout('index')
+    kit_render "moderate", :layout_o=>get_layout('index')
   end
 
   def rate_post
@@ -60,7 +58,7 @@ class ForumController < KitController
       @threads = current_user.topic_threads.page(params[:page]).per(@user_options.threads_per_page)
       @page_title = "Forum: Favourite Threads"
       @show_watch = true
-      kit_render "thread_list", :layout=>get_layout('im-watching', ['im-watching', 'threads']) 
+      kit_render "thread_list", :layout_o=>get_layout('im-watching', ['im-watching', 'threads']) 
     else
       redirect_to "/users/sign_in"
     end
@@ -72,7 +70,7 @@ class ForumController < KitController
     if current_user
       @page_title = "Forum: Threads I Posted To"
       @threads = TopicThread.im_on(current_user, @user_options.threads_per_page, @mod, params[:page])
-      kit_render "thread_list", :layout=>get_layout('im-on', ['im-on', 'threads'])
+      kit_render "thread_list", :layout_o=>get_layout('im-on', ['im-on', 'threads'])
     else
       redirect_to "/users/sign_in"
     end
@@ -93,7 +91,7 @@ class ForumController < KitController
     @destination_last = true
   
     respond_to do |format|
-      format.html { kit_render "thread_list", :layout=>get_layout('recent', ['recent', 'threads']) }
+      format.html { kit_render "thread_list", :layout_o=>get_layout('recent', ['recent', 'threads']) }
       format.rss { render "forum/thread_list.rss" }
     end
   end
@@ -120,7 +118,7 @@ class ForumController < KitController
       return
     end 
 
-    kit_render "report", :layout=>get_layout('report')
+    kit_render "report", :layout_o=>get_layout('report')
   end
 
   def index
@@ -129,7 +127,7 @@ class ForumController < KitController
     @categories = categories.all
     @page_title = "Forums"
     @canonical_tag = "/forums"
-    kit_render "index", :layout=>get_layout('index')
+    kit_render "index", :layout_o=>get_layout('index')
   end
 
   def search
@@ -151,7 +149,7 @@ class ForumController < KitController
       log = logger
 
       [ "TopicPost", "TopicThread" ].each do |model|
-        indexes << "kit_#{app_name.downcase}_#{model.tableize}"
+        indexes << "#{index_name}_#{model.tableize}"
         KitIndexed.indexed_columns(model).collect { |ic|
           search_fields << ic[:name] if ic[:user]
         }
@@ -185,7 +183,7 @@ class ForumController < KitController
       @results = nil
     end
 
-    kit_render "search", :layout=>get_layout('search')
+    kit_render "search", :layout_o=>get_layout('search')
   end
 
   def topic_index
@@ -215,7 +213,7 @@ class ForumController < KitController
     @page_title = "Forums: #{@topic.name}"
     @canonical_tag = "/forums/#{@topic.url}"
     @meta_description = "Forums"
-    kit_render "topic_index", :layout=>get_layout('threads')
+    kit_render "topic_index", :layout_o=>get_layout('threads')
   end
 
   def category_topic_list
@@ -292,7 +290,7 @@ class ForumController < KitController
     @page_title = "#{@thread.topic.name} - #{@thread.title}"
     @canonical_tag = @thread.link
 
-    kit_render "thread", :layout=>get_layout('posts')
+    kit_render "thread", :layout_o=>get_layout('posts')
   end
 
   def preview
@@ -304,9 +302,11 @@ class ForumController < KitController
   end
 
   def add_post
-    return unless anti_spam_okay?
-    return unless sanity_check_okay?
-    return unless check_post_rate?
+    unless current_user && current_user.admin?
+      return unless anti_spam_okay?
+      return unless sanity_check_okay?
+      return unless check_post_rate?
+    end
 
     @thread = TopicThread.where(:id=>params[:id]).first
     redirect_to "/forums" and return  unless level_okay(@thread.topic.write_access_level)
@@ -325,7 +325,7 @@ class ForumController < KitController
 
     if params[:topic_post][:body] && params[:topic_post][:body].strip.length<2
       flash[:form_message] = "Your message must be at least 2 characters"            
-      kit_render "thread", :layout=>get_layout('thread')
+      kit_render "thread", :layout_o=>get_layout('thread')
       return
     end
 
@@ -353,7 +353,11 @@ class ForumController < KitController
       @post.update_postnumber
     end
 
-    redirect_to @thread.link_for_post(@post.id, @user_options, @mod)
+    if request.xhr?
+      render :js=>";"
+    else
+      redirect_to @thread.link_for_post(@post.id, @user_options, @mod)
+    end
   end
 
   def comments
@@ -392,7 +396,7 @@ class ForumController < KitController
     @threads = nil
     @page_id = params[:page_id] 
     @about_page_title = Page.find_sys_id(_sid, @page_id).title
-    kit_render "topic_index", :layout=>get_layout('threads')
+    kit_render "topic_index", :layout_o=>get_layout('threads')
   end
 
   def create_thread
@@ -408,12 +412,12 @@ class ForumController < KitController
 
     if @post.raw_body.strip.length<2
       flash[:form_message] = "Your message must be at least 2 characters"      
-      kit_render "topic_index", :layout=>get_layout('threads')
+      kit_render "topic_index", :layout_o=>get_layout('threads')
       return
     end
     if params[:topic_post][:title].strip.length<2
       flash[:form_message] = "Title must be at least 4 characters"
-      kit_render "topic_index", :layout=>get_layout('threads')
+      kit_render "topic_index", :layout_o=>get_layout('threads')
       return
     end
     @post.system_id = _sid
@@ -563,9 +567,13 @@ class ForumController < KitController
     @post = TopicPost.sys(_sid).where(:id=>params[:id]).first
 
     if can?(:moderate, self) || (@post.is_visible==1 && @post.topic_thread.is_visible==1 && @post.topic_thread.topic.is_visible==1 && level_okay(@post.topic_thread.topic.read_access_level))
-      render :text=>@post.raw_body, :layout=>false
+      if params[:editor]
+        render "fetch_raw", :layout=>false, :locals=>{:is_mod=>params[:mod]=="1"}
+      else
+        render :text=>@post.raw_body, :layout_o=>false
+      end
     else
-      render :text=>"n/a", :layout=>false
+      render :text=>"n/a", :layout_o=>false
     end
   end
 
@@ -642,23 +650,25 @@ class ForumController < KitController
   end
 
   def get_layout(name, names = nil)
-    ll = Rails.cache.fetch("layout-exists-forum-#{name}", :expires_in=>5.seconds) do
+    ll = Rails.cache.fetch("layout-exists-forum-#{_sid}-#{name}", :expires_in=>60.seconds) do
       l = nil
       names = [name] unless names
       names.each do |aname|
-        if Layout.name_exists?("forum-#{aname}")
+        if Layout.name_exists?(_sid, "forum-#{aname}")
           l = "forum-#{aname}"
           break
         end
       end
       if l==nil
-        if Layout.name_exists?("forum")
+        if Layout.name_exists?(_sid, "forum")
           l = "forum"
-        else
-          l = "application"
         end
       end 
-      l
+      if l
+        Layout.sys(_sid).where(:name=>l).first 
+      else
+        Layout.preference(_sid, "forum_layout")
+      end
     end
     ll
   end

data/app/controllers/kit_controller.rb

@@ -5,6 +5,7 @@ class KitController <  ActionController::Base
   before_filter :set_requested_url, :except=>[:not_found_404]
   before_filter :set_system, :except=>[:not_found_404]
   before_filter :offline, :except=>[:not_found_404, :down_for_maintenance]
+  before_filter :check_user
   before_filter :kit_session, :except=>[:not_found_404]
   after_filter :kit_session_end, :except=>[:not_found_404]
   append_view_path Layout.resolver
@@ -12,13 +13,23 @@ class KitController <  ActionController::Base
   after_filter :check_and_record_goal, :except=>[:not_found_404]
 
 
-  attr_accessor :layout_name_being_used
+  attr_accessor :layout_being_used
   attr_accessor :template_being_used
   attr_accessor :requested_url
   
   attr_accessor :is_image_request
   attr_accessor :kit_request
 
+  def check_user
+    return true unless self.kit_system
+
+    u = User.cookie_authenticate(_sid, cookies[:sign_in])
+    if u
+     u.record_signin(_sid, request, 'c')
+     warden.set_user u
+    end 
+  end
+
   def set_requested_url
     self.is_image_request = false 
     self.requested_url = request.fullpath
@@ -76,25 +87,25 @@ class KitController <  ActionController::Base
 
   def stylesheets
     if @page
-      return (@page.page_template.layout.stylesheets + "," + @page.page_template.stylesheets).split(',').uniq
+      return (@page.page_template.layout.stylesheets + @page.page_template.stylesheets).uniq
     elsif @form
-      return @form.include_stylesheets
+      return (@form.stylesheets + @form.layout.stylesheets).uniq
     else
       layout = kit_layout_in_use
       if layout
-        return layout.stylesheets.split(',').uniq
-      else
-        return ["application"]
+        return layout.stylesheets
       end
     end
+
+    return []
   end
 
 
   def kit_layout_in_use
     l = nil
 
-    if self.layout_name_being_used # this gets set if kit_render is being used
-      l = Layout.sys(_sid).where(:name=>self.layout_name_being_used).first
+    if self.layout_being_used # this gets set if kit_render is being used
+      l = self.layout_being_used
     else 
       l = @page.layout if @page
     end
@@ -127,12 +138,17 @@ class KitController <  ActionController::Base
       @content = render_to_string name, :layout=>false
       options[:type] = custom_template.template_type || 'erb'
       options[:inline] = custom_template.body
-      options[:layout] = custom_template.layout.path
+      options[:layout] = custom_template.layout.name
       self.template_being_used = custom_template
-      self.layout_name_being_used = custom_template.layout.name
+      self.layout_id_being_used = custom_template.layout_id
       super_render options
     else
-      self.layout_name_being_used = options[:layout]
+      if options[:layout_o] 
+        self.layout_being_used = options[:layout_o]
+        options[:layout] = self.layout_being_used.path
+      elsif options[:layout]
+        self.layout_being_used = Layout.sys(_sid).where(:path=>options[:layout]).first rescue nil
+      end
       super_render name, options
     end
   end
@@ -239,7 +255,8 @@ HERE
         inline_template = "<div id='page_#{page.id}' class='template_#{error_template.id}'>\n\n" + error_template.body + "\n\n</div>"
         render :inline=>inline_template, :layout=>error_template.layout.path, :type=>error_template.template_type || 'erb'
       else
-        render "error/application", :layout=>Preference.getCached(_sid, "error_layout") || "application", :status=>status
+        render "error/application", 
+          :layout=>Layout.sys(_sid).where(:id=>(Preference.getCached(_sid, "error_layout").path || Layout.sys(_sid).first.id)).first.path, :status=>status
       end
     end
 
@@ -280,12 +297,12 @@ HERE
   end
 
   def can_use
-    authenticate_user!
+    authenticate!
     authorize! :use, self.class
   end
 
   def can_moderate
-    authenticate_user!
+    authenticate!
     authorize! :moderate, self.class
   end
 
@@ -324,6 +341,13 @@ HERE
     Preference.get_cached(_sid, "app_name")
   end
 
+  def index_name
+    ElasticSearch::INDEX_NAME
+  end
+
+  def rails_app_name
+    Rails.application.class.to_s.split("::").first
+  end
  
   def show_form(form)
     @page_title = form.title
@@ -337,7 +361,7 @@ HERE
       end
     end
 
-    render "form/show", :layout=>((form.respond_to?(:layout) && form.layout) ? form.layout : 'application')
+    render "form/show", :layout=>form.layout.path
   end    
   
   def captcha_okay?
@@ -437,6 +461,9 @@ HERE
     @gibbon = Gibbon.new(Preference.get_cached(_sid,'mailchimp_api_key'))
   end
 
+  def pref(name)
+    Preference.get_cached(_sid, name)
+  end
 
   Pagebase = Page.includes([:page_contents_version0, {:page_template=>:layout}, {:block_instances0=>:block}])
 

data/app/controllers/pages_controller.rb

@@ -1,8 +1,7 @@
 class PagesController < KitController
-
+  
   before_filter :load_page, :except=>[:search, :cookie_text, :unique, :index, :new, :create, :stub, :zoom, :terms, :editor_trial]
   before_filter :can_use, :except=>[:show, :search, :cookie_text, :editor_trial, :save, :redir]
-
   layout "layouts/cms"
 
   def copy
@@ -91,6 +90,25 @@ class PagesController < KitController
     params[:mode] = 'current' unless params[:mode]
   end
 
+  def links
+    if params[:refresh]
+       @page.queue_crawl
+       redirect_to "/page/#{@page.id}/info", :notice=>"Request processed"
+       return
+    end  
+
+    if params[:deep]
+      Page.sys(_sid).find_each do |p|      
+        p.queue_crawl(false)
+        redirect_to "/page/#{@page.id}/info", :notice=>"Request processed"
+        return
+      end
+
+      @page.queue_crawl
+      redirect_to "/page/#{@page.id}/links"
+    end
+  end
+
   def search
     if params[:search]
       search_fields = []
@@ -100,7 +118,7 @@ class PagesController < KitController
       the_page = (params[:page] || "1").to_i 
 
       [ "Page" ].each do |model|
-        indexes << "kit_#{app_name.downcase}_#{model.downcase.pluralize}"
+        indexes << "#{index_name}_#{model.downcase.pluralize}"
         KitIndexed.indexed_columns(model).collect { |c|
           search_fields << c[:name] if c[:user]
         }
@@ -117,6 +135,7 @@ class PagesController < KitController
         size search_size
         filter :term, :system_id=>system_id
       end
+      logger.info "SEARCH: #{indexes.join(',')} #{search.to_json}"
       @results = search.results
     else
       @results = nil
@@ -125,7 +144,7 @@ class PagesController < KitController
     @searched_for = params[:search]
 
     @show_edit_link = user_can_edit = can?(:use, self)
-    kit_render "pages/search", :layout=>Preference.getCached(_sid, "layout_search") || "application"
+    kit_render "pages/search", :layout_o=>Layout.preference(_sid, "layout_search") 
   end
 
   def auto_save_delete
@@ -167,6 +186,7 @@ class PagesController < KitController
       @page.updated_at = Time.now 
       @page.save
       @page.update_index 
+      @page.queue_crawl
     end
 
     render :js=>""
@@ -271,7 +291,7 @@ class PagesController < KitController
 
     if (@page==nil || @page.is_deleted==1 || !@page.is_published?) && !@page.editable && cannot?(:use, self)
       session[:error_message] = "Page not found"
-      render "/error/404", :status=>404, :layout=>@page ? @page.dif_template(use_mobile?).layout.path : false
+      render "/error/404", :status=>404, :layout_o=>@page ? @page.dif_template(use_mobile?).layout : false
       return
     end