phcscriptcdn 48.0.0 → 49.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440dc15290c206b27c165d6f58e25d1ef1a74d61e60ee678efa3078bcd5e0492
-  data.tar.gz: ef1754391b153ab5947f0dd3739ada2b549fd07a308cb8d2a0a7d0ddc1353052
+  metadata.gz: 544e9ea892cf2ef14ea1f76468ab26ef0cbc1a079a861938eb02bf2e1929703e
+  data.tar.gz: 244aa5773babb504ca06cd021b099f433145ed1e6a0517aa80c8d97b9f70c105
 SHA512:
-  metadata.gz: 473ffe394b57921305bd6fa8146aee1f1273419413edd00349da5d246e6e152bbdaa720634df67eda030afaa1494cc204795cfd73e12c49a53378c5e140465ee
-  data.tar.gz: 62770878dd0beeadf2d1fe7c92f714c191f9bda991082676cea38732b0c7aecedaa9adbbd8baa9035a9dce97fc8098ffa73b020d8b10969aeeea56b3b5b45896
+  metadata.gz: 506b7f7513c1affee5923575a1638a74659a125e72391e96d86284c65fdbaa3b94b05eea640d1c2ff0d26bdbede20a7717d98e100a5f920aaa633576e9dcfcc6
+  data.tar.gz: b610b14f4f130654ed6c6b457374a71a19a18856d458fa01c783bafcc445e577d206598f35c9a4dea78390700d5bb54a15094b3fcd9e62f02ee0c1b6b1d61510

data/README.md

@@ -31,5 +31,3 @@ To properly function re-compile your application's assets to copy over required
 All PHCScriptCDN views and layouts can be overwritten by copying files to your application.
 
 	rails generate phcscriptcdn:views
-
-#### Additional Information

data/app/assets/javascripts/phcscriptcdn/application.js

@@ -1,2 +1,2 @@
-// Load PHCAdmin3 Javascript
-//= require phc_admins_main_three
+// Load Admin Theme
+//= require phc_admin_theme_scripts_four

data/app/assets/stylesheets/phcscriptcdn/application.scss

@@ -1,2 +1,2 @@
-// Load PHCAdmin3 Styles
-@import "phc_admins_style_three";
+// Load Admin Theme
+@import "phc_admin_theme_styles_four";

data/app/controllers/phcscriptcdn/application_controller.rb

@@ -1,12 +1,22 @@
 module Phcscriptcdn
-  class ApplicationController < ActionController::Base
-
-    # Security
-    protect_from_forgery with: :exception
-
-    # Load Helpers
-    helper Phctitleseo::Engine.helpers
-    helper Phcnotifi::Engine.helpers
-
-  end
+    class ApplicationController < ActionController::Base
+    
+        # Security Filters
+        protect_from_forgery with: :exception
+    
+        # Load Requried Helper Files
+        helper Phccorehelpers::Engine.helpers
+        helper Phcmenus::Engine.helpers
+        helper Phctitleseo::Engine.helpers
+        helper Phcnotifi::Engine.helpers
+        helper Phcaccounts::Engine.helpers
+    
+        # Papertrail Whodunnit Username
+        def user_for_paper_trail
+          current_user ? current_user.username : 'Public user'
+        end
+    
+        private
+    
+    end
 end

data/app/controllers/phcscriptcdn/script/authors_controller.rb

@@ -3,21 +3,28 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::AuthorsController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_author, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Author
     def index
-      @script_authors = Script::Author.all
+      @script_authors = Script::Author.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Author
     def show
+      @script_authors = Script::Author.friendly.find(params[:id])
+      @versions = Phcscriptcdn::AuthorVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Author')
     end
 
     # NEW - Script Author
     def new
       @script_author = Script::Author.new
+      @script_author.user_id = current_user.id
+      @script_author.org_id = current_user.org_id
     end
 
     # EDIT - Script Author
@@ -27,19 +34,23 @@ module Phcscriptcdn
     # CREATE - Script Author
     def create
       @script_author = Script::Author.new(script_author_params)
+      @script_author.user_id = current_user.id
+      @script_author.org_id = current_user.org_id
       if @script_author.save
         redirect_to script_authors_url, notice: 'Author was successfully created.'
         else
-          render :new
+        render :new
       end
     end
 
     # PATCH/PUT - Script Author
     def update
+      @script_author.user_id = current_user.id
+      @script_author.org_id = current_user.org_id
       if @script_author.update(script_author_params)
-        redirect_to script_authors_url, notice: 'Author was successfully updated.'
-        else
-          render :edit
+          redirect_to script_authors_url, notice: 'Author was successfully updated.'
+          else
+            render :edit
       end
     end
 
@@ -53,12 +64,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_author
-      @script_author = Script::Author.find(params[:id])
+      @script_author = Script::Author.friendly.find(params[:id])
     end
 
     # Whitelist
     def script_author_params
