Merge pull request #168 from itthinx/tested-3.7.0-6.8

Tested 3.7.0 6.8

Author: itthinx

COPYRIGHT.txt

@@ -1,7 +1,7 @@
 
  Groups
 
- Copyright 2011-2024 "kento" (Karim Rahimpur) www.itthinx.com
+ Copyright 2011-2025 "kento" (Karim Rahimpur) www.itthinx.com
 
  The files COPYRIGHT.txt and LICENSE.txt as well as ALL NOTICES IN THE
  HEADERS OF ALL FILES MUST BE KEPT INTACT.

changelog.txt

@@ -1,5 +1,31 @@
 == Groups by itthinx - changelog.txt
 
+2025-09-08 - version 3.7.0
+* Update - WordPress 6.8 compatible.
+* Update - Requires at least WordPress 6.5.
+* Update - WooCommerce 10.2 compatible.
+* Update - Requires at least WooCommerce 8.5.
+* Update - Improved the row action rendering in the Groups admin screen.
+* Dev - Revised unused bits of code.
+* Dev - Added the groups_admin_groups_query filter.
+* Dev - Added the groups_admin_groups_results filter.
+* Dev - Added the groups_admin_groups_columns filter.
+* Dev - Added the groups_admin_groups_filters_fields_epilogue filter.
+* Dev - Added the groups_admin_groups_filters_html filter.
+* Dev - Added the groups_admin_groups_bulk_actions_fields_epilogue filter.
+* Dev - Added the groups_admin_groups_bulk_actions_html filter.
+* Dev - Added the groups_admin_groups_row_actions filter.
+* Dev - Added the groups_admin_groups_row_actions_html filter.
+* Dev - Added the groups_admin_groups_column_content filter.
+* Dev - Added the groups_admin_groups_handle_action action.
+* Dev - Added the groups_admin_groups_handle_action_submit filter.
+* Dev - Added the groups_admin_groups_handle_action_confirm action.
+* Dev - Added the groups_admin_groups_handle_action_reject action.
+* Dev - Added the groups_admin_groups_handle_bulk_action action.
+* Fix - Resolves performance issues with large sets of groups rendering using the group tree functions, as reported in https://github.com/itthinx/groups/issues/158
+* Fix - Legacy column for capabilities collapsing.
+* Add - Added info on contributing Bitcoin to support Groups development.
+
 2025-08-20 - version 3.6.0
 * Update - WordPress 6.8 compatible.
 * Dev - Removed superfluous spaces in several translations.

css/groups_admin.css

@@ -258,13 +258,124 @@ div.capability.edit label {
 	color: #f00;
 }
 
