Changeset 3147635

Timestamp:

09/06/2024 03:10:25 PM (18 months ago)

Author:

needle

Message:

Release 0.5.2

Location:

bp-groups-civicrm-sync/trunk

Files:

• assets/templates/wordpress/settings/metaboxes/metabox-settings-submit.php (modified) (1 diff)
• assets/templates/wordpress/settings/pages/page-dashboard.php (modified) (2 diffs)
• assets/templates/wordpress/settings/pages/page-settings.php (modified) (2 diffs)
• bp-groups-civicrm-sync.php (modified) (6 diffs)
• includes/civicrm/class-civicrm-group-contact.php (modified) (2 diffs)
• languages/bp-groups-civicrm-sync.pot (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

bp-groups-civicrm-sync/trunk/assets/templates/wordpress/settings/metaboxes/metabox-settings-submit.php

@@ -25 +25 @@
                  * Filters the "misc publishing actions" section.
                  *
+                 * Make sure that whatever is returned has been properly escaped.
+                 *
                  * @since 0.5.0
                  *
                  * @param string $misc_pub_section The text for the "misc publishing actions" section.
                  */
-                echo apply_filters( $this->hook_prefix . '/settings/page/metabox/submit/misc_pub', $misc_pub_section );
+                $misc_pub_section = apply_filters( $this->hook_prefix . '/settings/page/metabox/submit/misc_pub', $misc_pub_section );
+
+                // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo $misc_pub_section;
 
                 ?>

bp-groups-civicrm-sync/trunk/assets/templates/wordpress/settings/pages/page-dashboard.php

@@ -45 +45 @@
     ?>
 
+    <?php /* phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped */ ?>
     <form method="post" id="<?php echo esc_attr( $this->form_id ); ?>" action="<?php echo $this->form_submit_url_get(); ?>">
 
@@ -56 +57 @@
         <div id="dashboard-widgets-wrap">
 
-            <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
+            <div id="dashboard-widgets" class="metabox-holder<?php echo esc_attr( $columns_css ); ?>">
 
                 <div id="postbox-container-1" class="postbox-container">

bp-groups-civicrm-sync/trunk/assets/templates/wordpress/settings/pages/page-settings.php

@@ -56 +56 @@
     ?>
 
+    <?php /* phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped */ ?>
     <form method="post" id="<?php echo esc_attr( $this->form_id ); ?>" action="<?php echo $this->form_submit_url_get(); ?>">
 
@@ -64 +65 @@
         <div id="poststuff">
 
-            <div id="post-body" class="metabox-holder columns-<?php echo $columns; ?>">
+            <div id="post-body" class="metabox-holder columns-<?php echo esc_attr( $columns ); ?>">
 
                 <!--<div id="post-body-content">

bp-groups-civicrm-sync/trunk/bp-groups-civicrm-sync.php

@@ -1 +1 @@
 <?php
 /**
- * Plugin Name: BP Groups CiviCRM Sync
- * Plugin URI: https://github.com/christianwach/bp-groups-civicrm-sync
+ * BP Groups CiviCRM Sync
+ *
+ * Plugin Name:       BP Groups CiviCRM Sync
+ * Description:       Enables two-way synchronisation between BuddyPress Groups and CiviCRM Groups.
+ * Version:           0.5.2
+ * Plugin URI:        https://github.com/christianwach/bp-groups-civicrm-sync
  * GitHub Plugin URI: https://github.com/christianwach/bp-groups-civicrm-sync
- * Description: Enables two-way synchronisation between BuddyPress Groups and CiviCRM Groups.
- * Author: Christian Wach
- * Version: 0.5.1
- * Author URI: https://haystack.co.uk
- * Text Domain: bp-groups-civicrm-sync
- * Domain Path: /languages
+ * Author:            Christian Wach
+ * Author URI:        https://haystack.co.uk
+ * Requires at least: 4.9
+ * Requires PHP:      7.4
+ * License:           GPLv2 or later
+ * License URI:       https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * Text Domain:       bp-groups-civicrm-sync
+ * Domain Path:       /languages
  *
  * @package BP_Groups_CiviCRM_Sync
@@ -18 +24 @@
 
 // Set our version here.
-define( 'BP_GROUPS_CIVICRM_SYNC_VERSION', '0.5.1' );
+define( 'BP_GROUPS_CIVICRM_SYNC_VERSION', '0.5.2' );
 
 // Store reference to this file.
@@ -118 +124 @@
         $this->include_files();
         $this->setup_objects();
+        $this->register_hooks();
 
         /**
@@ -195 +202 @@
     }
 
+    /**
+     * Registers hooks.
+     *
+     * @since 0.5.2
+     */
+    public function register_hooks() {
+
+        // Add links to settings page.
+        add_filter( 'plugin_action_links', [ $this, 'action_links' ], 10, 2 );
+
+    }
+
     // -----------------------------------------------------------------------------------
 
@@ -307 +326 @@
     }
 