-      params.require(:script_author).permit(:authorfirstname, :authorlastname, :authorwebsite, :authorgithub, :authortwitter, :slug, :user_id, :user_name)
+      params.require(:script_author).permit(:authorfirstname, :authorlastname, :authorwebsite, :authorgithub, :slug, :user_id, :org_id, :listing_id)
     end
 
   end

data/app/controllers/phcscriptcdn/script/extensions_controller.rb

@@ -3,21 +3,28 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::ExtensionsController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_extension, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Extension
     def index
-      @script_extensions = Script::Extension.all
+      @script_extensions = Script::Extension.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Extension
     def show
+      @script_extensions = Script::Extension.friendly.find(params[:id])
+      @versions = Phcscriptcdn::ExtensionVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Extension')
     end
 
     # NEW - Script Extension
     def new
       @script_extension = Script::Extension.new
+      @script_extension.user_id = current_user.id
+      @script_extension.org_id = current_user.org_id
     end
 
     # EDIT - Script Extension
@@ -27,15 +34,19 @@ module Phcscriptcdn
     # CREATE - Script Extension
     def create
       @script_extension = Script::Extension.new(script_extension_params)
+      @script_extension.user_id = current_user.id
+      @script_extension.org_id = current_user.org_id
       if @script_extension.save
         redirect_to script_extensions_url, notice: 'Extension was successfully created.'
         else
-          render :new
+        render :new
       end
     end
 
     # PATCH/PUT - Script Extension
     def update
+      @script_extension.user_id = current_user.id
+      @script_extension.org_id = current_user.org_id
       if @script_extension.update(script_extension_params)
         redirect_to script_extensions_url, notice: 'Extension was successfully updated.'
         else
@@ -45,7 +56,7 @@ module Phcscriptcdn
 
     # DELETE - Script Extension
     def destroy
-      @script_extension.destroy
+    @script_extension.destroy
       redirect_to script_extensions_url, notice: 'Extension was successfully destroyed.'
     end
 
@@ -53,12 +64,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_extension
-      @script_extension = Script::Extension.find(params[:id])
+      @script_extension = Script::Extension.friendly.find(params[:id])
     end
 
     # Whitelists
     def script_extension_params
-      params.require(:script_extension).permit(:scriptextensionname, :scriptextensiondes, :scriptextension, :slug, :user_id, :user_name)
+      params.require(:script_extension).permit(:scriptextensionname, :scriptextensiondes, :scriptextension, :slug, :user_id, :org_id, :listing_id)
     end
 
   end

data/app/controllers/phcscriptcdn/script/licences_controller.rb

@@ -3,21 +3,28 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::LicencesController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_licence, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Licences
     def index
-      @script_licences = Script::Licence.all
+      @script_licences = Script::Licence.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Licences
     def show
+      @script_licences = Script::Licence.friendly.find(params[:id])
+      @versions = Phcscriptcdn::LicenceVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Licence')
     end
 
     # NEW - Script Licences
     def new
       @script_licence = Script::Licence.new
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
     end
 
     # EDIT - Script Licences
@@ -27,15 +34,19 @@ module Phcscriptcdn
     # POST - Script Licences
     def create
       @script_licence = Script::Licence.new(script_licence_params)
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.save
         redirect_to script_licences_url, notice: 'Licence was successfully created.'
         else
-          render :new
+        render :new
       end
     end
 
     # PATCH/PUT - Script Licences
     def update
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.update(script_licence_params)
         redirect_to script_licences_url, notice: 'Licence was successfully updated.'
         else
@@ -53,12 +64,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_licence
-      @script_licence = Script::Licence.find(params[:id])
+      @script_licence = Script::Licence.friendly.find(params[:id])
     end
 
     # Whitelists
     def script_licence_params
-      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :user_name)
+      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :org_id, :listing_id)
     end
 
   end

data/app/controllers/phcscriptcdn/script/listings_controller.rb

@@ -3,16 +3,21 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::ListingsController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_listing, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Listings
     def index
-      @script_listings = Script::Listing.all
+      @script_listings = Script::Listing.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Listings
     def show
+      @script_listings = Script::Listing.friendly.find(params[:id])
+      @versions = Phcscriptcdn::ListingVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Listing')
     end
 
     # NEW - Script Listings
@@ -27,6 +32,8 @@ module Phcscriptcdn
     # POST - Script Listings
     def create
       @script_listing = Script::Listing.new(script_listing_params)
+      @script_listing.user_id = current_user.id
+      @script_listing.org_id = current_user.org_id
       if @script_listing.save
         redirect_to script_listings_path, notice: 'Listing was successfully created.'
         else
@@ -36,10 +43,12 @@ module Phcscriptcdn
 
     # PATCH/PUT - Script Listings
     def update
+      @script_listing.user_id = current_user.id
+      @script_listing.org_id = current_user.org_id
       if @script_listing.update(script_listing_params)
         redirect_to script_listings_path, notice: 'Listing was successfully updated.'
-        else
-          render :edit
+      else
+        render :edit
       end
     end
 
@@ -53,12 +62,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_listing
-      @script_listing = Script::Listing.find(params[:id])
+      @script_listing = Script::Listing.friendly.find(params[:id])
     end
 
     # Whitelist
     def script_listing_params
-      params.require(:script_listing).permit(:scripttitle, :scriptdescription, :descriptionsource, :scriptwebsite, :scripttwitter, :scriptgithub, :scriptinitialrelease, :scriptlastestrelease, :scriptbetarelease, :scriptstatus, :slug, :user_id, :user_name, :version_id, :author_id, :licence_id)
+      params.require(:script_listing).permit(:scripttitle, :scriptdescription, :descriptionsource, :scriptwebsite, :scriptgithub, :scriptinitialrelease, :scriptlastestrelease, :scriptbetarelease, :scriptlastestreleasecdn, :scriptstatus, :slug, :user_id, :org_id, :version_id, :author_id, :licence_id)
     end
 
   end

data/app/controllers/phcscriptcdn/script/urls_controller.rb

@@ -3,7 +3,10 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::UrlsController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_url, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Authors
@@ -15,13 +18,15 @@ module Phcscriptcdn
     # DETAILED PROFILE - Script Authors
     def show
       script_listing = Script::Listing.find(params[:listing_id])
-      @script_url = script_listing.urls.find(params[:id])
+      @script_url = script_listing.urls.friendly.find(params[:id])
     end
 
     # NEW - Script Athors
     def new
       script_listing = Script::Listing.find(params[:listing_id])
       @script_url = script_listing.urls.build
+      @script_url.user_id = current_user.id
+      @script_url.org_id = current_user.org_id
     end
 
     # EDIT - Script Athors
@@ -34,6 +39,8 @@ module Phcscriptcdn
     def create
       @script_listing = Script::Listing.find(params[:listing_id])
       @script_url = @script_listing.urls.create(script_url_params)
+      @script_url.user_id = current_user.id
+      @script_url.org_id = current_user.org_id
       if @script_url.save
         redirect_to script_listing_urls_path, notice: 'Author was successfully created.'
         else
@@ -43,6 +50,8 @@ module Phcscriptcdn
 
     # PATCH/PUT - Script Athors
     def update
+      @script_url.user_id = current_user.id
+      @script_url.org_id = current_user.org_id
       if @script_url.update(script_url_params)
         redirect_to script_listing_urls_path, notice: 'Author was successfully updated.'
         else
@@ -62,12 +71,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_url
-      @script_url = Script::Url.find(params[:id])
+      @script_url = Script::Url.friendly.find(params[:id])
     end
 
     # Whitelists
     def script_url_params
-      params.require(:script_url).permit(:scripturl, :scripturlrelease, :scripturlcdnupdate, :slug, :user_id, :user_name, :listing_id, :version_id, :extension_id)
+      params.require(:script_url).permit(:scripturl, :scripturlrelease, :scripturlcdnupdate, :slug, :user_id, :org_id, :listing_id, :version_id, :extension_id)
     end
 
   end

data/app/controllers/phcscriptcdn/script/versions_controller.rb

@@ -3,21 +3,28 @@ require_dependency "phcscriptcdn/application_controller"
 module Phcscriptcdn
   class Script::VersionsController < ApplicationController
 
-    # Filters & Security
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_script_version, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Versions
     def index
-    @script_versions = Script::Version.all
+      @script_versions = Script::Version.where(org_id: current_user.org_id)
     end
 
     # DETAILS - Script Versions
     def show
+      @script_versions = Script::Version.friendly.find(params[:id])
+      @versions = Phcscriptcdn::ScriptversionVersions.where(item_id: params[:id], item_type: 'Phcscriptcdn::Script::Version')
     end
 
     # NEW - Script Versions
     def new
       @script_version = Script::Version.new
+      @script_version.user_id = current_user.id
+      @script_version.org_id = current_user.org_id
     end
 
     # EDIT - Script Versions
@@ -27,6 +34,8 @@ module Phcscriptcdn
     # POST - Script Versions
     def create
       @script_version = Script::Version.new(script_version_params)
+      @script_version.user_id = current_user.id
+      @script_version.org_id = current_user.org_id
       if @script_version.save
         redirect_to script_versions_url, notice: 'Version was successfully created.'
         else
@@ -36,6 +45,8 @@ module Phcscriptcdn
 
     # PATCH/PUT - Script Versions
     def update
+      @script_version.user_id = current_user.id
+      @script_version.org_id = current_user.org_id
       if @script_version.update(script_version_params)
         redirect_to script_versions_url, notice: 'Version was successfully updated.'
         else
@@ -53,12 +64,12 @@ module Phcscriptcdn
 
     # Common Callbacks
     def set_script_version
-      @script_version = Script::Version.find(params[:id])
+      @script_version = Script::Version.friendly.find(params[:id])
     end
 
     # Only allow a trusted parameter "white list" through.
     def script_version_params
-      params.require(:script_version).permit(:scriptversion, :slug, :user_id, :user_name)
+      params.require(:script_version).permit(:scriptversion, :slug, :user_id, :org_id, :listing_id)
     end
 
   end