app/controllers/phcscriptcdnpro/application_controller.rb in phcscriptcdnpro-5.10.1 vs app/controllers/phcscriptcdnpro/application_controller.rb in phcscriptcdnpro-5.10.3

@@ -1,24 +1,30 @@
 module Phcscriptcdnpro
   class ApplicationController < ActionController::Base
-  
-    # Load Helpers for PHCPress Widgets
-    before_action :phcpress_recent_posts
-    
+
     # Security Filters
     protect_from_forgery with: :exception
     
+    # Papertrail Whodunnit Username
+    def user_for_paper_trail
+      # Default is: current_user rescue nil
+      current_user ? current_user.username : 'Public user'
+    end
+    
     # Grab Member Information
-    def get_member_profile_info  
+    def get_member_profile_info
       @members_profile_info = Member::Profile.find(params[:profile_id])
     end
     
-    # AuthRocket User Helpers
+    def membership_info
+        AuthRocket::Membership.all(user_id: current_user.id).first
+    end
+    
+    #Authentication
     def require_user
       unless current_user
-        params.permit!
-        session[:last_url] = request.get? ? url_for(params) : url_for
+        session[:last_url] = request.get? ? url_for(params.dup.permit!.except(:domain, :host, :port, :protocol, :subdomain)) : url_for
         redirect_to new_login_url
       end
     end
     
     def current_user
@@ -26,26 +32,16 @@
     end
     helper_method :current_user
     
     def new_login_url
       ENV['AUTHROCKET_LOGIN_URL']
+      # $ar_login_url
     end
     helper_method :new_login_url
     
-    def membership_info
-      AuthRocket::Membership.all(user_id: current_user.id).first
-    end
-    
     # Load Helpers
     helper Phctitleseo::Engine.helpers
     helper Phcnotifi::Engine.helpers
     helper Phcaccountspro::Engine.helpers
-    
-    # PHCPress Widget Helpers
-    def phcpress_recent_posts
-      @recent_posts = Phcpresspro::Articles::Post.all
-    end
-  
+
   end
 end
-
-