Changeset 3082358

Timestamp:

05/07/2024 08:34:25 AM (22 months ago)

Author:

miunosoft

Message:

Upload 5.4.3b04

Location:

amazon-auto-links/trunk

Files:

• amazon-auto-links.php (modified) (2 diffs)
• include/core/component/proxy/admin/AmazonAutoLinks_ToolAdminPage_Proxy_Tab_Section.php (modified) (1 diff)
• include/core/component/proxy/utility/AmazonAutoLinks_Proxy_Utility.php (modified) (2 diffs)
• include/core/main/event/AmazonAutoLinks_Shadow.php (modified) (4 diffs)

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

@@ -6 +6 @@
  * Author:            Michael Uno (miunosoft)
  * Author URI:        https://michaeluno.jp
- * Version:           5.4.3b03
+ * Version:           5.4.3b04
  * Text Domain:       amazon-auto-links
  * Domain Path:       /language
@@ -19 +19 @@
  */
 class AmazonAutoLinks_Registry_Base {
-    const VERSION      = '5.4.3b03';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
+    const VERSION      = '5.4.3b04';    // <--- 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/component/proxy/admin/AmazonAutoLinks_ToolAdminPage_Proxy_Tab_Section.php

@@ -74 +74 @@
                 'description'     => array(
                     __( 'Enter proxy addresses one per line. Accepts up to 10000 items at a maximum.', 'amazon-auto-links' ),
-                    sprintf( __( 'The format: <code>%1$s</code>', 'amazon-auto-links' ), '{scheme}://{username}:{password}@{ip address}:{port number}' ),
+                    sprintf( __( 'The format: <code>%1$s</code>', 'amazon-auto-links' ), '{scheme}://{user name}:{password}@{ip address or host name}:{port number}' ),
                 ),
             ),

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

@@ -23 +23 @@
     static public function getProxyArguments( $sProxy ) {
 
-        $_aProxy          = parse_url( $sProxy );
+        $_aProxy = parse_url( $sProxy );
         return array(
             'host'     => isset( $_aProxy[ 'scheme' ] )
-                ? $_aProxy[ 'scheme' ] . '://' . $_aProxy[ 'host' ]
+                ? $_aProxy[ 'scheme' ] . '://' . self::getIPFromHostName( $_aProxy[ 'host' ] ) // cURL does not accept domain names
                 : $_aProxy[ 'host' ],
             'port'     => $_aProxy[ 'port' ],
@@ -33 +33 @@
             'raw'      => $sProxy,
         );
+
+    }
+
+    /**
+     * @since  5.4.3
+     * @return string The looked-up IP address or unmodified host name
+     */
+    static public function getIPFromHostName( $sHostNameOrIP ) {
+
+        // Return if it's an IP address
+        // @remark This checks whether it is a valid IPv4 address.
+        // @todo research a way to check whether IPv6 address
+        if ( ( boolean ) ip2long( $sHostNameOrIP ) ) {
+            return $sHostNameOrIP;
+        }
+
+        return gethostbyname( $sHostNameOrIP );
 
     }

amazon-auto-links/trunk/include/core/main/event/AmazonAutoLinks_Shadow.php

@@ -77 +77 @@
      */    
     static private function ___isBackground() {
-        $_sKey = 'aal_' . md5( get_class() );
+        $_sKey = 'aal_' . md5( __CLASS__ );
         return isset( $_COOKIE[ $_sKey ] );
     }
@@ -100 +100 @@
     static private function ___handleCronTasks( array $aActionHooks ) {
 
-        $_sTransientName = 'aal_' . md5( get_class() );
+        $_sTransientName = 'aal_' . md5( __CLASS__ );
         $_aFlags         = AmazonAutoLinks_WPUtility::getTransientWithoutCacheAsArray( $_sTransientName ) + array(
             '_called'    => 0, '_locked'    => 0,
@@ -128 +128 @@
          * Performs the plugin-specific scheduled tasks in the background.
          *
-         * This should only be called when the "aal_{ md5( get_class() ) }" transient is present.
+         * This should only be called when the "aal_{ md5( __CLASS__ ) }" transient is present.
          *
          * @since 1.0.0
@@ -256 +256 @@
 
             // Retrieve the plugin scheduled tasks array.
-            $_sTransientName = 'aal_' . md5( get_class() );
+            $_sTransientName = 'aal_' . md5( __CLASS__ );
             $_aFlags         = AmazonAutoLinks_WPUtility::getTransientWithoutCacheAsArray( $_sTransientName ) + array(
                 '_called' => 0,