From d96bf9e86c14d613d0fed3d099aa1e7e348cbf03 Mon Sep 17 00:00:00 2001 From: Bjorn Harvold Date: Mon, 16 May 2022 14:47:40 +0700 Subject: [PATCH 1/3] build: :construction_worker: disabled sslverify in dev env for layout call --- README.txt | 5 ++++- ikoTravel.php | 2 +- includes/elements/ikocontent.php | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.txt b/README.txt index 8c182bb..85fb5f3 100644 --- a/README.txt +++ b/README.txt @@ -3,7 +3,7 @@ Contributors: MB-Jan, ikotravel Tags: travel, iko, booking Requires at least: 4.7 Tested up to: 6.0 -Stable tag: 1.2.15 +Stable tag: 1.2.16 Version: 1.2.15 Requires PHP: 7.4 License: GPLv2 or later @@ -49,6 +49,9 @@ If you notice any issues, please contact us. == Changelog == += 1.2.16 = +* Disabled sslverify in development environment. + = 1.2.15 = * Build related. diff --git a/ikoTravel.php b/ikoTravel.php index 6569c0e..b8f80c2 100644 --- a/ikoTravel.php +++ b/ikoTravel.php @@ -2,7 +2,7 @@ /** * Plugin Name: iko.travel Affiliate * Description: This plugin integrates your iko.travel affiliate account with WordPress. It integrates with Gutenberg, Elementor, Avada, WPBakery and as shortcodes. - * Version: 1.2.15 + * Version: 1.2.16 * Author: iko.travel * Author URI: https://iko.travel/ * License: GPL-3.0 diff --git a/includes/elements/ikocontent.php b/includes/elements/ikocontent.php index 7a75aee..05776c6 100644 --- a/includes/elements/ikocontent.php +++ b/includes/elements/ikocontent.php @@ -144,7 +144,7 @@ function getIkoBearerToken() 'redirection' => 10, 'httpversion' => '1.0', 'blocking' => true, - 'sslverify' => false, + 'sslverify' => true, ); if ($this->environmentVal == 'development') { error_log('iko.travel - Development environment. Ignoring self-signed certificates'); @@ -207,6 +207,10 @@ function getIkoLayouts($bearerToken) { 'Authorization' => 'Bearer '.$bearerToken ) ); + if ($this->environmentVal == 'development') { + error_log('iko.travel - Development environment. Ignoring self-signed certificates'); + $getArgs['sslverify'] = false; + } $response = wp_remote_get($url,$getArgs); if ( is_wp_error( $response ) ) { // print out any error From 6d15c81b986d68079c789401d38958fa8ce710c0 Mon Sep 17 00:00:00 2001 From: Bjorn Harvold Date: Mon, 16 May 2022 14:48:16 +0700 Subject: [PATCH 2/3] build: :construction_worker: bumped version --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 85fb5f3..225a352 100644 --- a/README.txt +++ b/README.txt @@ -4,7 +4,7 @@ Tags: travel, iko, booking Requires at least: 4.7 Tested up to: 6.0 Stable tag: 1.2.16 -Version: 1.2.15 +Version: 1.2.16 Requires PHP: 7.4 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html From 6e19ece9af25b8d027a306832618f12ca98a2394 Mon Sep 17 00:00:00 2001 From: Bjorn Harvold Date: Mon, 16 May 2022 14:48:33 +0700 Subject: [PATCH 3/3] build: bookmark: merge to master Version bump to v1.2.16 registered Ops: crash --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abccae3..0944657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,32 @@ All notable changes to this project will be documented in this file. +## [1.2.16] - 2022-05-16 + +### Bug Fixes + +- :bug: fixed local development + +### Styling + +- :lipstick: added square brand icon + +### Build + +- :construction_worker: bumped version +- :construction_worker: disabled sslverify in dev env for layout call +- Bookmark: merge to master +- :construction_worker: bumped version numbers +- :construction_worker: changed git cliff tag name to fit the actual tag +- Bookmark: merge to master +- :construction_worker: bumped version number everywhere +- Bookmark: merge to master +- :construction_worker: bumped correct version number in ikotravel.php +- Bookmark: merge to master +- Bookmark: merge to master +- Bookmark: merge to master +- :construction_worker: bumped version number correctly + ## [1.2.15] - 2022-05-16 ### Bug Fixes