From 5fd75bcdf65dd642106ad26def08d689b6c5f840 Mon Sep 17 00:00:00 2001 From: Hai Zheng Date: Thu, 12 Oct 2023 14:31:09 -0400 Subject: [PATCH] v5.8-a11: * **Conf** CloudFlare CDN setting vulnerability patch. (Gulshan Kumar #541805) --- litespeed-cache.php | 4 +- readme.txt | 1 + src/admin-display.cls.php | 800 ++++++++++++++++++++------------------ tpl/cdn/manage.tpl.php | 4 +- 4 files changed, 425 insertions(+), 384 deletions(-) diff --git a/litespeed-cache.php b/litespeed-cache.php index b558da181..e9fbf3946 100644 --- a/litespeed-cache.php +++ b/litespeed-cache.php @@ -4,7 +4,7 @@ * Plugin Name: LiteSpeed Cache * Plugin URI: https://www.litespeedtech.com/products/cache-plugins/wordpress-acceleration * Description: High-performance page caching and site optimization from LiteSpeed - * Version: 5.8-a10 + * Version: 5.8-a11 * Author: LiteSpeed Technologies * Author URI: https://www.litespeedtech.com * License: GPLv3 @@ -34,7 +34,7 @@ return; } -!defined('LSCWP_V') && define('LSCWP_V', '5.8-a10'); +!defined('LSCWP_V') && define('LSCWP_V', '5.8-a11'); !defined('LSCWP_CONTENT_DIR') && define('LSCWP_CONTENT_DIR', WP_CONTENT_DIR); !defined('LSCWP_DIR') && define('LSCWP_DIR', __DIR__ . '/'); // Full absolute path '/var/www/html/***/wp-content/plugins/litespeed-cache/' or MU diff --git a/readme.txt b/readme.txt index 755c14db4..282734c5c 100644 --- a/readme.txt +++ b/readme.txt @@ -256,6 +256,7 @@ The vast majority of plugins and themes are compatible with LiteSpeed Cache. The * **Purge** Purge will not show QC message if no queue is cleared. * **Purge** Fixed an possible warning when post type is not as expected. (victorzink) * **Conf** Server IP field can now be emptiable. (#111647) +* **Conf** CloudFlare CDN setting vulnerability patch. (Gulshan Kumar #541805) * **Crawler** Suppressed sitemap generation msg when running by cron. * **VPI** VPI can now support non-alphabet filenames. * **VPI** Fixed PHP8.2 deprecated warning. (Ryan D) diff --git a/src/admin-display.cls.php b/src/admin-display.cls.php index 8f01db95c..9b2ea65af 100644 --- a/src/admin-display.cls.php +++ b/src/admin-display.cls.php @@ -1,4 +1,5 @@ */ + namespace LiteSpeed; -defined( 'WPINC' ) || exit; +defined('WPINC') || exit; -class Admin_Display extends Base { +class Admin_Display extends Base +{ const LOG_TAG = '👮‍♀️'; const NOTICE_BLUE = 'notice notice-info'; @@ -46,30 +49,30 @@ class Admin_Display extends Base { * * @since 1.0.7 */ - public function __construct() { + public function __construct() + { // main css - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ) ); + add_action('admin_enqueue_scripts', array($this, 'enqueue_style')); // Main js - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); $this->_is_network_admin = is_network_admin(); $this->_is_multisite = is_multisite(); // Quick access menu - if ( is_multisite() && $this->_is_network_admin ) { + if (is_multisite() && $this->_is_network_admin) { $manage = 'manage_network_options'; - } - else { + } else { $manage = 'manage_options'; } - if ( current_user_can( $manage ) ) { - if ( ! defined( 'LITESPEED_DISABLE_ALL' ) ) { - add_action( 'wp_before_admin_bar_render', array( GUI::cls(), 'backend_shortcut' ) ); + if (current_user_can($manage)) { + if (!defined('LITESPEED_DISABLE_ALL')) { + add_action('wp_before_admin_bar_render', array(GUI::cls(), 'backend_shortcut')); } // `admin_notices` is after `admin_enqueue_scripts` // @see wp-admin/admin-header.php - add_action( $this->_is_network_admin ? 'network_admin_notices' : 'admin_notices', array( $this, 'display_messages' ) ); + add_action($this->_is_network_admin ? 'network_admin_notices' : 'admin_notices', array($this, 'display_messages')); } /** @@ -77,19 +80,18 @@ public function __construct() { * @see https://codex.wordpress.org/Function_Reference/is_plugin_active_for_network * @since 2.0 */ - if ( ! function_exists( 'is_plugin_active_for_network' ) ) { - require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); + if (!function_exists('is_plugin_active_for_network')) { + require_once(ABSPATH . '/wp-admin/includes/plugin.php'); } // add menus ( Also check for mu-plugins) - if ( $this->_is_network_admin && ( is_plugin_active_for_network( LSCWP_BASENAME ) || defined( 'LSCWP_MU_PLUGIN' ) ) ) { - add_action( 'network_admin_menu', array( $this, 'register_admin_menu' ) ); - } - else { - add_action( 'admin_menu', array( $this, 'register_admin_menu' ) ); + if ($this->_is_network_admin && (is_plugin_active_for_network(LSCWP_BASENAME) || defined('LSCWP_MU_PLUGIN'))) { + add_action('network_admin_menu', array($this, 'register_admin_menu')); + } else { + add_action('admin_menu', array($this, 'register_admin_menu')); } - $this->cls( 'Metabox' )->register_settings(); + $this->cls('Metabox')->register_settings(); } /** @@ -98,8 +100,9 @@ public function __construct() { * @since 3.0 * @access public */ - public function title( $id ) { - echo Lang::title( $id ); + public function title($id) + { + echo Lang::title($id); } /** @@ -108,33 +111,34 @@ public function title( $id ) { * @since 1.0.0 * @access public */ - public function register_admin_menu() { + public function register_admin_menu() + { $capability = $this->_is_network_admin ? 'manage_network_options' : 'manage_options'; - if ( current_user_can( $capability ) ) { + if (current_user_can($capability)) { // root menu - add_menu_page( 'LiteSpeed Cache', 'LiteSpeed Cache', 'manage_options', 'litespeed' ); + add_menu_page('LiteSpeed Cache', 'LiteSpeed Cache', 'manage_options', 'litespeed'); // sub menus - $this->_add_submenu( __( 'Dashboard', 'litespeed-cache' ), 'litespeed', 'show_menu_dash' ); + $this->_add_submenu(__('Dashboard', 'litespeed-cache'), 'litespeed', 'show_menu_dash'); - $this->_add_submenu( __( 'Presets', 'litespeed-cache' ), 'litespeed-presets', 'show_menu_presets' ); + $this->_add_submenu(__('Presets', 'litespeed-cache'), 'litespeed-presets', 'show_menu_presets'); - $this->_add_submenu( __( 'General', 'litespeed-cache' ), 'litespeed-general', 'show_menu_general' ); + $this->_add_submenu(__('General', 'litespeed-cache'), 'litespeed-general', 'show_menu_general'); - $this->_add_submenu( __( 'Cache', 'litespeed-cache' ), 'litespeed-cache', 'show_menu_cache' ); + $this->_add_submenu(__('Cache', 'litespeed-cache'), 'litespeed-cache', 'show_menu_cache'); - ! $this->_is_network_admin && $this->_add_submenu( __( 'CDN', 'litespeed-cache' ), 'litespeed-cdn', 'show_menu_cdn' ); + !$this->_is_network_admin && $this->_add_submenu(__('CDN', 'litespeed-cache'), 'litespeed-cdn', 'show_menu_cdn'); - $this->_add_submenu( __( 'Image Optimization', 'litespeed-cache' ), 'litespeed-img_optm', 'show_img_optm' ); + $this->_add_submenu(__('Image Optimization', 'litespeed-cache'), 'litespeed-img_optm', 'show_img_optm'); - ! $this->_is_network_admin && $this->_add_submenu( __( 'Page Optimization', 'litespeed-cache' ), 'litespeed-page_optm', 'show_page_optm' ); + !$this->_is_network_admin && $this->_add_submenu(__('Page Optimization', 'litespeed-cache'), 'litespeed-page_optm', 'show_page_optm'); - $this->_add_submenu( __( 'Database', 'litespeed-cache' ), 'litespeed-db_optm', 'show_db_optm' ); + $this->_add_submenu(__('Database', 'litespeed-cache'), 'litespeed-db_optm', 'show_db_optm'); - ! $this->_is_network_admin && $this->_add_submenu( __( 'Crawler', 'litespeed-cache' ), 'litespeed-crawler', 'show_crawler' ); + !$this->_is_network_admin && $this->_add_submenu(__('Crawler', 'litespeed-cache'), 'litespeed-crawler', 'show_crawler'); - $this->_add_submenu( __( 'Toolbox', 'litespeed-cache' ), 'litespeed-toolbox', 'show_toolbox' ); + $this->_add_submenu(__('Toolbox', 'litespeed-cache'), 'litespeed-toolbox', 'show_toolbox'); // sub menus under options add_options_page('LiteSpeed Cache', 'LiteSpeed Cache', $capability, 'litespeed-cache-options', array($this, 'show_menu_cache')); @@ -150,8 +154,9 @@ public function register_admin_menu() { * @param string $menu_slug The slug of the page. * @param string $callback The callback to call if selected. */ - private function _add_submenu( $menu_title, $menu_slug, $callback ) { - add_submenu_page( 'litespeed', $menu_title, $menu_title, 'manage_options', $menu_slug, array( $this, $callback ) ); + private function _add_submenu($menu_title, $menu_slug, $callback) + { + add_submenu_page('litespeed', $menu_title, $menu_title, 'manage_options', $menu_slug, array($this, $callback)); } /** @@ -160,7 +165,8 @@ private function _add_submenu( $menu_title, $menu_slug, $callback ) { * @since 1.0.14 * @access public */ - public function enqueue_style() { + public function enqueue_style() + { wp_enqueue_style(Core::PLUGIN_NAME, LSWCP_PLUGIN_URL . 'assets/css/litespeed.css', array(), Core::VER, 'all'); } @@ -170,95 +176,96 @@ public function enqueue_style() { * @since 1.0.0 * @access public */ - public function enqueue_scripts() { - wp_register_script( Core::PLUGIN_NAME, LSWCP_PLUGIN_URL . 'assets/js/litespeed-cache-admin.js', array(), Core::VER, false ); + public function enqueue_scripts() + { + wp_register_script(Core::PLUGIN_NAME, LSWCP_PLUGIN_URL . 'assets/js/litespeed-cache-admin.js', array(), Core::VER, false); $localize_data = array(); - if ( GUI::has_whm_msg() ) { - $ajax_url_dismiss_whm = Utility::build_url( Core::ACTION_DISMISS, GUI::TYPE_DISMISS_WHM, true ); - $localize_data[ 'ajax_url_dismiss_whm' ] = $ajax_url_dismiss_whm; + if (GUI::has_whm_msg()) { + $ajax_url_dismiss_whm = Utility::build_url(Core::ACTION_DISMISS, GUI::TYPE_DISMISS_WHM, true); + $localize_data['ajax_url_dismiss_whm'] = $ajax_url_dismiss_whm; } - if ( GUI::has_msg_ruleconflict() ) { - $ajax_url = Utility::build_url( Core::ACTION_DISMISS, GUI::TYPE_DISMISS_EXPIRESDEFAULT, true ); - $localize_data[ 'ajax_url_dismiss_ruleconflict' ] = $ajax_url; + if (GUI::has_msg_ruleconflict()) { + $ajax_url = Utility::build_url(Core::ACTION_DISMISS, GUI::TYPE_DISMISS_EXPIRESDEFAULT, true); + $localize_data['ajax_url_dismiss_ruleconflict'] = $ajax_url; } - $promo_tag = GUI::cls()->show_promo( true ); - if ( $promo_tag ) { - $ajax_url_promo = Utility::build_url( Core::ACTION_DISMISS, GUI::TYPE_DISMISS_PROMO, true, null, array( 'promo_tag' => $promo_tag ) ); - $localize_data[ 'ajax_url_promo' ] = $ajax_url_promo; + $promo_tag = GUI::cls()->show_promo(true); + if ($promo_tag) { + $ajax_url_promo = Utility::build_url(Core::ACTION_DISMISS, GUI::TYPE_DISMISS_PROMO, true, null, array('promo_tag' => $promo_tag)); + $localize_data['ajax_url_promo'] = $ajax_url_promo; } // Injection to LiteSpeed pages global $pagenow; - if ( $pagenow == 'admin.php' && ! empty( $_GET[ 'page' ] ) && ( strpos( $_GET[ 'page' ], 'litespeed-' ) === 0 || $_GET[ 'page' ] == 'litespeed' ) ) { + if ($pagenow == 'admin.php' && !empty($_GET['page']) && (strpos($_GET['page'], 'litespeed-') === 0 || $_GET['page'] == 'litespeed')) { // Admin footer add_filter('admin_footer_text', array($this, 'admin_footer_text'), 1); - if ( $_GET[ 'page' ] == 'litespeed-crawler' || $_GET[ 'page' ] == 'litespeed-cdn' ) { + if ($_GET['page'] == 'litespeed-crawler' || $_GET['page'] == 'litespeed-cdn') { // Babel JS type correction - add_filter( 'script_loader_tag', array( $this, 'bable_type' ), 10, 3 ); + add_filter('script_loader_tag', array($this, 'bable_type'), 10, 3); - wp_enqueue_script( Core::PLUGIN_NAME . '-lib-react', LSWCP_PLUGIN_URL . 'assets/js/react.min.js', array(), Core::VER, false ); - wp_enqueue_script( Core::PLUGIN_NAME . '-lib-babel', LSWCP_PLUGIN_URL . 'assets/js/babel.min.js', array(), Core::VER, false ); + wp_enqueue_script(Core::PLUGIN_NAME . '-lib-react', LSWCP_PLUGIN_URL . 'assets/js/react.min.js', array(), Core::VER, false); + wp_enqueue_script(Core::PLUGIN_NAME . '-lib-babel', LSWCP_PLUGIN_URL . 'assets/js/babel.min.js', array(), Core::VER, false); } // Crawler Cookie Simulation - if ( $_GET[ 'page' ] == 'litespeed-crawler' ) { - wp_enqueue_script( Core::PLUGIN_NAME . '-crawler', LSWCP_PLUGIN_URL . 'assets/js/component.crawler.js', array(), Core::VER, false ); - $localize_data[ 'lang' ] = array(); - $localize_data[ 'lang' ][ 'cookie_name' ] = __( 'Cookie Name', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'cookie_value' ] = __( 'Cookie Values', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'one_per_line' ] = Doc::one_per_line( true ); - $localize_data[ 'lang' ][ 'remove_cookie_simulation' ] = __( 'Remove cookie simulation', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'add_cookie_simulation_row' ] = __( 'Add new cookie to simulate', 'litespeed-cache' ); - empty( $localize_data[ 'ids' ] ) && $localize_data[ 'ids' ] = array(); - $localize_data[ 'ids' ][ 'crawler_cookies' ] = self::O_CRAWLER_COOKIES; + if ($_GET['page'] == 'litespeed-crawler') { + wp_enqueue_script(Core::PLUGIN_NAME . '-crawler', LSWCP_PLUGIN_URL . 'assets/js/component.crawler.js', array(), Core::VER, false); + $localize_data['lang'] = array(); + $localize_data['lang']['cookie_name'] = __('Cookie Name', 'litespeed-cache'); + $localize_data['lang']['cookie_value'] = __('Cookie Values', 'litespeed-cache'); + $localize_data['lang']['one_per_line'] = Doc::one_per_line(true); + $localize_data['lang']['remove_cookie_simulation'] = __('Remove cookie simulation', 'litespeed-cache'); + $localize_data['lang']['add_cookie_simulation_row'] = __('Add new cookie to simulate', 'litespeed-cache'); + empty($localize_data['ids']) && $localize_data['ids'] = array(); + $localize_data['ids']['crawler_cookies'] = self::O_CRAWLER_COOKIES; } // CDN mapping - if ( $_GET[ 'page' ] == 'litespeed-cdn' ) { - $home_url = home_url( '/' ); - $parsed = parse_url( $home_url ); - $home_url = str_replace( $parsed[ 'scheme' ] . ':', '', $home_url ); - $cdn_url = 'https://cdn.' . substr( $home_url, 2 ); - - wp_enqueue_script( Core::PLUGIN_NAME . '-cdn', LSWCP_PLUGIN_URL . 'assets/js/component.cdn.js', array(), Core::VER, false ); - $localize_data[ 'lang' ] = array(); - $localize_data[ 'lang' ][ 'cdn_mapping_url' ] = Lang::title( self::CDN_MAPPING_URL ); - $localize_data[ 'lang' ][ 'cdn_mapping_inc_img' ] = Lang::title( self::CDN_MAPPING_INC_IMG ); - $localize_data[ 'lang' ][ 'cdn_mapping_inc_css' ] = Lang::title( self::CDN_MAPPING_INC_CSS ); - $localize_data[ 'lang' ][ 'cdn_mapping_inc_js' ] = Lang::title( self::CDN_MAPPING_INC_JS ); - $localize_data[ 'lang' ][ 'cdn_mapping_filetype' ] = Lang::title( self::CDN_MAPPING_FILETYPE ); - $localize_data[ 'lang' ][ 'cdn_mapping_url_desc' ] = sprintf( __( 'CDN URL to be used. For example, %s', 'litespeed-cache' ), '' . $cdn_url . '' ); - $localize_data[ 'lang' ][ 'one_per_line' ] = Doc::one_per_line( true ); - $localize_data[ 'lang' ][ 'cdn_mapping_remove' ] = __( 'Remove CDN URL', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'add_cdn_mapping_row' ] = __( 'Add new CDN URL', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'on' ] = __( 'ON', 'litespeed-cache' ); - $localize_data[ 'lang' ][ 'off' ] = __( 'OFF', 'litespeed-cache' ); - empty( $localize_data[ 'ids' ] ) && $localize_data[ 'ids' ] = array(); - $localize_data[ 'ids' ][ 'cdn_mapping' ] = self::O_CDN_MAPPING; + if ($_GET['page'] == 'litespeed-cdn') { + $home_url = home_url('/'); + $parsed = parse_url($home_url); + $home_url = str_replace($parsed['scheme'] . ':', '', $home_url); + $cdn_url = 'https://cdn.' . substr($home_url, 2); + + wp_enqueue_script(Core::PLUGIN_NAME . '-cdn', LSWCP_PLUGIN_URL . 'assets/js/component.cdn.js', array(), Core::VER, false); + $localize_data['lang'] = array(); + $localize_data['lang']['cdn_mapping_url'] = Lang::title(self::CDN_MAPPING_URL); + $localize_data['lang']['cdn_mapping_inc_img'] = Lang::title(self::CDN_MAPPING_INC_IMG); + $localize_data['lang']['cdn_mapping_inc_css'] = Lang::title(self::CDN_MAPPING_INC_CSS); + $localize_data['lang']['cdn_mapping_inc_js'] = Lang::title(self::CDN_MAPPING_INC_JS); + $localize_data['lang']['cdn_mapping_filetype'] = Lang::title(self::CDN_MAPPING_FILETYPE); + $localize_data['lang']['cdn_mapping_url_desc'] = sprintf(__('CDN URL to be used. For example, %s', 'litespeed-cache'), '' . $cdn_url . ''); + $localize_data['lang']['one_per_line'] = Doc::one_per_line(true); + $localize_data['lang']['cdn_mapping_remove'] = __('Remove CDN URL', 'litespeed-cache'); + $localize_data['lang']['add_cdn_mapping_row'] = __('Add new CDN URL', 'litespeed-cache'); + $localize_data['lang']['on'] = __('ON', 'litespeed-cache'); + $localize_data['lang']['off'] = __('OFF', 'litespeed-cache'); + empty($localize_data['ids']) && $localize_data['ids'] = array(); + $localize_data['ids']['cdn_mapping'] = self::O_CDN_MAPPING; } // If on Server IP setting page, append getIP link - if ( $_GET[ 'page' ] == 'litespeed-general' ) { - $localize_data[ 'ajax_url_getIP' ] = function_exists( 'get_rest_url' ) ? get_rest_url( null, 'litespeed/v1/tool/check_ip' ) : '/'; - $localize_data[ 'nonce' ] = wp_create_nonce( 'wp_rest' ); + if ($_GET['page'] == 'litespeed-general') { + $localize_data['ajax_url_getIP'] = function_exists('get_rest_url') ? get_rest_url(null, 'litespeed/v1/tool/check_ip') : '/'; + $localize_data['nonce'] = wp_create_nonce('wp_rest'); } // Activate or deactivate a specific crawler - if ( $_GET[ 'page' ] == 'litespeed-crawler' ) { - $localize_data[ 'ajax_url_crawler_switch' ] = function_exists( 'get_rest_url' ) ? get_rest_url( null, 'litespeed/v1/toggle_crawler_state' ) : '/'; - $localize_data[ 'nonce' ] = wp_create_nonce( 'wp_rest' ); + if ($_GET['page'] == 'litespeed-crawler') { + $localize_data['ajax_url_crawler_switch'] = function_exists('get_rest_url') ? get_rest_url(null, 'litespeed/v1/toggle_crawler_state') : '/'; + $localize_data['nonce'] = wp_create_nonce('wp_rest'); } } - if ( $localize_data ) { - wp_localize_script( Core::PLUGIN_NAME, 'litespeed_data', $localize_data ); + if ($localize_data) { + wp_localize_script(Core::PLUGIN_NAME, 'litespeed_data', $localize_data); } - wp_enqueue_script( Core::PLUGIN_NAME ); + wp_enqueue_script(Core::PLUGIN_NAME); } /** @@ -266,8 +273,9 @@ public function enqueue_scripts() { * * @since 3.6 */ - public function bable_type( $tag, $handle, $src ) { - if ( $handle != Core::PLUGIN_NAME . '-crawler' && $handle != Core::PLUGIN_NAME . '-cdn' ) { + public function bable_type($tag, $handle, $src) + { + if ($handle != Core::PLUGIN_NAME . '-crawler' && $handle != Core::PLUGIN_NAME . '-cdn') { return $tag; } @@ -282,7 +290,8 @@ public function bable_type( $tag, $handle, $src ) { * @param array $links Previously added links from other plugins. * @return array Links array with the litespeed cache one appended. */ - public function add_plugin_links($links) { + public function add_plugin_links($links) + { // $links[] = '' . __('Settings', 'litespeed-cache') . ''; $links[] = '' . __('Settings', 'litespeed-cache') . ''; @@ -296,7 +305,8 @@ public function add_plugin_links($links) { * @param string $footer_text * @return string */ - public function admin_footer_text($footer_text) { + public function admin_footer_text($footer_text) + { require_once LSCWP_DIR . 'tpl/inc/admin_footer.php'; return $footer_text; @@ -311,19 +321,19 @@ public function admin_footer_text($footer_text) { * @param string $str The notice message. * @return string The built notice html. */ - public static function build_notice( $color, $str, $irremovable = false ) { + public static function build_notice($color, $str, $irremovable = false) + { $cls = $color; - if ( $irremovable ) { + if ($irremovable) { $cls .= ' litespeed-irremovable'; - } - else { + } else { $cls .= ' is-dismissible'; } // possible translation - $str = Lang::maybe_translate( $str ); + $str = Lang::maybe_translate($str); - return '

'. $str . '

'; + return '

' . $str . '

'; } /** @@ -332,8 +342,9 @@ public static function build_notice( $color, $str, $irremovable = false ) { * @since 1.6.5 * @access public */ - public static function info( $msg, $echo = false, $irremovable = false ) { - self::add_notice( self::NOTICE_BLUE, $msg, $echo, $irremovable ); + public static function info($msg, $echo = false, $irremovable = false) + { + self::add_notice(self::NOTICE_BLUE, $msg, $echo, $irremovable); } /** @@ -342,8 +353,9 @@ public static function info( $msg, $echo = false, $irremovable = false ) { * @since 1.6.5 * @access public */ - public static function note( $msg, $echo = false, $irremovable = false ) { - self::add_notice( self::NOTICE_YELLOW, $msg, $echo, $irremovable ); + public static function note($msg, $echo = false, $irremovable = false) + { + self::add_notice(self::NOTICE_YELLOW, $msg, $echo, $irremovable); } /** @@ -352,12 +364,14 @@ public static function note( $msg, $echo = false, $irremovable = false ) { * @since 1.6 * @access public */ - public static function success( $msg, $echo = false, $irremovable = false ) { - self::add_notice( self::NOTICE_GREEN, $msg, $echo, $irremovable ); + public static function success($msg, $echo = false, $irremovable = false) + { + self::add_notice(self::NOTICE_GREEN, $msg, $echo, $irremovable); } /** @deprecated 4.7 */ - public static function succeed( $msg, $echo = false, $irremovable = false ) { - self::success( $msg, $echo, $irremovable ); + public static function succeed($msg, $echo = false, $irremovable = false) + { + self::success($msg, $echo, $irremovable); } /** @@ -366,16 +380,18 @@ public static function succeed( $msg, $echo = false, $irremovable = false ) { * @since 1.6 * @access public */ - public static function error( $msg, $echo = false, $irremovable = false ) { - self::add_notice( self::NOTICE_RED, $msg, $echo, $irremovable ); + public static function error($msg, $echo = false, $irremovable = false) + { + self::add_notice(self::NOTICE_RED, $msg, $echo, $irremovable); } /** * Add irremovable msg * @since 4.7 */ - public static function add_unique_notice( $color_mode, $msgs, $irremovable = false ) { - if ( ! is_array( $msgs ) ) $msgs = array( $msgs ); + public static function add_unique_notice($color_mode, $msgs, $irremovable = false) + { + if (!is_array($msgs)) $msgs = array($msgs); $color_map = array( 'info' => self::NOTICE_BLUE, @@ -383,20 +399,20 @@ public static function add_unique_notice( $color_mode, $msgs, $irremovable = fal 'success' => self::NOTICE_GREEN, 'error' => self::NOTICE_RED, ); - if ( empty( $color_map[ $color_mode ] ) ) { - self::debug( 'Wrong admin display color mode!' ); + if (empty($color_map[$color_mode])) { + self::debug('Wrong admin display color mode!'); return; } - $color = $color_map[ $color_mode ]; + $color = $color_map[$color_mode]; // Go through to make sure unique $filtered_msgs = array(); - foreach ( $msgs as $k => $str ) { - if( is_numeric( $k ) ) $k = md5( $str ); // Use key to make it overwriteable to previous same msg - $filtered_msgs[ $k ] = $str; + foreach ($msgs as $k => $str) { + if (is_numeric($k)) $k = md5($str); // Use key to make it overwriteable to previous same msg + $filtered_msgs[$k] = $str; } - self::add_notice( $color, $filtered_msgs, false, $irremovable ); + self::add_notice($color, $filtered_msgs, false, $irremovable); } /** @@ -405,49 +421,48 @@ public static function add_unique_notice( $color_mode, $msgs, $irremovable = fal * @since 1.0.7 * @access public */ - public static function add_notice( $color, $msg, $echo = false, $irremovable = false ) { + public static function add_notice($color, $msg, $echo = false, $irremovable = false) + { // Bypass adding for CLI or cron - if ( defined( 'LITESPEED_CLI' ) || defined( 'DOING_CRON' ) ) { + if (defined('LITESPEED_CLI') || defined('DOING_CRON')) { // WP CLI will show the info directly - if ( defined( 'WP_CLI' ) && WP_CLI ) { - if ( ! is_array( $msg ) ) { - $msg = array( $msg ); + if (defined('WP_CLI') && WP_CLI) { + if (!is_array($msg)) { + $msg = array($msg); } - foreach ( $msg as $v ) { - $v = strip_tags( $v ); - if ( $color == self::NOTICE_RED ) { - \WP_CLI::error( $v, false ); - } - else { - \WP_CLI::success( $v ); + foreach ($msg as $v) { + $v = strip_tags($v); + if ($color == self::NOTICE_RED) { + \WP_CLI::error($v, false); + } else { + \WP_CLI::success($v); } } } return; } - if ( $echo ) { - echo self::build_notice( $color, $msg ); + if ($echo) { + echo self::build_notice($color, $msg); return; } $msg_name = $irremovable ? self::DB_MSG_PIN : self::DB_MSG; - $messages = self::get_option( $msg_name, array() ); - if ( ! is_array( $messages ) ) { + $messages = self::get_option($msg_name, array()); + if (!is_array($messages)) { $messages = array(); } - if ( is_array($msg) ) { - foreach ( $msg as $k => $str ) { - $messages[ $k ] = self::build_notice( $color, $str, $irremovable ); + if (is_array($msg)) { + foreach ($msg as $k => $str) { + $messages[$k] = self::build_notice($color, $str, $irremovable); } + } else { + $messages[] = self::build_notice($color, $msg, $irremovable); } - else { - $messages[] = self::build_notice( $color, $msg, $irremovable ); - } - $messages = array_unique( $messages ); - self::update_option( $msg_name, $messages ); + $messages = array_unique($messages); + self::update_option($msg_name, $messages); } /** @@ -456,12 +471,13 @@ public static function add_notice( $color, $msg, $echo = false, $irremovable = f * @since 1.1.0 * @access public */ - public function display_messages() { - if ( ! defined( 'LITESPEED_CONF_LOADED' ) ) { + public function display_messages() + { + if (!defined('LITESPEED_CONF_LOADED')) { $this->_in_upgrading(); } - if ( GUI::has_whm_msg() ) { + if (GUI::has_whm_msg()) { $this->show_display_installed(); } @@ -471,36 +487,36 @@ public function display_messages() { Cloud::cls()->check_dev_version(); // One time msg - $messages = self::get_option( self::DB_MSG, array() ); + $messages = self::get_option(self::DB_MSG, array()); $added_thickbox = false; - if( is_array( $messages ) ) { - foreach ( $messages as $msg ) { + if (is_array($messages)) { + foreach ($messages as $msg) { // Added for popup links - if ( strpos( $msg, 'TB_iframe' ) && ! $added_thickbox ) { + if (strpos($msg, 'TB_iframe') && !$added_thickbox) { add_thickbox(); $added_thickbox = true; } echo $msg; } } - if ( $messages != -1 ) { - self::update_option( self::DB_MSG, -1 ); + if ($messages != -1) { + self::update_option(self::DB_MSG, -1); } // Pinned msg - $messages = self::get_option( self::DB_MSG_PIN, array() ); - if( is_array( $messages ) ) { - foreach ( $messages as $k => $msg ) { + $messages = self::get_option(self::DB_MSG_PIN, array()); + if (is_array($messages)) { + foreach ($messages as $k => $msg) { // Added for popup links - if ( strpos( $msg, 'TB_iframe' ) && ! $added_thickbox ) { + if (strpos($msg, 'TB_iframe') && !$added_thickbox) { add_thickbox(); $added_thickbox = true; } // Append close btn - if ( substr( $msg, -6 ) == '' ) { - $link = Utility::build_url( Core::ACTION_DISMISS, GUI::TYPE_DISMISS_PIN, false, null, array( 'msgid' => $k ) ); - $msg = substr( $msg, 0, -6 ) . '

' . __( 'Dismiss', 'litespeed-cache' ) . '' . '

'; + if (substr($msg, -6) == '') { + $link = Utility::build_url(Core::ACTION_DISMISS, GUI::TYPE_DISMISS_PIN, false, null, array('msgid' => $k)); + $msg = substr($msg, 0, -6) . '

' . __('Dismiss', 'litespeed-cache') . '' . '

'; } echo $msg; } @@ -509,19 +525,19 @@ public function display_messages() { // self::update_option( self::DB_MSG_PIN, -1 ); // } - if( empty( $_GET[ 'page' ] ) || strpos( $_GET[ 'page' ], 'litespeed' ) !== 0 ) { + if (empty($_GET['page']) || strpos($_GET['page'], 'litespeed') !== 0) { global $pagenow; - if ( $pagenow != 'plugins.php' ) { // && $pagenow != 'index.php' + if ($pagenow != 'plugins.php') { // && $pagenow != 'index.php' return; } } // Show disable all warning - if ( defined( 'LITESPEED_DISABLE_ALL' ) ) { - Admin_Display::error( Error::msg( 'disabled_all' ), true ); + if (defined('LITESPEED_DISABLE_ALL')) { + Admin_Display::error(Error::msg('disabled_all'), true); } - if ( ! $this->conf( self::O_NEWS ) ) { + if (!$this->conf(self::O_NEWS)) { return; } @@ -544,21 +560,22 @@ public function display_messages() { * @since 3.5.2 * @access public */ - public static function dismiss_pin() { - if ( ! isset( $_GET[ 'msgid' ] ) ) { + public static function dismiss_pin() + { + if (!isset($_GET['msgid'])) { return; } - $messages = self::get_option( self::DB_MSG_PIN, array() ); - if ( ! is_array( $messages ) || empty( $messages[ $_GET[ 'msgid' ] ] ) ) { + $messages = self::get_option(self::DB_MSG_PIN, array()); + if (!is_array($messages) || empty($messages[$_GET['msgid']])) { return; } - unset( $messages[ $_GET[ 'msgid' ] ] ); - if ( ! $messages ) { + unset($messages[$_GET['msgid']]); + if (!$messages) { $messages = -1; } - self::update_option( self::DB_MSG_PIN, $messages ); + self::update_option(self::DB_MSG_PIN, $messages); } /** @@ -569,7 +586,8 @@ public static function dismiss_pin() { * @since 1.1.0 * @access public */ - public function show_widget_edit($widget, $return, $instance) { + public function show_widget_edit($widget, $return, $instance) + { require LSCWP_DIR . 'tpl/esi_widget_edit.php'; } @@ -579,7 +597,8 @@ public function show_widget_edit($widget, $return, $instance) { * @since 3.0 * @access public */ - public function show_menu_dash() { + public function show_menu_dash() + { require_once LSCWP_DIR . 'tpl/dash/entry.tpl.php'; } @@ -589,7 +608,8 @@ public function show_menu_dash() { * @since 5.3 * @access public */ - public function show_menu_presets() { + public function show_menu_presets() + { require_once LSCWP_DIR . 'tpl/presets/entry.tpl.php'; } @@ -599,7 +619,8 @@ public function show_menu_presets() { * @since 3.0 * @access public */ - public function show_menu_general() { + public function show_menu_general() + { require_once LSCWP_DIR . 'tpl/general/entry.tpl.php'; } @@ -609,7 +630,8 @@ public function show_menu_general() { * @since 3.0 * @access public */ - public function show_menu_cdn() { + public function show_menu_cdn() + { require_once LSCWP_DIR . 'tpl/cdn/entry.tpl.php'; } @@ -619,7 +641,8 @@ public function show_menu_cdn() { * @since 3.0 * @access public */ - public function show_menu_auto_cdn_setup() { + public function show_menu_auto_cdn_setup() + { require_once LSCWP_DIR . 'tpl/auto_cdn_setup/entry.tpl.php'; } @@ -629,11 +652,11 @@ public function show_menu_auto_cdn_setup() { * @since 1.0.0 * @access public */ - public function show_menu_cache() { - if ( $this->_is_network_admin ) { + public function show_menu_cache() + { + if ($this->_is_network_admin) { require_once LSCWP_DIR . 'tpl/cache/entry_network.tpl.php'; - } - else { + } else { require_once LSCWP_DIR . 'tpl/cache/entry.tpl.php'; } } @@ -644,7 +667,8 @@ public function show_menu_cache() { * @since 3.0 * @access public */ - public function show_toolbox() { + public function show_toolbox() + { require_once LSCWP_DIR . 'tpl/toolbox/entry.tpl.php'; } @@ -654,7 +678,8 @@ public function show_toolbox() { * @since 1.1.0 * @access public */ - public function show_crawler() { + public function show_crawler() + { require_once LSCWP_DIR . 'tpl/crawler/entry.tpl.php'; } @@ -664,7 +689,8 @@ public function show_crawler() { * @since 1.6 * @access public */ - public function show_img_optm() { + public function show_img_optm() + { require_once LSCWP_DIR . 'tpl/img_optm/entry.tpl.php'; } @@ -674,7 +700,8 @@ public function show_img_optm() { * @since 3.0 * @access public */ - public function show_page_optm() { + public function show_page_optm() + { require_once LSCWP_DIR . 'tpl/page_optm/entry.tpl.php'; } @@ -684,7 +711,8 @@ public function show_page_optm() { * @since 3.0 * @access public */ - public function show_db_optm() { + public function show_db_optm() + { require_once LSCWP_DIR . 'tpl/db_optm/entry.tpl.php'; } @@ -695,7 +723,8 @@ public function show_db_optm() { * @since 1.0.12 * @access public */ - public function show_display_installed() { + public function show_display_installed() + { require_once LSCWP_DIR . 'tpl/inc/show_display_installed.php'; } @@ -705,7 +734,8 @@ public function show_display_installed() { * @since 1.0.12 * @access public */ - public static function show_error_cookie() { + public static function show_error_cookie() + { require_once LSCWP_DIR . 'tpl/inc/show_error_cookie.php'; } @@ -715,7 +745,8 @@ public static function show_error_cookie() { * @since 2.1 * @access public */ - public function cache_disabled_warning() { + public function cache_disabled_warning() + { include LSCWP_DIR . "tpl/inc/check_cache_disabled.php"; } @@ -725,7 +756,8 @@ public function cache_disabled_warning() { * @since 2.1 * @access private */ - private function _in_upgrading() { + private function _in_upgrading() + { include LSCWP_DIR . "tpl/inc/in_upgrading.php"; } @@ -735,25 +767,25 @@ private function _in_upgrading() { * @since 3.0 * @access public */ - public function form_action( $action = false, $type = false, $has_upload = false ) { - if ( ! $action ) { + public function form_action($action = false, $type = false, $has_upload = false) + { + if (!$action) { $action = Router::ACTION_SAVE_SETTINGS; } $has_upload = $has_upload ? 'enctype="multipart/form-data"' : ''; - if ( ! defined( 'LITESPEED_CONF_LOADED' ) ) { + if (!defined('LITESPEED_CONF_LOADED')) { echo '
'; + } else { + echo '
'; } echo ''; - if ( $type ) { + if ($type) { echo ''; } - wp_nonce_field( $action, Router::NONCE ); + wp_nonce_field($action, Router::NONCE); } /** @@ -762,20 +794,19 @@ public function form_action( $action = false, $type = false, $has_upload = false * @since 3.0 * @access public */ - public function form_end( $disable_reset = false ) { + public function form_end($disable_reset = false) + { echo "
"; - if ( ! defined( 'LITESPEED_CONF_LOADED' ) ) { - submit_button( __( 'Save Changes', 'litespeed-cache' ), 'secondary litespeed-duplicate-float', 'litespeed-submit', true, array( 'disabled' => 'disabled' ) ); + if (!defined('LITESPEED_CONF_LOADED')) { + submit_button(__('Save Changes', 'litespeed-cache'), 'secondary litespeed-duplicate-float', 'litespeed-submit', true, array('disabled' => 'disabled')); echo '
'; - } - else { - submit_button( __( 'Save Changes', 'litespeed-cache' ), 'primary litespeed-duplicate-float', 'litespeed-submit', true, array( 'id' => 'litespeed-submit-' . $this->_btn_i++ ) ); + } else { + submit_button(__('Save Changes', 'litespeed-cache'), 'primary litespeed-duplicate-float', 'litespeed-submit', true, array('id' => 'litespeed-submit-' . $this->_btn_i++)); echo ''; } - } /** @@ -784,7 +815,8 @@ public function form_end( $disable_reset = false ) { * @since 3.0 * @access public */ - public function enroll( $id ) { + public function enroll($id) + { echo ''; } @@ -794,33 +826,34 @@ public function enroll( $id ) { * @since 1.1.0 * @access public */ - public function build_textarea( $id, $cols = false, $val = null ) { - if ( $val === null ) { - $val = $this->conf( $id, true ); + public function build_textarea($id, $cols = false, $val = null) + { + if ($val === null) { + $val = $this->conf($id, true); - if ( is_array( $val ) ) { - $val = implode( "\n", $val ); + if (is_array($val)) { + $val = implode("\n", $val); } } - if ( ! $cols ) { + if (!$cols) { $cols = 80; } $rows = 5; - $lines = substr_count( $val, "\n" ) + 2; - if ( $lines > $rows ) { + $lines = substr_count($val, "\n") + 2; + if ($lines > $rows) { $rows = $lines; } - if ( $rows > 40 ) { + if ($rows > 40) { $rows = 40; } - $this->enroll( $id ); + $this->enroll($id); - echo ""; + echo ""; - $this->_check_overwritten( $id ); + $this->_check_overwritten($id); } /** @@ -829,31 +862,31 @@ public function build_textarea( $id, $cols = false, $val = null ) { * @since 1.1.0 * @access public */ - public function build_input( $id, $cls = null, $val = null, $type = 'text', $disabled = false ) { - if ( $val === null ) { - $val = $this->conf( $id, true ); + public function build_input($id, $cls = null, $val = null, $type = 'text', $disabled = false) + { + if ($val === null) { + $val = $this->conf($id, true); // Mask pswds - if ( $this->_conf_pswd( $id ) && $val ) { - $val = str_repeat( '*', strlen( $val ) ); + if ($this->_conf_pswd($id) && $val) { + $val = str_repeat('*', strlen($val)); } } - $label_id = preg_replace( '/\W/', '', $id ); + $label_id = preg_replace('/\W/', '', $id); - if ( $type == 'text' ) { + if ($type == 'text') { $cls = "regular-text $cls"; } - if ( $disabled ) { - echo " "; - } - else { - $this->enroll( $id ); - echo " "; + if ($disabled) { + echo " "; + } else { + $this->enroll($id); + echo " "; } - $this->_check_overwritten( $id ); + $this->_check_overwritten($id); } /** @@ -865,26 +898,27 @@ public function build_input( $id, $cls = null, $val = null, $type = 'text', $dis * @param string $title * @param bool $checked */ - public function build_checkbox( $id, $title, $checked = null, $value = 1 ) { - if ( $checked === null && $this->conf( $id, true ) ) { + public function build_checkbox($id, $title, $checked = null, $value = 1) + { + if ($checked === null && $this->conf($id, true)) { $checked = true; } $checked = $checked ? ' checked ' : ''; - $label_id = preg_replace( '/\W/', '', $id ); + $label_id = preg_replace('/\W/', '', $id); - if ( $value !== 1 ) { + if ($value !== 1) { $label_id .= '_' . $value; } - $this->enroll( $id ); + $this->enroll($id); echo "
"; - $this->_check_overwritten( $id ); + $this->_check_overwritten($id); } /** @@ -892,13 +926,14 @@ public function build_checkbox( $id, $title, $checked = null, $value = 1 ) { * * @since 1.7 */ - public function build_toggle( $id, $checked = null, $title_on = null, $title_off = null ) { - if ( $checked === null && $this->conf( $id, true ) ) { + public function build_toggle($id, $checked = null, $title_on = null, $title_off = null) + { + if ($checked === null && $this->conf($id, true)) { $checked = true; } - if ( $title_on === null ) { - $title_on = __( 'ON', 'litespeed-cache' ); - $title_off = __( 'OFF', 'litespeed-cache' ); + if ($title_on === null) { + $title_on = __('ON', 'litespeed-cache'); + $title_off = __('OFF', 'litespeed-cache'); } $cls = $checked ? 'primary' : 'default litespeed-toggleoff'; echo "
@@ -918,25 +953,26 @@ public function build_toggle( $id, $checked = null, $title_on = null, $title_off * @since 1.7 removed param $disable * @access public */ - public function build_switch( $id, $title_list = false ) { - $this->enroll( $id ); + public function build_switch($id, $title_list = false) + { + $this->enroll($id); echo '
'; - if ( ! $title_list ) { + if (!$title_list) { $title_list = array( - __( 'OFF', 'litespeed-cache' ), - __( 'ON', 'litespeed-cache' ), + __('OFF', 'litespeed-cache'), + __('ON', 'litespeed-cache'), ); } - foreach ( $title_list as $k => $v ) { - $this->_build_radio( $id, $k, $v ); + foreach ($title_list as $k => $v) { + $this->_build_radio($id, $k, $v); } echo '
'; - $this->_check_overwritten( $id ); + $this->_check_overwritten($id); } /** @@ -945,16 +981,16 @@ public function build_switch( $id, $title_list = false ) { * @since 1.1.0 * @access private */ - private function _build_radio( $id, $val, $txt ) { - $id_attr = 'input_radio_' . preg_replace( '/\W/', '', $id ) . '_' . $val; + private function _build_radio($id, $val, $txt) + { + $id_attr = 'input_radio_' . preg_replace('/\W/', '', $id) . '_' . $val; - $default = isset( self::$_default_options[ $id ] ) ? self::$_default_options[ $id ] : self::$_default_site_options[ $id ]; + $default = isset(self::$_default_options[$id]) ? self::$_default_options[$id] : self::$_default_site_options[$id]; - if ( ! is_string( $default ) ) { - $checked = (int) $this->conf( $id, true ) === (int) $val ? ' checked ' : ''; - } - else { - $checked = $this->conf( $id, true ) === $val ? ' checked ' : ''; + if (!is_string($default)) { + $checked = (int) $this->conf($id, true) === (int) $val ? ' checked ' : ''; + } else { + $checked = $this->conf($id, true) === $val ? ' checked ' : ''; } echo " "; @@ -965,41 +1001,40 @@ private function _build_radio( $id, $val, $txt ) { * * @since 3.0 */ - protected function _check_overwritten( $id ) { - $const_val = $this->const_overwritten( $id ); - $primary_val = $this->primary_overwritten( $id ); - if ( $const_val === null && $primary_val === null ) { + protected function _check_overwritten($id) + { + $const_val = $this->const_overwritten($id); + $primary_val = $this->primary_overwritten($id); + if ($const_val === null && $primary_val === null) { return; } $val = $const_val !== null ? $const_val : $primary_val; - $default = isset( self::$_default_options[ $id ] ) ? self::$_default_options[ $id ] : self::$_default_site_options[ $id ]; + $default = isset(self::$_default_options[$id]) ? self::$_default_options[$id] : self::$_default_site_options[$id]; - if ( is_bool( $default ) ) { - $val = $val ? __( 'ON', 'litespeed-cache' ) : __( 'OFF', 'litespeed-cache' ); - } - else { - if ( is_array( $default ) ) { - $val = implode( "\n", $val ); + if (is_bool($default)) { + $val = $val ? __('ON', 'litespeed-cache') : __('OFF', 'litespeed-cache'); + } else { + if (is_array($default)) { + $val = implode("\n", $val); } - $val = esc_textarea( $val ); + $val = esc_textarea($val); } echo '
⚠️ '; - if ( $const_val !== null ) { - echo sprintf( __( 'This setting is overwritten by the PHP constant %s', 'litespeed-cache' ), '' . Base::conf_const( $id ) . '' ); + if ($const_val !== null) { + echo sprintf(__('This setting is overwritten by the PHP constant %s', 'litespeed-cache'), '' . Base::conf_const($id) . ''); } else { - if ( get_current_blog_id() != BLOG_ID_CURRENT_SITE && $this->conf( self::NETWORK_O_USE_PRIMARY ) ) { - echo __( 'This setting is overwritten by the primary site setting', 'litespeed-cache' ); - } - else { - echo __( 'This setting is overwritten by the Network setting', 'litespeed-cache' ); + if (get_current_blog_id() != BLOG_ID_CURRENT_SITE && $this->conf(self::NETWORK_O_USE_PRIMARY)) { + echo __('This setting is overwritten by the primary site setting', 'litespeed-cache'); + } else { + echo __('This setting is overwritten by the Network setting', 'litespeed-cache'); } } - echo ', ' . sprintf( __( 'currently set to %s', 'litespeed-cache' ), "$val" ) . '
'; + echo ', ' . sprintf(__('currently set to %s', 'litespeed-cache'), "$val") . '
'; } /** @@ -1008,8 +1043,9 @@ protected function _check_overwritten( $id ) { * @since 3.0 * @access public */ - public function readable_seconds() { - echo __( 'seconds', 'litespeed-cache' ); + public function readable_seconds() + { + echo __('seconds', 'litespeed-cache'); echo ' '; } @@ -1019,33 +1055,33 @@ public function readable_seconds() { * @since 1.1.1 * @access public */ - public function recommended( $id ) { - if ( ! $this->default_settings ) { + public function recommended($id) + { + if (!$this->default_settings) { $this->default_settings = $this->load_default_vals(); } - $val = $this->default_settings[ $id ]; + $val = $this->default_settings[$id]; - if ( $val ) { - if ( is_array( $val ) ) { + if ($val) { + if (is_array($val)) { $rows = 5; $cols = 30; // Flexible rows/cols - $lines = count( $val ) + 1; - $rows = min( max( $lines, $rows ), 40 ); - foreach ( $val as $v ) { - $cols = max( strlen( $v ), $cols ); + $lines = count($val) + 1; + $rows = min(max($lines, $rows), 40); + foreach ($val as $v) { + $cols = max(strlen($v), $cols); } - $cols = min( $cols, 150 ); + $cols = min($cols, 150); - $val = implode( "\n", $val ); - $val = esc_textarea( $val ); - $val = '
' . __( 'Default value', 'litespeed-cache' ) . ':
' . ""; - } - else { - $val = esc_textarea( $val ); + $val = implode("\n", $val); + $val = esc_textarea($val); + $val = '
' . __('Default value', 'litespeed-cache') . ':
' . ""; + } else { + $val = esc_textarea($val); $val = "$val"; - $val = __( 'Default value', 'litespeed-cache' ) . ': '.$val; + $val = __('Default value', 'litespeed-cache') . ': ' . $val; } echo $val; } @@ -1056,20 +1092,21 @@ public function recommended( $id ) { * * @since 3.0 */ - protected function _validate_syntax( $id ) { - $val = $this->conf( $id, true ); + protected function _validate_syntax($id) + { + $val = $this->conf($id, true); - if ( ! $val ) { + if (!$val) { return; } - if ( ! is_array( $val ) ) { - $val = array( $val ); + if (!is_array($val)) { + $val = array($val); } - foreach ( $val as $v ) { - if ( ! Utility::syntax_checker( $v ) ) { - echo '
❌ ' . __( 'Invalid rewrite rule', 'litespeed-cache' ) . ': ' . $v . ''; + foreach ($val as $v) { + if (!Utility::syntax_checker($v)) { + echo '
❌ ' . __('Invalid rewrite rule', 'litespeed-cache') . ': ' . $v . ''; } } } @@ -1079,14 +1116,15 @@ protected function _validate_syntax( $id ) { * * @since 3.0 */ - protected function _validate_htaccess_path( $id ) { - $val = $this->conf( $id, true ); - if ( ! $val ) { + protected function _validate_htaccess_path($id) + { + $val = $this->conf($id, true); + if (!$val) { return; } - if ( substr( $val, -10 ) !== '/.htaccess' ) { - echo '
❌ ' . sprintf( __( 'Path must end with %s', 'litespeed-cache' ), '/.htaccess' ) . ''; + if (substr($val, -10) !== '/.htaccess') { + echo '
❌ ' . sprintf(__('Path must end with %s', 'litespeed-cache'), '/.htaccess') . ''; } } @@ -1095,44 +1133,43 @@ protected function _validate_htaccess_path( $id ) { * * @since 3.0 */ - protected function _validate_ttl( $id, $min = false, $max = false, $allow_zero = false ) { - $val = $this->conf( $id, true ); + protected function _validate_ttl($id, $min = false, $max = false, $allow_zero = false) + { + $val = $this->conf($id, true); - if ( $allow_zero && ! $val ) { + if ($allow_zero && !$val) { // return; } $tip = array(); - if ( $min && $val < $min && ( ! $allow_zero || $val != 0 ) ) { - $tip[] = __( 'Minimum value', 'litespeed-cache' ) . ': ' . $min . '.'; + if ($min && $val < $min && (!$allow_zero || $val != 0)) { + $tip[] = __('Minimum value', 'litespeed-cache') . ': ' . $min . '.'; } - if ( $max && $val > $max ) { - $tip[] = __( 'Maximum value', 'litespeed-cache' ) . ': ' . $max . '.'; + if ($max && $val > $max) { + $tip[] = __('Maximum value', 'litespeed-cache') . ': ' . $max . '.'; } echo '
'; - if ( $tip ) { - echo ' ❌ ' . implode( ' ', $tip ) . ''; + if ($tip) { + echo ' ❌ ' . implode(' ', $tip) . ''; } $range = ''; - if ( $allow_zero ) { - $range .= __( 'Zero, or', 'litespeed-cache' ) . ' '; + if ($allow_zero) { + $range .= __('Zero, or', 'litespeed-cache') . ' '; } - if ( $min && $max ) { + if ($min && $max) { $range .= $min . ' - ' . $max; - } - elseif ( $min ) { - $range .= __( 'Larger than', 'litespeed-cache' ) . ' ' . $min; - } - elseif ( $max ) { - $range .= __( 'Smaller than', 'litespeed-cache' ) . ' ' . $max; + } elseif ($min) { + $range .= __('Larger than', 'litespeed-cache') . ' ' . $min; + } elseif ($max) { + $range .= __('Smaller than', 'litespeed-cache') . ' ' . $max; } - echo __( 'Value range', 'litespeed-cache' ) . ': ' . $range . ''; + echo __('Value range', 'litespeed-cache') . ': ' . $range . ''; } /** @@ -1140,29 +1177,30 @@ protected function _validate_ttl( $id, $min = false, $max = false, $allow_zero = * * @since 3.0 */ - protected function _validate_ip( $id ) { - $val = $this->conf( $id, true ); - if ( ! $val ) { + protected function _validate_ip($id) + { + $val = $this->conf($id, true); + if (!$val) { return; } - if ( ! is_array( $val ) ) { - $val = array( $val ); + if (!is_array($val)) { + $val = array($val); } $tip = array(); - foreach ( $val as $v ) { - if ( ! $v ) { + foreach ($val as $v) { + if (!$v) { continue; } - if ( ! \WP_Http::is_ip_address( $v ) ) { - $tip[] = __( 'Invalid IP', 'litespeed-cache' ) . ': ' . esc_textarea( $v ) . '.'; + if (!\WP_Http::is_ip_address($v)) { + $tip[] = __('Invalid IP', 'litespeed-cache') . ': ' . esc_textarea($v) . '.'; } } - if ( $tip ) { - echo '
❌ ' . implode( ' ', $tip ) . ''; + if ($tip) { + echo '
❌ ' . implode(' ', $tip) . ''; } } @@ -1172,15 +1210,16 @@ protected function _validate_ip( $id ) { * @since 1.8.3 * @access protected */ - protected function _api_env_var() { + protected function _api_env_var() + { $args = func_get_args(); - $s = '' . implode( ', ', $args ) . ''; + $s = '' . implode(', ', $args) . ''; echo ' ' - . __( 'API', 'litespeed-cache' ) . ': ' - . sprintf( __( 'Server variable(s) %s available to override this setting.', 'litespeed-cache' ), $s ); + . __('API', 'litespeed-cache') . ': ' + . sprintf(__('Server variable(s) %s available to override this setting.', 'litespeed-cache'), $s); - Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/admin/#limiting-the-crawler' ); + Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/admin/#limiting-the-crawler'); } /** @@ -1189,13 +1228,14 @@ protected function _api_env_var() { * @since 2.6.1 * @access protected */ - protected function _uri_usage_example() { - echo __( 'The URLs will be compared to the REQUEST_URI server variable.', 'litespeed-cache' ); - echo ' ' . sprintf( __( 'For example, for %s, %s can be used here.', 'litespeed-cache' ), '/mypath/mypage?aa=bb', 'mypage?aa=' ); + protected function _uri_usage_example() + { + echo __('The URLs will be compared to the REQUEST_URI server variable.', 'litespeed-cache'); + echo ' ' . sprintf(__('For example, for %s, %s can be used here.', 'litespeed-cache'), '/mypath/mypage?aa=bb', 'mypage?aa='); echo '
'; - echo sprintf( __( 'To match the beginning, add %s to the beginning of the item.', 'litespeed-cache' ), '^' ); - echo ' ' . sprintf( __( 'To do an exact match, add %s to the end of the URL.', 'litespeed-cache' ), '$' ); - echo ' ' . __( 'One per line.', 'litespeed-cache' ); + echo sprintf(__('To match the beginning, add %s to the beginning of the item.', 'litespeed-cache'), '^'); + echo ' ' . sprintf(__('To do an exact match, add %s to the end of the URL.', 'litespeed-cache'), '$'); + echo ' ' . __('One per line.', 'litespeed-cache'); echo ''; } @@ -1205,27 +1245,27 @@ protected function _uri_usage_example() { * @since 2.0 * @access public */ - public static function print_plural( $num, $kind = 'group' ) { - if ( $num > 1 ) { - switch ( $kind ) { - case 'group' : - return sprintf( __( '%s groups', 'litespeed-cache' ), $num ); + public static function print_plural($num, $kind = 'group') + { + if ($num > 1) { + switch ($kind) { + case 'group': + return sprintf(__('%s groups', 'litespeed-cache'), $num); - case 'image' : - return sprintf( __( '%s images', 'litespeed-cache' ), $num ); + case 'image': + return sprintf(__('%s images', 'litespeed-cache'), $num); default: return $num; } - } - switch ( $kind ) { - case 'group' : - return sprintf( __( '%s group', 'litespeed-cache' ), $num ); + switch ($kind) { + case 'group': + return sprintf(__('%s group', 'litespeed-cache'), $num); - case 'image' : - return sprintf( __( '%s image', 'litespeed-cache' ), $num ); + case 'image': + return sprintf(__('%s image', 'litespeed-cache'), $num); default: return $num; @@ -1238,22 +1278,22 @@ public static function print_plural( $num, $kind = 'group' ) { * @since 2.0 * @access public */ - public static function guidance( $title, $steps, $current_step ) { - if ( $current_step === 'done' ) { - $current_step = count( $steps ) + 1; + public static function guidance($title, $steps, $current_step) + { + if ($current_step === 'done') { + $current_step = count($steps) + 1; } - $percentage = ' (' . floor( ( $current_step - 1 ) * 100 / count( $steps ) ) . '%)'; + $percentage = ' (' . floor(($current_step - 1) * 100 / count($steps)) . '%)'; $html = '
' - . '

' . $title . $percentage . '

' - . '
    '; - foreach ( $steps as $k => $v ) { + . '

    ' . $title . $percentage . '

    ' + . '
      '; + foreach ($steps as $k => $v) { $step = $k + 1; - if ( $current_step > $step ) { + if ($current_step > $step) { $html .= '
    1. '; - } - else { + } else { $html .= '
    2. '; } $html .= $v . '
      3. '; diff --git a/tpl/cdn/manage.tpl.php b/tpl/cdn/manage.tpl.php index 975c6ce33..880ec23dd 100644 --- a/tpl/cdn/manage.tpl.php +++ b/tpl/cdn/manage.tpl.php @@ -27,8 +27,8 @@
-

:

-

:

+

:

+

:

: