Flexible Shipping for WooCommerce - Version 4.11.7

Version Description

  • 2022-05-12 =
  • Added support for WordPress 6.0
Download this release

Release Info

Developer wpdesk
Plugin Icon 128x128 Flexible Shipping for WooCommerce
Version 4.11.7
Comparing to
See all releases

Code changes from version 4.11.6 to 4.11.7

Files changed (33) hide show
  1. assets/js/admin.min.js +1 -1
  2. flexible-shipping.php +4 -4
  3. lang/flexible-shipping.pot +2 -2
  4. readme.txt +5 -2
  5. vendor/composer/autoload_classmap.php +1 -0
  6. vendor/composer/autoload_static.php +1 -0
  7. vendor/composer/installed.json +2 -8
  8. vendor_prefixed/wpdesk/wp-forms/composer.json +1 -1
  9. vendor_prefixed/wpdesk/wp-forms/src/Field/DateField.php +21 -0
  10. vendor_prefixed/wpdesk/wp-forms/templates/form-field.php +2 -4
  11. vendor_prefixed/wpdesk/wp-forms/templates/input-checkbox.php +1 -2
  12. vendor_prefixed/wpdesk/wp-forms/templates/input-date-picker.php +1 -2
  13. vendor_prefixed/wpdesk/wp-forms/templates/input-hidden.php +1 -2
  14. vendor_prefixed/wpdesk/wp-forms/templates/input-image.php +4 -4
  15. vendor_prefixed/wpdesk/wp-forms/templates/input-number.php +1 -2
  16. vendor_prefixed/wpdesk/wp-forms/templates/input-radio.php +1 -2
  17. vendor_prefixed/wpdesk/wp-forms/templates/input-text.php +1 -2
  18. vendor_prefixed/wpdesk/wp-plugin-flow/composer.json +1 -1
  19. vendor_prefixed/wpdesk/wp-view/composer.json +1 -1
  20. vendor_prefixed/wpdesk/wp-view/src/Renderer/Renderer.php +5 -0
  21. vendor_prefixed/wpdesk/wp-view/src/Renderer/SimplePhpRenderer.php +10 -2
  22. vendor_prefixed/wpdesk/wp-wpdesk-fs-table-rate/composer.json +1 -1
  23. vendor_prefixed/wpdesk/wp-wpdesk-tracker/composer.json +1 -1
  24. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/OptInPage.php +2 -1
  25. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/OptOut.php +1 -1
  26. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/PluginActionLinks.php +2 -2
  27. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/Shop.php +16 -1
  28. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/views/tracker-connect.php +7 -6
  29. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/assets/images/octolize.com.png +0 -0
  30. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-connect.php +15 -15
  31. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-deactivate.php +16 -16
  32. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-notice.php +6 -6
  33. vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-opt-out-notice.php +1 -1
assets/js/admin.min.js CHANGED
@@ -1,5 +1,5 @@
1
  function fs_removeParam(key,sourceURL){var rtn=sourceURL.split("?")[0],param,params_arr=[],queryString=(sourceURL.indexOf("?")!==-1)?sourceURL.split("?")[1]:"";if(queryString!==""){params_arr=queryString.split("&");for(var i=params_arr.length-1;i>=0;i-=1){param=params_arr[i].split("=")[0];if(param===key){params_arr.splice(i,1)}}
2
- rtn=rtn+"?"+params_arr.join("&");}
3
  return rtn}
