Merge pull request #33 from brainstormforce/wp-update-readme

chore: updated the tested up to version.

README.md

@@ -3,8 +3,8 @@
 **Donate link:** https://www.paypal.me/BrainstormForce  
 **Tags:** Beaver Builder, Elementor, Astra, woff2, woff, ttf, svg, eot, otf, Custom Fonts, Font, Typography  
 **Requires at least:** 4.4  
-**Tested up to:** 5.4.2  
-**Stable tag:** 1.2.2  
+**Tested up to:** 5.5  
+**Stable tag:** 1.2.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -43,6 +43,9 @@ If you're not using any of the supported plugins and theme, you can write the cu
 
 ## Changelog ##
 
+### 1.2.3 ###
+- Fix: Fixed compatibility with other plugins with respect to the admin notice.
+
 ### 1.2.2 ###
 - New: Users can now share non-personal usage data to help us test and develop better products. ( https://store.brainstormforce.com/usage-tracking/?utm_source=wp_dashboard&utm_medium=general_settings&utm_campaign=usage_tracking )
 

admin/bsf-analytics/assets/css/unminified/style-rtl.css

@@ -1,21 +1,21 @@
-#bsf-optin-notice {
+[ID*="-optin-notice"] {
     padding: 1px 12px;
     border-right-color: #007cba;
 }
 
-#bsf-optin-notice .notice-container {
+[ID*="-optin-notice"] .notice-container {
     padding-top: 10px;
     padding-bottom: 12px;
 }
 
-#bsf-optin-notice .notice-content {
+[ID*="-optin-notice"] .notice-content {
     margin: 0;
 }
 
-#bsf-optin-notice .notice-heading {
+[ID*="-optin-notice"] .notice-heading {
     padding: 0 0 12px 20px;
 }
 
-#bsf-optin-notice .button-primary {
+[ID*="-optin-notice"] .button-primary {
     margin-left: 5px;
 }

admin/bsf-analytics/assets/css/unminified/style.css

@@ -1,21 +1,21 @@
-#bsf-optin-notice {
+[ID*="-optin-notice"] {
     padding: 1px 12px;
     border-left-color: #007cba;
 }
 
-#bsf-optin-notice .notice-container {
+[ID*="-optin-notice"] .notice-container {
     padding-top: 10px;
     padding-bottom: 12px;
 }
 
-#bsf-optin-notice .notice-content {
+[ID*="-optin-notice"] .notice-content {
     margin: 0;
 }
 
-#bsf-optin-notice .notice-heading {
+[ID*="-optin-notice"] .notice-heading {
     padding: 0 20px 12px 0;
 }
 
-#bsf-optin-notice .button-primary {
+[ID*="-optin-notice"] .button-primary {
     margin-right: 5px;
 }

admin/bsf-analytics/class-bsf-analytics-loader.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * BSF analytics loader file.
+ *
+ * @version 1.0.0
+ *
+ * @package bsf-analytics
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit();
+}
+
+/**
+ * Class BSF_Analytics_Loader.
+ */
+class BSF_Analytics_Loader {
+
+	/**
+	 * Analytics Entities.
+	 *
+	 * @access private
+	 * @var array Entities array.
+	 */
+	private $entities = array();
+
+	/**
+	 * Analytics Version.
+	 *
+	 * @access private
+	 * @var float analytics version.
+	 */
+	private $analytics_version = '';
+
+	/**
+	 * Analytics path.
+	 *
+	 * @access private
+	 * @var string path array.
+	 */
+	private $analytics_path = '';
+
+	/**
+	 * Instance
+	 *
+	 * @access private
+	 * @var object Class object.
+	 */
+	private static $instance = null;
+
+	/**
+	 * Get instace of class.
+	 *
+	 * @return object
+	 */
+	public static function get_instance() {
+		if ( null === self::$instance ) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		add_action( 'init', array( $this, 'load_analytics' ) );
+	}
+
+	/**
+	 * Set entity for analytics.
+	 *
+	 * @param string $data Entity attributes data.
+	 * @return void
+	 */
+	public function set_entity( $data ) {
+		array_push( $this->entities, $data );
+	}
+
+	/**
+	 * Load Analytics library.
+	 *
+	 * @return void
+	 */
+	public function load_analytics() {
+		$unique_entities = array();
+
+		if ( ! empty( $this->entities ) ) {
+			foreach ( $this->entities as $entity ) {
+				foreach ( $entity as $key => $data ) {
+
+					if ( isset( $data['path'] ) ) {
+						if ( file_exists( $data['path'] . '/version.json' ) ) {
+							$file_contents     = file_get_contents( $data['path'] . '/version.json' ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+							$analytics_version = json_decode( $file_contents, 1 );
+							$analytics_version = $analytics_version['bsf-analytics-ver'];
+
+							if ( version_compare( $analytics_version, $this->analytics_version, '>' ) ) {
+								$this->analytics_version = $analytics_version;
+								$this->analytics_path    = $data['path'];
+							}
+						}
+					}
+
+					if ( ! isset( $unique_entities[ $key ] ) ) {
+						$unique_entities[ $key ] = $data;
+					}
+				}
+			}
+
+			if ( file_exists( $this->analytics_path ) && ! class_exists( 'BSF_Analytics' ) ) {
+				require_once $this->analytics_path . '/class-bsf-analytics.php';
+				new BSF_Analytics( $unique_entities, $this->analytics_path, $this->analytics_version );
+			}
+		}
+	}
+}