phcmembers 61.0.0 → 61.3.0

data/app/helpers/phcmembers/application_helper.rb

@@ -1,14 +1,4 @@
 module Phcmembers
-	module ApplicationHelper
-	
-		# Add Active to Menu
-		def is_active_controller(controller_name)
-			params[:controller] == controller_name ? "active open selected" : nil
-		end
-
-		def is_active_action(action_name)
-			params[:action] == action_name ? "active" : nil
-		end
-	
-	end
+  module ApplicationHelper
+  end
 end

data/app/jobs/phcmembers/application_job.rb

@@ -1,4 +1,4 @@
 module Phcmembers
-	class ApplicationJob < ActiveJob::Base
-	end
+  class ApplicationJob < ActiveJob::Base
+  end
 end

data/app/mailers/phcmembers/application_mailer.rb

@@ -1,8 +1,6 @@
 module Phcmembers
-
-	class ApplicationMailer < ActionMailer::Base
-		default from: 'info@example.com'
-		layout 'mailer'
-	end
-
+  class ApplicationMailer < ActionMailer::Base
+    default from: ENV['PHC_MEMBERS_EMAIL_ADDRESS']
+    layout 'mailer'
+  end
 end

data/app/models/phcmembers/application_record.rb

@@ -1,5 +1,5 @@
 module Phcmembers
-	class ApplicationRecord < ActiveRecord::Base
-		self.abstract_class = true
-	end
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
 end

data/app/models/phcmembers/category_versions.rb

@@ -1,5 +1,5 @@
 module Phcmembers
-    class CategoryVersions < PaperTrail::Version
-        self.table_name = :phcmembers_category_versions
-    end
+  class CategoryVersions < PaperTrail::Version
+    self.table_name = :phcmembers_category_versions
+  end
 end

data/app/models/phcmembers/directory.rb

@@ -1,7 +1,7 @@
 module Phcmembers
-	module Directory
-		def self.table_name_prefix
-			'phcmembers_directory_'
-		end
-	end
+  module Directory
+    def self.table_name_prefix
+      'phcmembers_directory_'
+    end
+  end
 end

data/app/models/phcmembers/directory/category.rb

@@ -8,20 +8,17 @@ module Phcmembers
 		has_paper_trail :class_name => 'Phcmembers::CategoryVersions'
 
 		# Relationships
-		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
-		has_many :listings, class_name: 'Phcmembers::Member::Listing', :through => :categorylistings
+		has_and_belongs_to_many :listings, class_name: 'Phcmembers::Member::Listing', :join_table => 'categories_listings'
 
 		validates :catname,
-			length: { minimum: 3 }
+		  length: { minimum: 3 }
 
 		# Clean URL Define
 		friendly_id :phcmembers_category_slug, use: [:slugged, :finders]
 
 		# Define for Multiple Records
 		def phcmembers_category_slug
-			[
-				:catname
-			]
+			[:catname]
 		end
 
 	end

data/app/models/phcmembers/listing_versions.rb

@@ -1,5 +1,5 @@
 module Phcmembers
-    class ListingVersions < PaperTrail::Version
-        self.table_name = :phcmembers_listing_versions
-    end
+  class ListingVersions < PaperTrail::Version
+    self.table_name = :phcmembers_listing_versions
+  end
 end

data/app/models/phcmembers/member/address.rb

@@ -1,6 +1,6 @@
 module Phcmembers
-	class Member::Address < ApplicationRecord
-	
+  class Member::Address < ApplicationRecord
+
 		# Clean URL Initialize
 		extend FriendlyId
 
@@ -8,33 +8,33 @@ module Phcmembers
 		has_paper_trail :class_name => 'Phcmembers::AddressVersions'
 
 		# Model Relationships
-		belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
+    belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
 
-		# Validation for Form Fields
-		validates :mcaddressl1,
-			presence: true,
-			length: { minimum: 2 }
+    # Validation for Form Fields
+    validates :mcaddressl1,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mccity,
-			length: { minimum: 3 }
+    validates :mccity,
+      length: { minimum: 3 }
 
-		validates :mcprovince,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mcprovince,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mccountry,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mccountry,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mcpostalcode,
-			presence: true,
-			length: { minimum: 3 }
+    validates :mcpostalcode,
+      presence: true,
+      length: { minimum: 3 }
 