4
  function fs_trimChar(string,charToRemove){while(string.charAt(0)==charToRemove){string=string.substring(1)}
5
  while(string.charAt(string.length-1)==charToRemove){string=string.substring(0,string.length-1)}
1
  function fs_removeParam(key,sourceURL){var rtn=sourceURL.split("?")[0],param,params_arr=[],queryString=(sourceURL.indexOf("?")!==-1)?sourceURL.split("?")[1]:"";if(queryString!==""){params_arr=queryString.split("&");for(var i=params_arr.length-1;i>=0;i-=1){param=params_arr[i].split("=")[0];if(param===key){params_arr.splice(i,1)}}
2
+ rtn=rtn+"?"+params_arr.join("&")}
3
  return rtn}
4
  function fs_trimChar(string,charToRemove){while(string.charAt(0)==charToRemove){string=string.substring(1)}
5
  while(string.charAt(string.length-1)==charToRemove){string=string.substring(0,string.length-1)}
flexible-shipping.php CHANGED
@@ -3,14 +3,14 @@
3
  * Plugin Name: Flexible Shipping
4
  * Plugin URI: https://wordpress.org/plugins/flexible-shipping/
5
  * Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
6
- * Version: 4.11.6
7
  * Author: WP Desk
8
  * Author URI: https://octol.io/fs-author
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 5.2
12
- * Tested up to: 5.9
13
- * WC requires at least: 6.1
14
  * WC tested up to: 6.5
15
  * Requires PHP: 7.0
16
  *
@@ -38,7 +38,7 @@ if ( ! defined( 'ABSPATH' ) ) {
38
  } // Exit if accessed directly
39
 
40
  /* THIS VARIABLE CAN BE CHANGED AUTOMATICALLY */
41
- $plugin_version = '4.11.6';
42
 
43
  $plugin_name = 'Flexible Shipping';
44
  $product_id = 'Flexible Shipping';
3
  * Plugin Name: Flexible Shipping
4
  * Plugin URI: https://wordpress.org/plugins/flexible-shipping/
5
  * Description: Create additional shipment methods in WooCommerce and enable pricing based on cart weight or total.
6
+ * Version: 4.11.7
7
  * Author: WP Desk
8
  * Author URI: https://octol.io/fs-author
9
  * Text Domain: flexible-shipping
10
  * Domain Path: /lang/
11
  * Requires at least: 5.2
12
+ * Tested up to: 6.0
13
+ * WC requires at least: 6.2
14
  * WC tested up to: 6.5
15
  * Requires PHP: 7.0
16
  *
38
  } // Exit if accessed directly
39
 
40
  /* THIS VARIABLE CAN BE CHANGED AUTOMATICALLY */
41
+ $plugin_version = '4.11.7';
42
 
43
  $plugin_name = 'Flexible Shipping';
44
  $product_id = 'Flexible Shipping';
lang/flexible-shipping.pot CHANGED
@@ -2,14 +2,14 @@
2
  # This file is distributed under the same license as the Flexible Shipping plugin.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Flexible Shipping 4.11.6\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/flexible-shipping\n"
7
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
8
  "Language-Team: LANGUAGE <LL@li.org>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
- "POT-Creation-Date: 2022-04-21T16:09:34+00:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: flexible-shipping\n"
2
  # This file is distributed under the same license as the Flexible Shipping plugin.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Flexible Shipping 4.11.7\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/flexible-shipping\n"
7
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
8
  "Language-Team: LANGUAGE <LL@li.org>\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "POT-Creation-Date: 2022-05-12T14:47:42+00:00\n"
13
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14
  "X-Generator: WP-CLI 2.4.0\n"
15
  "X-Domain: flexible-shipping\n"
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: wpdesk,dyszczo,grola,piotrpo,marcinkolanko,mateuszgbiorczyk,sebast
3
  Donate link: https://octol.io/fs-repo-up
4
  Tags: table rate, table rate shipping, conditional shipping, free shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes, shipping, free shipping, advanced shipping
5
  Requires at least: 4.5
6
- Tested up to: 5.9
7
- Stable tag: 4.11.6
8
  Requires PHP: 7.0
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -200,6 +200,9 @@ If you are upgrading from the old Flexible Shipping version (1.3.2, woo-flexible
200
 
201
  == Changelog ==
202
 
 
 
 
203
  = 4.11.6 - 2022-04-21 =
204
  * Fixed composer PSR-4 autoload
205
  * Fixed notice: "Undefined index: method_integration"
3
  Donate link: https://octol.io/fs-repo-up
4
  Tags: table rate, table rate shipping, conditional shipping, free shipping, woocommerce shipping, flexible shipping, woocommerce table rate shipping, cart based shipping, weight shipping, weight based shipping, totals based shipping, order based shipping, shipping zones, shipping classes, shipping, free shipping, advanced shipping
5
  Requires at least: 4.5
6
+ Tested up to: 6.0
7
+ Stable tag: 4.11.7
8
  Requires PHP: 7.0
9
  License: GPLv3 or later
10
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
200
 
201
  == Changelog ==
202
 
203
+ = 4.11.7 - 2022-05-12 =
204
+ * Added support for WordPress 6.0
205
+
206
  = 4.11.6 - 2022-04-21 =
207
  * Fixed composer PSR-4 autoload
208
  * Fixed notice: "Undefined index: method_integration"
vendor/composer/autoload_classmap.php CHANGED
@@ -158,6 +158,7 @@ return array(
158
  'FSVendor\\WPDesk\\Forms\\Field\\BasicField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/BasicField.php',
159
  'FSVendor\\WPDesk\\Forms\\Field\\ButtonField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/ButtonField.php',
160
  'FSVendor\\WPDesk\\Forms\\Field\\CheckboxField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/CheckboxField.php',
 
161
  'FSVendor\\WPDesk\\Forms\\Field\\DatePickerField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DatePickerField.php',
162
  'FSVendor\\WPDesk\\Forms\\Field\\Header' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/Header.php',
163
  'FSVendor\\WPDesk\\Forms\\Field\\HiddenField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/HiddenField.php',
158
  'FSVendor\\WPDesk\\Forms\\Field\\BasicField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/BasicField.php',
159
  'FSVendor\\WPDesk\\Forms\\Field\\ButtonField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/ButtonField.php',
160
  'FSVendor\\WPDesk\\Forms\\Field\\CheckboxField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/CheckboxField.php',
161
+ 'FSVendor\\WPDesk\\Forms\\Field\\DateField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DateField.php',
162
  'FSVendor\\WPDesk\\Forms\\Field\\DatePickerField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DatePickerField.php',
163
  'FSVendor\\WPDesk\\Forms\\Field\\Header' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/Header.php',
164
  'FSVendor\\WPDesk\\Forms\\Field\\HiddenField' => $baseDir . '/vendor_prefixed/wpdesk/wp-forms/src/Field/HiddenField.php',
vendor/composer/autoload_static.php CHANGED
@@ -181,6 +181,7 @@ class ComposerStaticInitFlexibleShipping
181
  'FSVendor\\WPDesk\\Forms\\Field\\BasicField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/BasicField.php',
182
  'FSVendor\\WPDesk\\Forms\\Field\\ButtonField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/ButtonField.php',
183
  'FSVendor\\WPDesk\\Forms\\Field\\CheckboxField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/CheckboxField.php',
 
184
  'FSVendor\\WPDesk\\Forms\\Field\\DatePickerField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DatePickerField.php',
185
  'FSVendor\\WPDesk\\Forms\\Field\\Header' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/Header.php',
186
  'FSVendor\\WPDesk\\Forms\\Field\\HiddenField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/HiddenField.php',
181
  'FSVendor\\WPDesk\\Forms\\Field\\BasicField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/BasicField.php',
182
  'FSVendor\\WPDesk\\Forms\\Field\\ButtonField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/ButtonField.php',
183
  'FSVendor\\WPDesk\\Forms\\Field\\CheckboxField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/CheckboxField.php',
184
+ 'FSVendor\\WPDesk\\Forms\\Field\\DateField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DateField.php',
185
  'FSVendor\\WPDesk\\Forms\\Field\\DatePickerField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/DatePickerField.php',
186
  'FSVendor\\WPDesk\\Forms\\Field\\Header' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/Header.php',
187
  'FSVendor\\WPDesk\\Forms\\Field\\HiddenField' => __DIR__ . '/../..' . '/vendor_prefixed/wpdesk/wp-forms/src/Field/HiddenField.php',
vendor/composer/installed.json CHANGED
@@ -46,10 +46,7 @@
46
  "log",
47
  "psr",
48
  "psr-3"
49
- ],
50
- "support": {
51
- "source": "https://github.com/php-fig/log/tree/1.1.4"
52
- }
53
  },
54
  {
55
  "name": "wpdesk/wp-wpdesk-fs-shipment-interfaces",
@@ -84,10 +81,7 @@
84
  "name": "Krzysiek",
85
  "email": "krzysiek@wpdesk.pl"
86
  }
87
- ],
88
- "support": {
89
- "issues": "https://gitlab.com/api/v4/projects/27813970/issues"
90
- }
91
  },
92
  {
93
  "name": "wpdesk/wp-wpdesk-helper-override",
46
  "log",
47
  "psr",
48
  "psr-3"
49
+ ]
 
 
 
50
  },
