-
-
-
+
<# } #>
-
-
-
<# } #>
<# if ( ! _.isUndefined( data.default['font-size'] ) ) { #>
diff --git a/functions/kirki/controls/php/class-kirki-control-upload.php b/functions/kirki/controls/php/class-kirki-control-upload.php
index 365bf69..4c72a4b 100644
--- a/functions/kirki/controls/php/class-kirki-control-upload.php
+++ b/functions/kirki/controls/php/class-kirki-control-upload.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.23
*/
diff --git a/functions/kirki/controls/php/class-kirki-settings-repeater-setting.php b/functions/kirki/controls/php/class-kirki-settings-repeater-setting.php
index 69eccea..0c9b55d 100644
--- a/functions/kirki/controls/php/class-kirki-settings-repeater-setting.php
+++ b/functions/kirki/controls/php/class-kirki-settings-repeater-setting.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.0
*/
diff --git a/functions/kirki/controls/views/code.php b/functions/kirki/controls/views/code.php
index cb51c1e..e8531ea 100644
--- a/functions/kirki/controls/views/code.php
+++ b/functions/kirki/controls/views/code.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/controls/views/color.php b/functions/kirki/controls/views/color.php
index 75dec2f..97afa9d 100644
--- a/functions/kirki/controls/views/color.php
+++ b/functions/kirki/controls/views/color.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/controls/views/generic.php b/functions/kirki/controls/views/generic.php
index 38a224d..da51083 100644
--- a/functions/kirki/controls/views/generic.php
+++ b/functions/kirki/controls/views/generic.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/controls/views/image.php b/functions/kirki/controls/views/image.php
index b440116..5c0a5a7 100644
--- a/functions/kirki/controls/views/image.php
+++ b/functions/kirki/controls/views/image.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.34
*/
diff --git a/functions/kirki/controls/views/number.php b/functions/kirki/controls/views/number.php
index bb238ef..e37188d 100644
--- a/functions/kirki/controls/views/number.php
+++ b/functions/kirki/controls/views/number.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.27
*/
diff --git a/functions/kirki/controls/views/radio.php b/functions/kirki/controls/views/radio.php
index 59c9699..a3a8a76 100644
--- a/functions/kirki/controls/views/radio.php
+++ b/functions/kirki/controls/views/radio.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/controls/views/select.php b/functions/kirki/controls/views/select.php
index 96269e7..d2ddf96 100644
--- a/functions/kirki/controls/views/select.php
+++ b/functions/kirki/controls/views/select.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/controls/views/textarea.php b/functions/kirki/controls/views/textarea.php
index 30f19db..f2808b0 100644
--- a/functions/kirki/controls/views/textarea.php
+++ b/functions/kirki/controls/views/textarea.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/core/class-kirki-config.php b/functions/kirki/core/class-kirki-config.php
index 3c93e84..7147337 100644
--- a/functions/kirki/core/class-kirki-config.php
+++ b/functions/kirki/core/class-kirki-config.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
*/
diff --git a/functions/kirki/core/class-kirki-control.php b/functions/kirki/core/class-kirki-control.php
index ccf36b8..1a33746 100644
--- a/functions/kirki/core/class-kirki-control.php
+++ b/functions/kirki/core/class-kirki-control.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
*/
diff --git a/functions/kirki/core/class-kirki-field.php b/functions/kirki/core/class-kirki-field.php
index 68cde8f..b5b9621 100644
--- a/functions/kirki/core/class-kirki-field.php
+++ b/functions/kirki/core/class-kirki-field.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki-helper.php b/functions/kirki/core/class-kirki-helper.php
index 7fa43db..b71ae4b 100644
--- a/functions/kirki/core/class-kirki-helper.php
+++ b/functions/kirki/core/class-kirki-helper.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -34,8 +34,16 @@ class Kirki_Helper {
return array_replace_recursive( $array, $array1 );
}
- // Handle the arguments, merge one by one.
- $args = func_get_args();
+ /**
+ * Handle the arguments, merge one by one.
+ *
+ * In PHP 7 func_get_args() changed the way it behaves but this doesn't mean anything in this case
+ * sinc ethis method is only used when the array_replace_recursive() function doesn't exist
+ * and that was introduced in PHP v5.3.
+ *
+ * Once WordPress-Core raises its minimum requirements we''' be able to remove this fallback completely.
+ */
+ $args = func_get_args(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue
$array = $args[0];
if ( ! is_array( $array ) ) {
return $array;
@@ -121,7 +129,7 @@ class Kirki_Helper {
global $wp_filesystem;
if ( empty( $wp_filesystem ) ) {
- require_once wp_normalize_path( ABSPATH . '/wp-admin/includes/file.php' );
+ require_once wp_normalize_path( ABSPATH . '/wp-admin/includes/file.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
WP_Filesystem( $credentials );
}
@@ -247,7 +255,8 @@ class Kirki_Helper {
$post_types = get_post_types(
array(
'public' => true,
- ), 'objects'
+ ),
+ 'objects'
);
// Build the array.
@@ -411,7 +420,7 @@ class Kirki_Helper {
return $value1 !== $value2;
}
if ( ( '!=' === $operator || 'not equal' === $operator ) ) {
- return $value1 != $value2; // WPCS: loose comparison ok.
+ return $value1 != $value2; // phpcs:ignore WordPress.PHP.StrictComparisons
}
if ( ( '>=' === $operator || 'greater or equal' === $operator || 'equal or greater' === $operator ) ) {
return $value2 >= $value1;
@@ -428,20 +437,20 @@ class Kirki_Helper {
if ( 'contains' === $operator || 'in' === $operator ) {
if ( is_array( $value1 ) && is_array( $value2 ) ) {
foreach ( $value2 as $val ) {
- if ( in_array( $val, $value1 ) ) { // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
+ if ( in_array( $val, $value1 ) ) { // phpcs:ignore WordPress.PHP.StrictInArray
return true;
}
}
return false;
}
if ( is_array( $value1 ) && ! is_array( $value2 ) ) {
- return in_array( $value2, $value1 ); // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
+ return in_array( $value2, $value1 ); // phpcs:ignore WordPress.PHP.StrictInArray
}
if ( is_array( $value2 ) && ! is_array( $value1 ) ) {
- return in_array( $value1, $value2 ); // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
+ return in_array( $value1, $value2 ); // phpcs:ignore WordPress.PHP.StrictInArray
}
return ( false !== strrpos( $value1, $value2 ) || false !== strpos( $value2, $value1 ) );
}
- return $value1 == $value2; // WPCS: loose comparison ok.
+ return $value1 == $value2; // phpcs:ignore WordPress.PHP.StrictComparisons
}
}
diff --git a/functions/kirki/core/class-kirki-init.php b/functions/kirki/core/class-kirki-init.php
index 212aabb..af31f83 100644
--- a/functions/kirki/core/class-kirki-init.php
+++ b/functions/kirki/core/class-kirki-init.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -147,7 +147,8 @@ class Kirki_Init {
}
$skip_control_types = apply_filters(
- 'kirki_control_types_exclude', array(
+ 'kirki_control_types_exclude',
+ array(
'Kirki_Control_Repeater',
'WP_Customize_Control',
)
diff --git a/functions/kirki/core/class-kirki-l10n.php b/functions/kirki/core/class-kirki-l10n.php
index 6dd0c05..652b917 100644
--- a/functions/kirki/core/class-kirki-l10n.php
+++ b/functions/kirki/core/class-kirki-l10n.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -110,7 +110,7 @@ class Kirki_L10n {
public function override_load_textdomain( $override, $domain, $mofile ) {
global $l10n;
if ( isset( $l10n[ $this->get_theme_textdomain() ] ) ) {
- $l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
+ $l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
}
// Check if the domain is "kirki".
diff --git a/functions/kirki/core/class-kirki-modules.php b/functions/kirki/core/class-kirki-modules.php
index c9a61c6..ff90240 100644
--- a/functions/kirki/core/class-kirki-modules.php
+++ b/functions/kirki/core/class-kirki-modules.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.0
*/
@@ -56,7 +56,8 @@ class Kirki_Modules {
*/
public function setup_default_modules() {
self::$modules = apply_filters(
- 'kirki_modules', array(
+ 'kirki_modules',
+ array(
'css' => 'Kirki_Modules_CSS',
'css-vars' => 'Kirki_Modules_CSS_Vars',
'customizer-styling' => 'Kirki_Modules_Customizer_Styling',
@@ -72,6 +73,7 @@ class Kirki_Modules {
'webfont-loader' => 'Kirki_Modules_Webfont_Loader',
'preset' => 'Kirki_Modules_Preset',
'gutenberg' => 'Kirki_Modules_Gutenberg',
+ 'telemetry' => 'Kirki_Modules_Telemetry',
)
);
}
diff --git a/functions/kirki/core/class-kirki-panel.php b/functions/kirki/core/class-kirki-panel.php
index 72c1714..d78428a 100644
--- a/functions/kirki/core/class-kirki-panel.php
+++ b/functions/kirki/core/class-kirki-panel.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki-sanitize-values.php b/functions/kirki/core/class-kirki-sanitize-values.php
index de114c0..1a74b5c 100644
--- a/functions/kirki/core/class-kirki-sanitize-values.php
+++ b/functions/kirki/core/class-kirki-sanitize-values.php
@@ -5,8 +5,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki-section.php b/functions/kirki/core/class-kirki-section.php
index f723de4..8ebf3fc 100644
--- a/functions/kirki/core/class-kirki-section.php
+++ b/functions/kirki/core/class-kirki-section.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki-sections.php b/functions/kirki/core/class-kirki-sections.php
index e073452..44b041a 100644
--- a/functions/kirki/core/class-kirki-sections.php
+++ b/functions/kirki/core/class-kirki-sections.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.17
*/
diff --git a/functions/kirki/core/class-kirki-settings.php b/functions/kirki/core/class-kirki-settings.php
index cae5909..daf0560 100644
--- a/functions/kirki/core/class-kirki-settings.php
+++ b/functions/kirki/core/class-kirki-settings.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -110,7 +110,9 @@ class Kirki_Settings {
$this->wp_customize->add_setting(
new $classname(
- $this->wp_customize, $setting, array(
+ $this->wp_customize,
+ $setting,
+ array(
'default' => $default,
'type' => $type,
'capability' => $capability,
@@ -132,7 +134,8 @@ class Kirki_Settings {
// Apply the kirki_setting_types filter.
$this->setting_types = apply_filters(
- 'kirki_setting_types', array(
+ 'kirki_setting_types',
+ array(
'default' => 'WP_Customize_Setting',
'repeater' => 'Kirki_Settings_Repeater_Setting',
'user_meta' => 'Kirki_Setting_User_Meta',
diff --git a/functions/kirki/core/class-kirki-toolkit.php b/functions/kirki/core/class-kirki-toolkit.php
index 3a45fa6..f60e475 100644
--- a/functions/kirki/core/class-kirki-toolkit.php
+++ b/functions/kirki/core/class-kirki-toolkit.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki-util.php b/functions/kirki/core/class-kirki-util.php
index 4fd41d3..a988a35 100644
--- a/functions/kirki/core/class-kirki-util.php
+++ b/functions/kirki/core/class-kirki-util.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.9
*/
@@ -36,7 +36,7 @@ class Kirki_Util {
public static function is_plugin() {
$is_plugin = false;
if ( ! function_exists( 'get_plugins' ) ) {
- require_once ABSPATH . 'wp-admin/includes/plugin.php';
+ require_once ABSPATH . 'wp-admin/includes/plugin.php'; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
}
// Get all plugins.
@@ -55,7 +55,7 @@ class Kirki_Util {
}
// Make sure the is_plugins_loaded function is loaded.
- include_once ABSPATH . 'wp-admin/includes/plugin.php';
+ include_once ABSPATH . 'wp-admin/includes/plugin.php'; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
// Extra logic in case the plugin is installed but not activated.
if ( $_plugin && is_plugin_inactive( $_plugin ) ) {
diff --git a/functions/kirki/core/class-kirki-values.php b/functions/kirki/core/class-kirki-values.php
index b94e347..280ca7e 100644
--- a/functions/kirki/core/class-kirki-values.php
+++ b/functions/kirki/core/class-kirki-values.php
@@ -7,8 +7,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/class-kirki.php b/functions/kirki/core/class-kirki.php
index bda269e..e205beb 100644
--- a/functions/kirki/core/class-kirki.php
+++ b/functions/kirki/core/class-kirki.php
@@ -6,8 +6,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
diff --git a/functions/kirki/core/dynamic-css.php b/functions/kirki/core/dynamic-css.php
deleted file mode 100644
index 6e6f254..0000000
--- a/functions/kirki/core/dynamic-css.php
+++ /dev/null
@@ -1,39 +0,0 @@
- $args ) {
- if ( true === $args['disable_output'] ) {
- continue;
- }
-
- $styles = Kirki_Modules_CSS::loop_controls( $config_id );
- $styles = apply_filters( "kirki_{$config_id}_dynamic_css", $styles );
-
- // Some people put weird stuff in their CSS, KSES tends to be greedy.
- $styles = str_replace( '<=', '<=', $styles );
-
- $styles = wp_kses_post( $styles );
-
- // Why both KSES and strip_tags? Because we just added some '>'.
- // kses replaces lone '>' with >.
- // @codingStandardsIgnoreLine WordPress.WP.AlternativeFunctions.strip_tags_strip_tags WordPress.Security.EscapeOutput.OutputNotEscaped
- echo strip_tags( str_replace( '>', '>', $styles ) );
-}
diff --git a/functions/kirki/deprecated/classes.php b/functions/kirki/deprecated/classes.php
index abfd7a7..6bd6e64 100644
--- a/functions/kirki/deprecated/classes.php
+++ b/functions/kirki/deprecated/classes.php
@@ -1,5 +1,5 @@
choices[ $page->ID ] = $page->post_title;
+ }
+ }
+}
diff --git a/functions/kirki/field/class-kirki-field-editor.php b/functions/kirki/field/class-kirki-field-editor.php
index c8a42ce..47e0404 100644
--- a/functions/kirki/field/class-kirki-field-editor.php
+++ b/functions/kirki/field/class-kirki-field-editor.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-fontawesome.php b/functions/kirki/field/class-kirki-field-fontawesome.php
index dca4aec..4236401 100644
--- a/functions/kirki/field/class-kirki-field-fontawesome.php
+++ b/functions/kirki/field/class-kirki-field-fontawesome.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.0
*/
diff --git a/functions/kirki/field/class-kirki-field-generic.php b/functions/kirki/field/class-kirki-field-generic.php
index 8e7d85d..bec2172 100644
--- a/functions/kirki/field/class-kirki-field-generic.php
+++ b/functions/kirki/field/class-kirki-field-generic.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.3.2
*/
diff --git a/functions/kirki/field/class-kirki-field-group-title.php b/functions/kirki/field/class-kirki-field-group-title.php
index f00aa67..9b2d81f 100644
--- a/functions/kirki/field/class-kirki-field-group-title.php
+++ b/functions/kirki/field/class-kirki-field-group-title.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-image.php b/functions/kirki/field/class-kirki-field-image.php
index a26741f..3fb8a6e 100644
--- a/functions/kirki/field/class-kirki-field-image.php
+++ b/functions/kirki/field/class-kirki-field-image.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-kirki-generic.php b/functions/kirki/field/class-kirki-field-kirki-generic.php
index 2f684ee..4089d91 100644
--- a/functions/kirki/field/class-kirki-field-kirki-generic.php
+++ b/functions/kirki/field/class-kirki-field-kirki-generic.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-link.php b/functions/kirki/field/class-kirki-field-link.php
index 65c807e..d2a6044 100644
--- a/functions/kirki/field/class-kirki-field-link.php
+++ b/functions/kirki/field/class-kirki-field-link.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-multicheck.php b/functions/kirki/field/class-kirki-field-multicheck.php
index e5a236b..bfd7db8 100644
--- a/functions/kirki/field/class-kirki-field-multicheck.php
+++ b/functions/kirki/field/class-kirki-field-multicheck.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-multicolor.php b/functions/kirki/field/class-kirki-field-multicolor.php
index 80a15d1..582c1e4 100644
--- a/functions/kirki/field/class-kirki-field-multicolor.php
+++ b/functions/kirki/field/class-kirki-field-multicolor.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-number.php b/functions/kirki/field/class-kirki-field-number.php
index 792d2c9..80e00c6 100644
--- a/functions/kirki/field/class-kirki-field-number.php
+++ b/functions/kirki/field/class-kirki-field-number.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-palette.php b/functions/kirki/field/class-kirki-field-palette.php
index 423fa3a..6fd51ac 100644
--- a/functions/kirki/field/class-kirki-field-palette.php
+++ b/functions/kirki/field/class-kirki-field-palette.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-preset.php b/functions/kirki/field/class-kirki-field-preset.php
index 020d43b..f577908 100644
--- a/functions/kirki/field/class-kirki-field-preset.php
+++ b/functions/kirki/field/class-kirki-field-preset.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-radio-buttonset.php b/functions/kirki/field/class-kirki-field-radio-buttonset.php
index eb6c7e4..1b8683d 100644
--- a/functions/kirki/field/class-kirki-field-radio-buttonset.php
+++ b/functions/kirki/field/class-kirki-field-radio-buttonset.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-radio-image.php b/functions/kirki/field/class-kirki-field-radio-image.php
index 3926a2f..43c9939 100644
--- a/functions/kirki/field/class-kirki-field-radio-image.php
+++ b/functions/kirki/field/class-kirki-field-radio-image.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-radio.php b/functions/kirki/field/class-kirki-field-radio.php
index 887aa6d..673696e 100644
--- a/functions/kirki/field/class-kirki-field-radio.php
+++ b/functions/kirki/field/class-kirki-field-radio.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-repeater.php b/functions/kirki/field/class-kirki-field-repeater.php
index ec109cc..7336642 100644
--- a/functions/kirki/field/class-kirki-field-repeater.php
+++ b/functions/kirki/field/class-kirki-field-repeater.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-select.php b/functions/kirki/field/class-kirki-field-select.php
index 3057f61..91f034b 100644
--- a/functions/kirki/field/class-kirki-field-select.php
+++ b/functions/kirki/field/class-kirki-field-select.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-select2-multiple.php b/functions/kirki/field/class-kirki-field-select2-multiple.php
index a36c29e..9db03df 100644
--- a/functions/kirki/field/class-kirki-field-select2-multiple.php
+++ b/functions/kirki/field/class-kirki-field-select2-multiple.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-select2.php b/functions/kirki/field/class-kirki-field-select2.php
index 989d600..950b417 100644
--- a/functions/kirki/field/class-kirki-field-select2.php
+++ b/functions/kirki/field/class-kirki-field-select2.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-slider.php b/functions/kirki/field/class-kirki-field-slider.php
index 74b6d9d..810f4e8 100644
--- a/functions/kirki/field/class-kirki-field-slider.php
+++ b/functions/kirki/field/class-kirki-field-slider.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-sortable.php b/functions/kirki/field/class-kirki-field-sortable.php
index fccd333..d4612fc 100644
--- a/functions/kirki/field/class-kirki-field-sortable.php
+++ b/functions/kirki/field/class-kirki-field-sortable.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.3.2
*/
diff --git a/functions/kirki/field/class-kirki-field-spacing.php b/functions/kirki/field/class-kirki-field-spacing.php
index e2614a3..4062163 100644
--- a/functions/kirki/field/class-kirki-field-spacing.php
+++ b/functions/kirki/field/class-kirki-field-spacing.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-switch.php b/functions/kirki/field/class-kirki-field-switch.php
index 1b14742..868aa2f 100644
--- a/functions/kirki/field/class-kirki-field-switch.php
+++ b/functions/kirki/field/class-kirki-field-switch.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-text.php b/functions/kirki/field/class-kirki-field-text.php
index e4de399..3714bae 100644
--- a/functions/kirki/field/class-kirki-field-text.php
+++ b/functions/kirki/field/class-kirki-field-text.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-textarea.php b/functions/kirki/field/class-kirki-field-textarea.php
index fc94107..3f462cb 100644
--- a/functions/kirki/field/class-kirki-field-textarea.php
+++ b/functions/kirki/field/class-kirki-field-textarea.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-toggle.php b/functions/kirki/field/class-kirki-field-toggle.php
index 4cdb9f8..dd84c2b 100644
--- a/functions/kirki/field/class-kirki-field-toggle.php
+++ b/functions/kirki/field/class-kirki-field-toggle.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-typography.php b/functions/kirki/field/class-kirki-field-typography.php
index e976351..aa64bfb 100644
--- a/functions/kirki/field/class-kirki-field-typography.php
+++ b/functions/kirki/field/class-kirki-field-typography.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
@@ -151,7 +151,6 @@ class Kirki_Field_Typography extends Kirki_Field {
}
break;
case 'variant':
-
// Use 'regular' instead of 400 for font-variant.
$value['variant'] = ( 400 === $val || '400' === $val ) ? 'regular' : $val;
@@ -205,7 +204,8 @@ class Kirki_Field_Typography extends Kirki_Field {
$this->choices = array();
}
$this->choices = wp_parse_args(
- $this->choices, array(
+ $this->choices,
+ array(
'variant' => array(),
'fonts' => array(
'standard' => array(),
diff --git a/functions/kirki/field/class-kirki-field-upload.php b/functions/kirki/field/class-kirki-field-upload.php
index f8a1860..2f7d72f 100644
--- a/functions/kirki/field/class-kirki-field-upload.php
+++ b/functions/kirki/field/class-kirki-field-upload.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/field/class-kirki-field-url.php b/functions/kirki/field/class-kirki-field-url.php
index f3f7464..cb9e940 100644
--- a/functions/kirki/field/class-kirki-field-url.php
+++ b/functions/kirki/field/class-kirki-field-url.php
@@ -4,7 +4,7 @@
*
* @package Kirki
* @subpackage Controls
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 2.2.7
*/
diff --git a/functions/kirki/kirki.php b/functions/kirki/kirki.php
index ded38a5..84a8689 100644
--- a/functions/kirki/kirki.php
+++ b/functions/kirki/kirki.php
@@ -3,18 +3,19 @@
* Plugin Name: Kirki Toolkit
* Plugin URI: http://aristath.github.io/kirki
* Description: The ultimate WordPress Customizer Toolkit
- * Author: Aristeides Stathopoulos
+ * Author: Ari Stathopoulos (@aristath)
* Author URI: http://aristath.github.io
- * Version: 3.0.35.3
+ * Version: 3.0.36
* Text Domain: kirki
- *
+ * Requires WP: 4.9
+ * Requires PHP: 5.3
* GitHub Plugin URI: aristath/kirki
* GitHub Plugin URI: https://github.com/aristath/kirki
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -30,7 +31,7 @@ if ( class_exists( 'Kirki' ) ) {
}
// Include the autoloader.
-require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-kirki-autoload.php';
+require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-kirki-autoload.php'; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
new Kirki_Autoload();
if ( ! defined( 'KIRKI_PLUGIN_FILE' ) ) {
@@ -40,7 +41,7 @@ if ( ! defined( 'KIRKI_PLUGIN_FILE' ) ) {
// Define the KIRKI_VERSION constant.
if ( ! defined( 'KIRKI_VERSION' ) ) {
if ( ! function_exists( 'get_plugin_data' ) ) {
- include_once ABSPATH . 'wp-admin/includes/plugin.php';
+ include_once ABSPATH . 'wp-admin/includes/plugin.php'; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
}
$data = get_plugin_data( KIRKI_PLUGIN_FILE );
$version = ( isset( $data['Version'] ) ) ? $data['Version'] : false;
@@ -48,7 +49,7 @@ if ( ! defined( 'KIRKI_VERSION' ) ) {
}
// Make sure the path is properly set.
-Kirki::$path = wp_normalize_path( dirname( __FILE__ ) );
+Kirki::$path = wp_normalize_path( dirname( __FILE__ ) ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride
Kirki_Init::set_url();
new Kirki_Controls();
@@ -77,10 +78,10 @@ new Kirki();
new Kirki_L10n();
// Include deprecated functions & methods.
-require_once wp_normalize_path( dirname( __FILE__ ) . '/deprecated/deprecated.php' );
+require_once wp_normalize_path( dirname( __FILE__ ) . '/deprecated/deprecated.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
// Include the ariColor library.
-require_once wp_normalize_path( dirname( __FILE__ ) . '/lib/class-aricolor.php' );
+require_once wp_normalize_path( dirname( __FILE__ ) . '/lib/class-aricolor.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
// Add an empty config for global fields.
Kirki::add_config( '' );
@@ -88,11 +89,11 @@ Kirki::add_config( '' );
$custom_config_path = dirname( __FILE__ ) . '/custom-config.php';
$custom_config_path = wp_normalize_path( $custom_config_path );
if ( file_exists( $custom_config_path ) ) {
- require_once $custom_config_path;
+ require_once $custom_config_path; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
}
// Add upgrade notifications.
-require_once wp_normalize_path( dirname( __FILE__ ) . '/upgrade-notifications.php' );
+require_once wp_normalize_path( dirname( __FILE__ ) . '/upgrade-notifications.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
/**
* To enable tests, add this line to your wp-config.php file (or anywhere alse):
@@ -102,5 +103,5 @@ require_once wp_normalize_path( dirname( __FILE__ ) . '/upgrade-notifications.ph
* and will only be included in dev versions of the plugin in the github repository.
*/
if ( defined( 'KIRKI_TEST' ) && true === KIRKI_TEST && file_exists( dirname( __FILE__ ) . '/example.php' ) ) {
- include_once dirname( __FILE__ ) . '/example.php';
+ include_once dirname( __FILE__ ) . '/example.php'; // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
}
diff --git a/functions/kirki/lib/class-aricolor.php b/functions/kirki/lib/class-aricolor.php
index 714fa57..32191b7 100644
--- a/functions/kirki/lib/class-aricolor.php
+++ b/functions/kirki/lib/class-aricolor.php
@@ -1,5 +1,5 @@
get_path( 'file' ) ) ) {
-
- // If the file-write fails, fallback to inline
- // and cache the failure so we don't try again immediately.
- $this->write_file();
- }
- add_action( 'customize_save_after', array( $this, 'write_file' ) );
- }
-
- /**
- * Gets the path of the CSS file and folder in the filesystem.
- *
- * @access protected
- * @since 3.0.0
- * @param string $context Can be "file" or "folder". If empty, returns both as array.
- * @return string|array
- */
- protected function get_path( $context = '' ) {
- $upload_dir = wp_upload_dir();
- $paths = array(
- 'file' => wp_normalize_path( $upload_dir['basedir'] . '/kirki-css/styles.css' ),
- 'folder' => wp_normalize_path( $upload_dir['basedir'] . '/kirki-css' ),
- );
-
- if ( 'file' === $context ) {
- return $paths['file'];
- }
- if ( 'folder' === $context ) {
- return $paths['folder'];
- }
- return $paths;
- }
-
- /**
- * Gets the URL of the CSS file in the filesystem.
- *
- * @access public
- * @since 3.0.0
- * @return string
- */
- public function get_url() {
- $upload_dir = wp_upload_dir();
- return esc_url_raw( $upload_dir['baseurl'] . '/kirki-css/styles.css' );
- }
-
- /**
- * Gets the timestamp of the file.
- * This will be used as "version" for cache-busting purposes.
- *
- * @access public
- * @since 3.0.0
- * @return integer|false
- */
- public function get_timestamp() {
- if ( file_exists( $this->get_path( 'file' ) ) ) {
- return filemtime( $this->get_path( 'file' ) );
- }
- return false;
- }
-
- /**
- * Writes the file to disk.
- *
- * @access public
- * @since 3.0.0
- * @return bool
- */
- public function write_file() {
- $css = array();
- $configs = Kirki::$config;
- foreach ( $configs as $config_id => $args ) {
- // Get the CSS we want to write.
- $css[ $config_id ] = apply_filters( "kirki_{$config_id}_dynamic_css", Kirki_Modules_CSS::loop_controls( $config_id ) );
- }
- $css = implode( $css, '' );
-
- // If the folder doesn't exist, create it.
- if ( ! file_exists( $this->get_path( 'folder' ) ) ) {
- wp_mkdir_p( $this->get_path( 'folder' ) );
- }
-
- $filesystem = $this->get_filesystem();
- $write_file = (bool) $filesystem->put_contents( $this->get_path( 'file' ), $css );
- if ( ! $write_file ) {
- $this->fallback = true;
- set_transient( 'kirki_css_write_to_file_failed', true, HOUR_IN_SECONDS );
- }
- return $write_file;
- }
-
- /**
- * Gets the WP_Filesystem object.
- *
- * @access protected
- * @since 3.0.0
- * @return object
- */
- protected function get_filesystem() {
-
- // The WordPress filesystem.
- global $wp_filesystem;
-
- if ( empty( $wp_filesystem ) ) {
- require_once wp_normalize_path( ABSPATH . '/wp-admin/includes/file.php' );
- WP_Filesystem();
- }
- return $wp_filesystem;
- }
-}
diff --git a/functions/kirki/modules/css/class-kirki-modules-css-generator.php b/functions/kirki/modules/css/class-kirki-modules-css-generator.php
index c4fce0d..08fa87f 100644
--- a/functions/kirki/modules/css/class-kirki-modules-css-generator.php
+++ b/functions/kirki/modules/css/class-kirki-modules-css-generator.php
@@ -5,8 +5,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -164,15 +164,15 @@ final class Kirki_Modules_CSS_Generator {
// Find the class that will handle the outpout for this field.
$classname = 'Kirki_Output';
- $field_output_classes = apply_filters(
- "kirki_{$field['kirki_config']}_output_control_classnames", array(
- 'kirki-background' => 'Kirki_Output_Field_Background',
- 'kirki-dimensions' => 'Kirki_Output_Field_Dimensions',
- 'kirki-image' => 'Kirki_Output_Field_Image',
- 'kirki-typography' => 'Kirki_Output_Field_Typography',
- 'kirki-multicolor' => 'Kirki_Output_Field_Multicolor',
- )
+ $default_classnames = array(
+ 'kirki-background' => 'Kirki_Output_Field_Background',
+ 'kirki-dimensions' => 'Kirki_Output_Field_Dimensions',
+ 'kirki-image' => 'Kirki_Output_Field_Image',
+ 'kirki-typography' => 'Kirki_Output_Field_Typography',
+ 'kirki-multicolor' => 'Kirki_Output_Field_Multicolor',
);
+ $field_output_classes = apply_filters( 'kirki_output_control_classnames', $default_classnames );
+ $field_output_classes = apply_filters( "kirki_{$field['kirki_config']}_output_control_classnames", $field_output_classes );
if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
$classname = $field_output_classes[ self::$field_type ];
}
@@ -238,7 +238,8 @@ final class Kirki_Modules_CSS_Generator {
// Add -webkit-* and -moz-*.
if ( is_string( $property ) && in_array(
- $property, array(
+ $property,
+ array(
'border-radius',
'box-shadow',
'box-sizing',
@@ -247,7 +248,8 @@ final class Kirki_Modules_CSS_Generator {
'background-size',
'transition',
'transition-property',
- ), true
+ ),
+ true
) ) {
unset( $css[ $media_query ][ $element ][ $property ] );
$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
@@ -257,12 +259,14 @@ final class Kirki_Modules_CSS_Generator {
// Add -ms-* and -o-*.
if ( is_string( $property ) && in_array(
- $property, array(
+ $property,
+ array(
'transform',
'background-size',
'transition',
'transition-property',
- ), true
+ ),
+ true
) ) {
unset( $css[ $media_query ][ $element ][ $property ] );
$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
diff --git a/functions/kirki/modules/css/class-kirki-modules-css.php b/functions/kirki/modules/css/class-kirki-modules-css.php
index 903c245..74e6c06 100644
--- a/functions/kirki/modules/css/class-kirki-modules-css.php
+++ b/functions/kirki/modules/css/class-kirki-modules-css.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Modules
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.0
*/
@@ -25,14 +25,6 @@ class Kirki_Modules_CSS {
*/
private static $instance;
- /**
- * Whether we've already processed this or not.
- *
- * @access public
- * @var bool
- */
- public $processed = false;
-
/**
* The CSS array
*
@@ -41,23 +33,6 @@ class Kirki_Modules_CSS {
*/
public static $css_array = array();
- /**
- * Set to true if you want to use the AJAX method.
- *
- * @access public
- * @var bool
- */
- public static $ajax = false;
-
- /**
- * The Kirki_CSS_To_File object.
- *
- * @access protected
- * @since 3.0.0
- * @var object
- */
- protected $css_to_file;
-
/**
* Should we enqueue font-awesome?
*
@@ -75,7 +50,6 @@ class Kirki_Modules_CSS {
*/
protected function __construct() {
$class_files = array(
- 'Kirki_CSS_To_File' => '/class-kirki-css-to-file.php',
'Kirki_Modules_CSS_Generator' => '/class-kirki-modules-css-generator.php',
'Kirki_Output' => '/class-kirki-output.php',
'Kirki_Output_Field_Background' => '/field/class-kirki-output-field-background.php',
@@ -91,7 +65,7 @@ class Kirki_Modules_CSS {
foreach ( $class_files as $class_name => $file ) {
if ( ! class_exists( $class_name ) ) {
- include_once wp_normalize_path( dirname( __FILE__ ) . $file );
+ include_once wp_normalize_path( dirname( __FILE__ ) . $file ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
}
}
add_action( 'init', array( $this, 'init' ) );
@@ -119,125 +93,128 @@ class Kirki_Modules_CSS {
* @access public
*/
public function init() {
- global $wp_customize;
Kirki_Modules_Webfonts::get_instance();
- $config = apply_filters( 'kirki_config', array() );
- $priority = 999;
- if ( isset( $config['styles_priority'] ) ) {
- $priority = absint( $config['styles_priority'] );
- }
-
// Allow completely disabling Kirki CSS output.
if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config['disable_output'] ) && true === $config['disable_output'] ) ) {
return;
}
- $method = apply_filters( 'kirki_dynamic_css_method', 'inline' );
- if ( $wp_customize ) {
+ // Admin styles, adds compatibility with the new WordPress editor (Gutenberg).
+ add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_styles' ), 100 );
- // If we're in the customizer, load inline no matter what.
- add_action( 'wp_enqueue_scripts', array( $this, 'inline_dynamic_css' ), $priority );
- add_action( 'enqueue_block_editor_assets', array( $this, 'inline_dynamic_css' ), $priority );
-
- // If we're using file method, on save write the new styles.
- if ( 'file' === $method ) {
- $this->css_to_file = new Kirki_CSS_To_File();
- add_action( 'customize_save_after', array( $this->css_to_file, 'write_file' ) );
+ if ( ! apply_filters( 'kirki_output_inline_styles', true ) ) {
+ $config = apply_filters( 'kirki_config', array() );
+ $priority = 999;
+ if ( isset( $config['styles_priority'] ) ) {
+ $priority = absint( $config['styles_priority'] );
}
+ add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ), $priority );
+
+ // Prints the styles.
+ add_action( 'wp', array( $this, 'print_styles_action' ) );
return;
}
- if ( 'file' === $method ) {
-
- // Attempt to write the CSS to file.
- $this->css_to_file = new Kirki_CSS_To_File();
-
- // If we succesd, load this file.
- $failed = get_transient( 'kirki_css_write_to_file_failed' );
-
- // If writing CSS to file hasn't failed, just enqueue this file.
- if ( ! $failed ) {
- add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_compiled_file' ), $priority );
- return;
- }
- }
-
- // If we are in the customizer, load CSS using inline-styles.
- // If we are in the frontend AND self::$ajax is true, then load dynamic CSS using AJAX.
- if ( ( true === self::$ajax ) || ( isset( $config['inline_css'] ) && false === $config['inline_css'] ) ) {
- add_action( 'wp_enqueue_scripts', array( $this, 'frontend_styles' ), $priority );
- add_action( 'wp_ajax_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
- add_action( 'wp_ajax_nopriv_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
- return;
- }
-
- // If we got this far then add styles inline.
- add_action( 'wp_enqueue_scripts', array( $this, 'inline_dynamic_css' ), $priority );
-
- // Admin styles, adds Gutenberg compatibility.
- add_action( 'admin_enqueue_scripts', array( $this, 'inline_dynamic_css' ), $priority );
+ add_action( 'wp_head', array( $this, 'print_styles_inline' ), 999 );
}
/**
- * Enqueues compiled CSS file.
+ * Print styles inline.
*
* @access public
- * @since 3.0.0
+ * @since 3.0.36
+ * @return void
*/
- public function enqueue_compiled_file() {
- wp_enqueue_style( 'kirki-styles', $this->css_to_file->get_url(), array(), $this->css_to_file->get_timestamp() );
+ public function print_styles_inline() {
+ echo '';
}
+
/**
- * Adds inline styles.
+ * Enqueue the styles.
*
* @access public
+ * @since 3.0.36
+ * @return void
*/
- public function inline_dynamic_css() {
- $configs = Kirki::$config;
- if ( ! $this->processed ) {
- foreach ( $configs as $config_id => $args ) {
- if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) {
- continue;
- }
- $styles = self::loop_controls( $config_id );
- $styles = apply_filters( "kirki_{$config_id}_dynamic_css", $styles );
- if ( ! empty( $styles ) ) {
- $stylesheet = apply_filters( "kirki_{$config_id}_stylesheet", false );
- if ( $stylesheet ) {
- wp_add_inline_style( $stylesheet, $styles );
- continue;
- }
- wp_enqueue_style( 'kirki-styles-' . $config_id, trailingslashit( Kirki::$url ) . 'assets/css/kirki-styles.css', array(), KIRKI_VERSION );
- wp_add_inline_style( 'kirki-styles-' . $config_id, $styles );
- }
- }
- $this->processed = true;
- }
+ public function enqueue_styles() {
+ // Enqueue the dynamic stylesheet.
+ wp_enqueue_style(
+ 'kirki-styles',
+ add_query_arg(
+ 'action',
+ apply_filters( 'kirki_styles_action_handle', 'kirki-styles' ),
+ site_url()
+ ),
+ array(),
+ KIRKI_VERSION
+ );
+
+ // Enqueue FA if needed (I hope not, this FA version is pretty old, only kept here for backwards-compatibility purposes).
if ( self::$enqueue_fa && apply_filters( 'kirki_load_fontawesome', true ) ) {
wp_enqueue_script( 'kirki-fontawesome-font', 'https://use.fontawesome.com/30858dc40a.js', array(), '4.0.7', true );
}
}
/**
- * Get the dynamic-css.php file
+ * Prints the styles as an enqueued file.
*
* @access public
+ * @since 3.0.36
+ * @return void
*/
- public function ajax_dynamic_css() {
- require wp_normalize_path( Kirki::$path . '/modules/css/dynamic-css.php' );
+ public function print_styles_action() {
+ /**
+ * Note to code reviewers:
+ * There is no need for a nonce check here, we're only checking if this is a valid request or not.
+ */
+ if ( empty( $_GET['action'] ) || apply_filters( 'kirki_styles_action_handle', 'kirki-styles' ) !== $_GET['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+ return;
+ }
+
+ // This is a stylesheet.
+ header( 'Content-type: text/css' );
+ $this->print_styles();
exit;
}
/**
- * Enqueues the ajax stylesheet.
+ * Prints the styles.
*
* @access public
*/
- public function frontend_styles() {
- wp_enqueue_style( 'kirki-styles-php', admin_url( 'admin-ajax.php' ) . '?action=kirki_dynamic_css', array(), KIRKI_VERSION );
+ public function print_styles() {
+
+ // Go through all configs.
+ $configs = Kirki::$config;
+ foreach ( $configs as $config_id => $args ) {
+ if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) {
+ continue;
+ }
+ $styles = self::loop_controls( $config_id );
+ $styles = apply_filters( "kirki_{$config_id}_dynamic_css", $styles );
+ if ( ! empty( $styles ) ) {
+ /**
+ * Note to code reviewers:
+ *
+ * Though all output should be run through an escaping function, this is pure CSS.
+ *
+ * When used in the print_styles_action() method the PHP header() call makes the browser interpret it as such.
+ * No code, script or anything else can be executed from inside a stylesheet.
+ *
+ * When using in the print_styles_inline() method the wp_strip_all_tags call we use below
+ * strips anything that has the possibility to be malicious, and since this is inslide a \');}';
- }
-
- // Add anything we need before the main script.
- $script .= $this->before_script( $args );
-
- $field = array(
- 'scripts' => array(),
- );
-
- // Loop through the js_vars and generate the script.
- foreach ( $args['js_vars'] as $key => $js_var ) {
-
- // Skip styles if "exclude" is defined and value is excluded.
- if ( isset( $js_var['exclude'] ) ) {
- $js_var['exclude'] = (array) $js_var['exclude'];
- $script .= 'exclude=false;';
- foreach ( $js_var['exclude'] as $exclussion ) {
- $script .= "if(newval=='{$exclussion}'||(''==='{$exclussion}'&&_.isObject(newval)&&_.isEmpty(newval))){exclude=true;}";
- }
- }
- if ( isset( $js_var['element'] ) ) {
-
- // Array to string.
- if ( is_array( $js_var['element'] ) ) {
- $js_var['element'] = implode( ',', $js_var['element'] );
- }
-
- // Replace single quotes with double quotes to avoid issues with the compiled JS.
- $js_var['element'] = str_replace( '\'', '"', $js_var['element'] );
- }
- if ( isset( $js_var['function'] ) && 'html' === $js_var['function'] ) {
- $script .= $this->script_html_var( $js_var );
- continue;
- }
- $js_var['index_key'] = $key;
- $callback = $this->get_callback( $args );
- if ( is_callable( $callback ) ) {
- $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) );
- continue;
- }
- $field['scripts'][ $key ] = $this->script_var( $js_var );
- }
- $combo_extra_script = '';
- $combo_css_script = '';
- foreach ( $field['scripts'] as $script_array ) {
- $combo_extra_script .= $script_array['script'];
- $combo_css_script .= ( 'css' !== $combo_css_script ) ? $script_array['css'] : '';
- }
- $text = ( 'css' === $combo_css_script ) ? 'css' : '\'' . $combo_css_script . '\'';
-
- $script .= $combo_extra_script . "var cssContent={$text};";
- if ( isset( $js_var['exclude'] ) ) {
- $script .= 'if(true===exclude){cssContent="";}';
- }
- if ( $add_css ) {
- $script .= "jQuery('#{$style_id}').text(cssContent);jQuery('#{$style_id}').appendTo('head');";
- }
- $script .= '});});';
- return $script;
- }
-
- /**
- * Generates script for a single js_var when using "html" as function.
- *
- * @access protected
- * @since 3.0.0
- * @param array $args The arguments for this js_var.
- */
- protected function script_html_var( $args ) {
- $script = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : '';
-
- // Apply the value_pattern.
- if ( isset( $args['value_pattern'] ) && '' !== $args['value_pattern'] ) {
- $script .= $this->value_pattern_replacements( 'newval', $args );
- }
-
- if ( isset( $args['attr'] ) ) {
- $script .= "jQuery('{$args['element']}').attr('{$args['attr']}',newval);";
- return $script;
- }
- $script .= "jQuery('{$args['element']}').html(newval);";
- return $script;
- }
-
- /**
- * Generates script for a single js_var.
- *
- * @access protected
- * @since 3.0.0
- * @param array $args The arguments for this js_var.
- */
- protected function script_var( $args ) {
- $script = '';
- $property_script = '';
-
- $value_key = 'newval' . $args['index_key'];
- $property_script .= $value_key . '=newval;';
-
- $args = $this->get_args( $args );
-
- // Apply callback to the value if a callback is defined.
- if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) {
- $script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');';
- }
-
- // Apply the value_pattern.
- if ( '' !== $args['value_pattern'] ) {
- $script .= $this->value_pattern_replacements( $value_key, $args );
- }
-
- // Tweak to add url() for background-images.
- if ( 'background-image' === $args['property'] && ( ! isset( $args['value_pattern'] ) || false === strpos( $args['value_pattern'], 'gradient' ) ) ) {
- $script .= 'if(-1===' . $value_key . '.indexOf(\'url(\')){' . $value_key . '=\'url("\'+' . $value_key . '+\'")\';}';
- }
-
- // Apply prefix.
- $value = $value_key;
- if ( '' !== $args['prefix'] ) {
- $value = "'" . $args['prefix'] . "'+" . $value_key;
- }
- $css = $args['element'] . '{' . $args['property'] . ':\'+' . $value . '+\'' . $args['units'] . $args['suffix'] . ';}';
- if ( isset( $args['media_query'] ) ) {
- $css = $args['media_query'] . '{' . $css . '}';
- }
- return array(
- 'script' => $property_script . $script,
- 'css' => $css,
- );
- }
-
- /**
- * Processes script generation for fields that save an array.
- *
- * @access protected
- * @since 3.0.0
- * @param array $args The arguments for this js_var.
- */
- protected function script_var_array( $args ) {
- $script = ( 0 === $args['index_key'] ) ? 'css=\'\';' : '';
- $property_script = '';
-
- // Define choice.
- $choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : '';
-
- $value_key = 'newval' . $args['index_key'];
- $property_script .= $value_key . '=newval;';
-
- $args = $this->get_args( $args );
-
- // Apply callback to the value if a callback is defined.
- if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) {
- $script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');';
- }
- $script .= '_.each(' . $value_key . ', function(subValue,subKey){';
-
- // Apply the value_pattern.
- if ( '' !== $args['value_pattern'] ) {
- $script .= $this->value_pattern_replacements( 'subValue', $args );
- }
-
- // Tweak to add url() for background-images.
- if ( '' === $choice || 'background-image' === $choice ) {
- $script .= 'if(\'background-image\'===\'' . $args['property'] . '\'||\'background-image\'===subKey){if(-1===subValue.indexOf(\'url(\')){subValue=\'url("\'+subValue+\'")\';}}';
- }
-
- // Apply prefix.
- $value = $value_key;
- if ( '' !== $args['prefix'] ) {
- $value = '\'' . $args['prefix'] . '\'+subValue';
- }
-
- // Mostly used for padding, margin & position properties.
- $direction_script = 'if(_.contains([\'top\',\'bottom\',\'left\',\'right\'],subKey)){';
- $direction_script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . '-\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}';
-
- // Allows us to apply this just for a specific choice in the array of the values.
- if ( '' !== $choice ) {
- $choice_is_direction = ( false !== strpos( $choice, 'top' ) || false !== strpos( $choice, 'bottom' ) || false !== strpos( $choice, 'left' ) || false !== strpos( $choice, 'right' ) );
-
- // The script.
- $script .= 'if(\'' . $choice . '\'===subKey){';
- $script .= ( $choice_is_direction ) ? $direction_script . 'else{' : '';
- $script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . ':\'+subValue+\';}\';';
- $script .= ( $choice_is_direction ) ? '}' : '';
- $script .= '}';
- } else {
-
- // This is where most object-based fields will go.
- $script .= $direction_script . 'else{css+=\'' . $args['element'] . '{\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}';
- }
- $script .= '});';
-
- if ( isset( $args['media_query'] ) ) {
- $script .= 'css=\'' . $args['media_query'] . '{\'+css+\'}\';';
- }
-
- return array(
- 'script' => $property_script . $script,
- 'css' => 'css',
- );
- }
-
- /**
- * Processes script generation for typography fields.
- *
- * @access protected
- * @since 3.0.0
- * @param array $args The arguments for this js_var.
- * @param array $field The field arguments.
- */
- protected function script_var_typography( $args, $field ) {
- $args = $this->get_args( $args );
-
- $script = '';
- $css = '';
-
- // Load the font using WenFontloader.
- // This is a bit ugly because wp_add_inline_script doesn't allow adding
+
+ $php_version,
+ 'themeName' => $theme->get( 'Name' ),
+ 'themeAuthor' => $theme->get( 'Author' ),
+ 'themeURI' => $theme->get( 'ThemeURI' ),
+ 'fieldTypes' => $this->get_field_types(),
+ );
+ }
+
+ /**
+ * Get the field-types used.
+ *
+ * @access private
+ * @since 3.0.36
+ * @return array
+ */
+ public function get_field_types() {
+ $types = array();
+ foreach ( Kirki::$fields as $field ) {
+ if ( isset( $field['type'] ) ) {
+ $types[] = $field['type'];
+ }
+ }
+ return $types;
+ }
+
+ /**
+ * Dismisses the notice.
+ *
+ * @access private
+ * @since 3.0.36
+ * @return void
+ */
+ private function dismiss_notice() {
+
+ // Check if this is the request we want.
+ if ( isset( $_GET['_wpnonce'] ) && isset( $_GET['kirki-hide-notice'] ) ) {
+ if ( 'telemetry' === sanitize_text_field( wp_unslash( $_GET['kirki-hide-notice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+ // Check the wp-nonce.
+ if ( wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['_wpnonce'] ) ) ) ) {
+ // All good, we can save the option to dismiss this notice.
+ update_option( 'kirki_telemetry_no_consent', true );
+ }
+ }
+ }
+ }
+
+ /**
+ * Dismisses the notice.
+ *
+ * @access private
+ * @since 3.0.36
+ * @return void
+ */
+ private function consent() {
+
+ // Check if this is the request we want.
+ if ( isset( $_GET['_wpnonce'] ) && isset( $_GET['kirki-consent-notice'] ) ) {
+ if ( 'telemetry' === sanitize_text_field( wp_unslash( $_GET['kirki-consent-notice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+ // Check the wp-nonce.
+ if ( wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['_wpnonce'] ) ) ) ) {
+ // All good, we can save the option to dismiss this notice.
+ update_option( 'kirki_telemetry_optin', true );
+ }
+ }
+ }
+ }
+}
diff --git a/functions/kirki/modules/tooltips/class-kirki-modules-tooltips.php b/functions/kirki/modules/tooltips/class-kirki-modules-tooltips.php
index b0d4eb6..2d6502b 100644
--- a/functions/kirki/modules/tooltips/class-kirki-modules-tooltips.php
+++ b/functions/kirki/modules/tooltips/class-kirki-modules-tooltips.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Modules
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.0
*/
diff --git a/functions/kirki/modules/tooltips/tooltip.css b/functions/kirki/modules/tooltips/tooltip.css
index bd533ec..84ea886 100644
--- a/functions/kirki/modules/tooltips/tooltip.css
+++ b/functions/kirki/modules/tooltips/tooltip.css
@@ -1,36 +1,30 @@
-@charset "UTF-8";
.tooltip-wrapper {
float: right;
- position: relative;
-}
-.tooltip-wrapper .tooltip-trigger {
- text-decoration: none;
- cursor: help;
-}
-.tooltip-wrapper .tooltip-content {
- position: absolute;
- width: 200px;
- height: auto;
- top: -10px;
- left: -225px;
- background: #FFC107;
- color: #000;
- padding: 10px;
- z-index: 99999;
- border-radius: 3px;
- line-height: 1.4em;
-}
-.tooltip-wrapper .tooltip-content a {
- color: #000;
-}
-.tooltip-wrapper .tooltip-content:after {
- content: "";
- font-family: dashicons;
- position: absolute;
- right: -12px;
- top: 11px;
- color: #FFC107;
- font-size: 20px;
-}
+ position: relative; }
+ .tooltip-wrapper .tooltip-trigger {
+ text-decoration: none;
+ cursor: help; }
+ .tooltip-wrapper .tooltip-content {
+ position: absolute;
+ width: 200px;
+ height: auto;
+ top: -10px;
+ left: -225px;
+ background: #FFC107;
+ color: #000;
+ padding: 10px;
+ z-index: 99999;
+ border-radius: 3px;
+ line-height: 1.4em; }
+ .tooltip-wrapper .tooltip-content a {
+ color: #000; }
+ .tooltip-wrapper .tooltip-content:after {
+ content: "\f139";
+ font-family: dashicons;
+ position: absolute;
+ right: -12px;
+ top: 11px;
+ color: #FFC107;
+ font-size: 20px; }
/*# sourceMappingURL=tooltip.css.map */
diff --git a/functions/kirki/modules/webfont-loader/class-kirki-modules-webfont-loader.php b/functions/kirki/modules/webfont-loader/class-kirki-modules-webfont-loader.php
index 96b622d..ea79ee2 100644
--- a/functions/kirki/modules/webfont-loader/class-kirki-modules-webfont-loader.php
+++ b/functions/kirki/modules/webfont-loader/class-kirki-modules-webfont-loader.php
@@ -5,8 +5,8 @@
* @see https://github.com/typekit/webfontloader
* @package Kirki
* @category Modules
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0.26
*/
diff --git a/functions/kirki/modules/webfonts/class-kirki-fonts-google-local.php b/functions/kirki/modules/webfonts/class-kirki-fonts-google-local.php
deleted file mode 100644
index dd9163c..0000000
--- a/functions/kirki/modules/webfonts/class-kirki-fonts-google-local.php
+++ /dev/null
@@ -1,483 +0,0 @@
-family = $family;
- $key = sanitize_key( $this->family );
- $this->folder_path = $this->get_root_path() . "/$key";
- $this->folder_url = $this->get_root_url() . "/$key";
- $this->files = $this->get_font_family();
- }
-
- /**
- * Gets the @font-face CSS.
- *
- * @access public
- * @since 3.0.28
- * @param array $variants The variants we want to get.
- * @return string
- */
- public function get_css( $variants = array() ) {
- if ( ! $this->files ) {
- return;
- }
- $key = md5( wp_json_encode( $this->files ) );
- $cached = get_transient( $key );
- if ( $cached ) {
- return $cached;
- }
- $css = '';
-
- // If $variants is empty then use all variants available.
- if ( empty( $variants ) ) {
- $variants = array_keys( $this->files );
- }
-
- // Download files.
- $this->download_font_family( $variants );
-
- // Create the @font-face CSS.
- foreach ( $variants as $variant ) {
- $css .= $this->get_variant_fontface_css( $variant );
- }
- set_transient( $key, $css, DAY_IN_SECONDS );
- return $css;
- }
-
- /**
- * Get the @font-face CSS for a specific variant.
- *
- * @access public
- * @since 3.0.28
- * @param string $variant The variant.
- * @return string
- */
- public function get_variant_fontface_css( $variant ) {
- $font_face = "@font-face{font-family:'{$this->family}';";
-
- // Get the font-style.
- $font_style = ( false !== strpos( $variant, 'italic' ) ) ? 'italic' : 'normal';
- $font_face .= "font-style:{$font_style};";
-
- // Get the font-weight.
- $font_weight = '400';
- $font_weight = str_replace( 'italic', '', $variant );
- $font_weight = ( ! $font_weight || 'regular' === $font_weight ) ? '400' : $font_weight;
- $font_face .= "font-weight:{$font_weight};";
-
- // Get the font-names.
- $font_name_0 = $this->get_local_font_name( $variant, false );
- $font_name_1 = $this->get_local_font_name( $variant, true );
- $font_face .= "src:local('{$font_name_0}'),";
- if ( $font_name_0 !== $font_name_1 ) {
- $font_face .= "local('{$font_name_1}'),";
- }
-
- // Get the font-url.
- $font_url = $this->get_variant_local_url( $variant );
- $paths = $this->get_font_files_paths();
- if ( ! file_exists( $paths[ $variant ] ) ) {
- $font_url = $this->files[ $variant ];
- }
-
- // Get the font-format.
- $font_format = ( strpos( $font_url, '.woff2' ) ) ? 'woff2' : 'truetype';
- $font_format = ( strpos( $font_url, '.woff' ) && ! strpos( $font_url, '.woff2' ) ) ? 'woff' : $font_format;
- $font_face .= "url({$font_url}) format('{$font_format}');}";
-
- return $font_face;
- }
-
- /**
- * Gets the local URL for a variant.
- *
- * @access public
- * @since 3.0.28
- * @param string $variant The variant.
- * @return string The URL.
- */
- public function get_variant_local_url( $variant ) {
- $local_urls = $this->get_font_files_urls_local();
-
- if ( empty( $local_urls ) ) {
- return;
- }
-
- // Return the specific variant if we can find it.
- if ( isset( $local_urls[ $variant ] ) ) {
- return $local_urls[ $variant ];
- }
-
- // Return regular if the one we want could not be found.
- if ( isset( $local_urls['regular'] ) ) {
- return $local_urls['regular'];
- }
-
- // Return the first available if all else failed.
- $vals = array_values( $local_urls );
- return $vals[0];
- }
-
- /**
- * Get the name of the font-family.
- * This is used by @font-face in case the user already has the font downloaded locally.
- *
- * @access public
- * @since 3.0.28
- * @param string $variant The variant.
- * @param bool $compact Whether we want the compact formatting or not.
- * @return string
- */
- public function get_local_font_name( $variant, $compact = false ) {
- $variant_names = array(
- '100' => 'Thin',
- '100i' => 'Thin Italic',
- '100italic' => 'Thin Italic',
- '200' => 'Extra-Light',
- '200i' => 'Extra-Light Italic',
- '200italic' => 'Extra-Light Italic',
- '300' => 'Light',
- '300i' => 'Light Italic',
- '300italic' => 'Light Italic',
- '400' => 'Regular',
- 'regular' => 'Regular',
- '400i' => 'Regular Italic',
- 'italic' => 'Italic',
- '400italic' => 'Regular Italic',
- '500' => 'Medium',
- '500i' => 'Medium Italic',
- '500italic' => 'Medium Italic',
- '600' => 'Semi-Bold',
- '600i' => 'Semi-Bold Italic',
- '600italic' => 'Semi-Bold Italic',
- '700' => 'Bold',
- '700i' => 'Bold Italic',
- '700italic' => 'Bold Italic',
- '800' => 'Extra-Bold',
- '800i' => 'Extra-Bold Italic',
- '800italic' => 'Extra-Bold Italic',
- '900' => 'Black',
- '900i' => 'Black Italic',
- '900italic' => 'Black Italic',
- );
-
- $variant = (string) $variant;
- if ( $compact ) {
- if ( isset( $variant_names[ $variant ] ) ) {
- return str_replace( array( ' ', '-' ), '', $this->family ) . '-' . str_replace( array( ' ', '-' ), '', $variant_names[ $variant ] );
- }
- return str_replace( array( ' ', '-' ), '', $this->family );
- }
-
- if ( isset( $variant_names[ $variant ] ) ) {
- return $this->family . ' ' . $variant_names[ $variant ];
- }
- return $this->family;
- }
-
- /**
- * Get an array of font-files.
- * Only contains the filenames.
- *
- * @access public
- * @since 3.0.28
- * @return array
- */
- public function get_font_files() {
- $files = array();
- foreach ( $this->files as $key => $url ) {
- $files[ $key ] = $this->get_filename_from_url( $url );
- }
- return $files;
- }
-
- /**
- * Get an array of local file URLs.
- *
- * @access public
- * @since 3.0.28
- * @return array
- */
- public function get_font_files_urls_local() {
- $urls = array();
- $files = $this->get_font_files();
- foreach ( $files as $key => $file ) {
- $urls[ $key ] = $this->folder_url . '/' . $file;
- }
- return $urls;
- }
-
- /**
- * Get an array of local file paths.
- *
- * @access public
- * @since 3.0.28
- * @return array
- */
- public function get_font_files_paths() {
- $paths = array();
- $files = $this->get_font_files();
- foreach ( $files as $key => $file ) {
- $paths[ $key ] = $this->folder_path . '/' . $file;
- }
- return $paths;
- }
-
- /**
- * Downloads a font-file and saves it locally.
- *
- * @access private
- * @since 3.0.28
- * @param string $url The URL of the file we want to get.
- * @return bool
- */
- private function download_font_file( $url ) {
- $contents = $this->get_remote_url_contents( $url );
- $path = $this->folder_path . '/' . $this->get_filename_from_url( $url );
-
- // If the folder doesn't exist, create it.
- if ( ! file_exists( $this->folder_path ) ) {
- wp_mkdir_p( $this->folder_path );
- }
- // If the file exists no reason to do anything.
- if ( file_exists( $path ) ) {
- return true;
- }
-
- // Write file.
- return Kirki_Helper::init_filesystem()->put_contents( $path, $contents, FS_CHMOD_FILE );
- }
-
- /**
- * Get a font-family from the array of google-fonts.
- *
- * @access public
- * @since 3.0.28
- * @return array
- */
- public function get_font_family() {
-
- // Get the fonts array.
- $fonts = $this->get_fonts();
- if ( isset( $fonts[ $this->family ] ) ) {
- return $fonts[ $this->family ];
- }
- return array();
- }
-
- /**
- * Gets the filename by breaking-down the URL parts.
- *
- * @access private
- * @since 3.0.28
- * @param string $url The URL.
- * @return string The filename.
- */
- private function get_filename_from_url( $url ) {
- $url_parts = explode( '/', $url );
- $parts_count = count( $url_parts );
- if ( 1 < $parts_count ) {
- return $url_parts[ count( $url_parts ) - 1 ];
- }
- return $url;
- }
-
- /**
- * Get the font defined in the google-fonts API.
- *
- * @access private
- * @since 3.0.28
- * @return array
- */
- private function get_fonts() {
- ob_start();
- include wp_normalize_path( dirname( __FILE__ ) . '/webfont-files.json' );
- $json = ob_get_clean();
- return json_decode( $json, true );
- }
-
- /**
- * Gets the root fonts folder path.
- * Other paths are built based on this.
- *
- * @since 1.5
- * @access public
- * @return string
- */
- public function get_root_path() {
-
- // Get the upload directory for this site.
- $upload_dir = wp_upload_dir();
- $path = untrailingslashit( wp_normalize_path( $upload_dir['basedir'] ) ) . '/webfonts';
-
- // If the folder doesn't exist, create it.
- if ( ! file_exists( $path ) ) {
- wp_mkdir_p( $path );
- }
-
- // Return the path.
- return apply_filters( 'kirki_googlefonts_root_path', $path );
- }
-
- /**
- * Gets the root folder url.
- * Other urls are built based on this.
- *
- * @since 1.5
- * @access public
- * @return string
- */
- public function get_root_url() {
-
- // Get the upload directory for this site.
- $upload_dir = wp_upload_dir();
-
- // The URL.
- $url = trailingslashit( $upload_dir['baseurl'] );
-
- // Take care of domain mapping.
- // When using domain mapping we have to make sure that the URL to the file
- // does not include the original domain but instead the mapped domain.
- if ( defined( 'DOMAIN_MAPPING' ) && DOMAIN_MAPPING ) {
- if ( function_exists( 'domain_mapping_siteurl' ) && function_exists( 'get_original_url' ) ) {
- $mapped_domain = domain_mapping_siteurl( false );
- $original_domain = get_original_url( 'siteurl' );
- $url = str_replace( $original_domain, $mapped_domain, $url );
- }
- }
- $url = str_replace( array( 'https://', 'http://' ), '//', $url );
- return apply_filters( 'kirki_googlefonts_root_url', untrailingslashit( esc_url_raw( $url ) ) . '/webfonts' );
- }
-
- /**
- * Download font-family files.
- *
- * @access public
- * @since 3.0.28
- * @param array $variants An array of variants to download. Leave empty to download all.
- * @return void
- */
- public function download_font_family( $variants = array() ) {
- if ( empty( $variants ) ) {
- $variants = array_keys( $this->files );
- }
- foreach ( $this->files as $variant => $file ) {
- if ( in_array( $variant, $variants ) ) { // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
- $this->download_font_file( $file );
- }
- }
- }
-
- /**
- * Gets the remote URL contents.
- *
- * @access private
- * @since 3.0.28
- * @param string $url The URL we want to get.
- * @return string The contents of the remote URL.
- */
- public function get_remote_url_contents( $url ) {
- $response = wp_remote_get( $url );
- if ( is_wp_error( $response ) ) {
- return array();
- }
- $html = wp_remote_retrieve_body( $response );
- if ( is_wp_error( $html ) ) {
- return;
- }
- return $html;
- }
-}
diff --git a/functions/kirki/modules/webfonts/class-kirki-fonts-google.php b/functions/kirki/modules/webfonts/class-kirki-fonts-google.php
index 035672c..b2b5ffe 100644
--- a/functions/kirki/modules/webfonts/class-kirki-fonts-google.php
+++ b/functions/kirki/modules/webfonts/class-kirki-fonts-google.php
@@ -5,8 +5,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -110,7 +110,6 @@ final class Kirki_Fonts_Google {
* @param array $args The field arguments.
*/
public function generate_google_font( $args ) {
- global $wp_customize;
// Process typography fields.
if ( isset( $args['type'] ) && 'kirki-typography' === $args['type'] ) {
@@ -118,12 +117,8 @@ final class Kirki_Fonts_Google {
// Get the value.
$value = Kirki_Values::get_sanitized_field_value( $args );
- if ( isset( $value['downloadFont'] ) && $value['downloadFont'] ) {
- $this->hosted_fonts[] = $value['font-family'];
- }
-
// If we don't have a font-family then we can skip this.
- if ( ! $wp_customize && ( ! isset( $value['font-family'] ) || in_array( $value['font-family'], $this->hosted_fonts, true ) ) ) {
+ if ( ! isset( $value['font-family'] ) || in_array( $value['font-family'], $this->hosted_fonts, true ) ) {
return;
}
@@ -234,7 +229,7 @@ final class Kirki_Fonts_Google {
* @return void
*/
public function get_googlefonts_json() {
- include wp_normalize_path( dirname( __FILE__ ) . '/webfonts.json' );
+ include wp_normalize_path( dirname( __FILE__ ) . '/webfonts.json' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
wp_die();
}
@@ -248,15 +243,4 @@ final class Kirki_Fonts_Google {
echo wp_json_encode( Kirki_Fonts::get_standard_fonts() );
wp_die();
}
-
- /**
- * Gets $this->hosted_fonts.
- *
- * @access public
- * @since 3.0.32
- * @return array
- */
- public function get_hosted_fonts() {
- return $this->hosted_fonts;
- }
}
diff --git a/functions/kirki/modules/webfonts/class-kirki-fonts-helper.php b/functions/kirki/modules/webfonts/class-kirki-fonts-helper.php
new file mode 100644
index 0000000..14a4ca9
--- /dev/null
+++ b/functions/kirki/modules/webfonts/class-kirki-fonts-helper.php
@@ -0,0 +1,164 @@
+ basename( $url ),
+ 'type' => 'font/woff',
+ 'tmp_name' => $temp_file,
+ 'error' => 0,
+ 'size' => filesize( $temp_file ),
+ );
+
+ $overrides = array(
+ 'test_form' => false,
+ 'test_size' => true,
+ );
+
+ // Move the temporary file into the uploads directory.
+ $results = wp_handle_sideload( $file, $overrides );
+
+ if ( empty( $results['error'] ) ) {
+ return $results['url'];
+ }
+ return false;
+ }
+
+ /**
+ * Gets the root folder url.
+ * Other urls are built based on this.
+ *
+ * @static
+ * @since 3.0.36
+ * @access public
+ * @return string
+ */
+ public static function get_root_url() {
+
+ // Get the upload directory for this site.
+ $upload_dir = wp_upload_dir();
+
+ // The URL.
+ $url = trailingslashit( $upload_dir['baseurl'] );
+
+ // Take care of domain mapping.
+ // When using domain mapping we have to make sure that the URL to the file
+ // does not include the original domain but instead the mapped domain.
+ if ( defined( 'DOMAIN_MAPPING' ) && DOMAIN_MAPPING ) {
+ if ( function_exists( 'domain_mapping_siteurl' ) && function_exists( 'get_original_url' ) ) {
+ $mapped_domain = domain_mapping_siteurl( false );
+ $original_domain = get_original_url( 'siteurl' );
+ $url = str_replace( $original_domain, $mapped_domain, $url );
+ }
+ }
+ $url = str_replace( array( 'https://', 'http://' ), '//', $url );
+ return apply_filters( 'kirki_googlefonts_root_url', untrailingslashit( esc_url_raw( $url ) ) . '/webfonts' );
+ }
+}
diff --git a/functions/kirki/modules/webfonts/class-kirki-fonts.php b/functions/kirki/modules/webfonts/class-kirki-fonts.php
index 15f64d2..071bf63 100644
--- a/functions/kirki/modules/webfonts/class-kirki-fonts.php
+++ b/functions/kirki/modules/webfonts/class-kirki-fonts.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 1.0
*/
@@ -134,7 +134,7 @@ final class Kirki_Fonts {
// If we got this far, cache was empty so we need to get from JSON.
ob_start();
- include wp_normalize_path( dirname( __FILE__ ) . '/webfonts.json' );
+ include wp_normalize_path( dirname( __FILE__ ) . '/webfonts.json' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude
$fonts_json = ob_get_clean();
$fonts = json_decode( $fonts_json, true );
diff --git a/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-async.php b/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-async.php
index ec7f624..c1d8136 100644
--- a/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-async.php
+++ b/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-async.php
@@ -4,8 +4,8 @@
*
* @package Kirki
* @category Core
- * @author Aristeides Stathopoulos
- * @copyright Copyright (c) 2017, Aristeides Stathopoulos
+ * @author Ari Stathopoulos (@aristath)
+ * @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @since 3.0
*/
diff --git a/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-embed.php b/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-embed.php
new file mode 100644
index 0000000..1113743
--- /dev/null
+++ b/functions/kirki/modules/webfonts/class-kirki-modules-webfonts-embed.php
@@ -0,0 +1,236 @@
+config_id = $config_id;
+ $this->webfonts = $webfonts;
+ $this->googlefonts = $googlefonts;
+
+ add_action( 'wp', array( $this, 'init' ), 9 );
+ add_filter( 'wp_resource_hints', array( $this, 'resource_hints' ), 10, 2 );
+ }
+
+ /**
+ * Init.
+ *
+ * @access public
+ * @since 3.0.36
+ * @return void
+ */
+ public function init() {
+ $this->populate_fonts();
+ add_action( 'kirki_dynamic_css', array( $this, 'the_css' ) );
+ }
+
+ /**
+ * Add preconnect for Google Fonts.
+ *
+ * @access public
+ * @param array $urls URLs to print for resource hints.
+ * @param string $relation_type The relation type the URLs are printed.
+ * @return array $urls URLs to print for resource hints.
+ */
+ public function resource_hints( $urls, $relation_type ) {
+ $fonts_to_load = $this->googlefonts->fonts;
+
+ if ( ! empty( $fonts_to_load ) && 'preconnect' === $relation_type ) {
+ $urls[] = array(
+ 'href' => 'https://fonts.gstatic.com',
+ 'crossorigin',
+ );
+ }
+ return $urls;
+ }
+
+ /**
+ * Webfont Loader for Google Fonts.
+ *
+ * @access public
+ * @since 3.0.0
+ */
+ public function populate_fonts() {
+
+ // Go through our fields and populate $this->fonts.
+ $this->webfonts->loop_fields( $this->config_id );
+
+ $this->googlefonts->fonts = apply_filters( 'kirki_enqueue_google_fonts', $this->googlefonts->fonts );
+
+ // Goes through $this->fonts and adds or removes things as needed.
+ $this->googlefonts->process_fonts();
+
+ foreach ( $this->googlefonts->fonts as $font => $weights ) {
+ foreach ( $weights as $key => $value ) {
+ if ( 'italic' === $value ) {
+ $weights[ $key ] = '400i';
+ } else {
+ $weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
+ }
+ }
+ $this->fonts_to_load[] = array(
+ 'family' => $font,
+ 'weights' => $weights,
+ );
+ }
+ }
+
+ /**
+ * Webfont Loader script for Google Fonts.
+ *
+ * @access public
+ * @since 3.0.0
+ */
+ public function the_css() {
+ foreach ( $this->fonts_to_load as $font ) {
+ $family = str_replace( ' ', '+', trim( $font['family'] ) );
+ $weights = join( ',', $font['weights'] );
+ $url = "https://fonts.googleapis.com/css?family={$family}:{$weights}&subset=cyrillic,cyrillic-ext,devanagari,greek,greek-ext,khmer,latin,latin-ext,vietnamese,hebrew,arabic,bengali,gujarati,tamil,telugu,thai";
+
+ $transient_id = 'kirki_gfonts_' . md5( $url );
+ $contents = get_site_transient( $transient_id );
+ /**
+ * Note to code reviewers:
+ * There's no need to check nonces or anything else, this is a simple true/false evaluation.
+ */
+ if ( ! empty( $_GET['action'] ) && 'kirki-reset-cache' === $_GET['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification
+ $contents = false;
+ }
+ if ( ! $contents ) {
+
+ // Get the contents of the remote URL.
+ $contents = Kirki_Fonts_Helper::get_remote_url_contents(
+ $url,
+ array(
+ 'headers' => array(
+ /**
+ * Set user-agent to firefox so that we get woff files.
+ * If we want woff2, use this instead: 'Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0'
+ */
+ 'user-agent' => 'Mozilla/5.0 (X11; Linux i686; rv:21.0) Gecko/20100101 Firefox/21.0',
+ ),
+ )
+ );
+
+ /**
+ * Allow filtering the font-display property.
+ */
+ $font_display = apply_filters( 'kirki_googlefonts_font_display', 'swap' );
+
+ if ( $contents ) {
+
+ // Add font-display:swap to improve rendering speed.
+ $contents = str_replace( '@font-face {', '@font-face{', $contents );
+ $contents = str_replace( '@font-face{', '@font-face{font-display:' . $font_display . ';', $contents );
+
+ // Remove blank lines and extra spaces.
+ $contents = str_replace(
+ array( ': ', '; ', '; ', ' ' ),
+ array( ':', ';', ';', ' ' ),
+ preg_replace( "/\r|\n/", '', $contents )
+ );
+
+ // Use local fonts.
+ if ( apply_filters( 'kirki_use_local_fonts', true ) ) {
+ $contents = $this->use_local_files( $contents );
+ }
+
+ // Set the transient for a week.
+ set_site_transient( $transient_id, $contents, WEEK_IN_SECONDS );
+ }
+ }
+ if ( $contents ) {
+ /**
+ * Note to code reviewers:
+ *
+ * Though all output should be run through an escaping function, this is pure CSS
+ * and it is added on a call that has a PHP `header( 'Content-type: text/css' );`.
+ * No code, script or anything else can be executed from inside a stylesheet.
+ * For extra security we're using the wp_strip_all_tags() function here
+ * just to make sure there's no