-		validates :mctype,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mctype,
+      presence: true,
+      length: { minimum: 2 }
 
-		# Clean URL Define
+    # Clean URL Define
 		friendly_id :phcmembers_address_slug, use: [:slugged, :finders]
 
 		# Define for Multiple Records
@@ -44,10 +44,10 @@ module Phcmembers
 			]
 		end
 
-		def country_name
-			country = ISO3166::Country[country_code]
-			country.translations[I18n.locale.to_s] || country.mccountry
-		end
-	
-	end
+    def country_name
+      country = ISO3166::Country[country_code]
+      country.translations[I18n.locale.to_s] || country.mccountry
+    end
+
+  end
 end

data/app/models/phcmembers/member/listing.rb

@@ -1,67 +1,66 @@
 module Phcmembers
-	class Member::Listing < ApplicationRecord
+  class Member::Listing < ApplicationRecord
 
-		# Clean URL Initialize
-		extend FriendlyId
+    # Clean URL Initialize
+    extend FriendlyId
 
-		# Add Paper Trail
-		has_paper_trail :class_name => 'Phcmembers::ListingVersions'
+    # Add Paper Trail
+    has_paper_trail :class_name => 'Phcmembers::ListingVersions'
 
-		# Model Relationships
-		belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
-		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
-		has_many :categories, class_name: 'Phcmembers::Directory::Category', :through => :categorylistings
+    # Model Relationships
+    belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
+    has_and_belongs_to_many :categories, class_name: 'Phcmembers::Directory::Category', :join_table => 'categories_listings'
 
-		# Validation for Form Fields
-		validates :mbcompanyname,
-			presence: true,
-			length: { minimum: 2 }
+    # Validation for Form Fields
+    validates :mbcompanyname,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mbcontactname,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mbcontactname,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mbaddressl1,
-			length: { minimum: 3 }
+    validates :mbaddressl1,
+      length: { minimum: 3 }
 
-		validates :mbcity,
-			presence: true,
-			length: { minimum: 3 }
+    validates :mbcity,
+      presence: true,
+      length: { minimum: 3 }
 
-		validates :mbcountry,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mbcountry,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mbprovince,
-			presence: true,
-			length: { minimum: 2 }
+    validates :mbprovince,
+      presence: true,
+      length: { minimum: 2 }
 
-		validates :mbpostalcode,
-			presence: true,
-			length: { minimum: 3 }
+    validates :mbpostalcode,
+      presence: true,
+      length: { minimum: 3 }
 
-		validates :mbcontactemail,
-			presence: true,
-			length: { minimum: 3 },
-			format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
+    validates :mbcontactemail,
+    	presence: true,
+    	length: { minimum: 3 },
+    	format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
-		validates :mbwebsite,
-			presence: true,
-			length: { minimum: 6 }
+    validates :mbwebsite,
+    	presence: true,
+    	length: { minimum: 6 }
 
-		validates :mbphone,
-			presence: true,
-			format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
+    validates :mbphone,
+    	presence: true,
+    	format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
 
-		# Clean URL Define
-		friendly_id :phcmembers_listings_slug, use: [:slugged, :finders]
+    # Clean URL Define
+    friendly_id :phcmembers_listings_slug, use: [:slugged, :finders]
 
-		# Define for Multiple Records
-		def phcmembers_listings_slug
-			[
-				[:mbcompanyname, :mbcontactname]
-			]
-		end
+    # Define for Multiple Records
+    def phcmembers_listings_slug
+    	[
+    		[:mbcompanyname, :mbcontactname]
+    	]
+    end
 
-	end
+  end
 end

data/app/models/phcmembers/member/profile.rb

@@ -1,50 +1,50 @@
 module Phcmembers
-	class Member::Profile < ApplicationRecord
+  class Member::Profile < ApplicationRecord
 
-		# Clean URL Initialize
-		extend FriendlyId
+    # Clean URL Initialize
+    extend FriendlyId
 
-		# Add Paper Trail
-		has_paper_trail :class_name => 'Phcmembers::ProfileVersions'
+    # Add Paper Trail
+    has_paper_trail :class_name => 'Phcmembers::ProfileVersions'
 
-		# Gravatar
-		include Gravtastic
-			gravtastic :memail
+    # Gravatar
+    include Gravtastic
+    gravtastic :memail
 