+.groups-bitcoin-box {
+	padding: 1em;
+	margin: 1em;
+	background-color: #fff;
+	border-radius: 4px;
+	color: #111;
+	border: 1px solid #999;
+	width: 256px;
+}
+.groups-bitcoin-box.options {
+	position: relative;
+	float: right;
+}
+.groups-bitcoin-box-inside {
+	display: flex;
+	flex-direction: column;
+	text-align: center;
+}
+
+.groups-bitcoin-box span {
+	margin: 0.31em 0;
+	flex-grow: 1;
+	text-align: center;
+}
+.groups-bitcoin-box .groups-bitcoin-cta {
+	font-weight: bold;
+	padding-bottom: 16px;
+}
+.groups-bitcoin-box .groups-bitcoin-image img {
+	width: 100%;
+}
+.groups-bitcoin-box.small .groups-bitcoin-image img {
+	width: 128px;
+}
+.groups-bitcoin-box .groups-bitcoin-description {
+	padding-top: 12px;
+}
+.groups-bitcoin-box .groups-bitcoin-description .groups-bitcoin-address {
+	word-wrap: anywhere;
+	vertical-align: middle;
+	font-weight: bold;
+}
+.groups-bitcoin-box .groups-bitcoin-description .dashicons.dashicons-admin-page {
+	opacity: 0.42;
+	vertical-align: middle;
+}
+
+.groups-bitcoin-box.horizontal {
+	flex: auto;
+	max-width: 384px;
+	min-width: 256px;
+	width: auto;
+	padding: 8px;
+	margin: 8px;
+}
+.groups-bitcoin-box.horizontal .groups-bitcoin-box-inside {
+	display: grid;
+	grid-template-rows: 25% 75%;
+	grid-template-columns: 35% 65%;
+}
+.groups-bitcoin-box.horizontal .groups-bitcoin-cta {
+	grid-column-start: 2;
+	grid-row-start: 1;
+	padding: 4px;
+}
+.groups-bitcoin-box.horizontal .groups-bitcoin-image {
+	grid-row-start: 1;
+	grid-column-start: 1;
+	grid-row-end: span 2;
+}
+.groups-bitcoin-box.horizontal .groups-bitcoin-image img {
+	width: 128px;
+}
+.groups-bitcoin-box.horizontal .groups-bitcoin-description {
+	grid-row-start: 2;
+	grid-column-start: 2;
+	padding: 4px;
+}
+
+.groups-bitcoin-box a.close {
+	color: #999;
+	line-height: 18px;
+	position: absolute;
+	right: 4px;
+	text-decoration: none;
+	top: 4px;
+	font-family: sans;
+	font-size: 12px;
+}
+.groups-bitcoin-box a.close::before {
+	background: transparent;
+	color: #ddd;
+	content: "\f153";
+	display: inline-block;
+	font: normal 16px/20px dashicons;
+	height: 20px;
+	text-align: center;
+	width: 20px;
+	position: relative;
+	top: 4px;
+	right: 4px;
+	transition: all .62s ease-in-out;
+}
+.groups-bitcoin-box a.close:hover::before {
+	color: #f00;
+}
+
 #groups-extensions-support {
 	padding: 1em;
 	margin: 0 0 24px 0;
 	background-color: #fff;
 	border-radius: 4px;
 	color: #111;
 	border: 2px solid #7494d1;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: space-around;
 }
 #groups-extensions-support p {
 	font-size: 14px;
@@ -283,7 +394,10 @@ div.capability.edit label {
 	top: -4px;
 	left: 4px;
 }
-
+#groups-extensions-support-inside {
+	flex: 1;
+	min-width: 256px;
+}
 .groups-bulk-container {
 	padding-bottom: 1em;
 }

groups.php

