10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

* updated requests to site URL;

Browse Source 
* WPCS;
This commit is contained in:
Mykyta Synelnikov
2025-01-31 15:19:28 +02:00
parent 26c8aa21e1
commit a760a6242e
5 changed files with 93 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-notices.php
+2 -2
View File
@@ -630,8 +630,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
'license_key', 'license_key',
array( array(
'class' => 'error', 'class' => 'error',
// translators: %1$s is an inactive license number; %2$s is a plugin name; %3$s is a store link. // translators: %1$s is an inactive license number; %2$s is a plugin name.
'message' => '<p>' . sprintf( __( 'There are %1$s inactive %2$s license keys for this site. This site is not authorized to get plugin updates. You can active this site on <a href="%3$s">www.ultimatemember.com</a>.', 'ultimate-member' ), count( $arr_inactive_license_keys ), UM_PLUGIN_NAME, UM()->store_url ) . '</p>', 'message' => '<p>' . sprintf( __( 'There are %1$s inactive %2$s license keys for this site. This site is not authorized to get plugin updates. You can activate this site on <a href="https://ultimatemember.com/">www.ultimatemember.com</a>.', 'ultimate-member' ), count( $arr_inactive_license_keys ), UM_PLUGIN_NAME ) . '</p>',
), ),
3 3
); );
includes/admin/core/class-admin-settings.php
+4 -4
View File
@@ -2935,9 +2935,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
); );
$request = wp_remote_post( $request = wp_remote_post(
UM()->store_url, UM()::$store_url,
array( array(
'timeout' => UM()->request_timeout, 'timeout' => UM()::$request_timeout,
'sslverify' => false, 'sslverify' => false,
'body' => $api_params, 'body' => $api_params,
) )
@@ -2947,9 +2947,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
$request = json_decode( wp_remote_retrieve_body( $request ) ); $request = json_decode( wp_remote_retrieve_body( $request ) );
} else { } else {
$request = wp_remote_post( $request = wp_remote_post(
UM()->store_url, UM()::$store_url,
array( array(
'timeout' => UM()->request_timeout, 'timeout' => UM()::$request_timeout,
'sslverify' => true, 'sslverify' => true,
'body' => $api_params, 'body' => $api_params,
) )
includes/class-functions.php
+6 -15
View File
@@ -1,36 +1,27 @@
<?php if ( ! defined( 'ABSPATH' ) ) exit; <?php
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
if ( ! class_exists( 'UM_Functions' ) ) { if ( ! class_exists( 'UM_Functions' ) ) {
/** /**
* Class UM_Functions * Class UM_Functions
*/ */
class UM_Functions { class UM_Functions {
/** /**
* Store URL * Store URL
* *
* @var string * @var string
*/ */
var $store_url = 'https://ultimatemember.com/'; public static $store_url = 'https://ultimatemember.com/?edd-request=get-info';
/** /**
* WP remote Post timeout * WP remote Post timeout
* @var int * @var int
*/ */
var $request_timeout = 60; public static $request_timeout = 60;
/**
* UM_Functions constructor.
*/
function __construct() {
}
/** /**
* Check if AJAX now * Check if AJAX now
includes/class-init.php
-9
View File
@@ -175,15 +175,6 @@ if ( ! class_exists( 'UM' ) ) {
_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'ultimate-member' ), '1.0' ); _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'ultimate-member' ), '1.0' );
} }
/**
* UM constructor.
*
* @since 1.0
*/
function __construct() {
parent::__construct();
}
/** /**
* UM pseudo-constructor. * UM pseudo-constructor.
* *
includes/core/class-plugin-updater.php
+81 -113
View File
@@ -1,25 +1,24 @@
<?php <?php
namespace um\core; namespace um\core;
use WP_Error;
if ( ! defined( 'ABSPATH' ) ) exit; if ( ! defined( 'ABSPATH' ) ) {
exit;
}
if ( ! class_exists( 'um\core\Plugin_Updater' ) ) { if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
/** /**
* Class Plugin_Updater * Class Plugin_Updater
* @package um\core * @package um\core
*/ */
class Plugin_Updater { class Plugin_Updater {
/** /**
* Plugin_Updater constructor. * Plugin_Updater constructor.
*/ */
function __construct() { public function __construct() {
//cron request to UM()->store_url;
add_action( 'um_daily_scheduled_events', array( &$this, 'um_checklicenses' ) ); add_action( 'um_daily_scheduled_events', array( &$this, 'um_checklicenses' ) );
// clean update plugin cache // clean update plugin cache
@@ -35,16 +34,15 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
//add_filter( 'auto_update_plugin', array( &$this, 'prevent_dangerous_auto_updates' ), 99, 2 ); //add_filter( 'auto_update_plugin', array( &$this, 'prevent_dangerous_auto_updates' ), 99, 2 );
} }
/** /**
* Prevent auto-updating the WooCommerce plugin on major releases if there are untested extensions active. * Prevent auto-updating the WooCommerce plugin on major releases if there are untested extensions active.
* * @todo maybe check untested extensions.
* @since 3.2.0 * @since 3.2.0
* @param bool $should_update If should update. * @param bool $should_update If should update.
* @param object $plugin Plugin data. * @param object $plugin Plugin data.
* @return bool * @return bool
*/ */
function prevent_dangerous_auto_updates( $should_update, $plugin ) { public function prevent_dangerous_auto_updates( $should_update, $plugin ) {
if ( ! isset( $plugin->plugin, $plugin->new_version ) ) { if ( ! isset( $plugin->plugin, $plugin->new_version ) ) {
return $should_update; return $should_update;
} }
@@ -56,7 +54,6 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
return $should_update; return $should_update;
} }
/** /**
* This action is documented in wp-admin/includes/class-wp-upgrader.php * This action is documented in wp-admin/includes/class-wp-upgrader.php
* *
@@ -204,33 +201,32 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
foreach ( $the_plugs as $key => $value ) { foreach ( $the_plugs as $key => $value ) {
if ( in_array( $value, array_keys( $paid_extensions ) ) ) { if ( array_key_exists( $value, $paid_extensions ) ) {
$license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" ); $license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
if ( empty( $license ) ) { if ( empty( $license ) ) {
continue; continue;
} }
$active_um_plugins[ $value ] = $paid_extensions[ $value ]; $active_um_plugins[ $value ] = $paid_extensions[ $value ];
$active_um_plugins[ $value ]['license'] = $license; $active_um_plugins[ $value ]['license'] = $license;
} }
} }
restore_current_blog(); restore_current_blog();
} }
} else { } else {
$the_plugs = get_option( 'active_plugins' ); $the_plugs = get_option( 'active_plugins' );
foreach ( $the_plugs as $key => $value ) { foreach ( $the_plugs as $key => $value ) {
if ( in_array( $value, array_keys( $paid_extensions ) ) ) { if ( array_key_exists( $value, $paid_extensions ) ) {
$license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" ); $license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
if ( empty( $license ) ) { if ( empty( $license ) ) {
continue; continue;
} }
$active_um_plugins[ $value ] = $paid_extensions[ $value ]; $active_um_plugins[ $value ] = $paid_extensions[ $value ];
$active_um_plugins[ $value ]['license'] = $license; $active_um_plugins[ $value ]['license'] = $license;
} }
} }
@@ -239,14 +235,13 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
return $active_um_plugins; return $active_um_plugins;
} }
/** /**
* Check license function * Check license function
* WP Cron request to UM()::$store_url
*/ */
function um_checklicenses() { public function um_checklicenses() {
$exts = $this->get_active_plugins(); $exts = $this->get_active_plugins();
if ( empty( $exts ) ) {
if ( 0 == count( $exts ) ) {
return; return;
} }
@@ -267,16 +262,16 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
'slug' => $slug, 'slug' => $slug,
'license' => $data['license'], 'license' => $data['license'],
'item_name' => $data['title'], 'item_name' => $data['title'],
'version' => $plugin_data['Version'] 'version' => $plugin_data['Version'],
); );
} }
$request = wp_remote_post( $request = wp_remote_post(
UM()->store_url, UM()::$store_url,
array( array(
'timeout' => UM()->request_timeout, 'timeout' => UM()::$request_timeout,
'sslverify' => false, 'sslverify' => false,
'body' => $api_params 'body' => $api_params,
) )
); );
@@ -284,11 +279,11 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$request = json_decode( wp_remote_retrieve_body( $request ) ); $request = json_decode( wp_remote_retrieve_body( $request ) );
} else { } else {
$request = wp_remote_post( $request = wp_remote_post(
UM()->store_url, UM()::$store_url,
array( array(
'timeout' => UM()->request_timeout, 'timeout' => UM()::$request_timeout,
'sslverify' => true, 'sslverify' => true,
'body' => $api_params 'body' => $api_params,
) )
); );
@@ -321,11 +316,11 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$request->$slug->get_version_check->sections = maybe_unserialize( $request->$slug->get_version_check->sections ); $request->$slug->get_version_check->sections = maybe_unserialize( $request->$slug->get_version_check->sections );
$request->$slug->get_version_check->sections = (array) $request->$slug->get_version_check->sections; $request->$slug->get_version_check->sections = (array) $request->$slug->get_version_check->sections;
} else { } else {
$request->$slug->get_version_check = new \WP_Error( 'plugins_api_failed', $request->$slug->get_version_check = new WP_Error(
'plugins_api_failed',
sprintf( sprintf(
/* translators: %s: support forums URL */ /* translators: %s: support forums URL */
__( 'An unexpected error occurred. Something may be wrong with %s or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ), __( 'An unexpected error occurred. Something may be wrong with installation or server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
UM()->store_url,
__( 'https://wordpress.org/support/' ) __( 'https://wordpress.org/support/' )
), ),
wp_remote_retrieve_body( $request->$slug->get_version_check ) wp_remote_retrieve_body( $request->$slug->get_version_check )
@@ -341,7 +336,7 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
} }
if ( ! empty( $request->$slug->get_version_check->sections ) ) { if ( ! empty( $request->$slug->get_version_check->sections ) ) {
foreach( $request->$slug->get_version_check->sections as $key => $section ) { foreach ( $request->$slug->get_version_check->sections as $key => $section ) {
$request->$slug->get_version_check->$key = (array) $section; $request->$slug->get_version_check->$key = (array) $section;
} }
} }
@@ -350,11 +345,8 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
} }
} }
} }
return;
} }
/** /**
* Check for Updates by request to the marketplace * Check for Updates by request to the marketplace
* and modify the update array. * and modify the update array.
@@ -362,15 +354,15 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
* @param array $_transient_data plugin update array build by WordPress. * @param array $_transient_data plugin update array build by WordPress.
* @return \stdClass modified plugin update array. * @return \stdClass modified plugin update array.
*/ */
function check_update( $_transient_data ) { public function check_update( $_transient_data ) {
if ( ! is_object( $_transient_data ) ) { if ( ! is_object( $_transient_data ) ) {
$_transient_data = new \stdClass; $_transient_data = new \stdClass();
} }
$exts = $this->get_active_plugins(); $exts = $this->get_active_plugins();
foreach ( $exts as $slug => $data ) { foreach ( $exts as $slug => $data ) {
//if response for current product isn't empty check for override // If response for current product isn't empty check for override.
if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $slug ] ) && $_transient_data->last_checked > time() - DAY_IN_SECONDS ) { if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $slug ] ) && $_transient_data->last_checked > time() - DAY_IN_SECONDS ) {
continue; continue;
} }
@@ -387,12 +379,14 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$version_info = $this->get_cached_version_info( $slug ); $version_info = $this->get_cached_version_info( $slug );
if ( false === $version_info ) { if ( false === $version_info ) {
$version_info = $this->single_request( 'plugin_latest_version', array( $version_info = $this->single_request(
'slug' => $slug, array(
'license' => $data['license'], 'slug' => $slug,
'item_name' => $data['title'], 'license' => $data['license'],
'version' => $plugin_data['Version'] 'item_name' => $data['title'],
) ); 'version' => $plugin_data['Version'],
)
);
$this->set_version_info_cache( $slug, $version_info ); $this->set_version_info_cache( $slug, $version_info );
} }
@@ -400,42 +394,39 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) { if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
//show update version block if new version > then current //show update version block if new version > then current
if ( version_compare( $plugin_data['Version'], $version_info->new_version, '<' ) ) { if ( version_compare( $plugin_data['Version'], $version_info->new_version, '<' ) ) {
$_transient_data->response[ $slug ] = $version_info; $_transient_data->response[ $slug ] = $version_info;
$_transient_data->response[ $slug ]->plugin = $slug; $_transient_data->response[ $slug ]->plugin = $slug;
} else { } else {
$_transient_data->no_update[ $slug ] = $version_info; $_transient_data->no_update[ $slug ] = $version_info;
$_transient_data->no_update[ $slug ]->plugin = $slug; $_transient_data->no_update[ $slug ]->plugin = $slug;
} }
$_transient_data->last_checked = time(); $_transient_data->last_checked = time();
$_transient_data->checked[ $slug ] = $plugin_data['Version']; $_transient_data->checked[ $slug ] = $plugin_data['Version'];
} elseif ( false !== $version_info && is_object( $version_info ) && ! isset( $version_info->new_version ) ) { } elseif ( false !== $version_info && is_object( $version_info ) && ! isset( $version_info->new_version ) ) {
$_transient_data->no_update[ $slug ] = $version_info; $_transient_data->no_update[ $slug ] = $version_info;
$_transient_data->no_update[ $slug ]->plugin = $slug; $_transient_data->no_update[ $slug ]->plugin = $slug;
$_transient_data->last_checked = time(); $_transient_data->last_checked = time();
$_transient_data->checked[ $slug ] = $plugin_data['Version']; $_transient_data->checked[ $slug ] = $plugin_data['Version'];
} }
} }
return $_transient_data; return $_transient_data;
} }
/** /**
* Calls the API and, if successfull, returns the object delivered by the API. * Calls the API and, if successfully, returns the object delivered by the API.
* *
* @uses get_bloginfo() * @uses get_bloginfo()
* @uses wp_remote_post() * @uses wp_remote_post()
* @uses is_wp_error() * @uses is_wp_error()
* *
* @param string $_action The requested action. * @param array $_data Parameters for the API action.
* @param array $_data Parameters for the API action.
* @return false|object * @return false|object
*/ */
private function single_request( $_action, $_data ) { private function single_request( $_data ) {
$api_params = array( $api_params = array(
'edd_action' => 'get_version', 'edd_action' => 'get_version',
'author' => 'Ultimate Member', 'author' => 'Ultimate Member',
@@ -445,12 +436,12 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$api_params = array_merge( $api_params, $_data ); $api_params = array_merge( $api_params, $_data );
$request = wp_remote_post( $request = wp_remote_post(
UM()->store_url, UM()::$store_url,
array( array(
'timeout' => UM()->request_timeout, 'timeout' => UM()::$request_timeout,
'sslverify' => false, 'sslverify' => false,
'body' => $api_params 'body' => $api_params,
) )
); );
@@ -473,7 +464,7 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$request->icons = maybe_unserialize( $request->icons ); $request->icons = maybe_unserialize( $request->icons );
} }
if( ! empty( $request->sections ) ) { if ( ! empty( $request->sections ) ) {
foreach ( $request->sections as $key => $section ) { foreach ( $request->sections as $key => $section ) {
$request->$key = (array) $section; $request->$key = (array) $section;
} }
@@ -490,7 +481,6 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
return $request; return $request;
} }
/** /**
* Updates information on the "View version x.x details" popup with custom data. * Updates information on the "View version x.x details" popup with custom data.
* *
@@ -499,9 +489,9 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
* @param object $_args * @param object $_args
* @return object $_data * @return object $_data
*/ */
function plugin_information( $_data, $_action = '', $_args = null ) { public function plugin_information( $_data, $_action = '', $_args = null ) {
//by default $data = false (from Wordpress) //by default $data = false (from WordPress)
if ( $_action != 'plugin_information' ) { if ( 'plugin_information' !== $_action ) {
return $_data; return $_data;
} }
@@ -513,19 +503,21 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
if ( false === $api_request_transient ) { if ( false === $api_request_transient ) {
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $slug ); $plugin_data = get_plugin_data( WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $slug );
$api_request_transient = $this->single_request( 'plugin_latest_version', array( $api_request_transient = $this->single_request(
'slug' => $slug, array(
'license' => $data['license'], 'slug' => $slug,
'item_name' => $data['title'], 'license' => $data['license'],
'version' => $plugin_data['Version'] 'item_name' => $data['title'],
) ); 'version' => $plugin_data['Version'],
)
);
$this->set_version_info_cache( $slug, $api_request_transient ); $this->set_version_info_cache( $slug, $api_request_transient );
} }
break; break;
} }
} }
//If we have no transient-saved value, run the API, set a fresh transient with the API value, and return that value too right now. // If we have no transient-saved value, run the API, set a fresh transient with the API value, and return that value too right now.
if ( isset( $api_request_transient ) ) { if ( isset( $api_request_transient ) ) {
$_data = $api_request_transient; $_data = $api_request_transient;
} }
@@ -533,23 +525,6 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
return $_data; return $_data;
} }
/**
* Disable SSL verification in order to prevent download update failures
*
* @param array $args
* @param string $url
* @return array $array
*/
function http_request_args( $args, $url ) {
// If it is an https request and we are performing a package download, disable ssl verification
if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'action=package_download' ) ) {
$args['sslverify'] = false;
}
return $args;
}
/** /**
* Download extension URL * Download extension URL
* *
@@ -559,51 +534,46 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
* *
* @return string * @return string
*/ */
function extend_download_url( $download_url, $slug, $data ) { private function extend_download_url( $download_url, $slug, $data ) {
$url = get_site_url( get_current_blog_id() );
$url = get_site_url( get_current_blog_id() ); $domain = strtolower( urlencode( rtrim( $url, '/' ) ) );
$domain = strtolower( urlencode( rtrim( $url, '/' ) ) );
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $slug ); $plugin_data = get_plugin_data( WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $slug );
$api_params = array( $api_params = array(
'action' => 'get_last_version', 'action' => 'get_last_version',
'license' => ! empty( $data['license'] ) ? $data['license'] : '', 'license' => ! empty( $data['license'] ) ? $data['license'] : '',
'item_name' => str_replace( 'Ultimate Member - ', '', $plugin_data['Name'] ), 'item_name' => str_replace( 'Ultimate Member - ', '', $plugin_data['Name'] ),
'blog_id' => get_current_blog_id(), 'blog_id' => get_current_blog_id(),
'site_url' => urlencode( $url ), 'site_url' => urlencode( $url ),
'domain' => urlencode( $domain ), 'domain' => urlencode( $domain ),
'slug' => urlencode( $slug ), 'slug' => urlencode( $slug ),
); );
$download_url = add_query_arg( $api_params, $download_url ); return add_query_arg( $api_params, $download_url );
return $download_url;
} }
/** /**
* @param $slug * @param $slug
* *
* @return bool|string * @return bool|string
*/ */
function get_cache_key( $slug ) { private function get_cache_key( $slug ) {
$exts = $this->get_active_plugins(); $exts = $this->get_active_plugins();
if ( empty( $exts[ $slug ] ) ) { if ( empty( $exts[ $slug ] ) ) {
return false; return false;
} }
return 'edd_sl_' . md5( serialize( $slug . $exts[ $slug ]['license'] ) ); return 'edd_sl_' . md5( maybe_serialize( $slug . $exts[ $slug ]['license'] ) );
} }
/** /**
* @param $slug * @param $slug
* *
* @return array|bool|mixed|object * @return array|bool|mixed|object
*/ */
function get_cached_version_info( $slug ) { private function get_cached_version_info( $slug ) {
$cache_key = $this->get_cache_key( $slug ); $cache_key = $this->get_cache_key( $slug );
if ( empty( $cache_key ) ) { if ( empty( $cache_key ) ) {
return false; return false;
@@ -629,12 +599,11 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
return $cache['value']; return $cache['value'];
} }
/** /**
* @param $slug * @param string $slug
* @param string $value * @param string $value
*/ */
function set_version_info_cache( $slug, $value = '' ) { private function set_version_info_cache( $slug, $value = '' ) {
$cache_key = $this->get_cache_key( $slug ); $cache_key = $this->get_cache_key( $slug );
if ( empty( $cache_key ) ) { if ( empty( $cache_key ) ) {
return; return;
@@ -642,11 +611,10 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
$data = array( $data = array(
'timeout' => strtotime( '+6 hours', time() ), 'timeout' => strtotime( '+6 hours', time() ),
'value' => json_encode( $value ) 'value' => wp_json_encode( $value ),
); );
update_option( $cache_key, $data, 'no' ); update_option( $cache_key, $data, 'no' );
} }
} }
} }