Changeset 2890042

Timestamp:

03/30/2023 09:55:03 AM (17 months ago)

Author:

cadic

Message:

Update to version 1.0.1 from GitHub

Location:

which-blocks

Files:

• assets/banner-1544x500.png (added)
• assets/banner-772x250.png (added)
• assets/icon-128x128.png (added)
• assets/icon-256x256.png (added)
• assets/screenshot-1.png (added)
• tags/1.0.1 (copied) (copied from which-blocks/trunk)
• tags/1.0.1/.wordpress-org (added)
• tags/1.0.1/.wordpress-org/banner-1544x500.png (added)
• tags/1.0.1/.wordpress-org/banner-772x250.png (added)
• tags/1.0.1/.wordpress-org/icon-128x128.png (added)
• tags/1.0.1/.wordpress-org/icon-256x256.png (added)
• tags/1.0.1/.wordpress-org/screenshot-1.png (added)
• tags/1.0.1/CHANGELOG.md (added)
• tags/1.0.1/CODE_OF_CONDUCT.md (added)
• tags/1.0.1/CONTRIBUTING.md (added)
• tags/1.0.1/CREDITS.md (added)
• tags/1.0.1/README.md (added)
• tags/1.0.1/readme.txt (modified) (3 diffs)
• tags/1.0.1/src/class-plugin.php (modified) (2 diffs)
• tags/1.0.1/src/class-stats.php (modified) (2 diffs)
• tags/1.0.1/vendor (deleted)
• tags/1.0.1/which-blocks.php (modified) (2 diffs)
• trunk/.wordpress-org (added)
• trunk/.wordpress-org/banner-1544x500.png (added)
• trunk/.wordpress-org/banner-772x250.png (added)
• trunk/.wordpress-org/icon-128x128.png (added)
• trunk/.wordpress-org/icon-256x256.png (added)
• trunk/.wordpress-org/screenshot-1.png (added)
• trunk/CHANGELOG.md (added)
• trunk/CODE_OF_CONDUCT.md (added)
• trunk/CONTRIBUTING.md (added)
• trunk/CREDITS.md (added)
• trunk/README.md (added)
• trunk/readme.txt (modified) (3 diffs)
• trunk/src/class-plugin.php (modified) (2 diffs)
• trunk/src/class-stats.php (modified) (2 diffs)
• trunk/vendor (deleted)
• trunk/which-blocks.php (modified) (2 diffs)

which-blocks/tags/1.0.1/readme.txt

@@ -3 +3 @@
 Tags:              block, block editor, blocks usage, statistics
 Requires at least: 5.7
-Tested up to:      6.1
+Tested up to:      6.
 Requires PHP:      7.0
-Stable tag:        1.0.0
+Stable tag:        1.0.
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
@@ -21 +21 @@
 Admin menu: Tools > Which Blocks
 
+
+
+
+
 == Installation ==
+
 1. Install the plugin via the plugin installer, either by searching for it or uploading a .zip file.
 2. Activate the plugin.
@@ -28 +33 @@
 == Changelog ==
 
+
+
+
+
+
+
+
 = 1.0.0 - 09.02.2023 = 
 * Initial plugin release.

which-blocks/tags/1.0.1/src/class-plugin.php

@@ -14 +14 @@
 
     /**
+
+
+
+
+
+
+
      * Constructor
      */
@@ -26 +33 @@
      */
     public function init() {
-        new Tools_Page();
+        new Tools_Page();
     }
 }

which-blocks/tags/1.0.1/src/class-stats.php

@@ -24 +24 @@
         global $wpdb;
 
-        $args = wp_parse_args(
-            $args,
-            array(
-                'post_type'   => array( 'post', 'page' ),
-                'post_status' => 'publish',
-                'blocks'      => 'any',
-                'orderby'     => 'cnt',
-                'order'       => 'DESC',
-            )
-        );
+        $args = self::prepare_args( $args );
 
-        if ( 'any' === $args['post_type'] ) {
-            $args['post_type'] = array();
-        } elseif ( ! is_array( $args['post_type'] ) ) {
-            $args['post_type'] = array( $args['post_type'] );
-        }
-
-        if ( 'any' === $args['post_status'] ) {
-            $args['post_status'] = array();
-        } elseif ( ! is_array( $args['post_status'] ) ) {
-            $args['post_status'] = array( $args['post_status'] );
-        }
-
-        if ( 'any' === $args['blocks'] ) {
-            $blocks = array_keys( WP_Block_Type_Registry::get_instance()->get_all_registered() );
-        } elseif ( is_array( $args['blocks'] ) ) {
-            $blocks = $args['blocks'];
-        } elseif ( is_string( $args['blocks'] ) ) {
-            $blocks = array( $args['blocks'] );
-        }
-
-        /**
-         * Filter wich blocks get usage arguments before building the SQL
-         *
-         * @param array $args Arguments array.
-         * @return array
-         */
-        $args = apply_filters( 'which_blocks_get_usage_args', $args );
-
-        if ( ! is_array( $blocks ) || ! count( $blocks ) ) {
+        if ( ! is_array( $args['blocks'] ) || ! count( $args['blocks'] ) ) {
             return array();
         }
 
-        $where_clauses = array();
-
-        if ( count( $args['post_type'] ) ) {
-            $where_clauses[] .= $wpdb->prepare( 'post_type IN (' . implode( ',', array_fill( 0, count( $args['post_type'] ), '%s' ) ) . ')', $args['post_type'] );
-        }
-
-        if ( count( $args['post_status'] ) ) {
-            $where_clauses[] .= $wpdb->prepare( 'post_status IN (' . implode( ',', array_fill( 0, count( $args['post_status'] ), '%s' ) ) . ')', $args['post_status'] );
-        }
-
-        if ( count( $where_clauses ) ) {
-            $where = join( ' AND ', $where_clauses );
-        } else {
-            $where = '';
-        }
-
-        $queries = array();
-
-        foreach ( $blocks as $block ) {
-            if ( 'core/' === substr( $block, 0, 5 ) ) {
-                $block_name = substr( $block, 5 );
-            } else {
-                $block_name = $block;
-            }
-            $search_pattern = '<!-- wp:' . $block_name . ' ';
-
-            $block_where = $wpdb->prepare( 'WHERE post_content LIKE %s', '%' . $wpdb->esc_like( $search_pattern ) . '%' );
-            if ( $where ) {
-                $block_where .= ' AND ' . $where;
-            }
-
-            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- $block_where is prepared.
-            $queries[] = $wpdb->prepare( "(SELECT %s as block_name, COUNT(*) as cnt FROM {$wpdb->posts} " . $block_where . ' GROUP BY %s)', $block, $block );
-        }
-
-        $sql = join( ' UNION ', $queries ) . ' ORDER BY cnt DESC';
+        $sql = self::prepare_sql( $args );
 
         $results = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Prepared on previous steps.
@@ -123 +51 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Sort the block statistics elements
      *

which-blocks/tags/1.0.1/which-blocks.php

@@ -9 +9 @@
  * Domain Path:     /languages
  * Version:         1.0.0
+
  *
  * @package         Which_Blocks
@@ -15 +16 @@
 namespace WhichBlocks;
 
-require_once dirname( __FILE__ ) . '/vendor/autoload.php';
+if ( ! class_exists( 'WP_List_Table' ) ) {
+    require_once ABSPATH . 'wp-admin/includes/screen.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+}
+
+require_once dirname( __FILE__ ) . '/src/class-blocks-list-table.php';
+require_once dirname( __FILE__ ) . '/src/class-plugin.php';
+require_once dirname( __FILE__ ) . '/src/class-stats.php';
+require_once dirname( __FILE__ ) . '/src/class-tools-page.php';
 
 new Plugin();

which-blocks/trunk/readme.txt

@@ -3 +3 @@
 Tags:              block, block editor, blocks usage, statistics
 Requires at least: 5.7
-Tested up to:      6.1
+Tested up to:      6.
 Requires PHP:      7.0
-Stable tag:        1.0.0
+Stable tag:        1.0.
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
@@ -21 +21 @@
 Admin menu: Tools > Which Blocks
 
+
+
+
+
 == Installation ==
+
 1. Install the plugin via the plugin installer, either by searching for it or uploading a .zip file.
 2. Activate the plugin.
@@ -28 +33 @@
 == Changelog ==
 
+
+
+
+
+
+
+
 = 1.0.0 - 09.02.2023 = 
 * Initial plugin release.

which-blocks/trunk/src/class-plugin.php

@@ -14 +14 @@
 
     /**
+
+
+
+
+
+
+
      * Constructor
      */
@@ -26 +33 @@
      */
     public function init() {
-        new Tools_Page();
+        new Tools_Page();
     }
 }

which-blocks/trunk/src/class-stats.php

@@ -24 +24 @@
         global $wpdb;
 
-        $args = wp_parse_args(
-            $args,
-            array(
-                'post_type'   => array( 'post', 'page' ),
-                'post_status' => 'publish',
-                'blocks'      => 'any',
-                'orderby'     => 'cnt',
-                'order'       => 'DESC',
-            )
-        );
+        $args = self::prepare_args( $args );
 
-        if ( 'any' === $args['post_type'] ) {
-            $args['post_type'] = array();
-        } elseif ( ! is_array( $args['post_type'] ) ) {
-            $args['post_type'] = array( $args['post_type'] );
-        }
-
-        if ( 'any' === $args['post_status'] ) {
-            $args['post_status'] = array();
-        } elseif ( ! is_array( $args['post_status'] ) ) {
-            $args['post_status'] = array( $args['post_status'] );
-        }
-
-        if ( 'any' === $args['blocks'] ) {
-            $blocks = array_keys( WP_Block_Type_Registry::get_instance()->get_all_registered() );
-        } elseif ( is_array( $args['blocks'] ) ) {
-            $blocks = $args['blocks'];
-        } elseif ( is_string( $args['blocks'] ) ) {
-            $blocks = array( $args['blocks'] );
-        }
-
-        /**
-         * Filter wich blocks get usage arguments before building the SQL
-         *
-         * @param array $args Arguments array.
-         * @return array
-         */
-        $args = apply_filters( 'which_blocks_get_usage_args', $args );
-
-        if ( ! is_array( $blocks ) || ! count( $blocks ) ) {
+        if ( ! is_array( $args['blocks'] ) || ! count( $args['blocks'] ) ) {
             return array();
         }
 
-        $where_clauses = array();
-
-        if ( count( $args['post_type'] ) ) {
-            $where_clauses[] .= $wpdb->prepare( 'post_type IN (' . implode( ',', array_fill( 0, count( $args['post_type'] ), '%s' ) ) . ')', $args['post_type'] );
-        }
-
-        if ( count( $args['post_status'] ) ) {
-            $where_clauses[] .= $wpdb->prepare( 'post_status IN (' . implode( ',', array_fill( 0, count( $args['post_status'] ), '%s' ) ) . ')', $args['post_status'] );
-        }
-
-        if ( count( $where_clauses ) ) {
-            $where = join( ' AND ', $where_clauses );
-        } else {
-            $where = '';
-        }
-
-        $queries = array();
-
-        foreach ( $blocks as $block ) {
-            if ( 'core/' === substr( $block, 0, 5 ) ) {
-                $block_name = substr( $block, 5 );
-            } else {
-                $block_name = $block;
-            }
-            $search_pattern = '<!-- wp:' . $block_name . ' ';
-
-            $block_where = $wpdb->prepare( 'WHERE post_content LIKE %s', '%' . $wpdb->esc_like( $search_pattern ) . '%' );
-            if ( $where ) {
-                $block_where .= ' AND ' . $where;
-            }
-
-            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- $block_where is prepared.
-            $queries[] = $wpdb->prepare( "(SELECT %s as block_name, COUNT(*) as cnt FROM {$wpdb->posts} " . $block_where . ' GROUP BY %s)', $block, $block );
-        }
-
-        $sql = join( ' UNION ', $queries ) . ' ORDER BY cnt DESC';
+        $sql = self::prepare_sql( $args );
 
         $results = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Prepared on previous steps.
@@ -123 +51 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Sort the block statistics elements
      *

which-blocks/trunk/which-blocks.php

@@ -9 +9 @@
  * Domain Path:     /languages
  * Version:         1.0.0
+
  *
  * @package         Which_Blocks
@@ -15 +16 @@
 namespace WhichBlocks;
 
-require_once dirname( __FILE__ ) . '/vendor/autoload.php';
+if ( ! class_exists( 'WP_List_Table' ) ) {
+    require_once ABSPATH . 'wp-admin/includes/screen.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+}
+
+require_once dirname( __FILE__ ) . '/src/class-blocks-list-table.php';
+require_once dirname( __FILE__ ) . '/src/class-plugin.php';
+require_once dirname( __FILE__ ) . '/src/class-stats.php';
+require_once dirname( __FILE__ ) . '/src/class-tools-page.php';
 
 new Plugin();