51
  {
52
  "name": "wpdesk/wp-wpdesk-fs-shipment-interfaces",
81
  "name": "Krzysiek",
82
  "email": "krzysiek@wpdesk.pl"
83
  }
84
+ ]
 
 
 
85
  },
86
  {
87
  "name": "wpdesk/wp-wpdesk-helper-override",
vendor_prefixed/wpdesk/wp-forms/composer.json CHANGED
@@ -20,7 +20,7 @@
20
  "ext-curl": "*",
21
  "ext-json": "*",
22
  "wpdesk\/wp-persistence": "^2.0|^3.0",
23
- "wpdesk\/wp-view": "^1.1"
24
  },
25
  "require-dev": {
26
  "phpunit\/phpunit": "<7",
20
  "ext-curl": "*",
21
  "ext-json": "*",
22
  "wpdesk\/wp-persistence": "^2.0|^3.0",
23
+ "wpdesk\/wp-view": "^2"
24
  },
25
  "require-dev": {
26
  "phpunit\/phpunit": "<7",
vendor_prefixed/wpdesk/wp-forms/src/Field/DateField.php ADDED
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ namespace FSVendor\WPDesk\Forms\Field;
4
+
5
+ use FSVendor\WPDesk\Forms\Sanitizer\TextFieldSanitizer;
6
+ class DateField extends \FSVendor\WPDesk\Forms\Field\BasicField
7
+ {
8
+ public function __construct()
9
+ {
10
+ parent::__construct();
11
+ $this->set_placeholder('YYYY-MM-DD');
12
+ }
13
+ public function get_type()
14
+ {
15
+ return 'date';
16
+ }
17
+ public function get_template_name()
18
+ {
19
+ return 'input-text';
20
+ }
21
+ }
vendor_prefixed/wpdesk/wp-forms/templates/form-field.php CHANGED
@@ -16,8 +16,7 @@ namespace FSVendor;
16
  if ($field->has_label()) {
17
  ?>
18
  <?php
19
- echo $renderer->render('form-label', ['field' => $field]);
20
- // phpcs:ignore
21
  ?>
22
  <?php
23
  }
@@ -25,8 +24,7 @@ if ($field->has_label()) {
25
 
26
  <td class="forminp">
27
  <?php
28
- echo $renderer->render($template_name, ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
29
- // phpcs:ignore
30
  ?>
31
 
32
  <?php
16
  if ($field->has_label()) {
17
  ?>
18
  <?php
19
+ $renderer->output_render('form-label', ['field' => $field]);
 
20
  ?>
21
  <?php
22
  }
24
 
25
  <td class="forminp">
26
  <?php
27
+ $renderer->output_render($template_name, ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
28
  ?>
29
 
30
  <?php
vendor_prefixed/wpdesk/wp-forms/templates/input-checkbox.php CHANGED
@@ -12,5 +12,4 @@ namespace FSVendor;
12
  ?>
13
 
14
  <?php
15
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
16
- // phpcs:ignore;
12
  ?>
13
 
14
  <?php
15
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-forms/templates/input-date-picker.php CHANGED
@@ -9,5 +9,4 @@ namespace FSVendor;
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
13
- // phpcs:ignore
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-forms/templates/input-hidden.php CHANGED
@@ -9,5 +9,4 @@ namespace FSVendor;
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
13
- // phpcs:ignore
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-forms/templates/input-image.php CHANGED
@@ -78,13 +78,13 @@ echo \esc_attr($media_container_id);
78
  }
79
 
80
  frame = wp.media( {
81
- title: <?php
82
  \esc_html_e('Select or Upload Media', 'flexible-shipping');
83
- ?>,
84
  button: {
85
- text: <?php
86
  \esc_html_e('Use this media', 'flexible-shipping');
87
- ?>
88
  },
89
  library: {
90
  type: ['image']
78
  }
79
 
80
  frame = wp.media( {
81
+ title: "<?php
82
  \esc_html_e('Select or Upload Media', 'flexible-shipping');
83
+ ?>",
84
  button: {
85
+ text: "<?php
86
  \esc_html_e('Use this media', 'flexible-shipping');
87
+ ?>"
88
  },
89
  library: {
90
  type: ['image']
vendor_prefixed/wpdesk/wp-forms/templates/input-number.php CHANGED
@@ -9,5 +9,4 @@ namespace FSVendor;
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
13
- // phpcs:ignore
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-forms/templates/input-radio.php CHANGED
@@ -9,5 +9,4 @@ namespace FSVendor;
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
13
- // phpcs:ignore
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-forms/templates/input-text.php CHANGED
@@ -9,5 +9,4 @@ namespace FSVendor;
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
- echo $renderer->render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
13
- // phpcs:ignore
9
  * @var string $value
10
  * @var string $template_name Real field template.
11
  */
12
+ $renderer->output_render('input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value]);
 
vendor_prefixed/wpdesk/wp-plugin-flow/composer.json CHANGED
@@ -11,7 +11,7 @@
11
  "wpdesk\/wp-basic-requirements": "^3.2.3",
12
  "wpdesk\/wp-builder": "^2.0.0",
13
  "wpdesk\/wp-wpdesk-license": "^3.0.0",
14
- "wpdesk\/wp-wpdesk-tracker": "^3.0.0"
15
  },
16
  "require-dev": {
17
  "phpunit\/phpunit": "<7",
11
  "wpdesk\/wp-basic-requirements": "^3.2.3",
12
  "wpdesk\/wp-builder": "^2.0.0",
13
  "wpdesk\/wp-wpdesk-license": "^3.0.0",
14
+ "wpdesk\/wp-wpdesk-tracker": "^3.0.2"
15
  },
16
  "require-dev": {
17
  "phpunit\/phpunit": "<7",
vendor_prefixed/wpdesk/wp-view/composer.json CHANGED
@@ -7,7 +7,7 @@
7
  }
8
  ],
9
  "require": {
10
- "php": ">=5.5"
11
  },
12
  "require-dev": {
13
  "phpunit\/phpunit": "<7",
7
  }
8
  ],
9
  "require": {
10
+ "php": ">=7.0"
11
  },
12
  "require-dev": {
13
  "phpunit\/phpunit": "<7",
vendor_prefixed/wpdesk/wp-view/src/Renderer/Renderer.php CHANGED
@@ -21,4 +21,9 @@ interface Renderer
21
  * @return string
22
  */
23
  public function render($template, array $params = null);
 
 
 
 
 
24
  }
21
  * @return string
22
  */
23
  public function render($template, array $params = null);
24
+ /**
25
+ * @param string $template
26
+ * @param array $params
27
+ */
28
+ public function output_render($template, array $params = null);
29
  }
vendor_prefixed/wpdesk/wp-view/src/Renderer/SimplePhpRenderer.php CHANGED
@@ -30,12 +30,20 @@ class SimplePhpRenderer implements \FSVendor\WPDesk\View\Renderer\Renderer
30
  * @return string
31
  */
32
  public function render($template, array $params = null)
 
 
 
 
 
 
 
 
 
 
33
  {
34
  if ($params !== null) {
35
  \extract($params, \EXTR_SKIP);
36
  }
37
- \ob_start();
38
  include $this->resolver->resolve($template . '.php');
39
- return \ob_get_clean();
40
  }
41
  }
30
  * @return string
31
  */
32
  public function render($template, array $params = null)
33
+ {
34
+ \ob_start();
35
+ $this->output_render($template, $params);
36
+ return \ob_get_clean();
37
+ }
38
+ /**
39
+ * @param string $template
40
+ * @param array|null $params
41
+ */
42
+ public function output_render($template, array $params = null)
43
  {
44
  if ($params !== null) {
45
  \extract($params, \EXTR_SKIP);
46
  }
 
47
  include $this->resolver->resolve($template . '.php');
 
48
  }
49
  }
vendor_prefixed/wpdesk/wp-wpdesk-fs-table-rate/composer.json CHANGED
@@ -12,7 +12,7 @@
12
  ],
13
  "require": {
14
  "php": ">=5.6",
15
- "wpdesk\/wp-view": "^1.1",
16
  "psr\/log": "^1.1",
17
  "wpdesk\/wp-plugin-flow": "^3.0"
18
  },
12
  ],
13
  "require": {
14
  "php": ">=5.6",
15
+ "wpdesk\/wp-view": "^1.1|^2.0.0",
16
  "psr\/log": "^1.1",
17
  "wpdesk\/wp-plugin-flow": "^3.0"
18
  },
vendor_prefixed/wpdesk/wp-wpdesk-tracker/composer.json CHANGED
@@ -12,7 +12,7 @@
12
  "php": ">=7.0",
13
  "wpdesk\/wp-builder": "^2.0",
14
  "wpdesk\/wp-notice": "^3.1",
15
- "wpdesk\/wp-view": "^1.1"
16
  },