@@ -2,7 +2,7 @@
 /**
  * groups.php
  *
- * Copyright (c) 2011-2024 "kento" Karim Rahimpur www.itthinx.com
+ * Copyright (c) 2011-2025 "kento" Karim Rahimpur www.itthinx.com
  *
  * This code is released under the GNU General Public License.
  * See COPYRIGHT.txt and LICENSE.txt.
@@ -21,11 +21,11 @@
  * Plugin Name: Groups
  * Plugin URI: https://www.itthinx.com/plugins/groups
  * Description: Groups provides group-based user membership management, group-based capabilities and content access control.
- * Version: 3.6.0
- * Requires at least: 6.3
+ * Version: 3.7.0
+ * Requires at least: 6.5
  * Requires PHP: 7.4
- * WC requires at least: 8.2
- * WC tested up to: 9.6
+ * WC requires at least: 8.5
+ * WC tested up to: 10.2
  * Author: itthinx
  * Author URI: https://www.itthinx.com
  * Donate-Link: https://www.itthinx.com/shop/
@@ -36,7 +36,7 @@
 if ( !defined( 'ABSPATH' ) ) {
 	exit;
 }
-define( 'GROUPS_CORE_VERSION', '3.6.0' );
+define( 'GROUPS_CORE_VERSION', '3.7.0' );
 define( 'GROUPS_FILE', __FILE__ );
 if ( !defined( 'GROUPS_CORE_DIR' ) ) {
 	define( 'GROUPS_CORE_DIR', untrailingslashit( plugin_dir_path( __FILE__ ) ) );

images/groups-bitcoin.png

@@ -172,5 +172,89 @@ public static function admin_notices() {
 
 		echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
+
+	/**
+	 * Provide the Bitcoin box markup.
+	 *
+	 * @return string
+	 */
+	public static function get_groups_bitcoin_box( $params = null ) {
+		$type = '';
+		$where = '';
+		if ( is_array( $params ) ) {
+			if ( isset( $params['type'] ) ) {
+				switch ( $params['type'] ) {
+					case 'vertical':
+					case 'horizontal':
+						$type = $params['type'];
+						break;
+				}
+			}
+			if ( isset( $params['where'] ) ) {
+				switch ( $params['where'] ) {
+					case 'options':
+					case 'add-ons':
+						$where = $params['where'];
+						break;
+				}
+			}
+		}
+		$bitcoin_address = 'bc1q7klf9ge8gvtl4h4qlh6c73tgk0cdehfv5vcq0g';
+		$bitcoin_box = sprintf( '<div id="groups-bitcoin-box" class="groups-bitcoin-box %s %s">', esc_attr( $type ), esc_attr( $where ) );
+		$bitcoin_box .= '<div class="groups-bitcoin-box-inside">';
+		$bitcoin_box .= '<div class="groups-bitcoin-cta">';
+		$bitcoin_box .= esc_html__( 'Contribute Bitcoin to Groups', 'groups' );
+		$bitcoin_box .= '</div>'; // .groups-bitcoin-cta
+		$bitcoin_box .= '<div class="groups-bitcoin-image">';
+		$bitcoin_box .= sprintf( '<img class="groups-bitcoin-address-image" src="%s"/>', esc_url( GROUPS_PLUGIN_URL .'images/groups-bitcoin.png' ) );
+		$bitcoin_box .= '</div>'; // .groups-bitcoin-image
+		$bitcoin_box .= '<div class="groups-bitcoin-description">';
+		$bitcoin_box .= sprintf(
+			esc_html__( 'Support the developers and contribute Bitcoin to %s', 'groups' ),
+			'<span class="groups-bitcoin-address">' . esc_html( $bitcoin_address ) . '</span>' .
+			'&ensp;' .
+			'<span class="dashicons dashicons-admin-page pseudo-copy-icon" style="display:none"></span>'
+		);
+		$bitcoin_box .= '</div>'; // .groups-bitcoin-description
+		$bitcoin_box .= '</div>'; // .groups-bitcoin-box-inside
+		$bitcoin_box .= '</div>'; // .groups-bitcoin-box
+		$bitcoin_box .= '<script type="text/javascript">';
+		$bitcoin_box .= 'if ( typeof groups_bitcoin_box_address === "undefined" ) {';
+		$bitcoin_box .= 	'function groups_bitcoin_box_address( event ) {';
+		$bitcoin_box .= 		'if ( navigator.clipboard && window.isSecureContext ) {';
+		$bitcoin_box .= 			'try {';
+		$bitcoin_box .= 				'navigator.clipboard.writeText("' . esc_html( $bitcoin_address ) .'");';
+		$bitcoin_box .= 				'jQuery( event.target ).closest( ".groups-bitcoin-box-inside" ).fadeOut( 100 ).fadeIn( 100 );';
+		$bitcoin_box .= 			'} catch (error) {';
+		$bitcoin_box .= 			'}';
+		$bitcoin_box .= 		'} else if ( document.queryCommandEnabled && document.queryCommandEnabled( "copy" ) ) {';
+		$bitcoin_box .= 			'let tmp = document.createElement("textarea");';
+		$bitcoin_box .= 			sprintf( 'tmp.value="%s";', $bitcoin_address );
+		$bitcoin_box .= 			'tmp.setAttribute("style","display:none");';
+		$bitcoin_box .= 			'tmp.select();';
+		$bitcoin_box .= 			'try {';
+		$bitcoin_box .= 				'document.execCommand( "copy" );';
+		$bitcoin_box .= 				'jQuery( event.target ).closest( ".groups-bitcoin-box-inside" ).fadeOut( 100 ).fadeIn( 100 );';
+		$bitcoin_box .= 			'} catch ( error ) {';
+		$bitcoin_box .= 			'} finally {';
+		$bitcoin_box .= 				'tmp.remove();';
+		$bitcoin_box .= 			'}';
+		$bitcoin_box .= 		'}';
+		$bitcoin_box .= 	'}';
+		$bitcoin_box .= 	'document.addEventListener( "DOMContentLoaded", function() {';
+		$bitcoin_box .= 		'if ( typeof jQuery !== "undefined" ) {';
+		$bitcoin_box .= 			'if ( navigator.clipboard && window.isSecureContext || document.queryCommandEnabled && document.queryCommandEnabled( "copy" ) ) {';
+		$bitcoin_box .= 				'jQuery( ".groups-bitcoin-box" ).click( groups_bitcoin_box_address );';
+		$bitcoin_box .= 				'jQuery( ".groups-bitcoin-box" ).css( "cursor", "pointer" );';
+		$bitcoin_box .= 				'jQuery( ".groups-bitcoin-box .pseudo-copy-icon" ).css( "display", "inline" );';
+		$bitcoin_box .= 			'} else {';
+		$bitcoin_box .= 				'jQuery( ".groups-bitcoin-box .dashicons.dashicons-admin-page" ).remove();';
+		$bitcoin_box .= 			'}';
+		$bitcoin_box .= 		'}';
+		$bitcoin_box .= 	'} );'; // DOMContentLoaded
+		$bitcoin_box .= '}'; // typeof
+		$bitcoin_box .= '</script>';
+		return $bitcoin_box;
+	}
 }
 Groups_Admin_Notice::init();

