CVE-2023-4372 (published 2024-01-11T09:15Z)

The LiteSpeed Cache plugin for WordPress is vulnerable to Stored Cross-Site Scripting via the 'esi' shortcode in versions up to, and including, 5.6 due to insufficient input sanitization and output escaping on user supplied attributes. This makes it possible for authenticated attackers with contributor-level and above permissions to inject arbitrary web scripts in pages that will execute whenever a user accesses an injected page.

CVSS v3 base score: 5.4, MEDIUM (CVSS:3.1/AV:N/AC:L/PR:L/UI:R/S:C/C:L/I:L/A:N)

Weakness information:
cwe_id: CWE-79
cwe_name: Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting')
description: The product does not neutralize or incorrectly neutralizes user-controllable input before it is placed in output that is used as a web page that is served to other users.
extended_description: 
            Cross-site scripting (XSS) vulnerabilities occur when:
            
               Untrusted data enters a web application, typically from a web request.
               The web application dynamically generates a web page that contains this untrusted data.
               During page generation, the application does not prevent the data from containing content that is executable by a web browser, such as JavaScript, HTML tags, HTML attributes, mouse events, Flash, ActiveX, etc.
               A victim visits the generated web page through a web browser, which contains malicious script that was injected using the untrusted data.
               Since the script comes from a web page that was sent by the web server, the victim's web browser executes the malicious script in the context of the web server's domain.
               This effectively violates the intention of the web browser's same-origin policy, which states that scripts in one domain should not be able to access resources or run code in a different domain.
            
            There are three main kinds of XSS:
            
               
                  Type 1: Reflected XSS (or Non-Persistent) - 
         			The server reads data directly from the HTTP request and reflects it back in the HTTP response. Reflected XSS exploits occur when an attacker causes a victim to supply dangerous content to a vulnerable web application, which is then reflected back to the victim and executed by the web browser. The most common mechanism for delivering malicious content is to include it as a parameter in a URL that is posted publicly or e-mailed directly to the victim. URLs constructed in this manner constitute the core of many phishing schemes, whereby an attacker convinces a victim to visit a URL that refers to a vulnerable site. After the site reflects the attacker's content back to the victim, the content is executed by the victim's browser.
               
                  Type 2: Stored XSS (or Persistent) - 
               The application stores dangerous data in a database, message forum, visitor log, or other trusted data store. At a later time, the dangerous data is subsequently read back into the application and included in dynamic content. From an attacker's perspective, the optimal place to inject malicious content is in an area that is displayed to either many users or particularly interesting users. Interesting users typically have elevated privileges in the application or interact with sensitive data that is valuable to the attacker. If one of these users executes malicious content, the attacker may be able to perform privileged operations on behalf of the user or gain access to sensitive data belonging to the user. For example, the attacker might inject XSS into a log message, which might not be handled properly when an administrator views the logs.
            
               
                  Type 0: DOM-Based XSS - 
               In DOM-based XSS, the client performs the injection of XSS into the page; in the other types, the server performs the injection. DOM-based XSS generally involves server-controlled, trusted script that is sent to the client, such as Javascript that performs sanity checks on a form before the user submits it. If the server-supplied script processes user-supplied data and then injects it back into the web page (such as with dynamic HTML), then DOM-based XSS is possible.
            
            
            Once the malicious script is injected, the attacker can perform a variety of malicious activities. The attacker could transfer private information, such as cookies that may include session information, from the victim's machine to the attacker. The attacker could send malicious requests to a web site on behalf of the victim, which could be especially dangerous to the site if the victim has administrator privileges to manage that site. Phishing attacks could be used to emulate trusted web sites and trick the victim into entering a password, allowing the attacker to compromise the victim's account on that web site. Finally, the script could exploit a vulnerability in the web browser itself possibly taking over the victim's machine, sometimes referred to as "drive-by hacking."
            In many cases, the attack can be launched without the victim even being aware of it. Even with careful users, attackers frequently use a variety of methods to encode the malicious portion of the attack, such as URL encoding or Unicode, so the request looks less suspicious.
         
         

