Merge pull request #8 from akshuvo/dev

v3.4.9

Author: akshuvo

.github/workflows/demoServerPush.yml

@@ -2,7 +2,7 @@ name: Deploy Private GitHub repository to cPanel
 on:
   push:
     branches:
-      - dev
+      - main
 jobs:
   FTP-Deploy-Action:
     name: 🎉 Deploy

.github/workflows/wporg.yml

@@ -0,0 +1,18 @@
+name: Deploy to WordPress.org
+on:
+  push:
+    tags:
+    - "*"
+jobs:
+  tag:
+    name: New tag
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress Plugin Deploy
+      uses: 10up/action-wordpress-plugin-deploy@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+        SLUG: ajax-filter-posts # optional, remove if GitHub repo name matches SVN slug, including capitalization
+        

LICENSE

@@ -3,8 +3,8 @@
 ```md
 Contributors: mdshuvo, addonmaster, mdashikul
 Tags: infinite scroll, post grid, grid, post type grid, pagination, ajax pagination, grid display, filter, filtering, grid, layout, post, post filter, post layout, taxonomy, taxonomy filter, ajax grid, display post grid, post type grid, wp post grid, ajax post filter, filter post ajax, ajaxify, mixitup, isotop, category filter, filter without reload, ajax filter, ajax plugin
-Tested up to: 6.4.3
-Stable tag: 3.4.7
+Tested up to: 6.5.x
+Stable tag: 3.4.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 ```
@@ -181,6 +181,12 @@ More features coming soon...
 3. Pagination Preview
 
 ## Changelog
+
+= 3.4.9 - July 02, 2024 =
+- Fixed: Security issues
+- Compatible with WordPress 6.5.x
+
+
 = 3.4.7 - Mar 04, 2024=
 - Added: Filter Heading Option
 - Added: Toggle Filter Items Option

README.md

@@ -199,7 +199,7 @@ public function scripts() {
         ) );
 
         wp_enqueue_style( 'bootstrap-grid', GRIDMASTER_URL . '/admin/assets/bootstrap-grid.min.css', array(), GRIDMASTER_VERSION );
-        wp_enqueue_style( 'gridmaster-admin-style', GRIDMASTER_URL . '/admin/assets/admin.min.css', array(), GRIDMASTER_VERSION );
+        wp_enqueue_style( 'gridmaster-admin-style', GRIDMASTER_URL . '/admin/assets/admin.css', array(), GRIDMASTER_VERSION );
 
         if( !defined( 'GRIDMASTER_PRO_VERSION' ) ) {
             wp_enqueue_style( 'gridmaster-admin-pro-block-style', GRIDMASTER_URL . '/admin/assets/block-pro-admin.min.css', array(), GRIDMASTER_VERSION );

admin/Admin.php

@@ -0,0 +1,44 @@
+<?php
+namespace GridMaster;
+
+class DB_Migration {
+
+    // DB Version
+    private $db_version = '1.0.0';
+
+    /**
+     * Initialize the class
+     */
+    public function __construct() {
+        // run if the plugin version up using version_compare
+        if ( version_compare( get_option( 'gridmaster_db_version', 0 ), $this->db_version, '<' ) ) {
+            $this->run_migration();
+            update_option( 'gridmaster_db_version', $this->db_version );
+        }
+    }
+
+    /**
+     * Run the migration
+     *
+     * @return void
+     */
+    public function run_migration() {
+        global $wpdb;
+
+        $charset_collate = $wpdb->get_charset_collate();
+
+        $sql = "CREATE TABLE {$wpdb->prefix}gridmaster_grids (
+            id mediumint(9) NOT NULL AUTO_INCREMENT,
+            title text NOT NULL,
+            attributes text NOT NULL,
+            dated datetime DEFAULT NOW(),
+            PRIMARY KEY  (id)
+        ) $charset_collate;";
+
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        dbDelta( $sql );
+    }
+}
+
+// Initialize the class
+new DB_Migration();

admin/DB_Migration.php

@@ -0,0 +1,89 @@
+<?php
+namespace GridMaster;
+
+class Grids {
+
+    /**
+     * Initializes a singleton instance
+     */
+    public static function init() {
+        static $instance = false;
+
+        if ( ! $instance ) {
+            $instance = new self();
+        }
+
+        return $instance;
+    }
+
+    /**
+     * List of grids
+     * 
+     * @return array
+     */
+    public function list() {
+        global $wpdb;
+        $grids = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}gridmaster_grids" );
+        return $grids;
+    }
+
+    /**
+     * Add/update grid
+     * 
+     * @param array $data
+     * @return int
+     */
+    public function save( $data ) {
+        global $wpdb;
+
+        $id = isset( $data['id'] ) ? $data['id'] : 0;
+        $title = isset( $data['title'] ) ? $data['title'] : '';
+        $attributes = isset( $data['attributes'] ) ? $data['attributes'] : '';
+
+        if ( $id ) {
+            $wpdb->update( 
+                "{$wpdb->prefix}gridmaster_grids", 
+                [ 
+                    'title' => $title,
+                    'attributes' => $attributes
+                ], 
+                [ 'id' => $id ]
+            );
+        } else {
+            $wpdb->insert( 
+                "{$wpdb->prefix}gridmaster_grids", 
+                [ 
+                    'title' => $title,
+                    'attributes' => $attributes
+                ]
+            );
+            $id = $wpdb->insert_id;
+        }
+
+        return $id;
+    }
+
+    /**
+     * Get grid by ID
+     * 
+     * @param int $id
+     * @return object
+     */
+    public function get( $id ) {
+        global $wpdb;
+        $grid = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}gridmaster_grids WHERE id = %d", $id ) );
+        return $grid;
+    }
+
+    /**
+     * Delete grid
+     * 
+     * @param int $id
+     * @return void
+     */
+    public function delete( $id ) {
+        global $wpdb;
+        $wpdb->delete( $wpdb->prefix . 'gridmaster_grids', [ 'id' => $id ] );
+    }
+
+}

admin/Grids.php

@@ -62,6 +62,7 @@
     color: rgba(46,68,83,.8);
     border-color: #cfd7df;
     box-shadow: 0 1px 3px rgba(0,0,0,.08);
+    background-color: #f6f6f6;
 }
 
 .gm-btn-fill {
@@ -135,6 +136,7 @@ button.gm-btn:disabled{
     padding: 10px 20px;
     display: flex;
     align-items: center;
+    gap: 10px;
 }
 
 .gm-admin-toolbar .nav-tab span,
@@ -171,6 +173,7 @@ button.gm-btn:disabled{
 
 .gm-icon span {
     font-size: 62px;
+    width: 62px;
     color: #30057b;
 }
 
@@ -282,6 +285,10 @@ span.description {
     background: #fff;
 }
 
+.gm-btn-has-icon span {
+    margin-left: -7px;
+}
+
 /* Responsive Devices */
 span.gridmaster-responsive-fields {
     display: inline-flex;
@@ -526,4 +533,56 @@ div[class^="show-if-"] {
 #gm-responsive-bar-scale__value-wrapper{
     width: unset;
     padding: 0 10px;
-}
+}
+
+.gm-page-build-grid .nav-tab {
+    width: 100%;
+    justify-content: flex-end;
+    margin: 0;
+}
+
+/* Modal */
+.gm-modal-wrap {
+    background-color: rgba(0, 0, 0, 0.5);
+    display: none;
+    height: 100vh;
+    left: 0;
+    overflow: hidden;
+    position: fixed;
+    top: 0;
+    width: 100%;
+    z-index: 100100;
+}
+
+.gm-modal-inner {
+    background-color: white;
+    border-radius: 6px;
+    -moz-box-shadow: 0 0 40px 0 rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0 0 40px 0 rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 40px 0 rgba(0, 0, 0, 0.2);
+    display: block !important;
+    left: 50%;
+    max-width: 550px;
+    min-width: 550px;
+    position: absolute;
+    text-align: center;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    overflow: visible;
+}
+
+.gm-modal-body {
+    padding: 40px 50px;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+.gm-modal-close {
+    position: absolute;
+    top: 7px;
+    right: 7px;
+    display: flex !important;
+    align-items: center;
+    border: 0;
+}
+/* Modal */

admin/assets/admin.css

@@ -197,10 +197,20 @@ jQuery(document).ready(function($) {
 
     // Copy Shortcode
     jQuery( document ).on( 'click', '.gm-copy-btn', function(e) {
-        jQuery(".gm-copy-inp").select();
+        jQuery(this).closest(".gm-copy-wrap").find(".gm-copy-val").select();
         document.execCommand("copy");
     } );
 
+    // Modal Open
+    jQuery( document ).on( 'click', '.gm-toggle-modal', function(e) {
+        let modalId = jQuery(this).attr('data-modal-id');
+        jQuery('#' + modalId).fadeIn('fast');
+    } );
+    // Modal Close
+    jQuery( document ).on( 'click', '.gm-modal-close', function(e) {
+        jQuery(this).closest('.gm-modal-wrap').fadeOut('fast');
+    } );
+
     // Change Filter Style
     jQuery(document).on( 'change', '#filter_style', function(e) {
         let $val = jQuery(this).val();