Merge branch 'release/1.4.0'

.gitignore

@@ -11,6 +11,7 @@ Release*/
 *.app/
 *.pyc
 .svn/
+.idea/
 
 ###################################
 # IDE specific

CHANGELOG.md

@@ -1,3 +1,36 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.4.0] - 2024-01-19
+
+### Documentation
+
+- :memo: added changelog entry
+
+### Features
+
+- :memo: update some text and assets
+
+### Refactor
+
+- :recycle: updated release script
+- :recycle: updated release script
+- :recycle: updated copyright
+- :recycle: updates from Jan based on WordPress feedback
+- :wrench: added Wink-Version to API request
+- :wrench: added Wink-Version to API request
+- :fire: removed .idea directory from repo
+
+### Build
+
+- :wrench: updated release script
+- :wrench: updated release script
+- :wrench: updated release script
+- Arrow_up: bumping version and merging to master
+- :bookmark: updated Wink plugin version
+- :wrench: updated text file for Wordpress re-submission
+
 # wink-wordpress-plugin changelog
 
 Changelog of wink-wordpress-plugin.

README.md

@@ -5,7 +5,7 @@
 * Summary: Integrates WordPress with your Wink account at [https://sell.wink.travel](https://sell.wink.travel)
 
 ### Setup ###
-Once you've created an account with Wink, you can install this WordPress plugin on your site. Once installed, the plugin will ask you for your clientId and secretKey to connect with your account on WINK. 
+Once you've created an account with Wink, you can install this WordPress plugin on your site. Once installed, the plugin will ask you for your clientId and secretKey to connect with your account on Wink. 
 
 Once you've entered your credentials, you can go to your Gutenberg editor and start embedding our web components into your site.
 

README.txt

@@ -1,10 +1,10 @@
-=== iko.travel Affiliate ===
-Contributors: MB-Jan, wink
-Tags: wink2travel, travel, wink, booking
+=== wink2travel ===
+Contributors: MB-Jan, bjornharvold
+Tags: wink2travel, travel, hotel, booking, affiliate network
 Requires at least: 4.7
-Tested up to: 6.3.1
-Stable tag: 1.3.1
-Version: 1.3.1
+Tested up to: 6.4
+Stable tag: $versionNumber
+Version: $versionNumber
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -25,6 +25,10 @@ Available components:
 * [winkitinerary]Itinerary: Same as search button, only it contains itinerary information as button text.
 * [winkcontent]: Lets you embed the inventory you've selected on Wink directly into a page or post.
 
+== External Services ==
+
+This plugin requires a Wink account. It uses the Wink API to retrieve travel inventory data from your Wink account. You can find more information about Wink at [https://wink.travel](https://wink.travel "Influencer-driven travel booking").
+
 == Options ==
 There are multiple ways to use our components:
 
@@ -53,94 +57,4 @@ No. It is not yet compatible with PHP 8.x
 
 == Changelog ==
 
-= 1.3.1 =
-* Migrating over to new WordPress repo.
-
-= 1.3.0 =
-* Migrating over to new WordPress repo.
-
-= 1.2.23 =
-* Updated release script.
-
-= 1.2.22 =
-* Updated release script.
-
-= 1.2.21 =
-* Updated release script.
-
-= 1.2.20 =
-* Updated release script.
-
-= 1.2.19 =
-* Updated readme and tested with latest version of WordPress.
-
-= 1.2.18 =
-* Rebrand to Wink.
-
-= 1.2.17 =
-* Includes multiple fixes + notice if permalinks have not been set in WordPress.
-
-= 1.2.16 =
-* Disabled sslverify in development environment.
-
-= 1.2.15 =
-* Build related.
-
-= 1.2.14 =
-* Build related.
-
-= 1.2.13 =
-* Build related.
-
-= 1.2.12 =
-* Build related.
-
-= 1.2.11 =
-* Build related.
-
-= 1.2.10 =
-* Build related.
-
-= 1.2.9 =
-* Build related.
-
-= 1.2.8 =
-* Build related.
-
-= 1.2.7 =
-* Build related.
-
-= 1.2.6 =
-* Build related.
-
-= 1.2.5 =
-* Build related.
-
-= 1.2.4 =
-* Removed references to old scripts.js.
-
-= 1.2.3 =
-* Minor fix for silent-refresh endpoint.
-
-= 1.2.2 =
-* Added further security features.
-
-= 1.2.1 =
-* Updates to add compliance with WordPress codex.
-
-= 1.1.2 =
-* silent-refresh.html Support
-
-= 1.1.1 =
-* Added dynamic version to static resources
-
-= 1.1.0 =
-* Accommodated API changes
-
-= 1.0.19 =
-* Initial Launch
-
-== Upgrade Notice ==
-
-= 1.2.1 =
-This version is now fully compliant with the WordPress codex and has increased compatibility with different server environments.
+See CHANGELOG.md for details

includes/elementHandler.php

@@ -6,11 +6,9 @@
 }
 
 class winkElements {
-    protected $namespace = 'wink';
     protected $clientIdKey = 'winkClientId';
     protected $clientSecretKey = 'winkSecret';
     function __construct() {
-        // $this->namespace = 'wink';
         $this->pluginURL = trailingslashit( plugin_dir_url( __FILE__ ) );
         $this->imgURL = trailingslashit( dirname( plugin_dir_url( __FILE__ ) ) ) . 'img/';
         $this->environmentVal = get_option('winkEnvironment', 'production');

includes/elements/avada/fusionElements.php

@@ -27,7 +27,7 @@ function initElements() {
                     "name" => $shortcodeData['name'],
                     "shortcode" => $shortcodeData['code'],
                     "class" => "",
-                    "category" => esc_html__( "Content", $this->namespace),
+                    "category" => esc_html__( "Content", "wink"),
                     "icon" => 'fusion-module-icon fusiona-widget',
                     "params" => $params
                 ));

includes/elements/elementor/elementorControls.php

@@ -2,19 +2,17 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
 class winkDefault extends \Elementor\Base_Control {
-	public $namespace;
 	public function get_type() {
 		return 'winkDefault';
 	}
 
 	public function content_template() {
-		$this->namespace = 'wink';
 		?>
 		<div class="elementor-control-field">
-			<div class="elementor-control-input-wrapper"><b><?php esc_html_e( "This component does not require any configuration.", $this->namespace ); ?></b></div>
+			<div class="elementor-control-input-wrapper"><b><?php esc_html_e( "This component does not require any configuration.", "wink" ); ?></b></div>
 		</div>
 		<div class="elementor-control-field">
-			<div class="elementor-control-input-wrapper"><?php esc_html_e( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", $this->namespace ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('WINK settings',$this->namespace).'" target="_blank">'.esc_html(__('here',$this->namespace)).'</a>'; ?> </div>
+			<div class="elementor-control-input-wrapper"><?php esc_html_e( "Simply ensure that you have entered the correct Client-ID and Client-Secret ", "wink" ) . ' <a href="'.admin_url( '/customize.php?autofocus[section]=wink').'" title="'.esc_html__('WINK settings',"wink").'" target="_blank">'.esc_html(__('here',"wink")).'</a>'; ?> </div>
 		</div>
 		<?php
 	}

includes/elements/elementor/winkaccount.php

@@ -2,12 +2,11 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
 class elementorWinkAccount extends \Elementor\Widget_Base {
-	protected $namespace = 'wink';
 	public function get_name() {
 		return 'winkaccount';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Account', $this->namespace );
+		return esc_html__( 'wink Account', "wink" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -20,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', $this->namespace )
+				'label' => esc_html__( 'wink Options', "wink" )
 			]
 		);
 
@@ -39,7 +38,7 @@ protected function _register_controls() {
 	protected function render() {
 
 		$settings = $this->get_settings_for_display();
-		echo do_shortcode('[winkaccount]');
+		echo wp_kses(do_shortcode('[winkaccount]'));
 
 	}
 }

includes/elements/elementor/winkcontent.php

@@ -2,12 +2,11 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
 class elementorWinkContent extends \Elementor\Widget_Base {
-	protected $namespace = 'wink';
 	public function get_name() {
 		return 'winkcontent';
 	}
 	public function get_title() {
-		return __( 'wink Content', $this->namespace );
+		return __( 'wink Content', "wink" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -20,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', $this->namespace )
+				'label' => esc_html__( 'wink Options', "wink" )
 			]
 		);
 		$shortcodes = array();
@@ -38,7 +37,7 @@ protected function _register_controls() {
 					'type' => \Elementor\Controls_Manager::SELECT,
 					'placeholder' => '',
 					'options' => $options,
-					'description' => esc_html__('Select any of your saved inventories. We strongly recommend to use this block only in full-width content areas and not in columns.', $this->namespace ),
+					'description' => esc_html__('Select any of your saved inventories. We strongly recommend to use this block only in full-width content areas and not in columns.', "wink" ),
 				]
 			);
 		}
@@ -48,7 +47,7 @@ protected function _register_controls() {
 	}
 	protected function render() {
 		$settings = $this->get_settings_for_display();		
-		echo do_shortcode('[winkcontent layoutid="'.esc_html($settings['layoutid']).'"]');
+		echo wp_kses(do_shortcode('[winkcontent layoutid="'.esc_html($settings['layoutid']).'"]'));
 
 	}
 }

includes/elements/elementor/winkitinerary.php

@@ -2,12 +2,11 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
 class elementorWinkItinerary extends \Elementor\Widget_Base {
-	protected $namespace = 'wink';
 	public function get_name() {
 		return 'winkitinerary';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Itinerary Button', $this->namespace );
+		return esc_html__( 'wink Itinerary Button', "wink" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -20,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', $this->namespace )
+				'label' => esc_html__( 'wink Options', "wink" )
 			]
 		);
 
@@ -39,7 +38,7 @@ protected function _register_controls() {
 	protected function render() {
 
 		$settings = $this->get_settings_for_display();
-		echo do_shortcode('[winkitinerary]');
+		echo wp_kses(do_shortcode('[winkitinerary]'));
 
 	}
 }

includes/elements/elementor/winkitineraryform.php

@@ -2,12 +2,11 @@
 if ( ! defined( 'ABSPATH' ) ) exit;
 
 class elementorWinkItineraryForm extends \Elementor\Widget_Base {
-	protected $namespace = 'wink';
 	public function get_name() {
 		return 'winkitineraryform';
 	}
 	public function get_title() {
-		return esc_html__( 'wink Itinerary Form', $this->namespace );
+		return esc_html__( 'wink Itinerary Form', "wink" );
 	}
 	public function get_icon() {
 		return 'eicon-external-link-square';
@@ -20,7 +19,7 @@ protected function _register_controls() {
 		$this->start_controls_section(
 			'content_section',
 			[
-				'label' => esc_html__( 'wink Options', $this->namespace )
+				'label' => esc_html__( 'wink Options', "wink" )
 			]
 		);
 
@@ -39,7 +38,7 @@ protected function _register_controls() {
 	protected function render() {
 
 		$settings = $this->get_settings_for_display();
-		echo do_shortcode('[winkitineraryform]');
+		echo wp_kses(do_shortcode('[winkitineraryform]'));
 
 	}
 }