Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21738 from Prospress/issue_21736 

Add SSL check to dashboard SSL notice
This commit is contained in:
Claudiu Lodromanean 2018-11-14 12:51:50 -05:00 committed by GitHub
parent 29325898bb 427d7df7fb
commit 81be4f4795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
includes/admin/class-wc-admin-notices.php
View File

@ -83,17 +83,16 @@ class WC_Admin_Notices {
public static function reset_admin_notices() {
$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
$location = wc_get_base_location();
$shop_page = 0 < wc_get_page_id( 'shop' ) ? get_permalink( wc_get_page_id( 'shop' ) ) : get_home_url();
if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] && in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ), true ) ) {
WC_Admin_Notices::add_notice( 'simplify_commerce' );
self::add_notice( 'simplify_commerce' );
}
if ( ! is_ssl() || 'https' !== substr( $shop_page, 0, 5 ) ) {
WC_Admin_Notices::add_notice( 'no_secure_connection' );
if ( ! self::is_ssl() ) {
self::add_notice( 'no_secure_connection' );
}
WC_Admin_Notices::add_wootenberg_feature_plugin_notice();
self::add_wootenberg_feature_plugin_notice();
self::add_notice( 'template_files' );
}
@ -354,7 +353,7 @@ class WC_Admin_Notices {
* Notice about secure connection.
*/
public static function secure_connection_notice() {
if ( get_user_meta( get_current_user_id(), 'dismissed_no_secure_connection_notice', true ) ) {
if ( self::is_ssl() || get_user_meta( get_current_user_id(), 'dismissed_no_secure_connection_notice', true ) ) {
return;
}
@ -396,6 +395,19 @@ class WC_Admin_Notices {
include dirname( __FILE__ ) . '/views/html-notice-wootenberg.php';
}
/**
* Determine if the store is running SSL.
*
* @return bool Flag SSL enabled.
* @since 3.5.1
*/
protected static function is_ssl() {
$shop_page = 0 < wc_get_page_id( 'shop' ) ? get_permalink( wc_get_page_id( 'shop' ) ) : get_home_url();
return ( is_ssl() && 'https' === substr( $shop_page, 0, 5 ) );
}
}
WC_Admin_Notices::init();