Merge pull request #117 from itthinx/tested-4.19.0-6.2

Tested 4.19.0 6.2

COPYRIGHT.txt

@@ -27,11 +27,11 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
- Visit http://www.itthinx.com/ for help, general info and fun.
+ Visit https://www.itthinx.com/ for help, general info and fun.
 
- Plugin page: http://www.itthinx.com/plugins/affiliates
+ Plugin page: https://www.itthinx.com/plugins/affiliates
 
  Official and trusted premium versions are available here only:
 
- Affiliates Pro : http://www.itthinx.com/shop/affiliates-pro
- Affiliates Enterprise : http://www.itthinx.com/shop/affiliates-enterprise
+ Affiliates Pro : https://www.itthinx.com/shop/affiliates-pro
+ Affiliates Enterprise : https://www.itthinx.com/shop/affiliates-enterprise

affiliates.php

@@ -19,12 +19,12 @@
  * @since affiliates 1.0.0
  *
  * Plugin Name: Affiliates
- * Plugin URI: http://www.itthinx.com/plugins/affiliates
+ * Plugin URI: https://www.itthinx.com/plugins/affiliates
  * Description: The Affiliates plugin provides the right tools to maintain a partner referral program.
- * Version: 4.18.0
+ * Version: 4.19.0
  * Author: itthinx
- * Author URI: http://www.itthinx.com
- * Donate-Link: http://www.itthinx.com
+ * Author URI: https://www.itthinx.com
+ * Donate-Link: https://www.itthinx.com/shop
  * Text Domain: affiliates
  * Domain Path: /lib/core/languages
  * License: GPLv3
@@ -35,7 +35,7 @@
 }
 
 if ( !defined( 'AFFILIATES_CORE_VERSION' ) ) {
-	define( 'AFFILIATES_CORE_VERSION', '4.18.0' );
+	define( 'AFFILIATES_CORE_VERSION', '4.19.0' );
 	define( 'AFFILIATES_PLUGIN_NAME', 'affiliates' );
 	define( 'AFFILIATES_FILE', __FILE__ );
 	define( 'AFFILIATES_PLUGIN_BASENAME', plugin_basename( AFFILIATES_FILE ) );

changelog.txt

@@ -1,5 +1,21 @@
 == Affiliates - Changelog ==
 
+= 4.19.0 =
+* WordPress 6.2 compatible.
+* Requires at least WordPress 6.0.
+* Requires at least PHP 7.2.
+* Added the affiliates_get_referral_post_permalink API function.
+* Added the affiliates_referral_post_permalink filter.
+* Added the affiliates_get_referral_post_title API function.
+* Added the affiliates_referral_post_title filter.
+* Revised the referral post rendering in the Visits & Referrals admin screen.
+* Revised the referral post rendering in the Affiliates & Referrals admin screen.
+* Revised the referral post rendering in the Referrals admin screen.
+* Revised URLs to use https.
+* Updated the translation template.
+* Added several missing translations.
+* Fixed or removed several incorrect translations.
+
 = 4.18.0 =
 * WordPress 6.2 compatible.
 * Requires at least WordPress 5.9.

lib/core/affiliates-admin-add-ons.php

@@ -56,14 +56,14 @@ function affiliates_admin_add_ons() {
 			'title'   => 'Affiliates Pro',
 			'content' => 'Affiliates Pro is a powerful affiliate marketing and management system for sellers, shops and developers, who want to increase sales and foster growth with their own affiliate program.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-pro.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-pro/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-pro/',
 			'index'   => 10
 		),
 		'affiliates-enterprise' => array(
 			'title'   => 'Affiliates Enterprise',
 			'content' => 'Affiliates Enterprise is a powerful affiliate marketing and management system for active marketers, sellers, shops and developers. This growth-oriented business solution features affiliate campaigns, mulitple tiers and pixel tracking, in addition to all the powerful features included in Affiliates Pro.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-enterprise.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-enterprise/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-enterprise/',
 			'index'   => 10
 		),
 		'affiliates-import' => array(
@@ -91,42 +91,42 @@ function affiliates_admin_add_ons() {
 			'title'   => 'Affiliates by Username',
 			'content' => 'This extension allows affiliate links to indicate usernames in addition to the affiliate IDs used normally.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-by-username.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-by-username/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-by-username/',
 			'index'   => 20
 		),
 		'affiliates-coupons' => array(
 			'title'   => 'Affiliates Coupons',
 			'content' => 'This extension requires Affiliates Pro or Affiliates Enterprise and WooCommerce. It allows to create coupons for affiliates automatically and in bulk.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-coupons.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-coupons/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-coupons/',
 			'index'   => 100
 		),
 		'affiliates-ms' => array(
 			'title'   => 'Affiliates MS',
 			'content' => 'Affiliates MS is a solution to maintain a centralized affiliate program for a WordPress Network of sites.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-ms.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-ms/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-ms/',
 			'index'   => 100
 		),
 		'affiliates-permanent' => array(
 			'title'   => 'Affiliates Permanent',
 			'content' => 'New customers (or new users) are assigned to the referring affiliate. The affiliate will be credited with a referral on every purchase made by the customer from thereon. Assignments can be changed manually in user profiles.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-permanent.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-permanent/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-permanent/',
 			'index'   => 100
 		),
 		'affiliates-products' => array(
 			'title'   => 'Affiliates Products',
 			'content' => 'This extension requires WooCommerce and provides product commissions for distribution and vendors. It automatically grants commissions on product sales to assigned partners or affiliates. It is suitable to share revenue on every sale of one or more products.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-products.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-products/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-products/',
 			'index'   => 100
 		),
 		'affiliates-users' => array(
 			'title'   => 'Affiliates Users',
 			'content' => 'This extension automatically creates affiliate accounts for new users. It also allows to create affiliate accounts for all existing users.',
 			'image'   => AFFILIATES_PLUGIN_URL . 'images/add-ons/affiliates-users.png',
-			'url'     => 'http://www.itthinx.com/shop/affiliates-users/',
+			'url'     => 'https://www.itthinx.com/shop/affiliates-users/',
 			'index'   => 20
 		),
 	);
@@ -199,7 +199,7 @@ function affiliates_admin_add_ons() {
 	echo '</li>';
 
 	echo '<li>';
-	echo __( 'The <a href="http://docs.itthinx.com/">Documentation</a> site also provides up-to-date information on the Affiliates, Affiliates Pro and Affiliates Enterprise plugin features.', 'affiliates' );
+	echo __( 'The <a href="https://docs.itthinx.com/">Documentation</a> site also provides up-to-date information on the Affiliates, Affiliates Pro and Affiliates Enterprise plugin features.', 'affiliates' );
 	echo '</li>';
 
 	echo '</ul>';
@@ -241,7 +241,7 @@ function affiliates_admin_add_ons() {
 	echo '</h2>';
 
 	echo '<p>';
-	echo __( 'Free and premium extensions are listed on the <a href="http://www.itthinx.com/plugins-overview/">Overview</a> page and in the <a href="http://www.itthinx.com/shop/">Shop</a>.', 'affiliates' );
+	echo __( 'Free and premium extensions are listed on the <a href="https://www.itthinx.com/plugins-overview/">Overview</a> page and in the <a href="https://www.itthinx.com/shop/">Shop</a>.', 'affiliates' );
 	echo '</p>';
 
 	echo '</div>';

lib/core/affiliates-admin-hits-affiliate.php

@@ -548,9 +548,19 @@ function affiliates_admin_hits_affiliate() {
 						foreach ( $referrals as $referral ) {
 							$output .= '<tr class="details-referrals ' . ( $i % 2 == 0 ? 'even' : 'odd' ) . '">';
 							$output .= "<td class='datetime'>" . DateHelper::s2u( $referral->datetime ) . "</td>";
-							$link = get_permalink( $referral->post_id );
-							$title = get_the_title( $referral->post_id );
-							$output .= '<td class="post-id"><a href="' . esc_attr( $link ) . '" target="_blank">' . stripslashes( wp_filter_nohtml_kses( $title ) ) . '</a></td>';
+							$link = affiliates_get_referral_post_permalink( $referral );
+							$title = affiliates_get_referral_post_title( $referral );
+							$output .= '<td class="post-id">';
+							if ( !empty( $link ) ) {
+								$output .= sprintf(
+									'<a href="%s" target="_blank">%s</a>',
+									esc_url( $link ),
+									stripslashes( wp_filter_nohtml_kses( $title ) )
+								);
+							} else {
+								$output .= stripslashes( wp_filter_nohtml_kses( $title ) );
+							}
+							$output .= '</td>';
 							$output .= '</tr>';
 						}
 						$output .= '</tbody></table>';

lib/core/affiliates-admin-hits.php

@@ -465,7 +465,7 @@ function affiliates_admin_hits() {
 						$referrals_filter_params
 					);
 					$referrals = $wpdb->get_results( $referrals_query, OBJECT );
-					if ( count($referrals) > 0 ) {
+					if ( count( $referrals) > 0 ) {
 						$output .= '<tr class=" ' . ( $i % 2 == 0 ? 'even' : 'odd' ) . '">';
 						$output .= '<td colspan="5">';
 						$output .= '<div class="details-referrals">';
@@ -482,9 +482,19 @@ function affiliates_admin_hits() {
 						foreach ( $referrals as $referral ) {
 							$output .= '<tr class="details-referrals ' . ( $i % 2 == 0 ? 'even' : 'odd' ) . '">';
 							$output .= '<td class="datetime">' . esc_html( $referral->datetime ) . '</td>';
-							$link = get_permalink( $referral->post_id );
-							$title = get_the_title( $referral->post_id );
-							$output .= '<td class="post-id"><a href="' . esc_attr( $link ) . '" target="_blank">' . wp_filter_nohtml_kses( $title ) . '</a></td>';
+							$link = affiliates_get_referral_post_permalink( $referral );
+							$title = affiliates_get_referral_post_title( $referral );
+							$output .= '<td class="post-id">';
+							if ( !empty( $link ) ) {
+								$output .= sprintf(
+									'<a href="%s" target="_blank">%s</a>',
+									esc_url( $link ),
+									stripslashes( wp_filter_nohtml_kses( $title ) )
+								);
+							} else {
+								$output .= stripslashes( wp_filter_nohtml_kses( $title ) );
+							}
+							$output .= '</td>';
 							$output .= "<td class='affiliate-id'>" . stripslashes( wp_filter_nohtml_kses( $referral->name ) ) . "</td>";
 							$output .= '</tr>';
 						}

lib/core/affiliates-admin-referrals.php

@@ -597,9 +597,19 @@ function affiliates_admin_referrals() {
 
 			$output .= '<tr class="details-referrals ' . ( $i % 2 == 0 ? 'even' : 'odd' ) . '">';
 			$output .= '<td class="datetime">' . DateHelper::s2u( $result->datetime ) . '</td>';
-			$link = get_permalink( $result->post_id );
-			$title = get_the_title( $result->post_id );
-			$output .= '<td class="post_title"><a href="' . esc_attr( $link ) . '" target="_blank">' . wp_filter_nohtml_kses( $title ) . '</a></td>';
+			$link = affiliates_get_referral_post_permalink( $result );
+			$title = affiliates_get_referral_post_title( $result );
+			$output .= '<td class="post_title">';
+			if ( !empty( $link ) ) {
+				$output .= sprintf(
+					'<a href="%s" target="_blank">%s</a>',
+					esc_url( $link ),
+					stripslashes( wp_filter_nohtml_kses( $title ) )
+				);
+			} else {
+				$output .= stripslashes( wp_filter_nohtml_kses( $title ) );
+			}
+			$output .= '</td>';
 			$output .= sprintf(
 				"<td class='name'>%s [%d]</td>",
 				stripslashes( wp_filter_nohtml_kses( $result->name ) ),

lib/core/class-affiliates-admin-help.php

@@ -121,7 +121,7 @@ public static function affiliates_help_tab_footer( $render = true ) {
 			'<div class="affiliates-documentation">' .
 			sprintf(
 				'<a href="%s">%s</a>',
-				esc_attr( 'http://docs.itthinx.com/document/affiliates/' ),
+				esc_attr( 'https://docs.itthinx.com/document/affiliates/' ),
 				esc_html( __( 'Online documentation', 'affiliates' ) )
 			) .
 			'</div>';

lib/core/class-affiliates-admin.php

@@ -140,15 +140,15 @@ public static function plugin_row_meta( $plugin_meta, $plugin_file, $plugin_data
 		if ( $plugin_file === plugin_basename( AFFILIATES_FILE ) ) {
 			switch (  AFFILIATES_PLUGIN_NAME ) {
 				case 'affiliates-pro':
-					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="http://www.itthinx.com/shop/affiliates-enterprise/">Affiliates Enterprise</a>';
+					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="https://www.itthinx.com/shop/affiliates-enterprise/">Affiliates Enterprise</a>';
 					break;
 				case 'affiliates-enterprise':
 					break;
 				default:
-					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="http://www.itthinx.com/shop/affiliates-pro/">Affiliates Pro</a>';
-					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="http://www.itthinx.com/shop/affiliates-enterprise/">Affiliates Enterprise</a>';
+					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="https://www.itthinx.com/shop/affiliates-pro/">Affiliates Pro</a>';
+					$plugin_meta[] = '<a style="color: #5da64f; font-weight: bold; padding: 1px;" href="https://www.itthinx.com/shop/affiliates-enterprise/">Affiliates Enterprise</a>';
 			}
-			$plugin_meta[] = '<a style="color: #d65d4f; font-weight: bold; padding: 1px;" href="http://www.itthinx.com/shop/">Shop</a>';
+			$plugin_meta[] = '<a style="color: #d65d4f; font-weight: bold; padding: 1px;" href="https://www.itthinx.com/shop/">Shop</a>';
 		}
 		return $plugin_meta;
 	}

lib/core/class-affiliates-notice.php

@@ -115,7 +115,7 @@ public static function admin_notices() {
 			$output .= '<p>';
 			$output .= sprintf(
 				'<a class="button button-primary" href="%s" target="_blank">%s</a>',
-				esc_url( 'http://wordpress.org/support/view/plugin-reviews/affiliates?filter=5#postform' ),
+				esc_url( 'https://wordpress.org/support/view/plugin-reviews/affiliates?filter=5#postform' ),
 				__( 'Yes, here we go!', 'affiliates' )
 			);
 			$output .= ' ';
@@ -129,7 +129,7 @@ public static function admin_notices() {
 			$output .= sprintf(
 				__( 'You can also follow <a href="%s" target="_blank">@itthinx</a> on Twitter or visit <a href="%s" target="_blank">itthinx.com</a> to check out other free and premium plugins we provide.', 'affiliates' ),
 				esc_url( 'https://twitter.com/itthinx' ),
-				esc_url( 'http://www.itthinx.com' )
+				esc_url( 'https://www.itthinx.com' )
 			);
 			$output .= '</p>';
 			$output .= '</div>';