Changeset 3161302

Timestamp:

10/02/2024 07:58:13 AM (17 months ago)

Author:

miunosoft

Message:

Preparing for 5.4.3 release

Location:

amazon-auto-links/trunk

Files:

• amazon-auto-links.php (modified) (2 diffs)
• include/core/_common/utility/interpreter/http/AmazonAutoLinks_HTTPClient.php (modified) (4 diffs)
• include/core/component/custom_oembed/oembed/AmazonAutoLinks_CustomOEmbed_Endpoint.php (modified) (1 diff)
• include/core/component/proxy/event/action/AmazonAutoLinks_Proxy_Event_Action_UnusableProxy.php (modified) (2 diffs)
• include/core/component/proxy/utility/AmazonAutoLinks_Proxy_Utility.php (modified) (1 diff)
• include/core/main/admin/report/http_request/AmazonAutoLinks_AdminPage_Tab_HTTPRequest.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

amazon-auto-links/trunk/amazon-auto-links.php

@@ -6 +6 @@
  * Author:            Michael Uno (miunosoft)
  * Author URI:        https://michaeluno.jp
- * Version:           5.4.3b04
+ * Version:           5.4.3
  * Text Domain:       amazon-auto-links
  * Domain Path:       /language
@@ -19 +19 @@
  */
 class AmazonAutoLinks_Registry_Base {
-    const VERSION      = '5.4.3b04';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
+    const VERSION      = '5.4.3';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
     const NAME         = 'Auto Amazon Links';
     const DESCRIPTION  = 'Formerly, Amazon Auto Links. The plugin generates links of Amazon products just coming out today. You just pick categories and they appear even in JavaScript disabled browsers.';

amazon-auto-links/trunk/include/core/_common/utility/interpreter/http/AmazonAutoLinks_HTTPClient.php

@@ -546 +546 @@
 
                 if ( $_bProxySet ) {
-
+                    /**
+                     * @see AmazonAutoLinks_Proxy_Utility::getProxyArguments()
+                     */
                     $_aProxy = $_aProxy + array(
                         'host'      => null,
@@ -552 +554 @@
                         'username'  => null,
                         'password'  => null,
+                        'ip'        => null,
+                        'scheme'    => null,
                     );
                     curl_setopt( $_oCurl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
@@ -563 +567 @@
                         curl_setopt( $_oCurl, CURLOPT_PROXYUSERPWD, $_aProxy[ 'username' ] . ':' . $_aProxy[ 'password' ] );
                     }
-
                 }
 
@@ -588 +591 @@
 
                 // Error handling
+                $_sHost = $_aProxy[ 'raw' ] !== $_aProxy[ 'host' ]
+                    ? $_aProxy[ 'raw' ] . ' (' . $_aProxy[ 'host' ] . ')'
+                    : $_aProxy[ 'raw' ];
                 if ( ! $_bsResponse ) {
                     $_aErrorData = array( 'url' => $sURL ) + $_aProxy;
                     $_sHTTPCode  = $_sHTTPCode ? $_sHTTPCode : 'CURL_CONNECTION_FAILURE';
-                    return new WP_Error( $_sHTTPCode, sprintf( 'The cURL connection failed with a proxy: %1$s.', $_aProxy[ 'raw' ] ), $_aErrorData );
+                    return new WP_Error( $_sHTTPCode, sprintf( 'The cURL connection failed with a proxy: %1$s.', $_sHost ), $_aErrorData );
                 }
                 $_iResponseCode   = ( integer ) $_sHTTPCode;
                 if ( $_iResponseCode >= 400 ) {
                     $_aErrorData = array( 'url' => $sURL ) + $_aProxy;
-                    return new WP_Error( $_iResponseCode, sprintf( 'The cURL response returned an error with a proxy: %1$s.', $_aProxy[ 'raw' ] ), $_aErrorData );
+                    return new WP_Error( $_iResponseCode, sprintf( 'The cURL response returned an error with a proxy: %1$s.', $_sHost ), $_aErrorData );
                 }
 

amazon-auto-links/trunk/include/core/component/custom_oembed/oembed/AmazonAutoLinks_CustomOEmbed_Endpoint.php

@@ -46 +46 @@
         $_sNonce            = wp_create_nonce( 'aal_custom_oembed' );
         $_sProviderSiteURL  = $_oOption->get( array( 'custom_oembed', 'external_provider' ), '' );
+        $_sEmbedSlug        = ( string ) apply_filters( 'aal_filter_plugin_slug_oembed', 'amazon-auto-links' );
         $_sProviderEndpoint = filter_var( $_sProviderSiteURL, FILTER_VALIDATE_URL )
-            ? untrailingslashit( $_sProviderSiteURL ) . '/amazon-auto-links/embed/'
-            : untrailingslashit( site_url() ) . '/amazon-auto-links/embed/'; // using a custom non-existent url so when the plugin is deactivated, the iframe displays the 404 embedded page.
+            ? untrailingslashit( $_sProviderSiteURL ) . '/' . $_sEmbedSlug . '/embed/'
+            : untrailingslashit( site_url() ) . '/' . $_sEmbedSlug . '/embed/'; // using a custom non-existent url so when the plugin is deactivated, the iframe displays the 404 embedded page.
         $_sIFrameURL        = add_query_arg(
             array(
-                'embed'  => ( string ) apply_filters( 'aal_filter_plugin_slug_oembed', 'amazon-auto-links' ),    // usually the value is 1 for normal oEmbed posts but here we use a custom value to differentiate the request to process own custom outputs // [5.3.10] filter
+                'embed'  => $_sEmbedSlug,    // usually the value is 1 for normal oEmbed posts but here we use a custom value to differentiate the request to process own custom outputs // [5.3.10] filter
                 // 'url' => ... the key is reserved by the core for oEmbed discovery routine and when used, it causes recursive requests.
                 'uri'    => urlencode( AmazonAutoLinks_PluginUtility::getURLSanitized( $_GET[ 'url' ] ) ),  // sanitization done

amazon-auto-links/trunk/include/core/component/proxy/event/action/AmazonAutoLinks_Proxy_Event_Action_UnusableProxy.php

@@ -35 +35 @@
          * The stored proxies will be saved at shutdown.
          * @param array $aArguments
-         * @since   4.2.0
+         * @since 4.2.0
          */
         public function replyToCaptureUnusableProxies( array $aArguments ) {
 
-            $_sHost  = $this->getElement( $aArguments,  array( 'proxy', 'host' ), '' );
-            $_sPort  = $this->getElement( $aArguments,  array( 'proxy', 'port' ),  '' );
-            $_sUser  = $this->getElement( $aArguments,  array( 'proxy', 'username' ),  '' );
-            $_sPass  = $this->getElement( $aArguments,  array( 'proxy', 'password' ),  '' );
+            /**
+             * Allows the user to disable the updates of the list of unusable proxies.
+             * @since 5.4.3
+             */
+            if ( ! ( boolean ) apply_filters( 'aal_filter_http_request_proxy_update_unusable', true ) ) {
+                return;
+            }
 
-            // scheme://username:password@host:port
-            $_sUserPass = ( $_sUser && $_sPass ) ? $_sUser . ':' . $_sPass . '@': '';
-            $_sEntry    = $_sUserPass . $_sHost . ':' . $_sPort;
+            $_sEntry = $this->getElement( $aArguments,  array( 'proxy', 'raw' ),  '' );
             $this->___aUnusableProxies[ $_sEntry ] = $_sEntry;  // prevent duplicates by setting the value in key
             if ( 1 === count( $this->___aUnusableProxies ) ) {
@@ -69 +70 @@
         foreach( $this->___aUnusableProxies as $_sProxy ) {
 
-            $_aUnusables[]  = $_sProxy;
-            $_biIndex       = array_search( $_sProxy, $_aProxies );
+            $_aUnusables[] = $_sProxy;
+            $_biIndex      = array_search( $_sProxy, $_aProxies );
             if ( false === $_biIndex ) {
                 continue;

amazon-auto-links/trunk/include/core/component/proxy/utility/AmazonAutoLinks_Proxy_Utility.php

@@ -24 +24 @@
 
         $_aProxy = parse_url( $sProxy );
+        $_sIP    = self::getIPFromHostName( $_aProxy[ 'host' ] );
         return array(
+            'scheme'   => $_aProxy[ 'scheme' ],
+            'ip'       => $_sIP,
             'host'     => isset( $_aProxy[ 'scheme' ] )
-                ? $_aProxy[ 'scheme' ] . '://' . self::getIPFromHostName( $_aProxy[ 'host' ] ) // cURL does not accept domain names
+                ? $_aProxy[ 'scheme' ] . '://' . $_sIP  // cURL does not accept domain names
                 : $_aProxy[ 'host' ],
             'port'     => $_aProxy[ 'port' ],

amazon-auto-links/trunk/include/core/main/admin/report/http_request/AmazonAutoLinks_AdminPage_Tab_HTTPRequest.php

@@ -51 +51 @@
         private function ___getCacheDataTable( array $aCache, $sNonce ) {
 
-            $_aData         = $aCache[ 'data' ];
+            $_aData         = $this->getElementAsArray( $aCache, array( 'data' ) ) + array(
+                'body' => '',
+                'headers' => array(),
+                'cookies' => array(),
+            );
+            $aCache[ 'name' ] = isset( $aCache[ 'name' ] ) ? $aCache[ 'name' ] : '';
 
             if ( is_wp_error( $_aData ) ) {
@@ -145 +150 @@
             return "<div class='go-back'>"
                     . "<span class='dashicons dashicons-arrow-left-alt small-icon'></span>"
-                    . "<a href='{$_sProductsPageURL}'>"
+                    . "<a href='" . esc_url( $_sProductsPageURL ) . "'>"
                         . __( 'Go Back', 'amazon-auto-links' )
                     . "</a>"

amazon-auto-links/trunk/readme.txt

@@ -7 +7 @@
 Tested up to:       6.5.2
 Requires MySQL:     5.0.3
-Stable tag:         5.4.2
+Stable tag:         5.4.3
 License:            GPLv2 or later
 License URI:        http://www.gnu.org/licenses/gpl-2.0.html
@@ -185 +185 @@
 = Do I need API Keys? =
 
-For the category unit type, no, but for PA-API unit types, yes. You need to issue a pair of API keys on the Amazon Associates logged-in page.
+For the Category unit type, no, but for other unit types, yes. You need to issue a pair of API keys on the Amazon Associates logged-in page.
 
 For that, you need to have an account with [Amazon Product Advertising API](https://affiliate-program.amazon.com/gp/advertising/api/detail/main.html). The keys can be obtained by logging in to [Amazon Web Services](http://aws.amazon.com/) and you need to get **Access Key ID** (public key) and **Secret Access Key** (private key).
@@ -406 +406 @@
 == Changelog ==
 
-#### 5.4.2 - 04/17/2024
-- Added a method to avoid the PHP warning, "gzuncompress(): data error"
+#### 5.4.2 - 10/02/2024
+- Fixed a bug that the `sort` shortcode argument did not take effect when used with the `asin` argument.
+- Fixed a PHP critical error saying "Uncaught ValueError: DOMDocument::loadHTML(): Argument #1 ($source) must not be empty."
+- Added the **Server** section in the **About** tab of the **Help** page.
+- Added the ability to automatically update the default options of Country and Associate ID when the options of the Associates section are updated.
+- Changed to show some About details only when the Debug Mode with back-end is enabled.
+- Fixed a PHP warning saying "Deprecated: preg_replace(): Passing null to parameter #3" in PHP 8.2.
+- Changed the timing of applying the sort order of PA-API Item-Lookup units.
+- Added the ability to accept host names for HTTP proxies
+- Fixed the broken format in the unusable HTTP proxy list
+- Fixed a bug that the `aal_filter_plugin_slug_oembed` filter hook did not function
+- Fixed raw strings to be sanitized
 
 #### Old Log