-		# Model Relationships
-		has_many :addresses, class_name: 'Phcmembers::Member::Address'
-		has_many :listings, class_name: 'Phcmembers::Member::Listing'
+    # Model Relationships
+    has_many :addresses, class_name: 'Phcmembers::Member::Address'
+    has_many :listings, class_name: 'Phcmembers::Member::Listing'
 
-		# Validation for Form Fields
-		validates :mfirstname,
-			presence: true,
-			length: { minimum: 1 }
+    # Validation for Form Fields
+    validates :mfirstname,
+      presence: true,
+      length: { minimum: 1 }
 
-		validates :mlastname,
-			presence: true,
-			length: { minimum: 1 }
+    validates :mlastname,
+      presence: true,
+      length: { minimum: 1 }
 
-		validates :mtitle,
-			length: { minimum: 2 }
+    validates :mtitle,
+      length: { minimum: 2 }
 
-		validates :memail,
-			presence: true,
-			length: { minimum: 6 },
-			format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
+    validates :memail,
+      presence: true,
+      length: { minimum: 6 },
+      format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
-		validates :mphone,
-			presence: true,
-			format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
+    validates :mphone,
+      presence: true,
+      format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
 
-		# Clean URL Define
-		friendly_id :phcmembers_profiles_slug, use: [:slugged, :finders]
+    # Clean URL Define
+    friendly_id :phcmembers_profiles_slug, use: [:slugged, :finders]
 
-		# Define for Multiple Records
-		def phcmembers_profiles_slug
-			[
-				[:mfirstname, :mlastname]
-			]
-		end
+    # Define for Multiple Records
+    def phcmembers_profiles_slug
+      [
+        [:mfirstname, :mlastname]
+      ]
+    end
 
-	end
+  end
 end

data/app/models/phcmembers/profile_versions.rb

@@ -1,5 +1,5 @@
 module Phcmembers
-    class ProfileVersions < PaperTrail::Version
-        self.table_name = :phcmembers_profile_versions
-    end
+  class ProfileVersions < PaperTrail::Version
+    self.table_name = :phcmembers_profile_versions
+  end
 end

data/app/views/layouts/phcmembers/application.html.erb

@@ -2,24 +2,29 @@
 <html>
 <head>
 
-  <% phc_seo_title "PHCMembers" %>
-  <% phc_seo_description "Secure Membership and Web Directory Management Software" %>
+  <% phc_seo_title "PHCMembers DMS" %>
+  <% phc_seo_description "Membership & Directory Management System by PHCDevworks" %>
 
+  <!-- -PHC- SEO and Site Description -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title><%= yield(:phc_seo_title) %></title>
   <meta name="description" content="<%= yield(:phc_seo_description) %>">
-
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
   <link rel="canonical" href="http://phcmembers.com">
+  <!-- -PHC- SEO and Site Description -->
+  
+  <!-- -PHC- Security -->
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+  <!-- -PHC- Security -->
+  
+  <!-- -PHC- CSS -->
+  <%= stylesheet_link_tag 'phcmembers/application', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <!-- -PHC- CSS -->
 
   <!-- Font -->
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
-
-  <!-- Requried Style Sheets -->
-  <%= stylesheet_link_tag "phcmembers/application", media: "all", 'data-turbolinks-track': 'reload' %>
-
-  <!-- Security -->
-  <%= csrf_meta_tags %>
+  <!-- Font -->
 
 </head>
 <body>
@@ -62,14 +67,7 @@
 
   <!-- Requried JavaScripts -->
   <%= javascript_include_tag "phcmembers/application", 'data-turbolinks-track': 'reload' %>
-
-  <!-- WTF Slowing Down my Site. Nothing Nice to Say. Keep Bad Comments to Myself -->
-  <!--[if lt IE 9]>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/html5shiv.js"></script>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/respond.min.js"></script>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/excanvas.min.js"></script>
-	<![endif]-->
-  <!-- WTF Slowing Down my Site. Nothing Nice to Say. Keep Bad Comments to Myself -->
+  <script src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
 
   <script>
 		$(document).ready(function() {
@@ -79,4 +77,4 @@
   <!-- Requried JavaScripts -->
 
 </body>
-</html>
+</html>