caboose-cms 0.7.60 → 0.7.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad4bf6009e7d52ac46a3190b3c4889d0e89c076
-  data.tar.gz: cf31d15f32e0ead99aff9cff064c3d29bf80bceb
+  metadata.gz: 1dd0c8df55ed44f2cf96ae3a6bcf5f0880bcf0e1
+  data.tar.gz: 5e9eefed13aadc1df28ad230b9a76477140a0b46
 SHA512:
-  metadata.gz: d75db978103fa75b118f2aafe0e110745efd5a98dfeea8c494d51a751b47f76c83ebe2c5ae029437df9bc5f8cb88b3e1201669c02d75ac6cd04b7409840d975c
-  data.tar.gz: 193149455efe7ea7982c3a19f25e03c3e3a8e9c94570a3cb11a6f60c5c4a341ce81209578353d5182aaaf2f2b0ef86125959b3046f59ec3d5e793c98133350d8
+  metadata.gz: 8be4e56bcd72b88986b62097994deab1036f395080a264de958c30846918520b2ceb53fec6054908ef663a76ebb4bc840cd9e59f533c609a0fbfe0d029f6b776
+  data.tar.gz: 485e9fdc38ad15974a12bba7ce5bbe7859365d1793a653240282b466477ad005fe2e13b6b5c815ddc088b81b10f99f292799543acf0f9cac2ee92579fbd0b59a

data/app/controllers/caboose/admin_controller.rb

@@ -3,7 +3,7 @@ module Caboose
   class AdminController < ApplicationController
       
     # @route GET /admin
-    def index
+    def index      
       return if !user_is_allowed('admin', 'view')
       #if logged_in?
       #  redirect_to '/admin/pages'

data/app/controllers/caboose/application_controller.rb

@@ -16,16 +16,19 @@ module Caboose
       @use_page_cache = !request.fullpath.starts_with?('/admin')
             
       # Get the site we're working with      
-      @domain = Domain.where(:domain => request.host_with_port).first
-      @site = @domain ? @domain.site : nil
+      @domain = Domain.where(:domain => request.host_with_port).first      
+      @site = @domain ? @domain.site : nil      
+      if @domain.nil? || @site.nil?
+        Caboose.log("Error: No site configured for #{request.host_with_port}")
+      end
       
       # Set the site in any mailers
       CabooseMailer.site = @site
         
       # Make sure someone is logged in
-      if !logged_in?      
-        elo = User.find(User::LOGGED_OUT_USER_ID)        
-        login_user(elo)
+      if !logged_in? && @site                
+        elo = User.logged_out_user(@site.id)        
+        login_user(elo) if elo
       end
       
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
@@ -138,8 +141,8 @@ module Caboose
     # Returns whether or not a user is logged in
     def logged_in?
       validate_token
-      validate_cookie                                                                                                                                                          
-      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User::LOGGED_OUT_USER_ID     
+      validate_cookie
+      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User.logged_out_user_id(@site.id)
       return false
     end
     
@@ -157,11 +160,13 @@ module Caboose
     end
     
     # Checks to see if a remember me cookie value is present.    
-    def validate_cookie
-      if cookies[:caboose_user_id] && User.exists?(cookies[:caboose_user_id])
-        user = User.find(cookies[:caboose_user_id])
-        login_user(user)
-        return true
+    def validate_cookie     
+      if cookies[:caboose_user_id]
+        user = User.where(:id => cookies[:caboose_user_id]).first
+        if user        
+          login_user(user)
+          return true
+        end
       end
       return false
     end

data/app/controllers/caboose/logout_controller.rb

@@ -5,7 +5,7 @@ module Caboose
       Caboose.plugin_hook('before_logout')
       
       logout_user
-      elo = User.find(User::LOGGED_OUT_USER_ID)        
+      elo = User.logged_out_user(@site.id)        
       login_user(elo)      
       redirect_to params[:return_url] ? params[:return_url] : "/"    
     end

data/app/models/caboose/block.rb

@@ -117,6 +117,7 @@ class Caboose::Block < ActiveRecord::Base
   end
                                             
   def render(block, options)
+    #Caboose.log("block.full_name = #{block.full_name}")
     #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")                
     if block && block.is_a?(String)
       #Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")                                          
@@ -232,7 +233,7 @@ class Caboose::Block < ActiveRecord::Base
         "../../app/views/caboose/blocks/#{block.block_type.field_type}",
         "caboose/blocks/#{full_name}",                
         "caboose/blocks/#{block.block_type.name}",                
-        "caboose/blocks/#{block.block_type.field_type}"
+        "caboose/blocks/#{block.block_type.field_type}"                
       ]
       #Caboose.log(arr)
       str = self.render_helper(view, options2, block, full_name, arr, 0)
@@ -246,7 +247,7 @@ class Caboose::Block < ActiveRecord::Base
     begin
       str = view.render(:partial => arr[i], :locals => options)
       #Caboose.log("Level #{i+1} for #{full_name}: Found partial #{arr[i]}")
-      rescue ActionView::MissingTemplate => ex
+      rescue ActionView::MissingTemplate => ex        
         #Caboose.log("Level #{i+1} for #{full_name}: #{ex.message}")        
         str = render_helper(view, options, block, full_name, arr, i+1)
       rescue Exception => ex 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.60'
+  VERSION = '0.7.61'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.60
+  version: 0.7.61
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg