Pulled latest analytics code

Author: imnavanath

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

@@ -68,7 +68,7 @@ private function get_default_stats() {
 				'graupi_version'         => defined( 'BSF_UPDATER_VERSION' ) ? BSF_UPDATER_VERSION : false,
 				'domain_name'            => get_site_url(),
 				'php_os'                 => PHP_OS,
-				'server_software'        => $_SERVER['SERVER_SOFTWARE'],
+				'server_software'        => isset( $_SERVER['SERVER_SOFTWARE'] ) ? filter_var( wp_unslash( $_SERVER['SERVER_SOFTWARE'] ), FILTER_SANITIZE_STRING ) : '',
 				'mysql_version'          => $this->get_mysql_version(),
 				'php_version'            => $this->get_php_version(),
 				'php_max_input_vars'     => ini_get( 'max_input_vars' ), // phpcs:ignore:PHPCompatibility.IniDirectives.NewIniDirectives.max_input_varsFound
@@ -181,7 +181,7 @@ public function format_plugin( $plugin ) {
 		private function get_curl_ssl_version() {
 			$curl = array();
 			if ( function_exists( 'curl_version' ) ) {
-				$curl = curl_version();
+				$curl = curl_version(); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_version
 			}
 
 			return isset( $curl['ssl_version'] ) ? $curl['ssl_version'] : false;
@@ -196,7 +196,7 @@ private function get_curl_ssl_version() {
 		private function get_curl_version() {
 			$curl = array();
 			if ( function_exists( 'curl_version' ) ) {
-				$curl = curl_version();
+				$curl = curl_version(); // phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_version
 			}
 
 			return isset( $curl['version'] ) ? $curl['version'] : false;

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

@@ -33,7 +33,7 @@ class BSF_Analytics {
 		public function __construct() {
 
 			define( 'BSF_ANALYTICS_FILE', __FILE__ );
-			define( 'BSF_ANALYTICS_VERSION', '1.0.0' );
+			define( 'BSF_ANALYTICS_VERSION', '1.0.1' );
 			define( 'BSF_ANALYTICS_PATH', dirname( __FILE__ ) );
 			define( 'BSF_ANALYTICS_URI', $this->bsf_analytics_url() );
 
@@ -186,6 +186,8 @@ public function option_notice() {
 				$notice_string .= __( 'This will be applicable for all sites from the network.', 'custom-typekit-fonts' );
 			}
 
+			$language_dir = is_rtl() ? 'rtl' : 'ltr';
+
 			Astra_Notices::add_notice(
 				array(
 					'id'                         => 'bsf-optin-notice',
@@ -205,7 +207,7 @@ public function option_notice() {
 								</div>
 							</div>',
 						/* translators: %s usage doc link */
-						sprintf( $notice_string . '<a href="%2s" target="_blank" rel="noreferrer noopener">%3s</a>', $this->get_product_name(), esc_url( $this->usage_doc_link ), __( ' Know More.', 'custom-typekit-fonts' ) ),
+						sprintf( $notice_string . '<span dir="%2s"><a href="%3s" target="_blank" rel="noreferrer noopener">%4s</a><span>', esc_html( $this->get_product_name() ), $language_dir, esc_url( $this->usage_doc_link ), __( ' Know More.', 'custom-typekit-fonts' ) ),
 						add_query_arg(
 							array(
 								'bsf_analytics_optin' => 'yes',
@@ -240,11 +242,11 @@ public function handle_optin_optout() {
 				return;
 			}
 
-			if ( ! wp_verify_nonce( sanitize_text_field( $_GET['bsf_analytics_nonce'] ), 'bsf_analytics_optin' ) ) {
+			if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['bsf_analytics_nonce'] ) ), 'bsf_analytics_optin' ) ) {
 				return;
 			}
 
-			$optin_status = sanitize_text_field( $_GET['bsf_analytics_optin'] );
+			$optin_status = isset( $_GET['bsf_analytics_optin'] ) ? sanitize_text_field( wp_unslash( $_GET['bsf_analytics_optin'] ) ) : '';
 
 			if ( 'yes' === $optin_status ) {
 				$this->optin();
@@ -371,6 +373,7 @@ public function sanitize_option( $input ) {
 		 */
 		public function render_settings_field_html() {
 			?>
+			<fieldset>
 			<label for="bsf-analytics-optin">
 				<input id="bsf-analytics-optin" type="checkbox" value="1" name="bsf_analytics_optin" <?php checked( get_site_option( 'bsf_analytics_optin', 'no' ), 'yes' ); ?>>
 				<?php
@@ -383,6 +386,9 @@ public function render_settings_field_html() {
 			</label>
 			<?php
 			echo wp_kses_post( sprintf( '<a href="%1s" target="_blank" rel="noreferrer noopener">%2s</a>', esc_url( $this->usage_doc_link ), __( 'Learn More.', 'custom-typekit-fonts' ) ) );
+			?>
+			</fieldset>
+			<?php
 		}
 
 		/**
@@ -406,14 +412,30 @@ private function get_product_name() {
 			$exploded_path = explode( '/', $base, 2 );
 			$plugin_slug   = $exploded_path[0];
 
+			return $this->get_plugin_name( $plugin_slug );
+		}
+
+		/**
+		 * Get plugin name by plugin slug.
+		 *
+		 * @param string $plugin_slug Plugin slug.
+		 * @return string $plugin_info['Name'] Plugin name.
+		 */
+		private function get_plugin_name( $plugin_slug ) {
+
+			$plugins = get_option( 'active_plugins' );
+
 			if ( ! function_exists( 'get_plugin_data' ) ) {
 				require_once ABSPATH . 'wp-admin/includes/plugin.php';
 			}
 
-			$plugin_main_file = WP_PLUGIN_DIR . '/' . $plugin_slug . '/' . $plugin_slug . '.php';
-			$plugin_data      = get_plugin_data( wp_normalize_path( $plugin_main_file ) );
-
-			return $plugin_data['Name'];
+			foreach ( $plugins as $plugin_file ) {
+				if ( 0 === strpos( $plugin_file, $plugin_slug ) ) {
+					$plugin_path = WP_PLUGIN_DIR . '/' . $plugin_file;
+					$plugin_data = get_plugin_data( $plugin_path );
+					return $plugin_data['Name'];
+				}
+			}
 		}
 
 		/**

languages/custom-typekit-fonts.pot

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: Custom Adobe Fonts (Typekit) 1.0.17\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/custom-typekit-fonts\n"
-"POT-Creation-Date: 2020-06-09 13:09:34+00:00\n"
+"POT-Creation-Date: 2020-06-15 05:45:18+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,36 +36,36 @@ msgstr ""
 msgid "This will be applicable for all sites from the network."
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:208
+#: admin/bsf-analytics/class-bsf-analytics.php:210
 #. translators: %s usage doc link
 msgid " Know More."
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:215
+#: admin/bsf-analytics/class-bsf-analytics.php:217
 msgid "Yes! Allow it"
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:223
+#: admin/bsf-analytics/class-bsf-analytics.php:225
 msgid "No Thanks"
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:292
+#: admin/bsf-analytics/class-bsf-analytics.php:294
 msgid "Every two days"
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:346
+#: admin/bsf-analytics/class-bsf-analytics.php:348
 msgid "Usage Tracking"
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:377
+#: admin/bsf-analytics/class-bsf-analytics.php:380
 msgid "Allow Brainstorm Force products to track non-sensitive usage tracking data."
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:380
+#: admin/bsf-analytics/class-bsf-analytics.php:383
 msgid " This will be applicable for all sites from the network."
 msgstr ""
 
-#: admin/bsf-analytics/class-bsf-analytics.php:385
+#: admin/bsf-analytics/class-bsf-analytics.php:388
 msgid "Learn More."
 msgstr ""