CTX Feed – WooCommerce Product Feed Manager Plugin - Version 3.6.5

Version Description

(2020-06-13) = * Added: FTP passive mode selection option added.

Download this release

Release Info

Developer wahid0003
Plugin Icon 128x128 CTX Feed – WooCommerce Product Feed Manager Plugin
Version 3.6.5
Comparing to
See all releases

Code changes from version 3.6.4 to 3.6.5

Files changed (4) hide show
  1. README.txt +4 -1
  2. admin/partials/woo-feed-edit-ftp.php +10 -1
  3. includes/helper.php +3 -1
  4. woo-feed.php +2 -2
README.txt CHANGED
@@ -5,7 +5,7 @@ Tags:product feed,woocommerce product feed,google shopping feed,google shopping,
5
  Requires at least: 3.6
6
  Tested Up To: 5.4
7
  Requires PHP: 5.6
8
- Stable tag: 3.6.4
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -305,6 +305,9 @@ Using pro version:
305
 
306
  == Changelog ==
307
 
 
 
 
308
  = 3.6.4 (2020-06-03) =
309
  * Fixed: Yoast SEO Title (manually added title) issue fixed.
310
 
5
  Requires at least: 3.6
6
  Tested Up To: 5.4
7
  Requires PHP: 5.6
8
+ Stable tag: 3.6.5
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
305
 
306
  == Changelog ==
307
 
308
+ = 3.6.5 (2020-06-13) =
309
+ * Added: FTP passive mode selection option added.
310
+
311
  = 3.6.4 (2020-06-03) =
312
  * Fixed: Yoast SEO Title (manually added title) issue fixed.
313
 
admin/partials/woo-feed-edit-ftp.php CHANGED
@@ -50,6 +50,15 @@ if ( ! defined( 'ABSPATH' ) ) {
50
  <td><label for="ftppath"><?php _e( 'Path', 'woo-feed' ); ?></label></td>
51
  <td><input type="text" id="ftppath" value="<?php echo esc_attr( $feedRules['ftppath'] ); ?>" name="ftppath" autocomplete="off"/></td>
52
  </tr>
53
- </tbody>
 
 
 
 
 
 
 
 
 
54
  <?php } ?>
55
  </table>
50
  <td><label for="ftppath"><?php _e( 'Path', 'woo-feed' ); ?></label></td>
51
  <td><input type="text" id="ftppath" value="<?php echo esc_attr( $feedRules['ftppath'] ); ?>" name="ftppath" autocomplete="off"/></td>
52
  </tr>
53
+ <tr>
54
+ <td><label for="ftpmode"><?php _e( 'Connection Mode', 'woo-feed' ); ?></label></td>
55
+ <td>
56
+ <select name="ftpmode" id="ftpmode" class="ftpmode">
57
+ <option <?php echo (isset($feedRules['ftpmode']) && 'active' == $feedRules['ftpmode'] ) ? 'selected="selected" ' : ''; ?> value="active"><?php _e( 'Active', 'woo-feed' ); ?></option>
58
+ <option <?php echo (isset($feedRules['ftpmode']) && 'passive' == $feedRules['ftpmode'] ) ? 'selected="selected" ' : ''; ?>value="passive"><?php _e( 'Passive', 'woo-feed' ); ?></option>
59
+ </select>
60
+ </td>
61
+ </tr>
62
+ </tbody>
63
  <?php } ?>
64
  </table>
includes/helper.php CHANGED
@@ -366,6 +366,7 @@ if ( ! function_exists( 'woo_feed_handle_file_transfer' ) ) {
366
  $ftp_user = sanitize_text_field( $info['ftpuser'] );
367
  $ftp_password = sanitize_text_field( $info['ftppassword'] );
368
  $ftpPath = trailingslashit( untrailingslashit( sanitize_text_field( $info['ftppath'] ) ) );
 
369
  if ( isset( $info['ftporsftp'] ) & 'ftp' === $info['ftporsftp'] ) {
370
  $ftporsftp = 'ftp';
371
  } else {
@@ -383,7 +384,7 @@ if ( ! function_exists( 'woo_feed_handle_file_transfer' ) ) {
383
  try {
384
  if ( 'ftp' == $ftporsftp ) {
385
  $ftp = new FTPClient();
386
- if ( $ftp->connect( $ftpHost, $ftp_user, $ftp_password, false, $ftp_port ) ) {
387
  return $ftp->upload_file( $fileFrom, $ftpPath . $fileTo );
388
  }
389
  } elseif ( 'sftp' == $ftporsftp ) {
@@ -551,6 +552,7 @@ if ( ! function_exists( 'woo_feed_parse_feed_rules' ) ) {
551
  'ftpuser' => '',
552
  'ftppassword' => '',
553
  'ftppath' => '',
 
554
  'is_variations' => 'n',
555
  'variable_price' => 'first',
556
  'variable_quantity' => 'first',
366
  $ftp_user = sanitize_text_field( $info['ftpuser'] );
367
  $ftp_password = sanitize_text_field( $info['ftppassword'] );
368
  $ftpPath = trailingslashit( untrailingslashit( sanitize_text_field( $info['ftppath'] ) ) );
369
+ $ftp_passive_mode = (isset($info['ftpmode']) && sanitize_text_field( $info['ftpmode'] ) == 'passive') ? true : false;
370
  if ( isset( $info['ftporsftp'] ) & 'ftp' === $info['ftporsftp'] ) {
371
  $ftporsftp = 'ftp';
372
  } else {
384
  try {
385
  if ( 'ftp' == $ftporsftp ) {
386
  $ftp = new FTPClient();
387
+ if ( $ftp->connect( $ftpHost, $ftp_user, $ftp_password, $ftp_passive_mode, $ftp_port ) ) {
388
  return $ftp->upload_file( $fileFrom, $ftpPath . $fileTo );
389
  }
390
  } elseif ( 'sftp' == $ftporsftp ) {
552
  'ftpuser' => '',
553
  'ftppassword' => '',
554
  'ftppath' => '',
555
+ 'ftpmode' => false,
556
  'is_variations' => 'n',
557
  'variable_price' => 'first',
558
  'variable_quantity' => 'first',
woo-feed.php CHANGED
@@ -11,7 +11,7 @@
11
  * Plugin URI: https://webappick.com/
12
  * Description: Easily generate woocommerce product feed for any marketing channel like Google Shopping(Merchant), Facebook Remarketing, Bing, eBay & more. Support 100+ Merchants.
13
  *
14
- * Version: 3.6.4
15
  * Author: WebAppick
16
  * Author URI: https://webappick.com/
17
  * License: GPL v2
@@ -39,7 +39,7 @@ if ( ! defined( 'WOO_FEED_FREE_VERSION' ) ) {
39
  * @var string
40
  * @since 3.1.6
41
  */
42
- define( 'WOO_FEED_FREE_VERSION', '3.6.4' );
43
  }
44
 
45
  if ( ! defined( 'WOO_FEED_FREE_FILE' ) ) {
11
  * Plugin URI: https://webappick.com/
12
  * Description: Easily generate woocommerce product feed for any marketing channel like Google Shopping(Merchant), Facebook Remarketing, Bing, eBay & more. Support 100+ Merchants.
13
  *
14
+ * Version: 3.6.5
15
  * Author: WebAppick
16
  * Author URI: https://webappick.com/
17
  * License: GPL v2
39
  * @var string
40
  * @since 3.1.6
41
  */
42
+ define( 'WOO_FEED_FREE_VERSION', '3.6.5' );
43
  }
44
 
45
  if ( ! defined( 'WOO_FEED_FREE_FILE' ) ) {