17
  "require-dev": {
18
  "phpunit\/phpunit": "<7",
12
  "php": ">=7.0",
13
  "wpdesk\/wp-builder": "^2.0",
14
  "wpdesk\/wp-notice": "^3.1",
15
+ "wpdesk\/wp-view": "^2"
16
  },
17
  "require-dev": {
18
  "phpunit\/phpunit": "<7",
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/OptInPage.php CHANGED
@@ -48,7 +48,8 @@ class OptInPage implements \FSVendor\WPDesk\PluginBuilder\Plugin\Hookable
48
  $logo = $shop->get_shop_logo_file();
49
  $logo_url = \plugin_dir_url(__FILE__) . '../../../assets/images/' . $logo;
50
  $renderer = new \FSVendor\WPDesk\View\Renderer\SimplePhpRenderer(new \FSVendor\WPDesk\View\Resolver\DirResolver(__DIR__ . '/views'));
51
- echo $renderer->render('tracker-connect', ['logo_url' => \apply_filters('wpdesk/tracker/logo_url', $logo_url, $this->plugin_slug), 'username' => $username, 'allow_url' => $allow_url, 'skip_url' => $skip_url, 'terms_url' => $terms_url]);
 
52
  }
53
  /**
54
  *
48
  $logo = $shop->get_shop_logo_file();
49
  $logo_url = \plugin_dir_url(__FILE__) . '../../../assets/images/' . $logo;
50
  $renderer = new \FSVendor\WPDesk\View\Renderer\SimplePhpRenderer(new \FSVendor\WPDesk\View\Resolver\DirResolver(__DIR__ . '/views'));
51
+ // WPCS: XSS ok.
52
+ echo $renderer->output_render('tracker-connect', ['logo_url' => \apply_filters('wpdesk/tracker/logo_url', $logo_url, $this->plugin_slug), 'shop_name' => $shop->get_shop_name(), 'username' => $username, 'allow_url' => $allow_url, 'skip_url' => $skip_url, 'terms_url' => $terms_url]);
53
  }
54
  /**
55
  *
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/OptOut.php CHANGED
@@ -38,7 +38,7 @@ class OptOut implements \FSVendor\WPDesk\PluginBuilder\Plugin\Hookable
38
  $persistence = new \FSVendor\WPDesk_Tracker_Persistence_Consent();
39
  $persistence->set_active(\false);
40
  \delete_option('wpdesk_tracker_notice');
41
- new \FSVendor\WPDesk\Notice\Notice(\sprintf(\__('You successfully opted out of collecting usage data by %1$s. If you change your mind, you can always opt in later in the plugin\'s quick links.', 'flexible-shipping'), $this->plugin_name));
42
  }
43
  }
44
  }
38
  $persistence = new \FSVendor\WPDesk_Tracker_Persistence_Consent();
39
  $persistence->set_active(\false);
40
  \delete_option('wpdesk_tracker_notice');
41
+ new \FSVendor\WPDesk\Notice\Notice(\sprintf(\esc_html__('You successfully opted out of collecting usage data by %1$s. If you change your mind, you can always opt in later in the plugin\'s quick links.', 'flexible-shipping'), \esc_html($this->plugin_name)));
42
  }
43
  }
44
  }
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/PluginActionLinks.php CHANGED
@@ -47,10 +47,10 @@ class PluginActionLinks implements \FSVendor\WPDesk\PluginBuilder\Plugin\Hookabl
47
  $plugin_links = array();
48
  if (!$tracker_consent->is_active()) {
49
  $opt_in_link = \admin_url('admin.php?page=wpdesk_tracker_' . $this->plugin_slug . '&shop_url=' . $this->shop_url);
50
- $plugin_links[] = '<a href="' . $opt_in_link . '">' . \__('Opt-in', 'flexible-shipping') . '</a>';
51
  } else {
52
  $opt_in_link = \admin_url('plugins.php?wpdesk_tracker_opt_out_' . $this->plugin_slug . '=1&security=' . \wp_create_nonce($this->plugin_slug));
53
- $plugin_links[] = '<a href="' . $opt_in_link . '">' . \__('Opt-out', 'flexible-shipping') . '</a>';
54
  }
55
  return \array_merge($plugin_links, $links);
56
  }
47
  $plugin_links = array();
48
  if (!$tracker_consent->is_active()) {
49
  $opt_in_link = \admin_url('admin.php?page=wpdesk_tracker_' . $this->plugin_slug . '&shop_url=' . $this->shop_url);
50
+ $plugin_links[] = '<a href="' . \esc_url($opt_in_link) . '">' . \esc_html__('Opt-in', 'flexible-shipping') . '</a>';
51
  } else {
52
  $opt_in_link = \admin_url('plugins.php?wpdesk_tracker_opt_out_' . $this->plugin_slug . '=1&security=' . \wp_create_nonce($this->plugin_slug));
53
+ $plugin_links[] = '<a href="' . \esc_url($opt_in_link) . '">' . \esc_html__('Opt-out', 'flexible-shipping') . '</a>';
54
  }
55
  return \array_merge($plugin_links, $links);
56
  }
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/Shop.php CHANGED
@@ -11,6 +11,10 @@ class Shop
11
  * @var string
12
  */
