diff --git a/changelog.txt b/changelog.txt index 473f63e..600f819 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,10 @@ == Changelog == += 2.0.6 - NOV 9 2022 = +- NEW: Typography: Option to choose font format for local Google fonts feature (Customize > Typography > General). +- Fixed: Custom CSS: Custom Styling Location option doesn't store custom css. +- Updated: Plugin description. + = 2.0.5 = - Fixed: Customizer Styling Import: Potential vulnerability patch: WPScan report #5596728. diff --git a/includes/admin-bar/admin-bar.php b/includes/admin-bar/admin-bar.php index dc79b0c..6150a3e 100644 --- a/includes/admin-bar/admin-bar.php +++ b/includes/admin-bar/admin-bar.php @@ -21,6 +21,7 @@ public function __construct() { } add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_css' ) ); + add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_css' ) ); add_action( 'admin_bar_menu', array( $this, 'register' ), 999 ); } @@ -43,7 +44,7 @@ public function has_access() { * Add "Ocean" item to new-content admin bar menu item */ public function admin_bar( $wp_admin_bar ) { - if ( ! is_admin_bar_showing() || ! wpforms_current_user_can( 'create_forms' ) ) { + if ( ! is_admin_bar_showing() ) { return; } diff --git a/includes/admin-bar/assets/css/admin-bar.css b/includes/admin-bar/assets/css/admin-bar.css index 2b8c93d..e293352 100644 --- a/includes/admin-bar/assets/css/admin-bar.css +++ b/includes/admin-bar/assets/css/admin-bar.css @@ -21,6 +21,7 @@ .wp-ui-notification.ocean-menu-notification-counter, .wp-ui-notification.ocean-menu-notification-indicator { background-color: #19bbf1 !important; + color: #ffffff; } #wpadminbar .ocean-menu-notification-indicator:after { diff --git a/includes/admin-bar/assets/css/admin-bar.min.css b/includes/admin-bar/assets/css/admin-bar.min.css index 7f7f3e7..414ef1d 100644 --- a/includes/admin-bar/assets/css/admin-bar.min.css +++ b/includes/admin-bar/assets/css/admin-bar.min.css @@ -1 +1 @@ -#wpadminbar .ocean-menu-notification-counter{display:inline-block!important;min-width:18px!important;height:18px!important;border-radius:9px!important;margin:7px 0 0 2px!important;vertical-align:top!important;font-size:11px!important;line-height:1.6!important;text-align:center!important}#wpadminbar .ocean-menu-notification-indicator{float:right!important;margin:10px 0 0!important;width:8px!important;height:8px!important;border-radius:2px!important}.wp-ui-notification.ocean-menu-notification-counter,.wp-ui-notification.ocean-menu-notification-indicator{background-color:#19bbf1!important}#wpadminbar .ocean-menu-notification-indicator:after{display:block!important;content:"";position:absolute!important;width:inherit!important;height:inherit!important;border-radius:inherit!important;background-color:inherit!important;animation:ocean-menu-notification-indicator-pulse 1.5s infinite!important}@keyframes ocean-menu-notification-indicator-pulse{0%{transform:scale(1);opacity:1}100%{transform:scale(3);opacity:0}} \ No newline at end of file +#wpadminbar .ocean-menu-notification-counter{display:inline-block!important;min-width:18px!important;height:18px!important;border-radius:9px!important;margin:7px 0 0 2px!important;vertical-align:top!important;font-size:11px!important;line-height:1.6!important;text-align:center!important}#wpadminbar .ocean-menu-notification-indicator{float:right!important;margin:10px 0 0!important;width:8px!important;height:8px!important;border-radius:2px!important}.wp-ui-notification.ocean-menu-notification-counter,.wp-ui-notification.ocean-menu-notification-indicator{background-color:#19bbf1!important;color:#ffffff;}#wpadminbar .ocean-menu-notification-indicator:after{display:block!important;content:"";position:absolute!important;width:inherit!important;height:inherit!important;border-radius:inherit!important;background-color:inherit!important;animation:ocean-menu-notification-indicator-pulse 1.5s infinite!important}@keyframes ocean-menu-notification-indicator-pulse{0%{transform:scale(1);opacity:1}100%{transform:scale(3);opacity:0}} \ No newline at end of file diff --git a/includes/admin-bar/notifications.php b/includes/admin-bar/notifications.php index 3b04f3a..7321c86 100644 --- a/includes/admin-bar/notifications.php +++ b/includes/admin-bar/notifications.php @@ -124,7 +124,7 @@ public function check_dates( $notifications ) { public function get() { $option = $this->get_option(); - if (empty($option['update']) || time() > $option['update'] + DAY_IN_SECONDS) { + if ( empty( $option['update'] ) || time() > $option['update'] + DAY_IN_SECONDS ) { if ( ! wp_next_scheduled( 'ocean_admin_notifications_update' ) ) { wp_schedule_single_event( time() + 60, 'ocean_admin_notifications_update' ); } diff --git a/includes/compatibility/ocean.php b/includes/compatibility/ocean.php index 403e6f2..07f1025 100644 --- a/includes/compatibility/ocean.php +++ b/includes/compatibility/ocean.php @@ -171,10 +171,28 @@ function ocean_get_google_font_css( $url ) { if ( strpos( $url, 'https:' ) === false && strpos( $url, 'http:' ) === false ) { $url = 'https:' . $url; } + + $font_format = get_theme_mod( 'ocean_local_google_font_format', 'ttf' ); + switch ( $font_format ) { + case 'ttf': + $user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 6.1; et; rv:1.9.1.9) Gecko/20100315 Firefox/3.5.9'; + break; + case 'woff': + $user_agent = 'Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.0'; + break; + case 'woff2': + $user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36'; + break; + default: + $user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 6.1; et; rv:1.9.1.9) Gecko/20100315 Firefox/3.5.9'; + break; + } + $request = wp_safe_remote_get( $url, array( 'sslverify' => false, + 'user-agent' => $user_agent, ) ); if ( is_wp_error( $request ) ) { @@ -242,7 +260,6 @@ function oceanwp_webfonts_local_font_url( $url ) { // Setup theme => Generate the custom CSS file. add_action( 'admin_bar_init', 'ocean_save_customizer_css_in_file', 9999 ); if ( ! function_exists( 'ocean_save_customizer_css_in_file' ) ) { - function ocean_save_customizer_css_in_file( $output = null ) { // If Custom File is not selected. @@ -259,17 +276,16 @@ function ocean_save_customizer_css_in_file( $output = null ) { // Minified the Custom CSS. $output .= oceanwp_minify_css( $output_custom_css ); - // We will probably need to load this file. - require_once ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'file.php'; - $upload_dir = wp_upload_dir(); // Grab uploads folder array. $dir = trailingslashit( $upload_dir['basedir'] ) . 'oceanwp' . DIRECTORY_SEPARATOR; // Set storage directory path. - - if ( ! file_exists( untrailingslashit( $dir ) ) ) { - if ( mkdir( untrailingslashit( $dir ), FS_CHMOD_DIR ) ) { - if ( file_put_contents( $dir . 'custom-style.css', $output ) ) { - chmod( $filename, 0644 ); - } + $untraling_dir = untrailingslashit( $dir ); + if ( ! file_exists( $untraling_dir ) ) { + mkdir( $untraling_dir, FS_CHMOD_DIR ); + } + if( file_exists( $untraling_dir ) ) { + $filename = $dir . 'custom-style.css'; + if ( file_put_contents( $filename, $output ) ) { + chmod( $filename, 0644 ); } } } diff --git a/includes/panel/demos.php b/includes/panel/demos.php index 5ba950b..9b9c8df 100644 --- a/includes/panel/demos.php +++ b/includes/panel/demos.php @@ -1007,14 +1007,14 @@ public static function ajax_demo_data() {
', '' ); ?>