Fix information:
repo_url: https://github.com/litespeedtech/lscache_wp
commit_details: repo_url: https://github.com/litespeedtech/lscache_wp
author: Hai Zheng
author_date: 2023-08-16 17:40:05-04:00
msg: v5.6.1-a10: * 🐞**ESI** Patched a vulnerability issue. (István Márton@Wordfence #841011)
repository: repo_url: https://github.com/litespeedtech/lscache_wp
repo_name: litespeedtech/lscache_wp
description: LiteSpeed Cache for WordPress
repo_language: PHP
owner: litespeedtech
file_changes: filename: litespeed-cache.php
change_type: ModificationType.MODIFY
diff: @@ -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.6.1-a9
+ * Version:           5.6.1-a10
  * Author:            LiteSpeed Technologies
  * Author URI:        https://www.litespeedtech.com
  * License:           GPLv3
@@ -34,7 +34,7 @@ if (defined('LSCWP_V')) {
 	return;
 }
 
-!defined('LSCWP_V') && define('LSCWP_V', '5.6.1-a9');
+!defined('LSCWP_V') && define('LSCWP_V', '5.6.1-a10');
 
 !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

programming_language: PHP
filename: readme.txt
change_type: ModificationType.MODIFY
diff: @@ -254,6 +254,7 @@ The vast majority of plugins and themes are compatible with LiteSpeed Cache. The
 * 🌱**Page Optimize** New option available: Preconnect. (xguiboy/Mukesh Patel)
 * **Cloud** Force syncing the configuration to QUIC.cloud if CDN is reenabled.
 * **Cloud** Force syncing the configuration to QUIC.cloud if domain key is readded.
+* 🐞**ESI** Patched a possible vulnerability issue. (István Márton@Wordfence #841011)
 * 🐞**Image Optimize** Bypass unnecessary image processing when images were only partially optimized. (Ruikai)
 * **CDN** Auto disabled CDN if CDN URL is invalid. (Ruikai)
 * **API** A third filter `litespeed_media_add_missing_sizes` allows bypassing Media's "add missing sizes" option (for Guest Optimization and otherwise). (PR #564)

programming_language: Markdown
filename: esi.cls.php
change_type: ModificationType.MODIFY
diff: @@ -1,4 +1,5 @@
 <?php
+
 /**
  * The ESI class.
  *
@@ -9,16 +10,18 @@
  * @subpackage 	LiteSpeed/src
  * @author     	LiteSpeed Technologies <info@litespeedtech.com>
  */
+
 namespace LiteSpeed;
 
-defined( 'WPINC' ) || exit;
+defined('WPINC') || exit;
 
-class ESI extends Root {
+class ESI extends Root
+{
 	private static $has_esi = false;
 	private static $_combine_ids = array();
 	private $esi_args = null;
 	private $_esi_preserve_list = array();
-	private $_nonce_actions = array( -1 => '' ); // val is cache control
+	private $_nonce_actions = array(-1 => ''); // val is cache control
 
 	const QS_ACTION = 'lsesi';
 	const QS_PARAMS = 'esi';
@@ -38,21 +41,22 @@ class ESI extends Root {
 	 * @since  1.2.0
 	 * @since  4.0 Change to be after Vary init in hook 'after_setup_theme'
 	 */
-	public function init() {
+	public function init()
+	{
 		/**
 		 * Bypass ESI related funcs if disabled ESI to fix potential DIVI compatibility issue
 		 * @since  2.9.7.2
 		 */
-		if ( Router::is_ajax() || ! $this->cls( 'Router' )->esi_enabled() ) {
+		if (Router::is_ajax() || !$this->cls('Router')->esi_enabled()) {
 			return;
 		}
 
 		// Guest mode, don't need to use ESI
-		if ( defined( 'LITESPEED_GUEST' ) && LITESPEED_GUEST ) {
+		if (defined('LITESPEED_GUEST') && LITESPEED_GUEST) {
 			return;
 		}
 
-		if ( defined( 'LITESPEED_ESI_OFF' ) ) {
+		if (defined('LITESPEED_ESI_OFF')) {
 			return;
 		}
 
@@ -65,7 +69,7 @@ class ESI extends Root {
 		 */
 		$this->_transform_nonce();
 
-		! defined( 'LITESPEED_ESI_INITED' ) && define( 'LITESPEED_ESI_INITED', true );
+		!defined('LITESPEED_ESI_INITED') && define('LITESPEED_ESI_INITED', true);
 	}
 
 	/**
@@ -77,17 +81,18 @@ class ESI extends Root {
 	 * @since  4.0 Changed to private from public
 	 * @access private
 	 */
-	private function _hooks() {
-		add_filter( 'template_include', array( $this, 'esi_template' ), 99999 );
+	private function _hooks()
+	{
+		add_filter('template_include', array($this, 'esi_template'), 99999);
 
-		add_action( 'load-widgets.php', __NAMESPACE__ . '\Purge::purge_widget' );
-		add_action( 'wp_update_comment_count', __NAMESPACE__ . '\Purge::purge_comment_widget' );
+		add_action('load-widgets.php', __NAMESPACE__ . '\Purge::purge_widget');
+		add_action('wp_update_comment_count', __NAMESPACE__ . '\Purge::purge_comment_widget');
 
 		/**
 		 * Recover REQUEST_URI
 		 * @since  1.8.1
 		 */
-		if ( ! empty( $_GET[ self::QS_ACTION ] ) ) {
+		if (!empty($_GET[self::QS_ACTION])) {
 			$this->_register_esi_actions();
 		}
 
@@ -105,10 +110,9 @@ class ESI extends Root {
 		 * @since  2.8
 		 * @since  2.8.1 Check is_admin for Elementor compatibility #726013
 		 */
-		if ( ! is_admin() ) {
-			add_shortcode( 'esi', array( $this, 'shortcode' ) );
+		if (!is_admin()) {
+			add_shortcode('esi', array($this, 'shortcode'));
 		}
-
 	}
 
 	/**
@@ -116,21 +120,22 @@ class ESI extends Root {
 	 *
 	 * @since  2.9.5
 	 */
-	private function _transform_nonce() {
-		if ( is_admin() ) {
+	private function _transform_nonce()
+	{
+		if (is_admin()) {
 			return;
 		}
 
 		// Load ESI nonces in conf
-		$nonces = $this->conf( Base::O_ESI_NONCE );
-		add_filter( 'litespeed_esi_nonces', array( $this->cls( 'Data' ), 'load_esi_nonces' ) );
-		if ( $nonces = apply_filters( 'litespeed_esi_nonces', $nonces ) ) {
-			foreach ( $nonces as $action ) {
-				$this->nonce_action( $action );
+		$nonces = $this->conf(Base::O_ESI_NONCE);
+		add_filter('litespeed_esi_nonces', array($this->cls('Data'), 'load_esi_nonces'));
+		if ($nonces = apply_filters('litespeed_esi_nonces', $nonces)) {
+			foreach ($nonces as $action) {
+				$this->nonce_action($action);
 			}
 		}
 
-		add_action( 'litespeed_nonce', array( $this, 'nonce_action' ) );
+		add_action('litespeed_nonce', array($this, 'nonce_action'));
 	}
 
 	/**
@@ -138,22 +143,23 @@ class ESI extends Root {
 	 *
 	 * @since  2.9.5
 	 */
-	public function nonce_action( $action ) {
+	public function nonce_action($action)
+	{
 		// Split the Cache Control
-		$action = explode( ' ', $action );
-		$control = ! empty( $action[ 1 ] ) ? $action[ 1 ] : '';
-		$action = $action[ 0 ];
+		$action = explode(' ', $action);
+		$control = !empty($action[1]) ? $action[1] : '';
+		$action = $action[0];
 
 		// Wildcard supported
-		$action = Utility::wildcard2regex( $action );
+		$action = Utility::wildcard2regex($action);
 
-		if ( array_key_exists( $action, $this->_nonce_actions ) ) {
+		if (array_key_exists($action, $this->_nonce_actions)) {
 			return;
 		}
 
-		$this->_nonce_actions[ $action ] = $control;
+		$this->_nonce_actions[$action] = $control;
 
-		Debug2::debug( '[ESI] Appended nonce action to nonce list [action] ' . $action );
+		Debug2::debug('[ESI] Appended nonce action to nonce list [action] ' . $action);
 	}
 
 	/**
@@ -161,28 +167,28 @@ class ESI extends Root {
 	 *
 	 * @since 2.9.5
 	 */
-	public function is_nonce_action( $action ) {
+	public function is_nonce_action($action)
+	{
 		// If GM not run yet, then ESI not init yet, then ESI nonce will not be allowed even nonce func replaced.
-		if ( ! defined( 'LITESPEED_ESI_INITED' ) ) {
+		if (!defined('LITESPEED_ESI_INITED')) {
 			return null;
 		}
 
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return null;
 		}
 
-		if ( defined( 'LITESPEED_ESI_OFF' ) ) {
+		if (defined('LITESPEED_ESI_OFF')) {
 			return null;
 		}
 
-		foreach ( $this->_nonce_actions as $k => $v ) {
-			if ( strpos( $k, '*' ) !== false ) {
-				if( preg_match( '#' . $k . '#iU', $action ) ) {
+		foreach ($this->_nonce_actions as $k => $v) {
+			if (strpos($k, '*') !== false) {
+				if (preg_match('#' . $k . '#iU', $action)) {
 					return $v;
 				}
-			}
-			else {
-				if ( $k == $action ) {
+			} else {
+				if ($k == $action) {
 					return $v;
 				}
 			}
@@ -197,27 +203,28 @@ class ESI extends Root {
 	 * @since 2.8
 	 * @access public
 	 */
-	public function shortcode( $atts ) {
-		if ( empty( $atts[ 0 ] ) ) {
-			Debug2::debug( '[ESI] ===shortcode wrong format', $atts );
+	public function shortcode($atts)
+	{
+		if (empty($atts[0])) {
+			Debug2::debug('[ESI] ===shortcode wrong format', $atts);
 			return 'Wrong shortcode esi format';
 		}
 
 		$cache = 'public,no-vary';
-		if ( ! empty( $atts[ 'cache' ] ) ) {
-			$cache = $atts[ 'cache' ];
-			unset( $atts[ 'cache' ] );
+		if (!empty($atts['cache'])) {
+			$cache = $atts['cache'];
+			unset($atts['cache']);
 		}
 
 		$silence = false;
-		if ( ! empty( $atts[ '_ls_silence' ] ) ) {
+		if (!empty($atts['_ls_silence'])) {
 			$silence = true;
 		}
 
-		do_action( 'litespeed_esi_shortcode-' . $atts[ 0 ] );
+		do_action('litespeed_esi_shortcode-' . $atts[0]);
 
 		// Show ESI link
-		return $this->sub_esi_block( 'esi', 'esi-shortcode', $atts, $cache, $silence );
+		return $this->sub_esi_block('esi', 'esi-shortcode', $atts, $cache, $silence);
 	}
 
 	/**
@@ -228,7 +235,8 @@ class ESI extends Root {
 	 * @access public
 	 * @return string Esi On header if request has esi, empty string otherwise.
 	 */
-	public static function has_esi() {
+	public static function has_esi()
+	{
 		return self::$has_esi;
 	}
 
@@ -238,7 +246,8 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access public
 	 */
-	public static function set_has_esi() {
+	public static function set_has_esi()
+	{
 		self::$has_esi = true;
 	}
 
@@ -249,21 +258,22 @@ class ESI extends Root {
 	 * @since    1.1.3
 	 * @access   private
 	 */
-	private function _register_esi_actions() {
-		! defined( 'LSCACHE_IS_ESI' ) && define( 'LSCACHE_IS_ESI', $_GET[ self::QS_ACTION ] );// Reused this to ESI block ID
+	private function _register_esi_actions()
+	{
+		!defined('LSCACHE_IS_ESI') && define('LSCACHE_IS_ESI', $_GET[self::QS_ACTION]); // Reused this to ESI block ID
 
-		! empty( $_SERVER[ 'ESI_REFERER' ] ) && defined( 'LSCWP_LOG' ) && Debug2::debug( '[ESI] ESI_REFERER: ' . $_SERVER[ 'ESI_REFERER' ] );
+		!empty($_SERVER['ESI_REFERER']) && defined('LSCWP_LOG') && Debug2::debug('[ESI] ESI_REFERER: ' . $_SERVER['ESI_REFERER']);
 
 		/**
 		 * Only when ESI's parent is not REST, replace REQUEST_URI to avoid breaking WP5 editor REST call
 		 * @since 2.9.3
 		 */
-		if ( ! empty( $_SERVER[ 'ESI_REFERER' ] ) && ! $this->cls( 'REST' )->is_rest( $_SERVER[ 'ESI_REFERER' ] ) ) {
-			$_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'ESI_REFERER' ];
+		if (!empty($_SERVER['ESI_REFERER']) && !$this->cls('REST')->is_rest($_SERVER['ESI_REFERER'])) {
+			$_SERVER['REQUEST_URI'] = $_SERVER['ESI_REFERER'];
 		}
 
-		if ( ! empty( $_SERVER[ 'ESI_CONTENT_TYPE' ] ) && strpos( $_SERVER[ 'ESI_CONTENT_TYPE' ], 'application/json' ) === 0 ) {
-			add_filter( 'litespeed_is_json', '__return_true' );
+		if (!empty($_SERVER['ESI_CONTENT_TYPE']) && strpos($_SERVER['ESI_CONTENT_TYPE'], 'application/json') === 0) {
+			add_filter('litespeed_is_json', '__return_true');
 		}
 
 		/**
@@ -271,17 +281,17 @@ class ESI extends Root {
 		 * NOTE: Not effective due to ESI req are all to `/` yet
 		 * @since 2.9.4
 		 */
-		add_action( 'rest_api_init', array( $this, 'load_esi_block' ), 101 );
+		add_action('rest_api_init', array($this, 'load_esi_block'), 101);
 
 		// Register ESI blocks
 		add_action('litespeed_esi_load-widget', array($this, 'load_widget_block'));
 		add_action('litespeed_esi_load-admin-bar', array($this, 'load_admin_bar_block'));
 		add_action('litespeed_esi_load-comment-form', array($this, 'load_comment_form_block'));
 
-		add_action('litespeed_esi_load-nonce', array( $this, 'load_nonce_block' ) );
-		add_action('litespeed_esi_load-esi', array( $this, 'load_esi_shortcode' ) );
+		add_action('litespeed_esi_load-nonce', array($this, 'load_nonce_block'));
+		add_action('litespeed_esi_load-esi', array($this, 'load_esi_shortcode'));
 
-		add_action('litespeed_esi_load-' . self::COMBO, array( $this, 'load_combo' ) );
+		add_action('litespeed_esi_load-' . self::COMBO, array($this, 'load_combo'));
 	}
 
 	/**
@@ -293,10 +303,11 @@ class ESI extends Root {
 	 * @param string $template The template path filtered.
 	 * @return string The new template path.
 	 */
-	public function esi_template( $template ) {
+	public function esi_template($template)
+	{
 		// Check if is an ESI request
-		if ( defined( 'LSCACHE_IS_ESI' ) ) {
-			Debug2::debug( '[ESI] calling template' );
+		if (defined('LSCACHE_IS_ESI')) {
+			Debug2::debug('[ESI] calling template');
 
 			return LSCWP_DIR . 'tpl/esi.tpl.php';
 		}
@@ -311,30 +322,30 @@ class ESI extends Root {
 	 * @since    1.1.3
 	 * @access   private
 	 */
-	private function _register_not_esi_actions() {
-		do_action( 'litespeed_tpl_normal' );
+	private function _register_not_esi_actions()
+	{
+		do_action('litespeed_tpl_normal');
 
-		if ( ! Control::is_cacheable() ) {
+		if (!Control::is_cacheable()) {
 			return;
 		}
 
-		if ( Router::is_ajax() ) {
+		if (Router::is_ajax()) {
 			return;
 		}
 
-		add_filter('widget_display_callback', array( $this, 'sub_widget_block' ), 0, 3);
+		add_filter('widget_display_callback', array($this, 'sub_widget_block'), 0, 3);
 
 		// Add admin_bar esi
-		if ( Router::is_logged_in() ) {
+		if (Router::is_logged_in()) {
 			remove_action('wp_footer', 'wp_admin_bar_render', 1000);
 			add_action('wp_footer', array($this, 'sub_admin_bar_block'), 1000);
 		}
 
 		// Add comment forum esi for logged-in user or commenter
-		if ( ! Router::is_ajax() && Vary::has_vary() ) {
-			add_filter( 'comment_form_defaults', array( $this, 'register_comment_form_actions' ) );
+		if (!Router::is_ajax() && Vary::has_vary()) {
+			add_filter('comment_form_defaults', array($this, 'register_comment_form_actions'));
 		}
-
 	}
 
 	/**
@@ -342,12 +353,13 @@ class ESI extends Root {
 	 *
 	 * @since  3.4.2
 	 */
-	public static function combine( $block_id ) {
-		if ( ! isset( $_SERVER[ 'X-LSCACHE' ] ) || strpos( $_SERVER[ 'X-LSCACHE' ], 'combine' ) === false ) {
+	public static function combine($block_id)
+	{
+		if (!isset($_SERVER['X-LSCACHE']) || strpos($_SERVER['X-LSCACHE'], 'combine') === false) {
 			return;
 		}
 
-		if ( in_array( $block_id, self::$_combine_ids ) ) {
+		if (in_array($block_id, self::$_combine_ids)) {
 			return;
 		}
 
@@ -359,29 +371,30 @@ class ESI extends Root {
 	 *
 	 * @since  3.4.2
 	 */
-	public function load_combo() {
-		Control::set_nocache( 'ESI combine request' );
+	public function load_combo()
+	{
+		Control::set_nocache('ESI combine request');
 
-		if ( empty( $_POST[ 'esi_include' ] ) ) {
+		if (empty($_POST['esi_include'])) {
 			return;
 		}
 
 		self::set_has_esi();
 
-		Debug2::debug( '[ESI] 🍔 Load combo', $_POST[ 'esi_include' ] );
+		Debug2::debug('[ESI] 🍔 Load combo', $_POST['esi_include']);
 
 		$output = '';
-		foreach ( $_POST[ 'esi_include' ] as $url ) {
-			$qs = parse_url( htmlspecialchars_decode( $url ), PHP_URL_QUERY );
-			parse_str( $qs, $qs );
-			if ( empty( $qs[ self::QS_ACTION ] ) ) {
+		foreach ($_POST['esi_include'] as $url) {
+			$qs = parse_url(htmlspecialchars_decode($url), PHP_URL_QUERY);
+			parse_str($qs, $qs);
+			if (empty($qs[self::QS_ACTION])) {
 				continue;
 			}
-			$esi_id = $qs[ self::QS_ACTION ];
-			$esi_param = ! empty( $qs[ self::QS_PARAMS ] ) ? $this->_parse_esi_param( $qs[ self::QS_PARAMS ] ) : false;
-			$inline_param = apply_filters( 'litespeed_esi_inline-' . $esi_id, array(), $esi_param ); // Returned array need to be [ val, control, tag ]
-			if ( $inline_param ) {
-				$output .= self::_build_inline( $url, $inline_param );
+			$esi_id = $qs[self::QS_ACTION];
+			$esi_param = !empty($qs[self::QS_PARAMS]) ? $this->_parse_esi_param($qs[self::QS_PARAMS]) : false;
+			$inline_param = apply_filters('litespeed_esi_inline-' . $esi_id, array(), $esi_param); // Returned array need to be [ val, control, tag ]
+			if ($inline_param) {
+				$output .= self::_build_inline($url, $inline_param);
 			}
 		}
 
@@ -393,12 +406,13 @@ class ESI extends Root {
 	 *
 	 * @since  3.4.2
 	 */
-	private static function _build_inline( $url, $inline_param ) {
-		if ( ! $url || empty( $inline_param[ 'val' ] ) || empty( $inline_param[ 'control' ] ) || empty( $inline_param[ 'tag' ] ) ) {
+	private static function _build_inline($url, $inline_param)
+	{
+		if (!$url || empty($inline_param['val']) || empty($inline_param['control']) || empty($inline_param['tag'])) {
 			return '';
 		}
 
-		return "<esi:inline name='$url' cache-control='" . $inline_param[ 'control' ] . "' cache-tag='" . $inline_param[ 'tag' ] . "'>" . $inline_param[ 'val' ] . "</esi:inline>";
+		return "<esi:inline name='$url' cache-control='" . $inline_param['control'] . "' cache-tag='" . $inline_param['tag'] . "'>" . $inline_param['val'] . "</esi:inline>";
 	}
 
 	/**
@@ -417,31 +431,32 @@ class ESI extends Root {
 	 * @param bool $svar  		If store the value in memory or not, in memory wil be faster
 	 * @param array $inline_val 	If show the current value for current request( this can avoid multiple esi requests in first time cache generating process )
 	 */
-	public function sub_esi_block( $block_id, $wrapper, $params = array(), $control = 'private,no-vary', $silence = false, $preserved = false, $svar = false, $inline_param = array() ) {
-		if ( empty($block_id) || ! is_array($params) || preg_match('/[^\w-]/', $block_id) ) {
+	public function sub_esi_block($block_id, $wrapper, $params = array(), $control = 'private,no-vary', $silence = false, $preserved = false, $svar = false, $inline_param = array())
+	{
+		if (empty($block_id) || !is_array($params) || preg_match('/[^\w-]/', $block_id)) {
 			return false;
 		}
 
-		if ( defined( 'LITESPEED_ESI_OFF' ) ) {
-			Debug2::debug( '[ESI] ESI OFF so force loading [block_id] ' . $block_id );
-			do_action( 'litespeed_esi_load-' . $block_id, $params );
+		if (defined('LITESPEED_ESI_OFF')) {
+			Debug2::debug('[ESI] ESI OFF so force loading [block_id] ' . $block_id);
+			do_action('litespeed_esi_load-' . $block_id, $params);
 			return;
 		}
 
-		if ( $silence ) {
+		if ($silence) {
 			// Don't add comment to esi block ( original for nonce used in tag property data-nonce='esi_block' )
-			$params[ '_ls_silence' ] = true;
+			$params['_ls_silence'] = true;
 		}
 
-		if ( $this->cls( 'REST' )->is_rest() || $this->cls( 'REST' )->is_internal_rest() ) {
-			$params[ 'is_json' ] = 1;
+		if ($this->cls('REST')->is_rest() || $this->cls('REST')->is_internal_rest()) {
+			$params['is_json'] = 1;
 		}
 
-		$params = apply_filters( 'litespeed_esi_params', $params, $block_id );
-		$control = apply_filters('litespeed_esi_control', $control, $block_id );
+		$params = apply_filters('litespeed_esi_params', $params, $block_id);
+		$control = apply_filters('litespeed_esi_control', $control, $block_id);
 
-		if ( !is_array($params) || !is_string($control) ) {
-			defined( 'LSCWP_LOG' ) && Debug2::debug( "[ESI] 🛑 Sub hooks returned Params: \n" . var_export($params, true) . "\ncache control: \n" . var_export($control, true) );
+		if (!is_array($params) || !is_string($control)) {
+			defined('LSCWP_LOG') && Debug2::debug("[ESI] 🛑 Sub hooks returned Params: \n" . var_export($params, true) . "\ncache control: \n" . var_export($control, true));
 
 			return false;
 		}
@@ -450,61 +465,62 @@ class ESI extends Root {
 		$appended_params = array(
 			self::QS_ACTION	=> $block_id,
 		);
-		if ( ! empty( $control ) ) {
-			$appended_params[ '_control' ] = $control;
+		if (!empty($control)) {
+			$appended_params['_control'] = $control;
 		}
-		if ( $params ) {
-			$appended_params[ self::QS_PARAMS ] = base64_encode( json_encode( $params ) );
-			Debug2::debug2( '[ESI] param ', $params );
+		if ($params) {
+			$appended_params[self::QS_PARAMS] = base64_encode(json_encode($params));
+			Debug2::debug2('[ESI] param ', $params);
 		}
 
 		// Append hash
-		$appended_params[ '_hash' ] = $this->_gen_esi_md5( $appended_params );
+		$appended_params['_hash'] = $this->_gen_esi_md5($appended_params);
 
 		/**
 		 * Escape potential chars
 		 * @since 2.9.4
 		 */
-		$appended_params = array_map( 'urlencode', $appended_params );
+		$appended_params = array_map('urlencode', $appended_params);
 
 		// Generate ESI URL
-		$url = add_query_arg( $appended_params, trailingslashit( wp_make_link_relative( home_url() ) ) );
+		$url = add_query_arg($appended_params, trailingslashit(wp_make_link_relative(home_url())));
 
 		$output = '';
-		if ( $inline_param ) {
-			$output .= self::_build_inline( $url, $inline_param );
+		if ($inline_param) {
+			$output .= self::_build_inline($url, $inline_param);
 		}
 
 		$output .= "<esi:include src='$url'";
-		if ( ! empty( $control ) ) {
+		if (!empty($control)) {
+			$control = esc_attr($control);
 			$output .= " cache-control='$control'";
 		}
-		if ( $svar ) {
+		if ($svar) {
 			$output .= " as-var='1'";
 		}
-		if ( in_array( $block_id, self::$_combine_ids ) ) {
+		if (in_array($block_id, self::$_combine_ids)) {
 			$output .= " combine='sub'";
 		}
-		if ( $block_id == self::COMBO && isset( $_SERVER[ 'X-LSCACHE' ] ) && strpos( $_SERVER[ 'X-LSCACHE' ], 'combine' ) !== false ) {
+		if ($block_id == self::COMBO && isset($_SERVER['X-LSCACHE']) && strpos($_SERVER['X-LSCACHE'], 'combine') !== false) {
 			$output .= " combine='main'";
 		}
 		$output .= " />";
 
-		if ( ! $silence ) {
+		if (!$silence) {
 			$output = "<!-- lscwp $wrapper -->$output<!-- lscwp $wrapper esi end -->";
 		}
 
-		Debug2::debug( "[ESI] 💕  [BLock_ID] $block_id \t[wrapper] $wrapper \t\t[Control] $control" );
-		Debug2::debug2( $output );
+		Debug2::debug("[ESI] 💕  [BLock_ID] $block_id \t[wrapper] $wrapper \t\t[Control] $control");
+		Debug2::debug2($output);
 
 		self::set_has_esi();
 
 		// Convert to string to avoid html chars filter when using
 		// Will reverse the buffer when output in self::finalize()
-		if ( $preserved ) {
-			$hash = md5( $output );
-			$this->_esi_preserve_list[ $hash ] = $output;
-			Debug2::debug( "[ESI] Preserved to $hash" );
+		if ($preserved) {
+			$hash = md5($output);
+			$this->_esi_preserve_list[$hash] = $output;
+			Debug2::debug("[ESI] Preserved to $hash");
 
 			return $hash;
 		}
@@ -518,7 +534,8 @@ class ESI extends Root {
 	 * @since  2.9.6
 	 * @access private
 	 */
-	private function _gen_esi_md5( $params ) {
+	private function _gen_esi_md5($params)
+	{
 		$keys = array(
 			self::QS_ACTION,
 			'_control',
@@ -526,14 +543,14 @@ class ESI extends Root {
 		);
 
 		$str = '';
-		foreach ( $keys as $v ) {
-			if ( isset( $params[ $v ] ) && is_string( $params[ $v ] ) ) {
-				$str .= $params[ $v ];
+		foreach ($keys as $v) {
+			if (isset($params[$v]) && is_string($params[$v])) {
+				$str .= $params[$v];
 			}
 		}
-		Debug2::debug2( '[ESI] md5_string=' . $str );
+		Debug2::debug2('[ESI] md5_string=' . $str);
 
-		return md5( $this->conf( Base::HASH ) . $str );
+		return md5($this->conf(Base::HASH) . $str);
 	}
 
 	/**
@@ -542,27 +559,27 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access private
 	 */
-	private function _parse_esi_param( $qs_params = false ) {
+	private function _parse_esi_param($qs_params = false)
+	{
 		$req_params = false;
-		if ( $qs_params ) {
+		if ($qs_params) {
 			$req_params = $qs_params;
-		}
-		elseif ( isset( $_REQUEST[ self::QS_PARAMS ] ) ) {
-			$req_params = $_REQUEST[ self::QS_PARAMS ];
+		} elseif (isset($_REQUEST[self::QS_PARAMS])) {
+			$req_params = $_REQUEST[self::QS_PARAMS];
 		}
 
-		if ( ! $req_params ) {
+		if (!$req_params) {
 			return false;
 		}
 
-		$unencrypted = base64_decode( $req_params );
-		if ( $unencrypted === false ) {
+		$unencrypted = base64_decode($req_params);
+		if ($unencrypted === false) {
 			return false;
 		}
 
-		Debug2::debug2( '[ESI] parms', $unencrypted );
+		Debug2::debug2('[ESI] parms', $unencrypted);
 		// $unencoded = urldecode($unencrypted); no need to do this as $_GET is already parsed
-		$params = json_decode( $unencrypted, true );
+		$params = json_decode($unencrypted, true);
 
 		return $params;
 	}
@@ -573,41 +590,42 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access public
 	 */
-	public function load_esi_block() {
+	public function load_esi_block()
+	{
 		/**
 		 * Validate if is a legal ESI req
 		 * @since 2.9.6
 		 */
-		if ( empty( $_GET[ '_hash' ] ) || $this->_gen_esi_md5( $_GET ) != $_GET[ '_hash' ] ) {
-			Debug2::debug( '[ESI] ❌ Failed to validate _hash' );
+		if (empty($_GET['_hash']) || $this->_gen_esi_md5($_GET) != $_GET['_hash']) {
+			Debug2::debug('[ESI] ❌ Failed to validate _hash');
 			return;
 		}
 
 		$params = $this->_parse_esi_param();
 
-		if ( defined( 'LSCWP_LOG' ) ) {
+		if (defined('LSCWP_LOG')) {
 			$logInfo = '[ESI] ⭕ ';
-			if( ! empty( $params[ self::PARAM_NAME ] ) ) {
-				$logInfo .= ' Name: ' . $params[ self::PARAM_NAME ] . ' ----- ';
+			if (!empty($params[self::PARAM_NAME])) {
+				$logInfo .= ' Name: ' . $params[self::PARAM_NAME] . ' ----- ';
 			}
 			$logInfo .= ' [ID] ' . LSCACHE_IS_ESI;
-			Debug2::debug( $logInfo );
+			Debug2::debug($logInfo);
 		}
 
-		if ( ! empty( $params[ '_ls_silence' ] ) ) {
-			! defined( 'LSCACHE_ESI_SILENCE' ) && define( 'LSCACHE_ESI_SILENCE', true );
+		if (!empty($params['_ls_silence'])) {
+			!defined('LSCACHE_ESI_SILENCE') && define('LSCACHE_ESI_SILENCE', true);
 		}
 
 		/**
 		 * Buffer needs to be JSON format
 		 * @since  2.9.4
 		 */
-		if ( ! empty( $params[ 'is_json' ] ) ) {
-			add_filter( 'litespeed_is_json', '__return_true' );
+		if (!empty($params['is_json'])) {
+			add_filter('litespeed_is_json', '__return_true');
 		}
 
-		Tag::add( rtrim( Tag::TYPE_ESI, '.' ) );
-		Tag::add( Tag::TYPE_ESI . LSCACHE_IS_ESI );
+		Tag::add(rtrim(Tag::TYPE_ESI, '.'));
+		Tag::add(Tag::TYPE_ESI . LSCACHE_IS_ESI);
 
 		// Debug2::debug(var_export($params, true ));
 
@@ -616,13 +634,13 @@ class ESI extends Root {
 		 *
 		 * @since  2.2.3
 		 */
-		if ( ! empty( $_GET[ '_control' ] ) ) {
-			$control = explode( ',', $_GET[ '_control' ] );
-			if ( in_array( 'private', $control ) ) {
+		if (!empty($_GET['_control'])) {
+			$control = explode(',', $_GET['_control']);
+			if (in_array('private', $control)) {
 				Control::set_private();
 			}
 
-			if ( in_array( 'no-vary', $control ) ) {
+			if (in_array('no-vary', $control)) {
 				Control::set_no_vary();
 			}
 		}
@@ -630,8 +648,8 @@ class ESI extends Root {
 		do_action('litespeed_esi_load-' . LSCACHE_IS_ESI, $params);
 	}
 
-// The *_sub_* functions are helpers for the sub_* functions.
-// The *_load_* functions are helpers for the load_* functions.
+	// The *_sub_* functions are helpers for the sub_* functions.
+	// The *_load_* functions are helpers for the load_* functions.
 
 	/**
 	 * Loads the default options for default WordPress widgets.
@@ -639,19 +657,20 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access public
 	 */
-	public static function widget_default_options($options, $widget) {
-		if ( ! is_array($options) ) {
+	public static function widget_default_options($options, $widget)
+	{
+		if (!is_array($options)) {
 			return $options;
 		}
 
 		$widget_name = get_class($widget);
 		switch ($widget_name) {
-			case 'WP_Widget_Recent_Posts' :
-			case 'WP_Widget_Recent_Comments' :
+			case 'WP_Widget_Recent_Posts':
+			case 'WP_Widget_Recent_Comments':
 				$options[self::WIDGET_O_ESIENABLE] = Base::VAL_OFF;
 				$options[self::WIDGET_O_TTL] = 86400;
 				break;
-			default :
+			default:
 				break;
 		}
 		return $options;
@@ -669,24 +688,25 @@ class ESI extends Root {
 	 * @param array $args Parameter used to build the widget.
 	 * @return mixed Return false if display through esi, instance otherwise.
 	 */
-	public function sub_widget_block( $instance, $widget, $args ) {
+	public function sub_widget_block($instance, $widget, $args)
+	{
 		// #210407
-		if ( ! is_array( $instance ) ) {
+		if (!is_array($instance)) {
 			return $instance;
 		}
 
-		$name = get_class( $widget );
-		if ( ! isset( $instance[ Base::OPTION_NAME ] ) ) {
+		$name = get_class($widget);
+		if (!isset($instance[Base::OPTION_NAME])) {
 			return $instance;
 		}
-		$options = $instance[ Base::OPTION_NAME ];
-		if ( ! isset( $options ) || ! $options[ self::WIDGET_O_ESIENABLE ] ) {
-			defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI 0 ' . $name . ': '. ( ! isset( $options ) ? 'not set' : 'set off' ) );
+		$options = $instance[Base::OPTION_NAME];
+		if (!isset($options) || !$options[self::WIDGET_O_ESIENABLE]) {
+			defined('LSCWP_LOG') && Debug2::debug('ESI 0 ' . $name . ': ' . (!isset($options) ? 'not set' : 'set off'));
 
 			return $instance;
 		}
 
-		$esi_private = $options[ self::WIDGET_O_ESIENABLE ] == Base::VAL_ON2 ? 'private,' : '';
+		$esi_private = $options[self::WIDGET_O_ESIENABLE] == Base::VAL_ON2 ? 'private,' : '';
 
 		$params = array(
 			self::PARAM_NAME => $name,
@@ -695,7 +715,7 @@ class ESI extends Root {
 			self::PARAM_ARGS => $args
 		);
 
-		echo $this->sub_esi_block( 'widget', 'widget ' . $name, $params, $esi_private . 'no-vary' );
+		echo $this->sub_esi_block('widget', 'widget ' . $name, $params, $esi_private . 'no-vary');
 
 		return false;
 	}
@@ -708,19 +728,20 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @global type $wp_admin_bar
 	 */
-	public function sub_admin_bar_block() {
+	public function sub_admin_bar_block()
+	{
 		global $wp_admin_bar;
 
-		if ( ! is_admin_bar_showing() || ! is_object($wp_admin_bar) ) {
+		if (!is_admin_bar_showing() || !is_object($wp_admin_bar)) {
 			return;
 		}
 
 		// To make each admin bar ESI request different for `Edit` button different link
 		$params = array(
-			'ref' => $_SERVER[ 'REQUEST_URI' ],
+			'ref' => $_SERVER['REQUEST_URI'],
 		);
 
-		echo $this->sub_esi_block( 'admin-bar', 'adminbar', $params );
+		echo $this->sub_esi_block('admin-bar', 'adminbar', $params);
 	}
 
 	/**
@@ -731,28 +752,28 @@ class ESI extends Root {
 	 * @global $wp_widget_factory
 	 * @param array $params Input parameters needed to correctly display widget
 	 */
-	public function load_widget_block( $params ) {
+	public function load_widget_block($params)
+	{
 		// global $wp_widget_factory;
 		// $widget = $wp_widget_factory->widgets[ $params[ self::PARAM_NAME ] ];
-		$option = $params[ self::PARAM_INSTANCE ];
-		$option = $option[ Base::OPTION_NAME ];
+		$option = $params[self::PARAM_INSTANCE];
+		$option = $option[Base::OPTION_NAME];
 
 		// Since we only reach here via esi, safe to assume setting exists.
-		$ttl = $option[ self::WIDGET_O_TTL ];
-		defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI widget render: name ' . $params[ self::PARAM_NAME ] . ', id ' . $params[ self::PARAM_ID ] . ', ttl ' . $ttl );
-		if ( $ttl == 0 ) {
-			Control::set_nocache( 'ESI Widget time to live set to 0' );
-		}
-		else {
-			Control::set_custom_ttl( $ttl );
-
-			if ( $option[ self::WIDGET_O_ESIENABLE ] == Base::VAL_ON2 ) {
+		$ttl = $option[self::WIDGET_O_TTL];
+		defined('LSCWP_LOG') && Debug2::debug('ESI widget render: name ' . $params[self::PARAM_NAME] . ', id ' . $params[self::PARAM_ID] . ', ttl ' . $ttl);
+		if ($ttl == 0) {
+			Control::set_nocache('ESI Widget time to live set to 0');
+		} else {
+			Control::set_custom_ttl($ttl);
+
+			if ($option[self::WIDGET_O_ESIENABLE] == Base::VAL_ON2) {
 				Control::set_private();
 			}
 			Control::set_no_vary();
-			Tag::add( Tag::TYPE_WIDGET . $params[ self::PARAM_ID ] );
+			Tag::add(Tag::TYPE_WIDGET . $params[self::PARAM_ID]);
 		}
-		the_widget( $params[ self::PARAM_NAME ], $params[ self::PARAM_INSTANCE ], $params[ self::PARAM_ARGS ] );
+		the_widget($params[self::PARAM_NAME], $params[self::PARAM_INSTANCE], $params[self::PARAM_ARGS]);
 	}
 
 	/**
@@ -761,31 +782,31 @@ class ESI extends Root {
 	 * @access public
 	 * @since 1.1.3
 	 */
-	public function load_admin_bar_block( $params ) {
+	public function load_admin_bar_block($params)
+	{
 
-		if ( ! empty( $params[ 'ref' ] ) ) {
-			$ref_qs = parse_url( $params[ 'ref' ], PHP_URL_QUERY );
-			if ( ! empty( $ref_qs ) ) {
-				parse_str( $ref_qs, $ref_qs_arr );
+		if (!empty($params['ref'])) {
+			$ref_qs = parse_url($params['ref'], PHP_URL_QUERY);
+			if (!empty($ref_qs)) {
+				parse_str($ref_qs, $ref_qs_arr);
 
-				if ( ! empty( $ref_qs_arr ) ) {
-					foreach ( $ref_qs_arr as $k => $v ) {
-						$_GET[ $k ] = $v;
+				if (!empty($ref_qs_arr)) {
+					foreach ($ref_qs_arr as $k => $v) {
+						$_GET[$k] = $v;
 					}
 				}
 			}
 		}
 
 		wp_admin_bar_render();
-		if ( ! $this->conf( Base::O_ESI_CACHE_ADMBAR ) ) {
-			Control::set_nocache( 'build-in set to not cacheable' );
-		}
-		else {
+		if (!$this->conf(Base::O_ESI_CACHE_ADMBAR)) {
+			Control::set_nocache('build-in set to not cacheable');
+		} else {
 			Control::set_private();
 			Control::set_no_vary();
 		}
 
-		defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI: adminbar ref: ' . $_SERVER[ 'REQUEST_URI' ] );
+		defined('LSCWP_LOG') && Debug2::debug('ESI: adminbar ref: ' . $_SERVER['REQUEST_URI']);
 	}
 
 
@@ -796,15 +817,15 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @param array $params Input parameters needed to correctly display comment form
 	 */
-	public function load_comment_form_block( $params ) {
-		comment_form( $params[ self::PARAM_ARGS ], $params[ self::PARAM_ID ] );
+	public function load_comment_form_block($params)
+	{
+		comment_form($params[self::PARAM_ARGS], $params[self::PARAM_ID]);
 
-		if ( ! $this->conf( Base::O_ESI_CACHE_COMMFORM ) ) {
-			Control::set_nocache( 'build-in set to not cacheable' );
-		}
-		else {
+		if (!$this->conf(Base::O_ESI_CACHE_COMMFORM)) {
+			Control::set_nocache('build-in set to not cacheable');
+		} else {
 			// by default comment form is public
-			if ( Vary::has_vary() ) {
+			if (Vary::has_vary()) {
 				Control::set_private();
 				Control::set_no_vary();
 			}
@@ -817,23 +838,23 @@ class ESI extends Root {
 	 * @access public
 	 * @since 2.6
 	 */
-	public function load_nonce_block( $params ) {
-		$action = $params[ 'action' ];
+	public function load_nonce_block($params)
+	{
+		$action = $params['action'];
 
-		Debug2::debug( '[ESI] load_nonce_block [action] ' . $action );
+		Debug2::debug('[ESI] load_nonce_block [action] ' . $action);
 
 		// set nonce TTL to half day
-		Control::set_custom_ttl( 43200 );
+		Control::set_custom_ttl(43200);
 
-		if ( Router::is_logged_in() ) {
+		if (Router::is_logged_in()) {
 			Control::set_private();
 		}
 
-		if ( function_exists( 'wp_create_nonce_litespeed_esi' ) ) {
-			echo wp_create_nonce_litespeed_esi( $action );
-		}
-		else {
-			echo wp_create_nonce( $action );
+		if (function_exists('wp_create_nonce_litespeed_esi')) {
+			echo wp_create_nonce_litespeed_esi($action);
+		} else {
+			echo wp_create_nonce($action);
 		}
 	}
 
@@ -843,32 +864,32 @@ class ESI extends Root {
 	 * @access public
 	 * @since 2.8
 	 */
-	public function load_esi_shortcode( $params ) {
-		if ( isset( $params[ 'ttl' ] ) ) {
-			if ( ! $params[ 'ttl' ] ) {
-				Control::set_nocache( 'ESI shortcode att ttl=0' );
-			}
-			else {
-				Control::set_custom_ttl( $params[ 'ttl' ] );
+	public function load_esi_shortcode($params)
+	{
+		if (isset($params['ttl'])) {
+			if (!$params['ttl']) {
+				Control::set_nocache('ESI shortcode att ttl=0');
+			} else {
+				Control::set_custom_ttl($params['ttl']);
 			}
-			unset( $params[ 'ttl' ] );
+			unset($params['ttl']);
 		}
 
 		// Replace to original shortcode
-		$shortcode = $params[ 0 ];
+		$shortcode = $params[0];
 		$atts_ori = array();
-		foreach ( $params as $k => $v ) {
-			if ( $k === 0 ) {
+		foreach ($params as $k => $v) {
+			if ($k === 0) {
 				continue;
 			}
 
-			$atts_ori[] = is_string( $k ) ? "$k='" . addslashes( $v ) . "'" : $v;
+			$atts_ori[] = is_string($k) ? "$k='" . addslashes($v) . "'" : $v;
 		}
 
-		Tag::add( Tag::TYPE_ESI . "esi.$shortcode" );
+		Tag::add(Tag::TYPE_ESI . "esi.$shortcode");
 
 		// Output original shortcode final content
-		echo do_shortcode( "[$shortcode " . implode( ' ', $atts_ori ) . " ]" );
+		echo do_shortcode("[$shortcode " . implode(' ', $atts_ori) . " ]");
 	}
 
 	/**
@@ -880,11 +901,12 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access public
 	 */
-	public function register_comment_form_actions( $defaults ) {
+	public function register_comment_form_actions($defaults)
+	{
 		$this->esi_args = $defaults;
 		echo GUI::clean_wrapper_begin();
-		add_filter( 'comment_form_submit_button', array( $this, 'sub_comment_form_btn' ), 1000, 2 ); // To save the params passed in
-		add_action( 'comment_form', array( $this, 'sub_comment_form_block' ), 1000 );
+		add_filter('comment_form_submit_button', array($this, 'sub_comment_form_btn'), 1000, 2); // To save the params passed in
+		add_action('comment_form', array($this, 'sub_comment_form_block'), 1000);
 		return $defaults;
 	}
 
@@ -894,26 +916,25 @@ class ESI extends Root {
 	 * @since  3.4
 	 * @access public
 	 */
-	public function sub_comment_form_btn( $unused, $args ) {
-		if ( empty( $args ) || empty( $this->esi_args ) ) {
-			Debug2::debug( 'comment form args empty?' );
+	public function sub_comment_form_btn($unused, $args)
+	{
+		if (empty($args) || empty($this->esi_args)) {
+			Debug2::debug('comment form args empty?');
 			return $unused;
 		}
 		$esi_args = array();
 
 		// compare current args with default ones
-		foreach ( $args as $k => $v ) {
-			if ( ! isset( $this->esi_args[ $k ] ) ) {
-				$esi_args[ $k ] = $v;
-			}
-			elseif ( is_array( $v ) ) {
-				$diff = array_diff_assoc( $v, $this->esi_args[ $k ] );
-				if ( ! empty( $diff ) ) {
-					$esi_args[ $k ] = $diff;
+		foreach ($args as $k => $v) {
+			if (!isset($this->esi_args[$k])) {
+				$esi_args[$k] = $v;
+			} elseif (is_array($v)) {
+				$diff = array_diff_assoc($v, $this->esi_args[$k]);
+				if (!empty($diff)) {
+					$esi_args[$k] = $diff;
 				}
-			}
-			elseif ( $v !== $this->esi_args[ $k ] ) {
-				$esi_args[ $k ] = $v;
+			} elseif ($v !== $this->esi_args[$k]) {
+				$esi_args[$k] = $v;
 			}
 		}
 
@@ -930,16 +951,17 @@ class ESI extends Root {
 	 * @access public
 	 * @since 1.1.3
 	 */
-	public function sub_comment_form_block( $post_id ) {
+	public function sub_comment_form_block($post_id)
+	{
 		echo GUI::clean_wrapper_end();
 		$params = array(
 			self::PARAM_ID => $post_id,
 			self::PARAM_ARGS => $this->esi_args,
 		);
 
-		echo $this->sub_esi_block( 'comment-form', 'comment form', $params );
+		echo $this->sub_esi_block('comment-form', 'comment form', $params);
 		echo GUI::clean_wrapper_begin();
-		add_action( 'comment_form_after', array( $this, 'comment_form_sub_clean' ) );
+		add_action('comment_form_after', array($this, 'comment_form_sub_clean'));
 	}
 
 	/**
@@ -949,7 +971,8 @@ class ESI extends Root {
 	 * @since 1.1.3
 	 * @access public
 	 */
-	public function comment_form_sub_clean() {
+	public function comment_form_sub_clean()
+	{
 		echo GUI::clean_wrapper_end();
 	}
 
@@ -959,24 +982,25 @@ class ESI extends Root {
 	 * @since  2.6
 	 * @access public
 	 */
-	public function finalize( $buffer ) {
+	public function finalize($buffer)
+	{
 		// Prepend combo esi block
-		if ( self::$_combine_ids ) {
-			Debug2::debug( '[ESI] 🍔 Enabled combo' );
-			$esi_block = $this->sub_esi_block( self::COMBO, '__COMBINE_MAIN__', array(), 'no-cache', true );
+		if (self::$_combine_ids) {
+			Debug2::debug('[ESI] 🍔 Enabled combo');
+			$esi_block = $this->sub_esi_block(self::COMBO, '__COMBINE_MAIN__', array(), 'no-cache', true);
 			$buffer = $esi_block . $buffer;
 		}
 
 		// Bypass if no preserved list to be replaced
-		if ( ! $this->_esi_preserve_list ) {
+		if (!$this->_esi_preserve_list) {
 			return $buffer;
 		}
 
-		$keys = array_keys( $this->_esi_preserve_list );
+		$keys = array_keys($this->_esi_preserve_list);
 
-		Debug2::debug( '[ESI] replacing preserved blocks', $keys );
+		Debug2::debug('[ESI] replacing preserved blocks', $keys);
 
-		$buffer = str_replace( $keys, $this->_esi_preserve_list, $buffer );
+		$buffer = str_replace($keys, $this->_esi_preserve_list, $buffer);
 
 		return $buffer;
 	}
@@ -986,17 +1010,17 @@ class ESI extends Root {
 	 *
 	 * @since  3.3
 	 */
-	public function contain_preserve_esi( $content ) {
+	public function contain_preserve_esi($content)
+	{
 		$hit_list = array();
-		foreach ( $this->_esi_preserve_list as $k => $v ) {
-			if ( strpos( $content, '"' . $k . '"' ) !== false ) {
+		foreach ($this->_esi_preserve_list as $k => $v) {
+			if (strpos($content, '"' . $k . '"') !== false) {
 				$hit_list[] = '"' . $k . '"';
 			}
-			if ( strpos( $content, "'" . $k . "'" ) !== false ) {
+			if (strpos($content, "'" . $k . "'") !== false) {
 				$hit_list[] = "'" . $k . "'";
 			}
 		}
 		return $hit_list;
 	}
-
 }

programming_language: PHP