13
  private $default_shop = 'wpdesk.pl';
 
 
 
 
14
  /**
15
  * @var string
16
  */
@@ -18,7 +22,11 @@ class Shop
18
  /**
19
  * @var array<string, string>
20
  */
21
- private $shops_usage_tracking_pages = ['wpdesk.pl' => 'https://www.wpdesk.pl/dane-uzytkowania/', 'wpdesk.net' => 'https://www.wpdesk.net/usage-tracking/', 'flexibleshipping.com' => 'https://www.flexibleshipping.com/usage-tracking/', 'shopmagic.app' => 'https://www.shopmagic.app/usage-tracking/', 'flexibleinvoices.com' => 'https://www.flexibleinvoices.com/usage-tracking/'];
 
 
 
 
22
  /**
23
  * @var string
24
  */
@@ -38,6 +46,13 @@ class Shop
38
  $usage_tracking_page = isset($this->shops_usage_tracking_pages[$this->shop]) ? $this->shops_usage_tracking_pages[$this->shop] : $this->shops_usage_tracking_pages[$this->default_shop];
39
  return \apply_filters('wpdesk/tracker/usage_tracking_page', $usage_tracking_page, $this->shop);
40
  }
 
 
 
 
 
 
 
41
  /**
42
  * @return string
43
  */
11
  * @var string
12
  */
13
  private $default_shop = 'wpdesk.pl';
14
+ /**
15
+ * @var string
16
+ */
17
+ private $default_shop_name = 'WP Desk';
18
  /**
19
  * @var string
20
  */
22
  /**
23
  * @var array<string, string>
24
  */
25
+ private $shops_usage_tracking_pages = ['wpdesk.pl' => 'https://www.wpdesk.pl/dane-uzytkowania/', 'wpdesk.net' => 'https://www.wpdesk.net/usage-tracking/', 'octolize.com' => 'https://octolize.com/usage-tracking/', 'shopmagic.app' => 'https://www.shopmagic.app/usage-tracking/', 'flexibleinvoices.com' => 'https://www.flexibleinvoices.com/usage-tracking/'];
26
+ /**
27
+ * @var array<string, string>
28
+ */
29
+ private $shops_usage_tracking_names = ['octolize.com' => 'Octolize'];
30
  /**
31
  * @var string
32
  */
46
  $usage_tracking_page = isset($this->shops_usage_tracking_pages[$this->shop]) ? $this->shops_usage_tracking_pages[$this->shop] : $this->shops_usage_tracking_pages[$this->default_shop];
47
  return \apply_filters('wpdesk/tracker/usage_tracking_page', $usage_tracking_page, $this->shop);
48
  }
49
+ /**
50
+ * @return string
51
+ */
52
+ public function get_shop_name()
53
+ {
54
+ return \apply_filters('wpdesk/tracker/shop_name', $this->shops_usage_tracking_names[$this->shop] ?? $this->default_shop_name, $this->shop);
55
+ }
56
  /**
57
  * @return string
58
  */
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/PSR/WPDesk/Tracker/views/tracker-connect.php CHANGED
@@ -8,6 +8,7 @@ namespace FSVendor;
8
  * @var $allow_url string
9
  * @var $skip_url string
10
  * @var $terms_url string
 
11
  */
12
  if (!\defined('ABSPATH')) {
13
  exit;
@@ -19,7 +20,7 @@ echo \esc_attr($logo_url);
19
  ?>" /></span>
20
  <p>
21
  <?php
22
- echo \esc_html(\sprintf(\__('Hey %s,', 'flexible-shipping'), $username));
23
  ?><br/>
24
  <?php
25
  \esc_html_e('Please help us improve our plugins! If you opt-in, we will collect some non-sensitive data and usage information anonymously. If you skip this, that\'s okay! All plugins will work just fine.', 'flexible-shipping');
@@ -29,14 +30,14 @@ echo \esc_html(\sprintf(\__('Hey %s,', 'flexible-shipping'), $username));
29
 
30
  <div class="actions plugin-card-bottom">
31
  <a id="wpdesk_tracker_allow_button" href="<?php
32
- echo \esc_attr($allow_url);
33
  ?>" class="button button-primary button-allow button-large"><?php
34
  \esc_html_e('Allow & Continue &rarr;', 'flexible-shipping');
35
  ?></a>
36
  <a href="<?php
37
- echo $skip_url;
38
  ?>" class="button button-secondary"><?php
39
- \_e('Skip', 'flexible-shipping');
40
  ?></a>
41
  <div class="clear"></div>
42
  </div>
@@ -66,7 +67,7 @@ echo $skip_url;
66
  \esc_html_e('Plugin Usage', 'flexible-shipping');
67
  ?></span>
68
  <p><?php
69
- \esc_html_e('Current settings and usage information of WP Desk plugins', 'flexible-shipping');
70
  ?></p>
71
  </div>
72
  </li>
@@ -85,7 +86,7 @@ echo $skip_url;
85
 
86
  <div class="terms">
87
  <a href="<?php
88
- echo \esc_attr($terms_url);
89
  ?>" target="_blank"><?php
90
  \esc_html_e('Find out more &raquo;', 'flexible-shipping');
91
  ?></a>
8
  * @var $allow_url string
9
  * @var $skip_url string
10
  * @var $terms_url string
11
+ * @var $shop_name string
12
  */
13
  if (!\defined('ABSPATH')) {
14
  exit;
20
  ?>" /></span>
21
  <p>
22
  <?php
23
+ \printf(\esc_html__('Hey %s,', 'flexible-shipping'), \esc_html($username));
24
  ?><br/>
25
  <?php
26
  \esc_html_e('Please help us improve our plugins! If you opt-in, we will collect some non-sensitive data and usage information anonymously. If you skip this, that\'s okay! All plugins will work just fine.', 'flexible-shipping');
30
 
31
  <div class="actions plugin-card-bottom">
32
  <a id="wpdesk_tracker_allow_button" href="<?php
33
+ echo \esc_url($allow_url);
34
  ?>" class="button button-primary button-allow button-large"><?php
35
  \esc_html_e('Allow & Continue &rarr;', 'flexible-shipping');
36
  ?></a>
37
  <a href="<?php
38
+ echo \esc_url($skip_url);
39
  ?>" class="button button-secondary"><?php
40
+ \esc_html_e('Skip', 'flexible-shipping');
41
  ?></a>
42
  <div class="clear"></div>
43
  </div>
67
  \esc_html_e('Plugin Usage', 'flexible-shipping');
68
  ?></span>
69
  <p><?php
70
+ \printf(\esc_html__('Current settings and usage information of %1$s plugins', 'flexible-shipping'), $shop_name);
71
  ?></p>
72
  </div>
73
  </li>
86
 
87
  <div class="terms">
88
  <a href="<?php
89
+ echo \esc_url($terms_url);
90
  ?>" target="_blank"><?php
91
  \esc_html_e('Find out more &raquo;', 'flexible-shipping');
92
  ?></a>
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/assets/images/octolize.com.png ADDED
Binary file
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-connect.php CHANGED
@@ -12,31 +12,31 @@ if (!\defined('ABSPATH')) {
12
 
13
  <p>
14
  <?php
15
- \printf(\__('Hey %s,', 'flexible-shipping'), $username);
16
  ?><br/>
17
  <?php
18
- \_e('Please help us improve our plugins! If you opt-in, we will collect some non-sensitive data and usage information anonymously. If you skip this, that\'s okay! All plugins will work just fine.', 'flexible-shipping');
19
  ?>
20
  </p>
21
  </div>
22
 
23
  <div class="actions plugin-card-bottom">
24
  <a id="wpdesk_tracker_allow_button" href="<?php
25
- echo $allow_url;
26
  ?>" class="button button-primary button-allow button-large"><?php
27
- \_e('Allow & Continue &rarr;', 'flexible-shipping');
28
  ?></a>
29
  <a href="<?php
30
- echo $skip_url;
31
  ?>" class="button button-secondary"><?php
32
- \_e('Skip', 'flexible-shipping');
33
  ?></a>
34
  <div class="clear"></div>
35
  </div>
36
 
37
  <div class="permissions">
38
  <a class="trigger" href="#"><?php
39
- \_e('What permissions are being granted?', 'flexible-shipping');
40
  ?></a>
41
 
42
  <div class="permissions-details">
@@ -45,10 +45,10 @@ echo $skip_url;
45
  <i class="dashicons dashicons-admin-settings"></i>
46
  <div>
47
  <span><?php
48
- \_e('Your Site Overview', 'flexible-shipping');
49
  ?></span>
50
  <p><?php
51
- \_e('WP version, PHP info', 'flexible-shipping');
52
  ?></p>
53
  </div>
54
  </li>
@@ -56,10 +56,10 @@ echo $skip_url;
56
  <i class="dashicons dashicons-admin-plugins"></i>
57
  <div>
58
  <span><?php
59
- \_e('Plugin Usage', 'flexible-shipping');
60
  ?></span>
61
  <p><?php
62
- \_e('Current settings and usage information of WP Desk plugins', 'flexible-shipping');
63
  ?></p>
64
  </div>
65
  </li>
@@ -67,10 +67,10 @@ echo $skip_url;
67
  <i class="dashicons dashicons-store"></i>
68
  <div>
69
  <span><?php
70
- \_e('Your Store Overview', 'flexible-shipping');
71
  ?></span>
72
  <p><?php
73
- \_e('Anonymized and non-sensitive store usage information', 'flexible-shipping');
74
  ?></p>
75
  </div>
76
  </li>
@@ -78,9 +78,9 @@ echo $skip_url;
78
 
79
  <div class="terms">
80
  <a href="<?php
81
- echo $terms_url;
82
  ?>" target="_blank"><?php
83
- \_e('Find out more &raquo;', 'flexible-shipping');
84
  ?></a>
85
  </div>
86
  </div>
12
 
13
  <p>
14
  <?php
15
+ \printf(\esc_html__('Hey %s,', 'flexible-shipping'), \esc_html($username));
16
  ?><br/>
17
  <?php
18
+ \esc_html_e('Please help us improve our plugins! If you opt-in, we will collect some non-sensitive data and usage information anonymously. If you skip this, that\'s okay! All plugins will work just fine.', 'flexible-shipping');
19
  ?>
20
  </p>
21
  </div>
22
 
23
  <div class="actions plugin-card-bottom">
24
  <a id="wpdesk_tracker_allow_button" href="<?php
25
+ echo \esc_url($allow_url);
26
  ?>" class="button button-primary button-allow button-large"><?php
27
+ \esc_html_e('Allow & Continue &rarr;', 'flexible-shipping');
28
  ?></a>
29
  <a href="<?php
30
+ echo \esc_url($skip_url);
31
  ?>" class="button button-secondary"><?php
32
+ \esc_html_e('Skip', 'flexible-shipping');
33
  ?></a>
34
  <div class="clear"></div>
35
  </div>
36
 
37
  <div class="permissions">
38
  <a class="trigger" href="#"><?php
39
+ \esc_html_e('What permissions are being granted?', 'flexible-shipping');
40
  ?></a>
41
 
42
  <div class="permissions-details">
45
  <i class="dashicons dashicons-admin-settings"></i>
46
  <div>
47
  <span><?php
48
+ \esc_html_e('Your Site Overview', 'flexible-shipping');
49
  ?></span>
50
  <p><?php
51
+ \esc_html_e('WP version, PHP info', 'flexible-shipping');
52
  ?></p>
53
  </div>
54
  </li>
56
  <i class="dashicons dashicons-admin-plugins"></i>
57
  <div>
58
  <span><?php
59
+ \esc_html_e('Plugin Usage', 'flexible-shipping');
60
  ?></span>
61
  <p><?php
62
+ \esc_html_e('Current settings and usage information of WP Desk plugins', 'flexible-shipping');
63
  ?></p>
64
  </div>
65
  </li>
67
  <i class="dashicons dashicons-store"></i>
68
  <div>
69
  <span><?php
70
+ \esc_html_e('Your Store Overview', 'flexible-shipping');
71
  ?></span>
72
  <p><?php
73
+ \esc_html_e('Anonymized and non-sensitive store usage information', 'flexible-shipping');
74
  ?></p>
75
  </div>
76
  </li>
78
 
79
  <div class="terms">
80
  <a href="<?php
81
+ echo \esc_url($terms_url);
82
  ?>" target="_blank"><?php
83
+ \esc_html_e('Find out more &raquo;', 'flexible-shipping');
84
  ?></a>
85
  </div>
86
  </div>
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-deactivate.php CHANGED
@@ -8,7 +8,7 @@ if (!\defined('ABSPATH')) {
8
  ?>
9
 
10
  <h2><?php
11
- echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plugin_name);
12
  ?></h2>
13
 
14
  <div class="wpdesk_tracker_deactivate">
@@ -16,7 +16,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
16
  <div class="panel" data-panel-id="confirm"><p></p></div>
17
  <div class="panel active" data-panel-id="reasons">
18
  <h4><strong><?php
19
- \_e(' If you have a moment, please let us know why you are deactivating plugin (anonymous feedback):', 'flexible-shipping');
20
  ?></strong></h4>
21
  <ul id="reasons-list">
22
  <li class="reason">
@@ -25,7 +25,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
25
  <input type="radio" name="selected-reason" value="plugin_stopped_working">
26
  </span>
27
  <span><?php
28
- \_e('The plugin suddenly stopped working', 'flexible-shipping');
29
  ?></span>
30
  </label>
31
  </li>
@@ -35,7 +35,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
35
  <input type="radio" name="selected-reason" value="broke_my_site">
36
  </span>
37
  <span><?php
38
- \_e('The plugin broke my site', 'flexible-shipping');
39
  ?></span>
40
  </label>
41
  </li>
@@ -45,12 +45,12 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
45
  <input type="radio" name="selected-reason" value="found_better_plugin">
46
  </span>
47
  <span><?php
48
- \_e('I found a better plugin', 'flexible-shipping');
49
  ?></span>
50
  </label>
51
  <div id="found_better_plugin" class="reason-input">
52
  <input type="text" name="better_plugin_name" placeholder="<?php
53
- \_e('What\'s the plugin\'s name?', 'flexible-shipping');
54
  ?>">
55
  </div>
56
  </li>
@@ -60,7 +60,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
60
  <input type="radio" name="selected-reason" value="plugin_for_short_period">
61
  </span>
62
  <span><?php
63
- \_e('I only needed the plugin for a short period', 'flexible-shipping');
64
  ?></span>
65
  </label>
66
  </li>
@@ -70,7 +70,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
70
  <input type="radio" name="selected-reason" value="no_longer_need">
71
  </span>
72
  <span><?php
73
- \_e('I no longer need the plugin', 'flexible-shipping');
74
  ?></span>
75
  </label>
76
  </li>
@@ -80,7 +80,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
80
  <input type="radio" name="selected-reason" value="temporary_deactivation">
81
  </span>
82
  <span><?php
83
- \_e('It\'s a temporary deactivation. I\'m just debugging an issue.', 'flexible-shipping');
84
  ?></span>
85
  </label>
86
  </li>
@@ -90,12 +90,12 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
90
  <input type="radio" name="selected-reason" value="other">
91
  </span>
92
  <span><?php
93
- \_e('Other', 'flexible-shipping');
94
  ?></span>
95
  </label>
96
  <div id="other" class="reason-input">
97
  <input type="text" name="other" placeholder="<?php
98
- \_e('Kindly tell us the reason so we can improve', 'flexible-shipping');
99
  ?>">
100
  </div>
101
  </li>
@@ -104,10 +104,10 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
104
  </div>
105
  <div class="footer">
106
  <a href="#" class="button button-secondary button-close"><?php
107
- \_e('Cancel', 'flexible-shipping');
108
  ?></a>
109
  <a href="#" class="button button-primary button-deactivate allow-deactivate"><?php
110
- \_e('Skip &amp; Deactivate', 'flexible-shipping');
111
  ?></a>
112
  </div>
113
  </div>
@@ -123,7 +123,7 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
123
  jQuery('#other').show();
124
  }
125
  jQuery('.wpdesk_tracker_deactivate .button-deactivate').html( '<?php
126
- \_e('Submit &amp; Deactivate', 'flexible-shipping');
127
  ?>' );
128
  })
129
  jQuery('.button-deactivate').click(function(e){
@@ -131,10 +131,10 @@ echo \sprintf(\__('You are deactivating %s plugin.', 'flexible-shipping'), $plug
131
  console.log('deactivate');
132
  var reason = jQuery('input[name=selected-reason]:checked').val();
133
  var plugin = '<?php
134
- echo $plugin;
135
  ?>';
136
  var plugin_name = '<?php
137
- echo $plugin_name;
138
  ?>';
139
  var additional_info = '';
140
  if ( reason == 'found_better_plugin' ) {
8
  ?>
9
 
10
  <h2><?php
11
+ \printf(\esc_html__('You are deactivating %s plugin.', 'flexible-shipping'), \esc_html($plugin_name));
12
  ?></h2>
13
 
14
  <div class="wpdesk_tracker_deactivate">
16
  <div class="panel" data-panel-id="confirm"><p></p></div>
17
  <div class="panel active" data-panel-id="reasons">
18
  <h4><strong><?php
19
+ \esc_html_e(' If you have a moment, please let us know why you are deactivating plugin (anonymous feedback):', 'flexible-shipping');
20
  ?></strong></h4>
21
  <ul id="reasons-list">
22
  <li class="reason">
25
  <input type="radio" name="selected-reason" value="plugin_stopped_working">
26
  </span>
27
  <span><?php
28
+ \esc_html_e('The plugin suddenly stopped working', 'flexible-shipping');
29
  ?></span>
30
  </label>
31
  </li>
35
  <input type="radio" name="selected-reason" value="broke_my_site">
36
  </span>
37
  <span><?php
38
+ \esc_html_e('The plugin broke my site', 'flexible-shipping');
39
  ?></span>
40
  </label>
41
  </li>
45
  <input type="radio" name="selected-reason" value="found_better_plugin">
46
  </span>
47
  <span><?php
48
+ \esc_html_e('I found a better plugin', 'flexible-shipping');
49
  ?></span>
50
  </label>
51
  <div id="found_better_plugin" class="reason-input">
52
  <input type="text" name="better_plugin_name" placeholder="<?php
53
+ \esc_html_e('What\'s the plugin\'s name?', 'flexible-shipping');
54
  ?>">
55
  </div>
56
  </li>
60
  <input type="radio" name="selected-reason" value="plugin_for_short_period">
61
  </span>
62
  <span><?php
63
+ \esc_html_e('I only needed the plugin for a short period', 'flexible-shipping');
64
  ?></span>
65
  </label>
66
  </li>
70
  <input type="radio" name="selected-reason" value="no_longer_need">
71
  </span>
72
  <span><?php
73
+ \esc_html_e('I no longer need the plugin', 'flexible-shipping');
74
  ?></span>
75
  </label>
76
  </li>
80
  <input type="radio" name="selected-reason" value="temporary_deactivation">
81
  </span>
82
  <span><?php
83
+ \esc_html_e('It\'s a temporary deactivation. I\'m just debugging an issue.', 'flexible-shipping');
84
  ?></span>
85
  </label>
86
  </li>
90
  <input type="radio" name="selected-reason" value="other">
91
  </span>
92
  <span><?php
93
+ \esc_html_e('Other', 'flexible-shipping');
94
  ?></span>
95
  </label>
96
  <div id="other" class="reason-input">
97
  <input type="text" name="other" placeholder="<?php
98
+ \esc_attr_e('Kindly tell us the reason so we can improve', 'flexible-shipping');
99
  ?>">
100
  </div>
101
  </li>
104
  </div>
105
  <div class="footer">
106
  <a href="#" class="button button-secondary button-close"><?php
107
+ \esc_html_e('Cancel', 'flexible-shipping');
108
  ?></a>
109
  <a href="#" class="button button-primary button-deactivate allow-deactivate"><?php
110
+ \esc_html_e('Skip &amp; Deactivate', 'flexible-shipping');
111
  ?></a>
112
  </div>
113
  </div>
123
  jQuery('#other').show();
124
  }
125
  jQuery('.wpdesk_tracker_deactivate .button-deactivate').html( '<?php
126
+ \esc_html_e('Submit &amp; Deactivate', 'flexible-shipping');
127
  ?>' );
128
  })
129
  jQuery('.button-deactivate').click(function(e){
131
  console.log('deactivate');
132
  var reason = jQuery('input[name=selected-reason]:checked').val();
133
  var plugin = '<?php
134
+ echo \esc_attr($plugin);
135
  ?>';
136
  var plugin_name = '<?php
137
+ echo \esc_attr($plugin_name);
138
  ?>';
139
  var additional_info = '';
140
  if ( reason == 'found_better_plugin' ) {
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-notice.php CHANGED
@@ -16,21 +16,21 @@ $notice_content = \apply_filters('wpdesk_tracker_notice_content', \false, $usern
16
  if (empty($notice_content)) {
17
  ?>
18
  <?php
19
- \printf(\__('Hey %s,', 'flexible-shipping'), $username);
20
  ?><br/>
21
  <?php
22
- \_e('We need your help to improve <strong>WP Desk plugins</strong>, so they are more useful for you and the rest of <strong>30,000+ users</strong>. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe.', 'flexible-shipping');
23
  ?>
24
  <a href="<?php
25
- echo $terms_url;
26
  ?>" target="_blank"><?php
27
- \_e('Find out more &raquo;', 'flexible-shipping');
28
  ?></a>
29
  <?php
30
  } else {
31
  ?>
32
  <?php
33
- echo $notice_content;
34
  ?>
35
  <?php
36
  }
@@ -38,7 +38,7 @@ if (empty($notice_content)) {
38
  </p>
39
  <p>
40
  <button id="wpdesk_tracker_allow_button_notice" class="button button-primary"><?php
41
- \_e('Allow', 'flexible-shipping');
42
  ?></button>
43
  </p>
44
  </div>
16
  if (empty($notice_content)) {
17
  ?>
18
  <?php
19
+ \printf(\esc_html__('Hey %s,', 'flexible-shipping'), $username);
20
  ?><br/>
21
  <?php
22
+ \esc_html_e('We need your help to improve <strong>WP Desk plugins</strong>, so they are more useful for you and the rest of <strong>30,000+ users</strong>. By collecting data on how you use our plugins, you will help us a lot. We will not collect any sensitive data, so you can feel safe.', 'flexible-shipping');
23
  ?>
24
  <a href="<?php
25
+ echo \esc_url($terms_url);
26
  ?>" target="_blank"><?php
27
+ \esc_html_e('Find out more &raquo;', 'flexible-shipping');
28
  ?></a>
29
  <?php
30
  } else {
31
  ?>
32
  <?php
33
+ echo \wp_kses_post($notice_content);
34
  ?>
35
  <?php
36
  }
38
  </p>
39
  <p>
40
  <button id="wpdesk_tracker_allow_button_notice" class="button button-primary"><?php
41
+ \esc_html_e('Allow', 'flexible-shipping');
42
  ?></button>
43
  </p>
44
  </div>
vendor_prefixed/wpdesk/wp-wpdesk-tracker/src/views/tracker-opt-out-notice.php CHANGED
@@ -8,7 +8,7 @@ if (!\defined('ABSPATH')) {
8
  ?>
9
  <div id="wpdesk_tracker_notice" class="updated notice wpdesk_tracker_notice">
10
  <p><?php
11
- \_e('You successfully opted out of collecting usage data by WP Desk. If you change your mind, you can always opt in later in the plugin\'s quick links.', 'flexible-shipping');
12
  ?></p>
13
  </div>
14
  <?php
8
  ?>
9
  <div id="wpdesk_tracker_notice" class="updated notice wpdesk_tracker_notice">
10
  <p><?php
11
+ \esc_html_e('You successfully opted out of collecting usage data by WP Desk. If you change your mind, you can always opt in later in the plugin\'s quick links.', 'flexible-shipping');
12
  ?></p>
13
  </div>
14
  <?php