js/groups_admin.js js/groups-admin.jsjs/groups_admin.js renamed to js/groups-admin.js

@@ -121,7 +121,7 @@ public static function admin_head() {
 				echo '.wp-list-table td { overflow: visible; }'; // idem for bulk actions
 				echo 'label.groups-read-terms { vertical-align: middle; line-height: 28px; margin-right: 4px; }'; // Terms checkbox label
 				echo 'label.groups-read-terms input[type="checkbox"] { height: 1rem; }'; // Terms checkbox
-				echo 'th.column-groups, th.column-groups-read { width:10%; }';
+				echo 'th.column-groups, th.column-groups-read, th.column-capabilities { width:10%; }';
 				echo '</style>';
 			}
 		}

lib/admin/class-groups-admin-notice.php

@@ -84,8 +84,7 @@ public static function admin_print_styles() {
 	 */
 	public static function admin_print_scripts() {
 		global $groups_version;
-		// this one's currently empty
-		// wp_enqueue_script( 'groups_admin', GROUPS_PLUGIN_URL . 'js/groups_admin.js', array( ), $groups_version );
+		// wp_enqueue_script( 'groups-admin', GROUPS_PLUGIN_URL . 'js/groups-admin.js', array( ), $groups_version );
 		Groups_UIE::enqueue( 'select' );
 	}
 

lib/admin/class-groups-admin-posts.php

@@ -32,7 +32,9 @@ function groups_admin_add_ons() {
 	echo esc_html__( 'Add-Ons', 'groups' );
 	echo '</h1>';
 
+	echo '<div class="groups-extensions-support-contribute">';
 	$extensions_box = '<div id="groups-extensions-support">';
+	$extensions_box .= '<div id="groups-extensions-support-inside">';
 	$extensions_box .= '<h2>';
 	$extensions_box .= esc_html__( 'Your support matters!', 'groups' );
 	$extensions_box .= '</h2>';
@@ -43,8 +45,14 @@ function groups_admin_add_ons() {
 	$extensions_box .= esc_html__( 'By getting an official extension, you fund the work that is necessary to maintain and improve Groups.', 'groups' );
 	$extensions_box .= '</p>';
 	$extensions_box .= '</div>';
+	$extensions_box .= Groups_Admin_Notice::get_groups_bitcoin_box( array( 'type' => 'horizontal', 'where' => 'add-ons' ) );
+	$extensions_box .= '</div>';
 	echo $extensions_box; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
+// 	echo Groups_Admin_Notice::get_groups_bitcoin_box( array( 'type' => 'horizontal', 'where' => 'add-ons' ) );
+
+	echo '</div>'; // .groups-extensions-support-contribute
+
 	groups_admin_add_ons_content();
 	echo '</div>'; // .groups-admin-add-ons.wrap
 }