+    /**
+     * Adds utility links to settings page.
+     *
+     * @since 0.1
+     * @since 0.5.2 Moved into plugin class.
+     *
+     * @param array  $links The existing links array.
+     * @param string $file The name of the plugin file.
+     * @return array $links The modified links array.
+     */
+    public function action_links( $links, $file ) {
+
+        // Bail if not this plugin.
+        if ( plugin_basename( dirname( __FILE__ ) . '/bp-groups-civicrm-sync.php' ) !== $file ) {
+            return $links;
+        }
+
+        // Add links only when CiviCRM is fully installed.
+        if ( ! defined( 'CIVICRM_INSTALLED' ) || ! CIVICRM_INSTALLED ) {
+            return $links;
+        }
+
+        // Bail if CiviCRM plugin is not present.
+        if ( ! function_exists( 'civi_wp' ) ) {
+            return $links;
+        }
+
+        // Bail if BuddyPress plugin is not present.
+        if ( ! function_exists( 'buddypress' ) ) {
+            return $links;
+        }
+
+        // Add settings link if not network activated and not viewing network admin.
+        $link    = add_query_arg( [ 'page' => 'bpgcs_settings' ], admin_url( 'admin.php' ) );
+        $links[] = '<a href="' . esc_url( $link ) . '">' . esc_html__( 'Settings', 'bp-groups-civicrm-sync' ) . '</a>';
+
+        // Always add Paypal link.
+        $paypal  = 'https://www.paypal.me/interactivist';
+        $links[] = '<a href="' . esc_url( $paypal ) . '" target="_blank">' . __( 'Donate!', 'bp-groups-civicrm-sync' ) . '</a>';
+
+        // --<
+        return $links;
+
+    }
+
 }
 
@@ -338 +402 @@
  * @see https://developer.wordpress.org/reference/functions/register_uninstall_hook/
  */
-
-/**
- * Utility to add link to settings page.
- *
- * @since 0.1
- *
- * @param array $links The existing links array.
- * @param str   $file The name of the plugin file.
- * @return array $links The modified links array.
- */
-function bp_groups_civicrm_sync_plugin_action_links( $links, $file ) {
-
-    // Add settings link.
-    if ( plugin_basename( dirname( __FILE__ ) . '/bp-groups-civicrm-sync.php' === $file ) ) {
-
-        // Is this Network Admin?
-        if ( is_network_admin() ) {
-            $link = add_query_arg( [ 'page' => 'bp_groups_civicrm_sync_parent' ], network_admin_url( 'settings.php' ) );
-        } else {
-            $link = add_query_arg( [ 'page' => 'bp_groups_civicrm_sync_parent' ], admin_url( 'admin.php' ) );
-        }
-
-        // Add settings link.
-        $links[] = '<a href="' . $link . '">' . esc_html__( 'Settings', 'bp-groups-civicrm-sync' ) . '</a>';
-
-        // Add Paypal link.
-        $paypal  = 'https://www.paypal.me/interactivist';
-        $links[] = '<a href="' . $paypal . '" target="_blank">' . __( 'Donate!', 'bp-groups-civicrm-sync' ) . '</a>';
-
-    }
-
-    // --<
-    return $links;
-
-}
-
-// Add filters for the above.
-add_filter( 'network_admin_plugin_action_links', 'bp_groups_civicrm_sync_plugin_action_links', 10, 2 );
-add_filter( 'plugin_action_links', 'bp_groups_civicrm_sync_plugin_action_links', 10, 2 );

bp-groups-civicrm-sync/trunk/includes/civicrm/class-civicrm-group-contact.php

@@ -703 +703 @@
 
         // Return early if something went wrong.
-        if ( ! empty( $result['error'] ) ) {
+        if ( ! empty( $result['is_error'] ) && 1 === (int) $result['is_error'] ) {
             $e     = new \Exception();
             $trace = $e->getTraceAsString();
@@ -754 +754 @@
 
         // Return early if something went wrong.
-        if ( ! empty( $result['error'] ) ) {
+        if ( ! empty( $result['is_error'] ) && 1 === (int) $result['is_error'] ) {
             $e     = new \Exception();
             $trace = $e->getTraceAsString();

bp-groups-civicrm-sync/trunk/languages/bp-groups-civicrm-sync.pot

@@ -1 +1 @@
 # Copyright (C) 2024 Christian Wach
-# This file is distributed under the same license as the BP Groups CiviCRM Sync plugin.
+# This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: BP Groups CiviCRM Sync 0.5.1a\n"
+"Project-Id-Version: BP Groups CiviCRM Sync 0.5.2a\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/bp-groups-civicrm-sync\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-04-11T13:53:16+00:00\n"
+"POT-Creation-Date: 2024-09-06T15:08:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
@@ -120 +120 @@
 msgstr ""
 
-#: assets/templates/wordpress/settings/metaboxes/metabox-settings-submit.php:41
+#: assets/templates/wordpress/settings/metaboxes/metabox-settings-submit.php:46
 msgid "Update"
 msgstr ""
@@ -128 +128 @@
 msgstr ""
 
-#: bp-groups-civicrm-sync.php:363
+#: bp-groups-civicrm-sync.php:362
 #: includes/admin/class-page-settings.php:127
 #: includes/admin/class-page-settings.php:130
@@ -134 +134 @@
 msgstr ""
 
-#: bp-groups-civicrm-sync.php:367
+#: bp-groups-civicrm-sync.php:366
 msgid "Donate!"
 msgstr ""

bp-groups-civicrm-sync/trunk/readme.txt

@@ -4 +4 @@
 Tags: civicrm, buddypress, user, groups, sync
 Requires at least: 4.9
-Tested up to: 6.5
-Stable tag: 0.5.1
+Tested up to: 6.6
+Stable tag: 0.5.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -44 +44 @@
 
 == Changelog ==
+
+= 0.5.2 =
+
+* Fixes CiviCRM API error check
 
 = 0.5.1 =