Changeset 3422724

Timestamp:

12/18/2025 10:28:23 AM (3 months ago)

Author:

domainsupport

Message:

Tagging version 1.4.2

Location:

template-editor

Files:

• tags/1.4.2 (copied) (copied from template-editor/trunk)
• tags/1.4.2/css/has-full-block-link.css (copied) (copied from template-editor/trunk/css/has-full-block-link.css)
• tags/1.4.2/includes/class-te-common.php (modified) (30 diffs)
• tags/1.4.2/js/block-logic.js (copied) (copied from template-editor/trunk/js/block-logic.js)
• tags/1.4.2/readme.txt (copied) (copied from template-editor/trunk/readme.txt) (4 diffs)
• tags/1.4.2/template-editor.php (copied) (copied from template-editor/trunk/template-editor.php) (50 diffs)
• trunk/includes/class-te-common.php (modified) (30 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/template-editor.php (modified) (50 diffs)

template-editor/tags/1.4.2/includes/class-te-common.php

@@ -1 +1 @@
 <?php
 /*
- * Version: 1.3.9
+ * Version: 1.4.4
  */
 
@@ -43 +43 @@
         public static function plugin_text_domain() {
 
-            return self::$plugin_text_domain;
+            return 'template-editor';
 
         }
@@ -61 +61 @@
         public static function support_url() {
 
-            return 'https://wordpress.org/support/plugin/' . self::$plugin_text_domain . '/';
+            return 'https://wordpress.org/support/plugin/' . 'template-editor' . '/';
 
         }
@@ -67 +67 @@
         public static function control_upgrade_text() {
 
-            $upgrade_text = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name)) . '">' . sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name) . '</a>';
+/* translators: name of the plugin */
+            $upgrade_text = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name)) . '">' . sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name) . '</a>';
 
             if (!class_exists(self::$plugin_premium_class) || !get_option(self::$plugin_prefix . '_purchased')) {
@@ -73 +74 @@
                 if (!class_exists(self::$plugin_premium_class)) {
 
-                    $upgrade_text .= sprintf(wp_kses(__(' or <a href="%s" title="Download Free Trial">trial it for 7 days</a>', self::$plugin_text_domain), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::premium_link()));
+/* translators: link to the premium upgrade */
+                    $upgrade_text .= sprintf(wp_kses(__(' or <a href="%s" title="Download Free Trial">trial it for 7 days</a>', 'template-editor'), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::premium_link()));
 
                 }
@@ -85 +87 @@
         public static function control_section_description() {
 
-            $default_description = sprintf(wp_kses(__('If you have any requests for new features, please <a href="%s" title="Support Forum">let us know in the support forum</a>.', self::$plugin_text_domain), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::support_url()));
+/* translators: link to the plugin's support forum */
+            $default_description = sprintf(wp_kses(__('If you have any requests for new features, please <a href="%s" title="Support Forum">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::support_url()));
 
             if (self::$plugin_premium_class) {
@@ -95 +98 @@
                     if (!class_exists(self::$plugin_premium_class)) {
 
-                        $section_description = '<strong>' . __('For even more options', self::$plugin_text_domain) . '</strong>' . ' ' . $upgrade_text;
+                        $section_description = '<strong>' . __('For even more options', 'template-editor') . '</strong>' . ' ' . $upgrade_text;
 
                     } else {
 
-                        $section_description = '<strong>' . __('To keep using premium options', self::$plugin_text_domain) . '</strong>' . ' ' . $upgrade_text;
+                        $section_description = '<strong>' . __('To keep using premium options', 'template-editor') . '</strong>' . ' ' . $upgrade_text;
 
                     }
@@ -119 +122 @@
                 $section_description .= ' ' . sprintf(
                     wp_kses(
+/* translators: link to plugin install page */
                         __(
                             '<strong>To reset this section of options to default settings</strong> without affecting other sections in the customizer, install <a href="%s" title="Reset Customizer">Reset Customizer</a>.',
-                            self::$plugin_text_domain
+                            'template-editor'
                         ),
                         array('strong' => array(), 'a' => array('href' => array(), 'title' => array()))
@@ -145 +149 @@
         public static function control_setting_upgrade_nag() {
 
-            $upgrade_nag = self::control_upgrade_text() . __(' to use this option.', self::$plugin_text_domain);
+            $upgrade_nag = self::control_upgrade_text() . __(' to use this option.', 'template-editor');
 
             return $upgrade_nag;
@@ -234 +238 @@
 
                 $generated_css = sprintf('%s { %s: %s; }', $selector, $style, $prefix.$mod.$postfix);
-                echo $generated_css;
+
+// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo wp_strip_all_tags($generated_css);
 
             } elseif ($mod) {
 
                 $generated_css = sprintf('%s { %s:%s; }', $selector, $style, $prefix.$value.$postfix);
-                echo $generated_css;
+
+// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo wp_strip_all_tags($generated_css);
 
             }
@@ -249 +257 @@
             if (self::$plugin_premium_class) {
 
-                return add_query_arg('url', (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'], 'https://webd.uk/product/' . self::$plugin_text_domain . '-upgrade/');
-
+                if (isset($_SERVER['HTTP_HOST'])) {
+
+                    return add_query_arg('url', (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . filter_var(wp_unslash($_SERVER['HTTP_HOST'], FILTER_SANITIZE_URL)), 'https://webd.uk/product/' . 'template-editor' . '-upgrade/');
+
+                } else {
+
+                    return 'https://webd.uk/product/' . 'template-editor' . '-upgrade/';
+
+                }
 
             } else {
@@ -276 +291 @@
             $settings_links = array();
 
-            $settings_links[] = '<a href="' . esc_url($settings_link) . '" title="' . esc_attr(__('Settings', self::$plugin_text_domain)) . '">' . __('Settings', self::$plugin_text_domain) . '</a>';
+            $settings_links[] = '<a href="' . esc_url($settings_link) . '" title="' . esc_attr(__('Settings', 'template-editor')) . '">' . __('Settings', 'template-editor') . '</a>';
 
             if (!get_option(self::$plugin_prefix . '_purchased')) {
@@ -284 +299 @@
                     if (self::$plugin_upgrade) {
 
-                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s Premium', self::$plugin_text_domain), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', self::$plugin_text_domain) . '</a>';
+/* translators: name of the plugin */
+                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s Premium', 'template-editor'), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', 'template-editor') . '</a>';
 
                     } else {
 
-                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s', self::$plugin_text_domain), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', self::$plugin_text_domain) . '</a>';
+/* translators: name of the plugin */
+                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s', 'template-editor'), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', 'template-editor') . '</a>';
 
                     }
@@ -294 +311 @@
                 } else {
 
-                    $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr((self::$plugin_premium_class ? sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name) : sprintf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name))) . '" style="color: orange; font-weight: bold;">' . (self::$plugin_premium_class ? __('Upgrade', self::$plugin_text_domain) : __('Support Us', self::$plugin_text_domain)) . '</a>';
+/* translators: name of the plugin */
+                    $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr((self::$plugin_premium_class ? sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name) : sprintf(__('Contribute to %s', 'template-editor'), self::$plugin_name))) . '" style="color: orange; font-weight: bold;">' . (self::$plugin_premium_class ? __('Upgrade', 'template-editor') : __('Support Us', 'template-editor')) . '</a>';
 
                 }
@@ -300 +318 @@
                 if ($premium) {
 
-                    $settings_links[] = '<a href="' . wp_nonce_url('?activate-' . self::$plugin_prefix . '=true', self::$plugin_prefix . '_activate') . '" id="' . self::$plugin_prefix . '_activate_upgrade" title="' . esc_attr(__('Activate Purchase', self::$plugin_text_domain)) . '" onclick="jQuery(this).append(&#39; <img src=&#34;/wp-admin/images/loading.gif&#34; style=&#34;float: none; width: auto; height: auto;&#34; />&#39;); setTimeout(function(){document.getElementById(\'' . self::$plugin_prefix . '_activate_upgrade\').removeAttribute(\'href\');},1); return true;">' . __('Activate Purchase', self::$plugin_text_domain) . '</a>';
-
-                } elseif (self::$plugin_trial && !is_plugin_active(self::$plugin_text_domain . '-premium/' . self::$plugin_text_domain . '-premium.php')) {
-
-                    $settings_links[] = '<a href="' . esc_url(self::premium_link()) . '" title="' . esc_attr(sprintf(__('Trial %s Premium', self::$plugin_text_domain), self::$plugin_name)) . ' for 7 days">' . __('Download Trial', self::$plugin_text_domain) . '</a>';
+                    $settings_links[] = '<a href="' . wp_nonce_url('?activate-' . self::$plugin_prefix . '=true', self::$plugin_prefix . '_activate') . '" id="' . self::$plugin_prefix . '_activate_upgrade" title="' . esc_attr(__('Activate Purchase', 'template-editor')) . '" onclick="jQuery(this).append(&#39; <img src=&#34;/wp-admin/images/loading.gif&#34; style=&#34;float: none; width: auto; height: auto;&#34; />&#39;); setTimeout(function(){document.getElementById(\'' . self::$plugin_prefix . '_activate_upgrade\').removeAttribute(\'href\');},1); return true;">' . __('Activate Purchase', 'template-editor') . '</a>';
+
+                } elseif (self::$plugin_trial && !is_plugin_active('template-editor' . '-premium/' . 'template-editor' . '-premium.php')) {
+
+/* translators: name of the plugin */
+                    $settings_links[] = '<a href="' . esc_url(self::premium_link()) . '" title="' . esc_attr(sprintf(__('Trial %s Premium', 'template-editor'), self::$plugin_name)) . ' for 7 days">' . __('Download Trial', 'template-editor') . '</a>';
 
                 }
@@ -310 +329 @@
             } elseif ($premium) {
 
-                $settings_links[] = '<strong style="color: green; display: inline;">' . __('Purchase Confirmed', self::$plugin_text_domain) . '</strong>';
+                $settings_links[] = '<strong style="color: green; display: inline;">' . __('Purchase Confirmed', 'template-editor') . '</strong>';
 
             }
@@ -320 +339 @@
         public static function plugin_row_meta($plugin_meta, $plugin_file, $plugin_data, $status) {
 
-            if ($plugin_file === self::$plugin_text_domain . '/' . self::$plugin_text_domain . '.php') {
-
-                $plugin_meta[] = '<a href="' . esc_url(self::support_url()) . '" title="' . __('Problems? We are here to help!', self::$plugin_text_domain) . '" style="color: orange; font-weight: bold;">' . __('Need help?', self::$plugin_text_domain) . '</a>';
-                $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/' . self::$plugin_text_domain . '/reviews/#new-post" title="' . esc_attr(sprintf(__('If you like %s, please leave a review!', self::$plugin_text_domain), self::$plugin_name)) . '">' . __('Review plugin', self::$plugin_text_domain) . '</a>';
+            if ($plugin_file === 'template-editor' . '/' . 'template-editor' . '.php') {
+
+                $plugin_meta[] = '<a href="' . esc_url(self::support_url()) . '" title="' . __('Problems? We are here to help!', 'template-editor') . '" style="color: orange; font-weight: bold;">' . __('Need help?', 'template-editor') . '</a>';
+/* translators: name of the plugin */
+                $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/' . 'template-editor' . '/reviews/#new-post" title="' . esc_attr(sprintf(__('If you like %s, please leave a review!', 'template-editor'), self::$plugin_name)) . '">' . __('Review plugin', 'template-editor') . '</a>';
 
             }
@@ -353 +373 @@
             if (self::$plugin_premium_class) {
 
-                if (get_option(self::$plugin_prefix . '_purchased') && !class_exists(self::$plugin_premium_class) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()) {
-
-?>
-
-<div class="notice notice-error is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-
-<p><strong><?php echo self::$plugin_name; ?></strong><br />
-<?php esc_html_e('In order to use the premium features, you need to install the premium version of the plugin ...', self::$plugin_text_domain); ?></p>
-
-<p><a href="<?php echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Download %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Download %s Premium', self::$plugin_text_domain), self::$plugin_name); ?></a></p>
+                if (
+                    get_option(self::$plugin_prefix . '_purchased') &&
+                    !class_exists(self::$plugin_premium_class) &&
+                    get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()
+                ) {
+
+?>
+
+<div class="notice notice-error is-dismissible <?php echo esc_html(self::$plugin_prefix); ?>-notice">
+
+<p><strong><?php echo esc_html(self::$plugin_name); ?></strong><br />
+<?php esc_html_e('In order to use the premium features, you need to install the premium version of the plugin ...', 'template-editor'); ?></p>
+
+<p><a href="<?php
+/* translators: name of the plugin */
+echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Download %s Premium', 'template-editor'), self::$plugin_name)); ?>" class="button-primary"><?php printf(esc_html(__('Download %s Premium', 'template-editor')), esc_html(self::$plugin_name)); ?></a></p>
 
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -380 +406 @@
 <?php
 
-                } elseif (!class_exists(self::$plugin_premium_class) && time() > (strtotime('+1 hour', filectime(__DIR__))) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()) {
-
-?>
-
-<div class="notice notice-info is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-
-<p><strong><?php printf(__('Thank you for using %s plugin', self::$plugin_text_domain), self::$plugin_name); ?></strong><br />
+                } elseif (
+                    !class_exists(self::$plugin_premium_class) &&
+                    time() > (strtotime('+1 hour', filectime(__DIR__))) &&
+                    get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()
+                ) {
+
+?>
+
+<div class="notice notice-info is-dismissible <?php echo esc_attr(self::$plugin_prefix); ?>-notice">
+
+    <p style="font-size:15px;"><strong><?php
+/* translators: name of the plugin */
+printf(esc_html(__('Thank you for using %s plugin', 'template-editor')), esc_html(self::$plugin_name)); ?></strong></p>
 <?php
 
                     if (self::$plugin_trial == true) {
 
-                        _e('Would you like to try even more features? Download your 7 day free trial now!', self::$plugin_text_domain); 
+?>
+
+    <p><?php echo esc_html(__('Would you like to try even more features? Download your 7 day free trial now!', 'template-editor')); ?></p>
+<?php
 
                     } else {
 
-                        echo sprintf(__('Upgrade now to %s Premium to enable more options and features and contribute to the further development of this plugin.', self::$plugin_text_domain), self::$plugin_name);
+?>
+
+    <p>
+        <?php
+/* translators: name of the plugin */
+                        echo esc_html(sprintf(__('Upgrade now to %s Premium to enable more options and features and contribute to the further development of this plugin.', 'template-editor'), self::$plugin_name)); ?>
+    </p>
+<?php
 
                     }
 
-?></p>
-
-<p><?php
+?>
+
+    <p><?php
 
                     if (self::$plugin_trial == true) {
@@ -407 +449 @@
 ?>
 
-<a href="<?php echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Try %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Trial %s Premium for 7 days', self::$plugin_text_domain), self::$plugin_name); ?></a>
-
+        <a href="<?php echo esc_url(self::premium_link()); ?>" 
+           title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Try %s Premium', 'template-editor'), self::$plugin_name)); ?>" 
+           class="button-secondary">
+           <?php echo esc_html(__('Try premium plugin free for 7 days', 'template-editor')); ?>
+        </a>
 <?php
 
@@ -414 +461 @@
 
 ?>
-<a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php echo esc_attr(sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name); ?></a></p>
+
+        <a href="<?php echo esc_url(self::upgrade_link()); ?>" 
+           title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name)); ?>" 
+           class="button-primary">
+           <?php echo esc_html(__('Upgrade now to premium plugin', 'template-editor')); ?>
+        </a>
+
+    </p>
+
+    <hr style="margin:12px 0;">
+
+    <p>
+        <strong>✨ Need help with your WordPress site?</strong>
+        🚀 Slow, want new features, or need a glow-up?
+        <a href="https://webd.uk/services/?utm_campaign=notice&utm_term=template-editor" class="button-secondary" style="margin-left:6px; vertical-align: middle;">Explore our services</a>
+    </p>
 
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -434 +498 @@
                 }
 
-            } elseif (time() > (strtotime('+1 hour', filectime(__DIR__))) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version() && !get_option(self::$plugin_prefix . '_donated')) {
-
-?>
-
-<div class="notice notice-info is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-<p><strong><?php printf(__('Thank you for using %s plugin', self::$plugin_text_domain), self::$plugin_name); ?></strong></p>
-<?php
-
+            } elseif (
+                time() > (strtotime('+1 hour', filectime(__DIR__))) &&
+                get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version() &&
+                !get_option(self::$plugin_prefix . '_donated')
+            ) {
+
+?>
+
+<div class="notice notice-info is-dismissible <?php echo esc_attr(self::$plugin_prefix); ?>-notice">
+
+    <p><strong><?php
+/* translators: name of the plugin */
+printf(esc_html(__('Thank you for using %s plugin', 'template-editor')), esc_html(self::$plugin_name)); ?></strong></p>
+<?php
+
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.DynamicHooknameFound
                 do_action(self::$plugin_prefix . '_admin_notice_donate');
 
 ?>
-<p><?php esc_html_e('Funding plugins like this one with small financial contributions is essential to pay the developers to continue to do what they do. Please take a moment to give a small amount ...', self::$plugin_text_domain); ?></p>
-<p><a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php echo esc_attr(sprintf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name); ?></a> <a href="#" id="<?php echo self::$plugin_prefix; ?>-already-paid" title="<?php echo esc_attr(__('Aleady Contributed!', self::$plugin_text_domain)); ?>" class="button-primary"><?php esc_html_e('Aleady Contributed!', self::$plugin_text_domain); ?></a></p>
+
+    <p><?php esc_html_e('Funding plugins like this one with small financial contributions is essential to pay the developers to continue to do what they do. Please take a moment to give a small amount ...', 'template-editor'); ?></p>
+
+    <p><a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Contribute to %s', 'template-editor'), self::$plugin_name)); ?>" class="button-primary"><?php echo esc_html(__('Buy us a coffee ☕️', 'template-editor')); ?></a> <a href="#" id="<?php echo esc_attr(self::$plugin_prefix); ?>-already-paid" title="<?php echo esc_attr(__('Aleady Contributed!', 'template-editor')); ?>" class="button-secondary"><?php esc_html_e('Aleady Contributed!', 'template-editor'); ?></a></p>
+
+    <hr style="margin:12px 0;">
+
+    <p>
+        <strong>✨ Need help with your WordPress site?</strong>
+        🚀 Slow, want new features, or need a glow-up?
+        <a href="https://webd.uk/services/?utm_campaign=notice&utm_term=template-editor" class="button-secondary" style="margin-left:6px; vertical-align: middle;">Explore our services</a>
+    </p>
+
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '#<?php echo self::$plugin_prefix; ?>-already-paid', function() {
-        if (confirm(<?php echo json_encode(__('Have you really? Press "Cancel" if you forgot to 🙂', self::$plugin_text_domain)); ?>)) {
-            alert(<?php echo json_encode(__('Thank you!', self::$plugin_text_domain)); ?>);
-            jQuery('.<?php echo self::$plugin_prefix; ?>-notice').fadeTo(100, 0, function() {
-                jQuery('.<?php echo self::$plugin_prefix; ?>-notice').slideUp(100, function() {
-                    jQuery('.<?php echo self::$plugin_prefix; ?>-notice').remove()
+    jQuery(document).on('click', '#<?php echo esc_attr(self::$plugin_prefix); ?>-already-paid', function() {
+        if (confirm(<?php echo json_encode(__('Have you really? Press "Cancel" if you forgot to 🙂', 'template-editor')); ?>)) {
+            alert(<?php echo json_encode(__('Thank you!', 'template-editor')); ?>);
+            jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').fadeTo(100, 0, function() {
+                jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').slideUp(100, function() {
+                    jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').remove()
                 });
             });
@@ -461 +546 @@
                 url: ajaxurl,
                 data: {
-                    action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
+                    action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
                     donated: 'true',
-                    _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                    _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
                 }
             });
         } else {
-            window.location.assign('<?php echo self::upgrade_link(); ?>');
+            window.location.assign('<?php echo esc_url(self::upgrade_link()); ?>');
         }
     });
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -509 +594 @@
                     is_admin() && 
                     $pagenow === 'customize.php' &&
-                    isset($_GET['theme']) && 
-                    !in_array($_GET['theme'], $themes, true)
+                    isset($_GET['theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    !in_array($_GET['theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ) && !(
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid']) && 
-                    !in_array($_GET['customize_theme'], $themes, true)
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    !in_array($_GET['customize_theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 )
             ) {
@@ -530 +615 @@
                     is_admin() && 
                     $pagenow === 'customize.php' &&
-                    isset($_GET['theme']) && 
-                    in_array($_GET['theme'], $themes, true)
+                    isset($_GET['theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    in_array($_GET['theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ) || (
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid']) && 
-                    in_array($_GET['customize_theme'], $themes, true)
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    in_array($_GET['customize_theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ))
             ) {
@@ -549 +634 @@
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid'])
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 
             ) {
 
-                $child = wp_get_theme($_GET['customize_theme']);
+                $child = wp_get_theme(sanitize_file_name(wp_unslash($_GET['customize_theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
                 if (isset($child->template) && in_array($child->template, $themes, true)) {
@@ -568 +653 @@
                 is_admin() && 
                 ($pagenow === 'customize.php' || $pagenow === 'admin-ajax.php') &&
-                isset($_GET['theme']) || (isset($_POST['customize_theme']) && isset($_POST['customize_changeset_uuid']))
+                (
+                    isset($_GET['theme']) || // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    (
+                        isset($_POST['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                        isset($_POST['customize_changeset_uuid']) // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                    )
+                )
             ) {
 
-                if (isset($_GET['theme'])) {
-
-                    $child = wp_get_theme($_GET['theme']);
+                if (isset($_GET['theme'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+                    $child = wp_get_theme(sanitize_file_name(wp_unslash($_GET['theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
                 } else {
 
-                    $child = wp_get_theme($_POST['customize_theme']);
+                    $child = wp_get_theme(sanitize_file_name(wp_unslash($_POST['customize_theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
                 }
@@ -599 +690 @@
 if (!function_exists('webd_customize_register')) {
 
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
     function webd_customize_register($wp_customize) {
 
         if (!class_exists('webd_Customize_Control_Checkbox_Multiple')) {
 
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedClassFound
             class webd_Customize_Control_Checkbox_Multiple extends WP_Customize_Control {
 
@@ -622 +715 @@
 
 ?>
-<span class="description customize-control-description"><?php echo $this->description; ?></span>
+<span class="description customize-control-description"><?php echo esc_html($this->description); ?></span>
 <?php
 
@@ -647 +740 @@
 ?>
         </ul>
-        <input type="hidden" id="_customize-input-<?php echo $this->id; ?>" <?php $this->link(); ?> value="<?php echo esc_attr(implode(',', $multi_values)); ?>" />
+        <input type="hidden" id="_customize-input-<?php echo esc_attr($this->id); ?>" <?php $this->link(); ?> value="<?php echo esc_attr(implode(',', $multi_values)); ?>" />
 <?php
 

template-editor/tags/1.4.2/readme.txt

@@ -2 +2 @@
 Contributors: domainsupport
 Donate link: https://webd.uk/product/support-us/
-Tags: block theme, templates, template parts, google fonts, global styles
+Tags: block theme, templates, template parts, block options, global styles
 Requires at least: 5.8
 Tested up to: 6.9
 Requires PHP: 5.6
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-Import / Export global styles, templates and template parts to Full Site Editing / Block Themes without a child theme!
+Adds options to core blocks and allows import / export of global styles, templates and template parts!
 
 == Description ==
-= Template Editor =
-
-With WordPress v5.9 the first default theme with Full Site Editing was launched ... Twenty Twenty-Two.
-
-This plugin expands on the functionality to manage (export / import) templates that are not part of the theme without having to have a child theme.
-
-Having a block theme also removes links to the Customizer. This plugin changes that!
+= Options for Block Themes =
+
+With WordPress v5.9 the first default block theme with Full Site Editing was launched ... Twenty Twenty-Two.
+
+This plugin expands on the functionality to manage (export / import / delete) templates and template parts that are not part of the theme without having to have a child theme.
+
+Having a block theme also removes links to the legacy Customizer. This plugin allows you to change that!
 
 This plugin will also enable the Template Editor in Gutenberg for full site editing for any theme!
@@ -27 +27 @@
 - Option to enable expandable submenus to the Navigation Block modal.
 - Option to add full block link option to Group and Cover Blocks.
-- Option to close other Details Blocks when selected one is opened giving the Details Block basic accordion functionality.
+- Option to close other Details Blocks when selected one is opened giving the Details Block a basic "accordion" functionality.
 
 = Conditional Block Logic =
@@ -75 +75 @@
 Enable an option to shrink the header site logo when you scroll down the page.
 
-= Add Google Fonts to Editor =
-
-NB: This is only relevant to WordPress v5.8 - v6.4 and classic themes as the Font Library was introduced into core in v6.5
-
-Choose Google Fonts and add them to the full screen editor global styles options!
-
-= Remove Block Theme Fonts =
-
-NB: This is only relevant to WordPress v5.8 - v6.4 as the Font Library was introduced into core in v6.5
-
-This plugin will allow you to choose which theme fonts are included in the FSE editor and if not required will prevent them from being loaded on the front end.
-
 == Installation ==
 
 Easily use this plugin to enable the Template Editor on your site ...
 
-1) Install "Template Editor" automatically or by uploading the ZIP file.
+1) Install "Options for Block Themes" automatically or by uploading the .zip file.
 2) Activate the plugin through the "Plugins" menu in WordPress.
-3) Start using the Template Editor with your theme.
+3) Start using the Options for Block Themes.
 
 == Changelog ==
+
+= 1.4.2 =
+* General housekeeping preparing for "Plugin Check" code review
 
 = 1.4.1 =
@@ -225 +216 @@
 == Upgrade Notice ==
 
-= 1.4.1 =
-* Fixed a margin / block spacing bug with "Full Block Link" option
+= 1.4.2 =
+* General housekeeping preparing for "Plugin Check" code review

template-editor/tags/1.4.2/template-editor.php

@@ -2 +2 @@
 /*
  * Plugin Name: Options for Block Themes
- * Version: 1.4.1
+ * Version: 1.4.2
  * Plugin URI: https://webd.uk/support/
- * Description: Import / Export global styles, templates and template parts to Full Site Editing / Block Themes without a child theme!
+ * Description: Adds options to core blocks and allows import / export of global styles, templates and template parts!
  * Author: Webd Ltd
  * Author URI: https://webd.uk
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  * Text Domain: template-editor
  */
@@ -22 +24 @@
     class template_editor_class {
 
-        public static $version = '1.4.1';
+        public static $version = '1.4.2';
         public $is_block_theme = false;
 
@@ -385 +387 @@
                         unset($submenu['themes.php'][7]);
 
+                    } elseif (isset($_SERVER['REQUEST_URI'])) {
+
+                        $customize_url = add_query_arg(
+                            'return',
+                            urlencode(remove_query_arg(wp_removable_query_args(), sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])))),
+                            'customize.php'
+                        );
+                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url($customize_url), '', 'hide-if-no-customize');
+
                     } else {
 
-                        $customize_url = add_query_arg('return', urlencode(remove_query_arg(wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI']))), 'customize.php');
-                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url($customize_url), '', 'hide-if-no-customize');
+                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url('customize.php'), '', 'hide-if-no-customize');
 
                     }
@@ -423 +433 @@
         public static function settings_page() {
 
+// phpcs:ignore WordPress.Security.NonceVerification.Recommended
             if (isset($_GET['tab']) && in_array(sanitize_key($_GET['tab']), array('theme_options', 'manage_template_parts'))) {
 
+// phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 $current_tab = sanitize_key($_GET['tab']);
 
@@ -449 +461 @@
 
 ?>
-<a id="<?php echo esc_attr($tab); ?>" class="nav-tab<?php echo $class; ?>" href="#" title="<?php echo esc_attr($title); ?>"><?php echo esc_html($title); ?></a>
+<a id="<?php echo esc_attr($tab); ?>" class="nav-tab<?php echo esc_attr($class); ?>" href="#" title="<?php echo esc_attr($title); ?>"><?php echo esc_html($title); ?></a>
 <?php
 
@@ -460 +472 @@
     $('#adminmenu li.current').addClass('manage_templates');
     $('#adminmenu .current').removeClass('current');
-    $('#adminmenu .<?php echo $current_tab; ?>').addClass('current');
+    $('#adminmenu .<?php echo esc_attr($current_tab); ?>').addClass('current');
     $('.nav-tab-wrapper .nav-tab').click(function() {
         $('.tab_content').hide();
@@ -482 +494 @@
 <p><?php esc_html_e('You can then rename the slug (and title / description) of the edited template to whatever you require and either save it or save it as a copy if you want to keep the original.', 'template-editor'); ?></p>
 <p><?php esc_html_e('Using this plugin you can create new templates outside of those that are available by default <strong>without</strong> having to create a child them! :)', 'template-editor'); ?></p>
-<h2><?php printf(__('Active Theme (%s) Templates', 'template-editor'), $active_theme); ?></h2>
+<h2><?php
+/* translators: active theme slug */
+printf(esc_html__('Active Theme (%s) Templates', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -549 +563 @@
 
 ?>
-<h2><?php printf(__('Other Theme Templates', 'template-editor'), $active_theme); ?></h2>
+<h2><?php printf(esc_html__('Other Theme Templates', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -632 +646 @@
 <th scope="row"><label for="te_post_name"><?php esc_html_e( 'Template Name', 'template-editor' ); ?></label></th>
 <td><input name="te_post_name" type="text" id="te_post_name" value="" class="regular-text">.html<br />
-<?php printf(__('<strong>This is the important bit!</strong> The template name <i>has</i> to match the slug that you would expect WordPress to look for in the <a href="%1$s" title="%2$s" target="_blank">Template Heirachy</a>','template-editor'),'https://developer.wordpress.org/themes/basics/template-hierarchy/', __('Template Heirachy','template-editor')); ?></td>
+<?php
+/* translators: link to template documentation */
+printf(wp_kses(__('<strong>This is the important bit!</strong> The template name <i>has</i> to match the slug that you would expect WordPress to look for in the <a href="%s" title="Template Heirachy" target="_blank">Template Heirachy</a>','template-editor'), 'post'),'https://developer.wordpress.org/themes/basics/template-hierarchy/'); ?></td>
 </tr>
 <tr>
@@ -660 +676 @@
     $('#te_save_as_copy').click(function() { save_template(1); });
     function save_template(saveAsCopy) {
-        if (confirm('<?php _e('Are you sure you want to save your changes to the template?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to save your changes to the template?', 'template-editor'); ?>')) {
             $('#te_save').unbind('click')
             var data = {
                 action: 'te_save',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-save'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-save')); ?>',
                 post_id: $('#te_post_id').val(),
                 post_title: $('#te_post_title').val(),
@@ -677 +693 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -693 +709 @@
         var data = {
             action: 'te_download_wp_template',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-template'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-template')); ?>',
             post_id: $(this).data('template').ID,
             post_name: $(this).data('template').post_name
@@ -729 +745 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the template?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the template?', 'template-editor'); ?>')) {
             $('#te-delete').unbind('click')
             var data = {
                 action: 'te_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('template')
             };
@@ -747 +763 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -764 +780 @@
     });
     $('#te-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as an active theme template?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as an active theme template?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_template');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-template'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-template')); ?>');
             data.append('file', $('#te-json-file').prop('files')[0]);
             $.ajax({
@@ -778 +796 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -797 +815 @@
 <h1><?php esc_html_e('Manage Template Parts', 'template-editor'); ?></h1>
 <p><?php esc_html_e('Every theme default template part (header, footer, etc) you have edited is listed here ...', 'template-editor'); ?></p>
-<h2><?php printf(esc_html__('Active Theme (%s) Template Parts', 'template-editor'), $active_theme); ?></h2>
+<h2><?php
+/* translators: active theme slug */
+printf(esc_html__('Active Theme (%s) Template Parts', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -863 +883 @@
 
 ?>
-<h2><?php printf(__('Other Theme Template Parts', 'template-editor'), $active_theme); ?></h2>
+<h2><?php printf(esc_html__('Other Theme Template Parts', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -942 +962 @@
         var data = {
             action: 'te_download_wp_template',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-template'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-template')); ?>',
             post_id: $(this).data('template-part').ID,
             post_name: $(this).data('template-part').post_name
@@ -978 +998 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-part-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the template part?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the template part?', 'template-editor'); ?>')) {
             $('#te-part-delete').unbind('click')
             var data = {
                 action: 'te_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('template-part')
             };
@@ -996 +1016 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1022 +1042 @@
     });
     $('#te-part-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as an active theme template part?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as an active theme template part?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-part-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_template_part');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-template-part'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-template-part')); ?>');
             data.append('file', $('#te-part-json-file').prop('files')[0]);
             $.ajax({
@@ -1036 +1058 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1130 +1152 @@
         var data = {
             action: 'te_download_wp_global_styles',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-global-styles'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-global-styles')); ?>',
             post_id: $(this).data('global-styles').ID,
             theme: $(this).data('global-styles').theme
@@ -1166 +1188 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-styles-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the selected global styles?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the selected global styles?', 'template-editor'); ?>')) {
             $('#te-styles-delete').unbind('click')
             var data = {
                 action: 'te_global_styles_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('global-styles')
             };
@@ -1184 +1206 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1210 +1232 @@
     });
     $('#te-styles-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as the active theme\\\'s global styles?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as the active theme\\\'s global styles?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-styles-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_global_styles');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-global-styles'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-global-styles')); ?>');
             data.append('file', $('#te-styles-json-file').prop('files')[0]);
             $.ajax({
@@ -1224 +1248 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1274 +1298 @@
                 current_user_can('manage_options') &&
                 isset($_POST['post_id']) && absint($_POST['post_id']) &&
-                isset($_POST['post_title']) && sanitize_text_field($_POST['post_title']) &&
-                isset($_POST['post_name']) && sanitize_title($_POST['post_name']) &&
-                isset($_POST['post_excerpt']) && sanitize_text_field($_POST['post_excerpt']) &&
+                isset($_POST['post_title']) && sanitize_text_field(wp_unslash($_POST['post_title'])) &&
+                isset($_POST['post_name']) && sanitize_title(wp_unslash($_POST['post_name'])) &&
+                isset($_POST['post_excerpt']) && sanitize_text_field(wp_unslash($_POST['post_excerpt'])) &&
                 isset($_POST['save_as_copy']) && in_array($_POST['save_as_copy'], ['0', '1'], true)
             ) {
 
                 $post_id = absint($_POST['post_id']);
-                $post_title = sanitize_text_field($_POST['post_title']);
-                $post_name = sanitize_title($_POST['post_name']);
-                $post_excerpt = sanitize_text_field($_POST['post_excerpt']);
+                $post_title = sanitize_text_field(wp_unslash($_POST['post_title']));
+                $post_name = sanitize_title(wp_unslash($_POST['post_name']));
+                $post_excerpt = sanitize_text_field(wp_unslash($_POST['post_excerpt']));
                 $save_as_copy = absint($_POST['save_as_copy']);
 
@@ -1454 +1478 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $template = false;
 
@@ -1532 +1556 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $global_styles = false;
 
@@ -1617 +1641 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $template = false;
 
@@ -1719 +1743 @@
             } else {
 
-                add_settings_section('te_options', __('Fonts', 'template-editor'), 'template_editor_class::fonts_text_new', 'te_fonts');
+                $options = get_option('te_options');
+
+                if (
+                    isset($options['inject_google_fonts']) &&
+                    is_array($options['inject_google_fonts']) &&
+                    $options['inject_google_fonts']
+                ) {
+
+                    add_settings_section('te_options', __('Fonts', 'template-editor'), 'template_editor_class::fonts_text_new', 'te_fonts');
+
+                }
 
             }
@@ -1728 +1762 @@
 
 ?>
-<p><?php echo sprintf(wp_kses(__('Here are some options for Full Site Editor themes. If you\'d like to see more options here, <a href="%s">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'class' => array()))), esc_url('https://wordpress.org/support/plugin/template-editor/')); ?></p>
+<p><?php
+/* translators: link to plugin support forum */
+echo sprintf(wp_kses(__('Here are some options for Full Site Editor themes. If you\'d like to see more options here, <a href="%s">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'class' => array()))), esc_url('https://wordpress.org/support/plugin/template-editor/')); ?></p>
 <?php
 
@@ -1795 +1831 @@
 
 ?>
-<p><?php echo __('We\'ve worked out how to inject Google Fonts into the Full Site Editor without modifying the theme or creating a child theme!', 'template-editor'); ?></p>
+<p><?php esc_html_e('We\'ve worked out how to inject Google Fonts into the Full Site Editor without modifying the theme or creating a child theme!', 'template-editor'); ?></p>
 <?php
 
@@ -1805 +1841 @@
 
 ?>
-<p><?php echo __('With the launch of WordPress v6.5 came the new "Font Library". This awesome core update allows you to manage fonts from the Site Editor.', 'template-editor'); ?></p>
-<?php
-
-            if (isset($options['inject_google_fonts']) && is_array($options['inject_google_fonts']) && $options['inject_google_fonts']) {
-
-?>
-<p style="color: red;"><strong><?php echo __('We notice that you use this plugin to inject the following Google fonts. If you haven\'t already you should use the Site Editor to add these fonts again:', 'template-editor'); ?>
-<?php
-
-                $count_fonts = 0;
-
-                foreach ($options['inject_google_fonts'] as $font => $styles) {
-
-                    if (!is_array($styles)) { $styles = array($styles); }
-
-                    foreach ($styles as $key => $style) {
+<p><?php esc_html_e('With the launch of WordPress v6.5 came the new "Font Library". This awesome core update allows you to manage fonts from the Site Editor.', 'template-editor'); ?></p>
+<p style="color: red;"><strong><?php esc_html_e('We notice that you use this plugin to inject the following Google fonts. If you haven\'t already you should use the Site Editor to add these fonts again:', 'template-editor'); ?>
+<?php
+
+            $count_fonts = 0;
+
+            foreach ($options['inject_google_fonts'] as $font => $styles) {
+
+                if (!is_array($styles)) { $styles = array($styles); }
+
+                foreach ($styles as $key => $style) {
 
 ?>
@@ -1826 +1857 @@
 <?php
 
-                        $count_fonts++;
-
-                    }
-
-                }
+                    $count_fonts++;
+
+                }
+
+            }
 
 ?>
 </strong></p>
-<p><?php echo __('Go to "Dashboard - Appearance - Editor - Styles - <edit pencil icon> - Typography". From there click on any font to enter the "Font Library". It is important that you first remove the above Google fonts then re-install them using the "Install Fonts" tab of the "Font Library".', 'template-editor'); ?></p>
-<?php
-
-            }
+<p><?php esc_html_e('Go to "Dashboard - Appearance - Editor - Styles - <edit pencil icon> - Typography". From there click on any font to enter the "Font Library". It is important that you first remove the above Google fonts then re-install them using the "Install Fonts" tab of the "Font Library".', 'template-editor'); ?></p>
+<?php
 
         }
@@ -1988 +2017 @@
                 'block' => esc_html__('"block" - Wait until the font has loaded before drawing the text.', 'template-editor'), 
                 'swap' => esc_html__('"swap" - Draw the text straight away then re-draw the text when the font has loaded.', 'template-editor'),
-                'fallback' => sprintf(esc_html__('"fallback" - Waits for a %1$svery%2$s short time before drawing the text anyway if the font hasn\'t yet loaded then re-draws the text if the font loads shortly after.', 'template-editor'),'<strong>','</strong>'),
-                'optional' => sprintf(esc_html__('"optional" - Waits for a %1$svery%2$s short time before drawing the text anyway but %1$sdoesn\'t%2$s re-draw when the font loads.', 'template-editor'),'<strong>','</strong>')
+                'fallback' => wp_kses(sprintf('%1$s<strong>%2$s</strong>%3$s', __('"fallback" - Waits for a ', 'template-editor'), __('very', 'template-editor'), __(' short time before drawing the text anyway if the font hasn\'t yet loaded then re-draws the text if the font loads shortly after.', 'template-editor')), 'post'),
+                'optional' => wp_kses(sprintf('%1$s<strong>%2$s</strong>%3$s<strong>%4$s</strong>%5$s', __('"optional" - Waits for a ', 'template-editor'), __('very', 'template-editor'), __(' short time before drawing the text anyway but ', 'template-editor'), __('doesn\'t', 'template-editor'), __(' re-draw when the font loads.', 'template-editor')), 'post'),
             );
 
@@ -2001 +2030 @@
 
 ?>
-<label for="google-font-display-<?php echo $key; ?>">
-<input type="radio" id="google-font-display-<?php echo $key; ?>" name="te_options[google_font_display]" value="<?php echo $key; ?>"<?php if (isset($options['google_font_display'])) { checked($options['google_font_display'], $key); } else { checked('auto', $key); } ?>>
-<?php echo $value ?>
+<label for="google-font-display-<?php echo esc_attr($key); ?>">
+<input type="radio" id="google-font-display-<?php echo esc_attr($key); ?>" name="te_options[google_font_display]" value="<?php echo esc_attr($key); ?>"<?php if (isset($options['google_font_display'])) { checked($options['google_font_display'], $key); } else { checked('auto', $key); } ?>>
+<?php echo esc_html($value) ?>
 </label>
 <?php
@@ -2036 +2065 @@
 
                 remove_filter('wp_theme_json_data_theme', 'template_editor_class::wp_theme_json_data_theme');
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
                 $theme_json = apply_filters('wp_theme_json_data_theme', new WP_Theme_JSON_Data($theme_json_data, 'theme'));
                 add_filter('wp_theme_json_data_theme', 'template_editor_class::wp_theme_json_data_theme');
@@ -2379 +2409 @@
                     $css_import_string .= '&display=' . (isset($options['google_font_display']) ? sanitize_key($options['google_font_display']) : 'auto');
 
-                    $google_request = wp_safe_remote_get($css_import_string,  array(
-                        'user-agent' => $_SERVER['HTTP_USER_AGENT']
-                    ));
+                    $google_request = wp_safe_remote_get($css_import_string,  (isset($_SERVER['HTTP_USER_AGENT']) ? array(
+                        'user-agent' => sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']))
+                    ) : array()));
 
                     $abort_font_download = false;
@@ -2398 +2428 @@
                             $google_fonts = array_unique($google_fonts[1]);
 
+                            global $wp_filesystem;
+
+                            if (!$wp_filesystem) {
+
+                                require_once (ABSPATH . '/wp-admin/includes/file.php');
+
+                                WP_Filesystem();
+
+                            }
+
                             if (!is_dir($filepath)) {
 
-                                mkdir($filepath);
+                                $wp_filesystem->mkdir($filepath);
 
                             } else {
@@ -2406 +2446 @@
                                 $fileSystemDirect = new WP_Filesystem_Direct(false);
                                 $fileSystemDirect->rmdir($filepath, true);
-                                mkdir($filepath);
+                                $wp_filesystem->mkdir($filepath);
 
                             }
@@ -2414 +2454 @@
                             foreach ($google_fonts as $google_font_url) {
 
-                                $google_font = wp_safe_remote_get($google_font_url,  array(
-                                    'user-agent' => $_SERVER['HTTP_USER_AGENT']
-                                ));
+                                $google_font = wp_safe_remote_get($google_font_url,  (isset($_SERVER['HTTP_USER_AGENT']) ? array(
+                                    'user-agent' => sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']))
+                                ) : array()));
 
                                 if (
@@ -2427 +2467 @@
                                     $google_font_filename = wp_basename($google_font_url);
                                     $wp_filesystem->put_contents($filepath . $google_font_filename, $google_font['body']);
-                                    $parse_url = parse_url($upload_dir['baseurl']);
+                                    $parse_url = wp_parse_url($upload_dir['baseurl']);
 
                                     $google_font_css = str_replace(
@@ -2597 +2637 @@
                         headerWrapper.classList.add('shrink-logo');
                         if ('undefined' !== customLogo.length) {
-                            customLogo.style.width = '<?php echo $new_logo_width; ?>px';
-                            customLogo.style.height = '<?php echo (false !== $new_logo_height ? $new_logo_height : 48); ?>px';
+                            customLogo.style.width = '<?php echo esc_attr($new_logo_width); ?>px';
+                            customLogo.style.height = '<?php echo esc_attr(false !== $new_logo_height ? $new_logo_height : 48); ?>px';
                         }
                     }
@@ -2757 +2797 @@
                 return str_replace(
                     '[HTTP_HOST]',
-                    'http' . (is_ssl() ? 's' : '') . '://' . $_SERVER['HTTP_HOST'],
+                    'http' . (is_ssl() ? 's' : '') . '://' . (isset($_SERVER['HTTP_HOST']) ? sanitize_url(wp_unslash($_SERVER['HTTP_HOST'])) : gethostname()),
                     $options['google_font_css']
                 );
@@ -2895 +2935 @@
     if (version_compare(get_bloginfo('version'), '5.8', '>=')) {
 
-        $template_editor_object = new template_editor_class();
+        new template_editor_class();
 
     } else {
@@ -2915 +2955 @@
 <div class="notice notice-error">
 
-<p><strong><?php esc_html_e('Template Editor Plugin Error', 'template-editor'); ?></strong><br />
+<p><strong><?php esc_html_e('Options for Block Themes Plugin Error', 'template-editor'); ?></strong><br />
 <?php
 
         printf(
-            __('This plugin requires at least WordPress v5.8 to be installed in order to function. Your WordPress version "%s" is not compatible.', 'template-editor'),
-            get_bloginfo('version')
+/* translators: WordPress version */
+            esc_html(__('This plugin requires at least WordPress v5.8 to be installed in order to function. Your WordPress version "%s" is not compatible.', 'template-editor')),
+            esc_html(get_bloginfo('version'))
         );
 
@@ -2926 +2967 @@
 
 <p><a class="button" href="<?php echo esc_url(admin_url('update-core.php')); ?>" title="<?php esc_attr_e('WordPress Updates', 'template-editor'); ?>"><?php
-        _e('WordPress Updates', 'template-editor');
+        esc_html_e('WordPress Updates', 'template-editor');
 ?></a>.</p>
 

template-editor/trunk/includes/class-te-common.php

@@ -1 +1 @@
 <?php
 /*
- * Version: 1.3.9
+ * Version: 1.4.4
  */
 
@@ -43 +43 @@
         public static function plugin_text_domain() {
 
-            return self::$plugin_text_domain;
+            return 'template-editor';
 
         }
@@ -61 +61 @@
         public static function support_url() {
 
-            return 'https://wordpress.org/support/plugin/' . self::$plugin_text_domain . '/';
+            return 'https://wordpress.org/support/plugin/' . 'template-editor' . '/';
 
         }
@@ -67 +67 @@
         public static function control_upgrade_text() {
 
-            $upgrade_text = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name)) . '">' . sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name) . '</a>';
+/* translators: name of the plugin */
+            $upgrade_text = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name)) . '">' . sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name) . '</a>';
 
             if (!class_exists(self::$plugin_premium_class) || !get_option(self::$plugin_prefix . '_purchased')) {
@@ -73 +74 @@
                 if (!class_exists(self::$plugin_premium_class)) {
 
-                    $upgrade_text .= sprintf(wp_kses(__(' or <a href="%s" title="Download Free Trial">trial it for 7 days</a>', self::$plugin_text_domain), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::premium_link()));
+/* translators: link to the premium upgrade */
+                    $upgrade_text .= sprintf(wp_kses(__(' or <a href="%s" title="Download Free Trial">trial it for 7 days</a>', 'template-editor'), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::premium_link()));
 
                 }
@@ -85 +87 @@
         public static function control_section_description() {
 
-            $default_description = sprintf(wp_kses(__('If you have any requests for new features, please <a href="%s" title="Support Forum">let us know in the support forum</a>.', self::$plugin_text_domain), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::support_url()));
+/* translators: link to the plugin's support forum */
+            $default_description = sprintf(wp_kses(__('If you have any requests for new features, please <a href="%s" title="Support Forum">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'title' => array()))), esc_url(self::support_url()));
 
             if (self::$plugin_premium_class) {
@@ -95 +98 @@
                     if (!class_exists(self::$plugin_premium_class)) {
 
-                        $section_description = '<strong>' . __('For even more options', self::$plugin_text_domain) . '</strong>' . ' ' . $upgrade_text;
+                        $section_description = '<strong>' . __('For even more options', 'template-editor') . '</strong>' . ' ' . $upgrade_text;
 
                     } else {
 
-                        $section_description = '<strong>' . __('To keep using premium options', self::$plugin_text_domain) . '</strong>' . ' ' . $upgrade_text;
+                        $section_description = '<strong>' . __('To keep using premium options', 'template-editor') . '</strong>' . ' ' . $upgrade_text;
 
                     }
@@ -119 +122 @@
                 $section_description .= ' ' . sprintf(
                     wp_kses(
+/* translators: link to plugin install page */
                         __(
                             '<strong>To reset this section of options to default settings</strong> without affecting other sections in the customizer, install <a href="%s" title="Reset Customizer">Reset Customizer</a>.',
-                            self::$plugin_text_domain
+                            'template-editor'
                         ),
                         array('strong' => array(), 'a' => array('href' => array(), 'title' => array()))
@@ -145 +149 @@
         public static function control_setting_upgrade_nag() {
 
-            $upgrade_nag = self::control_upgrade_text() . __(' to use this option.', self::$plugin_text_domain);
+            $upgrade_nag = self::control_upgrade_text() . __(' to use this option.', 'template-editor');
 
             return $upgrade_nag;
@@ -234 +238 @@
 
                 $generated_css = sprintf('%s { %s: %s; }', $selector, $style, $prefix.$mod.$postfix);
-                echo $generated_css;
+
+// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo wp_strip_all_tags($generated_css);
 
             } elseif ($mod) {
 
                 $generated_css = sprintf('%s { %s:%s; }', $selector, $style, $prefix.$value.$postfix);
-                echo $generated_css;
+
+// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo wp_strip_all_tags($generated_css);
 
             }
@@ -249 +257 @@
             if (self::$plugin_premium_class) {
 
-                return add_query_arg('url', (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'], 'https://webd.uk/product/' . self::$plugin_text_domain . '-upgrade/');
-
+                if (isset($_SERVER['HTTP_HOST'])) {
+
+                    return add_query_arg('url', (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . filter_var(wp_unslash($_SERVER['HTTP_HOST'], FILTER_SANITIZE_URL)), 'https://webd.uk/product/' . 'template-editor' . '-upgrade/');
+
+                } else {
+
+                    return 'https://webd.uk/product/' . 'template-editor' . '-upgrade/';
+
+                }
 
             } else {
@@ -276 +291 @@
             $settings_links = array();
 
-            $settings_links[] = '<a href="' . esc_url($settings_link) . '" title="' . esc_attr(__('Settings', self::$plugin_text_domain)) . '">' . __('Settings', self::$plugin_text_domain) . '</a>';
+            $settings_links[] = '<a href="' . esc_url($settings_link) . '" title="' . esc_attr(__('Settings', 'template-editor')) . '">' . __('Settings', 'template-editor') . '</a>';
 
             if (!get_option(self::$plugin_prefix . '_purchased')) {
@@ -284 +299 @@
                     if (self::$plugin_upgrade) {
 
-                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s Premium', self::$plugin_text_domain), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', self::$plugin_text_domain) . '</a>';
+/* translators: name of the plugin */
+                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s Premium', 'template-editor'), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', 'template-editor') . '</a>';
 
                     } else {
 
-                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s', self::$plugin_text_domain), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', self::$plugin_text_domain) . '</a>';
+/* translators: name of the plugin */
+                        $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr(sprintf(__('Buy %s', 'template-editor'), self::$plugin_name)) . '" style="color: orange; font-weight: bold;">' . __('Buy Now', 'template-editor') . '</a>';
 
                     }
@@ -294 +311 @@
                 } else {
 
-                    $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr((self::$plugin_premium_class ? sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name) : sprintf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name))) . '" style="color: orange; font-weight: bold;">' . (self::$plugin_premium_class ? __('Upgrade', self::$plugin_text_domain) : __('Support Us', self::$plugin_text_domain)) . '</a>';
+/* translators: name of the plugin */
+                    $settings_links[] = '<a href="' . esc_url(self::upgrade_link()) . '" title="' . esc_attr((self::$plugin_premium_class ? sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name) : sprintf(__('Contribute to %s', 'template-editor'), self::$plugin_name))) . '" style="color: orange; font-weight: bold;">' . (self::$plugin_premium_class ? __('Upgrade', 'template-editor') : __('Support Us', 'template-editor')) . '</a>';
 
                 }
@@ -300 +318 @@
                 if ($premium) {
 
-                    $settings_links[] = '<a href="' . wp_nonce_url('?activate-' . self::$plugin_prefix . '=true', self::$plugin_prefix . '_activate') . '" id="' . self::$plugin_prefix . '_activate_upgrade" title="' . esc_attr(__('Activate Purchase', self::$plugin_text_domain)) . '" onclick="jQuery(this).append(&#39; <img src=&#34;/wp-admin/images/loading.gif&#34; style=&#34;float: none; width: auto; height: auto;&#34; />&#39;); setTimeout(function(){document.getElementById(\'' . self::$plugin_prefix . '_activate_upgrade\').removeAttribute(\'href\');},1); return true;">' . __('Activate Purchase', self::$plugin_text_domain) . '</a>';
-
-                } elseif (self::$plugin_trial && !is_plugin_active(self::$plugin_text_domain . '-premium/' . self::$plugin_text_domain . '-premium.php')) {
-
-                    $settings_links[] = '<a href="' . esc_url(self::premium_link()) . '" title="' . esc_attr(sprintf(__('Trial %s Premium', self::$plugin_text_domain), self::$plugin_name)) . ' for 7 days">' . __('Download Trial', self::$plugin_text_domain) . '</a>';
+                    $settings_links[] = '<a href="' . wp_nonce_url('?activate-' . self::$plugin_prefix . '=true', self::$plugin_prefix . '_activate') . '" id="' . self::$plugin_prefix . '_activate_upgrade" title="' . esc_attr(__('Activate Purchase', 'template-editor')) . '" onclick="jQuery(this).append(&#39; <img src=&#34;/wp-admin/images/loading.gif&#34; style=&#34;float: none; width: auto; height: auto;&#34; />&#39;); setTimeout(function(){document.getElementById(\'' . self::$plugin_prefix . '_activate_upgrade\').removeAttribute(\'href\');},1); return true;">' . __('Activate Purchase', 'template-editor') . '</a>';
+
+                } elseif (self::$plugin_trial && !is_plugin_active('template-editor' . '-premium/' . 'template-editor' . '-premium.php')) {
+
+/* translators: name of the plugin */
+                    $settings_links[] = '<a href="' . esc_url(self::premium_link()) . '" title="' . esc_attr(sprintf(__('Trial %s Premium', 'template-editor'), self::$plugin_name)) . ' for 7 days">' . __('Download Trial', 'template-editor') . '</a>';
 
                 }
@@ -310 +329 @@
             } elseif ($premium) {
 
-                $settings_links[] = '<strong style="color: green; display: inline;">' . __('Purchase Confirmed', self::$plugin_text_domain) . '</strong>';
+                $settings_links[] = '<strong style="color: green; display: inline;">' . __('Purchase Confirmed', 'template-editor') . '</strong>';
 
             }
@@ -320 +339 @@
         public static function plugin_row_meta($plugin_meta, $plugin_file, $plugin_data, $status) {
 
-            if ($plugin_file === self::$plugin_text_domain . '/' . self::$plugin_text_domain . '.php') {
-
-                $plugin_meta[] = '<a href="' . esc_url(self::support_url()) . '" title="' . __('Problems? We are here to help!', self::$plugin_text_domain) . '" style="color: orange; font-weight: bold;">' . __('Need help?', self::$plugin_text_domain) . '</a>';
-                $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/' . self::$plugin_text_domain . '/reviews/#new-post" title="' . esc_attr(sprintf(__('If you like %s, please leave a review!', self::$plugin_text_domain), self::$plugin_name)) . '">' . __('Review plugin', self::$plugin_text_domain) . '</a>';
+            if ($plugin_file === 'template-editor' . '/' . 'template-editor' . '.php') {
+
+                $plugin_meta[] = '<a href="' . esc_url(self::support_url()) . '" title="' . __('Problems? We are here to help!', 'template-editor') . '" style="color: orange; font-weight: bold;">' . __('Need help?', 'template-editor') . '</a>';
+/* translators: name of the plugin */
+                $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/' . 'template-editor' . '/reviews/#new-post" title="' . esc_attr(sprintf(__('If you like %s, please leave a review!', 'template-editor'), self::$plugin_name)) . '">' . __('Review plugin', 'template-editor') . '</a>';
 
             }
@@ -353 +373 @@
             if (self::$plugin_premium_class) {
 
-                if (get_option(self::$plugin_prefix . '_purchased') && !class_exists(self::$plugin_premium_class) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()) {
-
-?>
-
-<div class="notice notice-error is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-
-<p><strong><?php echo self::$plugin_name; ?></strong><br />
-<?php esc_html_e('In order to use the premium features, you need to install the premium version of the plugin ...', self::$plugin_text_domain); ?></p>
-
-<p><a href="<?php echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Download %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Download %s Premium', self::$plugin_text_domain), self::$plugin_name); ?></a></p>
+                if (
+                    get_option(self::$plugin_prefix . '_purchased') &&
+                    !class_exists(self::$plugin_premium_class) &&
+                    get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()
+                ) {
+
+?>
+
+<div class="notice notice-error is-dismissible <?php echo esc_html(self::$plugin_prefix); ?>-notice">
+
+<p><strong><?php echo esc_html(self::$plugin_name); ?></strong><br />
+<?php esc_html_e('In order to use the premium features, you need to install the premium version of the plugin ...', 'template-editor'); ?></p>
+
+<p><a href="<?php
+/* translators: name of the plugin */
+echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Download %s Premium', 'template-editor'), self::$plugin_name)); ?>" class="button-primary"><?php printf(esc_html(__('Download %s Premium', 'template-editor')), esc_html(self::$plugin_name)); ?></a></p>
 
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -380 +406 @@
 <?php
 
-                } elseif (!class_exists(self::$plugin_premium_class) && time() > (strtotime('+1 hour', filectime(__DIR__))) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()) {
-
-?>
-
-<div class="notice notice-info is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-
-<p><strong><?php printf(__('Thank you for using %s plugin', self::$plugin_text_domain), self::$plugin_name); ?></strong><br />
+                } elseif (
+                    !class_exists(self::$plugin_premium_class) &&
+                    time() > (strtotime('+1 hour', filectime(__DIR__))) &&
+                    get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version()
+                ) {
+
+?>
+
+<div class="notice notice-info is-dismissible <?php echo esc_attr(self::$plugin_prefix); ?>-notice">
+
+    <p style="font-size:15px;"><strong><?php
+/* translators: name of the plugin */
+printf(esc_html(__('Thank you for using %s plugin', 'template-editor')), esc_html(self::$plugin_name)); ?></strong></p>
 <?php
 
                     if (self::$plugin_trial == true) {
 
-                        _e('Would you like to try even more features? Download your 7 day free trial now!', self::$plugin_text_domain); 
+?>
+
+    <p><?php echo esc_html(__('Would you like to try even more features? Download your 7 day free trial now!', 'template-editor')); ?></p>
+<?php
 
                     } else {
 
-                        echo sprintf(__('Upgrade now to %s Premium to enable more options and features and contribute to the further development of this plugin.', self::$plugin_text_domain), self::$plugin_name);
+?>
+
+    <p>
+        <?php
+/* translators: name of the plugin */
+                        echo esc_html(sprintf(__('Upgrade now to %s Premium to enable more options and features and contribute to the further development of this plugin.', 'template-editor'), self::$plugin_name)); ?>
+    </p>
+<?php
 
                     }
 
-?></p>
-
-<p><?php
+?>
+
+    <p><?php
 
                     if (self::$plugin_trial == true) {
@@ -407 +449 @@
 ?>
 
-<a href="<?php echo esc_url(self::premium_link()); ?>" title="<?php echo esc_attr(sprintf(__('Try %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Trial %s Premium for 7 days', self::$plugin_text_domain), self::$plugin_name); ?></a>
-
+        <a href="<?php echo esc_url(self::premium_link()); ?>" 
+           title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Try %s Premium', 'template-editor'), self::$plugin_name)); ?>" 
+           class="button-secondary">
+           <?php echo esc_html(__('Try premium plugin free for 7 days', 'template-editor')); ?>
+        </a>
 <?php
 
@@ -414 +461 @@
 
 ?>
-<a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php echo esc_attr(sprintf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Upgrade now to %s Premium', self::$plugin_text_domain), self::$plugin_name); ?></a></p>
+
+        <a href="<?php echo esc_url(self::upgrade_link()); ?>" 
+           title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Upgrade now to %s Premium', 'template-editor'), self::$plugin_name)); ?>" 
+           class="button-primary">
+           <?php echo esc_html(__('Upgrade now to premium plugin', 'template-editor')); ?>
+        </a>
+
+    </p>
+
+    <hr style="margin:12px 0;">
+
+    <p>
+        <strong>✨ Need help with your WordPress site?</strong>
+        🚀 Slow, want new features, or need a glow-up?
+        <a href="https://webd.uk/services/?utm_campaign=notice&utm_term=template-editor" class="button-secondary" style="margin-left:6px; vertical-align: middle;">Explore our services</a>
+    </p>
 
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -434 +498 @@
                 }
 
-            } elseif (time() > (strtotime('+1 hour', filectime(__DIR__))) && get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version() && !get_option(self::$plugin_prefix . '_donated')) {
-
-?>
-
-<div class="notice notice-info is-dismissible <?php echo self::$plugin_prefix; ?>-notice">
-<p><strong><?php printf(__('Thank you for using %s plugin', self::$plugin_text_domain), self::$plugin_name); ?></strong></p>
-<?php
-
+            } elseif (
+                time() > (strtotime('+1 hour', filectime(__DIR__))) &&
+                get_user_meta(get_current_user_id(), self::$plugin_prefix . '-notice-dismissed', true) != self::plugin_version() &&
+                !get_option(self::$plugin_prefix . '_donated')
+            ) {
+
+?>
+
+<div class="notice notice-info is-dismissible <?php echo esc_attr(self::$plugin_prefix); ?>-notice">
+
+    <p><strong><?php
+/* translators: name of the plugin */
+printf(esc_html(__('Thank you for using %s plugin', 'template-editor')), esc_html(self::$plugin_name)); ?></strong></p>
+<?php
+
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.DynamicHooknameFound
                 do_action(self::$plugin_prefix . '_admin_notice_donate');
 
 ?>
-<p><?php esc_html_e('Funding plugins like this one with small financial contributions is essential to pay the developers to continue to do what they do. Please take a moment to give a small amount ...', self::$plugin_text_domain); ?></p>
-<p><a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php echo esc_attr(sprintf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name)); ?>" class="button-primary"><?php printf(__('Contribute to %s', self::$plugin_text_domain), self::$plugin_name); ?></a> <a href="#" id="<?php echo self::$plugin_prefix; ?>-already-paid" title="<?php echo esc_attr(__('Aleady Contributed!', self::$plugin_text_domain)); ?>" class="button-primary"><?php esc_html_e('Aleady Contributed!', self::$plugin_text_domain); ?></a></p>
+
+    <p><?php esc_html_e('Funding plugins like this one with small financial contributions is essential to pay the developers to continue to do what they do. Please take a moment to give a small amount ...', 'template-editor'); ?></p>
+
+    <p><a href="<?php echo esc_url(self::upgrade_link()); ?>" title="<?php
+/* translators: name of the plugin */
+echo esc_attr(sprintf(__('Contribute to %s', 'template-editor'), self::$plugin_name)); ?>" class="button-primary"><?php echo esc_html(__('Buy us a coffee ☕️', 'template-editor')); ?></a> <a href="#" id="<?php echo esc_attr(self::$plugin_prefix); ?>-already-paid" title="<?php echo esc_attr(__('Aleady Contributed!', 'template-editor')); ?>" class="button-secondary"><?php esc_html_e('Aleady Contributed!', 'template-editor'); ?></a></p>
+
+    <hr style="margin:12px 0;">
+
+    <p>
+        <strong>✨ Need help with your WordPress site?</strong>
+        🚀 Slow, want new features, or need a glow-up?
+        <a href="https://webd.uk/services/?utm_campaign=notice&utm_term=template-editor" class="button-secondary" style="margin-left:6px; vertical-align: middle;">Explore our services</a>
+    </p>
+
 </div>
 
 <script type="text/javascript">
-    jQuery(document).on('click', '#<?php echo self::$plugin_prefix; ?>-already-paid', function() {
-        if (confirm(<?php echo json_encode(__('Have you really? Press "Cancel" if you forgot to 🙂', self::$plugin_text_domain)); ?>)) {
-            alert(<?php echo json_encode(__('Thank you!', self::$plugin_text_domain)); ?>);
-            jQuery('.<?php echo self::$plugin_prefix; ?>-notice').fadeTo(100, 0, function() {
-                jQuery('.<?php echo self::$plugin_prefix; ?>-notice').slideUp(100, function() {
-                    jQuery('.<?php echo self::$plugin_prefix; ?>-notice').remove()
+    jQuery(document).on('click', '#<?php echo esc_attr(self::$plugin_prefix); ?>-already-paid', function() {
+        if (confirm(<?php echo json_encode(__('Have you really? Press "Cancel" if you forgot to 🙂', 'template-editor')); ?>)) {
+            alert(<?php echo json_encode(__('Thank you!', 'template-editor')); ?>);
+            jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').fadeTo(100, 0, function() {
+                jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').slideUp(100, function() {
+                    jQuery('.<?php echo esc_attr(self::$plugin_prefix); ?>-notice').remove()
                 });
             });
@@ -461 +546 @@
                 url: ajaxurl,
                 data: {
-                    action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
+                    action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
                     donated: 'true',
-                    _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                    _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
                 }
             });
         } else {
-            window.location.assign('<?php echo self::upgrade_link(); ?>');
+            window.location.assign('<?php echo esc_url(self::upgrade_link()); ?>');
         }
     });
-    jQuery(document).on('click', '.<?php echo self::$plugin_prefix; ?>-notice .notice-dismiss', function() {
+    jQuery(document).on('click', '.<?php echo esc_attr(self::$plugin_prefix); ?>-notice .notice-dismiss', function() {
         jQuery.ajax({
             url: ajaxurl,
             data: {
-                action: 'dismiss_<?php echo self::$plugin_prefix; ?>_notice_handler',
-                _ajax_nonce: '<?php echo wp_create_nonce(self::$plugin_prefix . '-ajax-nonce'); ?>'
+                action: 'dismiss_<?php echo esc_attr(self::$plugin_prefix); ?>_notice_handler',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce(self::$plugin_prefix . '-ajax-nonce')); ?>'
             }
         });
@@ -509 +594 @@
                     is_admin() && 
                     $pagenow === 'customize.php' &&
-                    isset($_GET['theme']) && 
-                    !in_array($_GET['theme'], $themes, true)
+                    isset($_GET['theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    !in_array($_GET['theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ) && !(
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid']) && 
-                    !in_array($_GET['customize_theme'], $themes, true)
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    !in_array($_GET['customize_theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 )
             ) {
@@ -530 +615 @@
                     is_admin() && 
                     $pagenow === 'customize.php' &&
-                    isset($_GET['theme']) && 
-                    in_array($_GET['theme'], $themes, true)
+                    isset($_GET['theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    in_array($_GET['theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ) || (
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid']) && 
-                    in_array($_GET['customize_theme'], $themes, true)
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    in_array($_GET['customize_theme'], $themes, true) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 ))
             ) {
@@ -549 +634 @@
                     !is_admin() && 
                     $pagenow === 'index.php' &&
-                    isset($_GET['customize_theme']) && 
-                    isset($_GET['customize_changeset_uuid'])
+                    isset($_GET['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    isset($_GET['customize_changeset_uuid']) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 
             ) {
 
-                $child = wp_get_theme($_GET['customize_theme']);
+                $child = wp_get_theme(sanitize_file_name(wp_unslash($_GET['customize_theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
                 if (isset($child->template) && in_array($child->template, $themes, true)) {
@@ -568 +653 @@
                 is_admin() && 
                 ($pagenow === 'customize.php' || $pagenow === 'admin-ajax.php') &&
-                isset($_GET['theme']) || (isset($_POST['customize_theme']) && isset($_POST['customize_changeset_uuid']))
+                (
+                    isset($_GET['theme']) || // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    (
+                        isset($_POST['customize_theme']) && // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                        isset($_POST['customize_changeset_uuid']) // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                    )
+                )
             ) {
 
-                if (isset($_GET['theme'])) {
-
-                    $child = wp_get_theme($_GET['theme']);
+                if (isset($_GET['theme'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+                    $child = wp_get_theme(sanitize_file_name(wp_unslash($_GET['theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
                 } else {
 
-                    $child = wp_get_theme($_POST['customize_theme']);
+                    $child = wp_get_theme(sanitize_file_name(wp_unslash($_POST['customize_theme']))); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
                 }
@@ -599 +690 @@
 if (!function_exists('webd_customize_register')) {
 
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
     function webd_customize_register($wp_customize) {
 
         if (!class_exists('webd_Customize_Control_Checkbox_Multiple')) {
 
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedClassFound
             class webd_Customize_Control_Checkbox_Multiple extends WP_Customize_Control {
 
@@ -622 +715 @@
 
 ?>
-<span class="description customize-control-description"><?php echo $this->description; ?></span>
+<span class="description customize-control-description"><?php echo esc_html($this->description); ?></span>
 <?php
 
@@ -647 +740 @@
 ?>
         </ul>
-        <input type="hidden" id="_customize-input-<?php echo $this->id; ?>" <?php $this->link(); ?> value="<?php echo esc_attr(implode(',', $multi_values)); ?>" />
+        <input type="hidden" id="_customize-input-<?php echo esc_attr($this->id); ?>" <?php $this->link(); ?> value="<?php echo esc_attr(implode(',', $multi_values)); ?>" />
 <?php
 

template-editor/trunk/readme.txt

@@ -2 +2 @@
 Contributors: domainsupport
 Donate link: https://webd.uk/product/support-us/
-Tags: block theme, templates, template parts, google fonts, global styles
+Tags: block theme, templates, template parts, block options, global styles
 Requires at least: 5.8
 Tested up to: 6.9
 Requires PHP: 5.6
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-Import / Export global styles, templates and template parts to Full Site Editing / Block Themes without a child theme!
+Adds options to core blocks and allows import / export of global styles, templates and template parts!
 
 == Description ==
-= Template Editor =
-
-With WordPress v5.9 the first default theme with Full Site Editing was launched ... Twenty Twenty-Two.
-
-This plugin expands on the functionality to manage (export / import) templates that are not part of the theme without having to have a child theme.
-
-Having a block theme also removes links to the Customizer. This plugin changes that!
+= Options for Block Themes =
+
+With WordPress v5.9 the first default block theme with Full Site Editing was launched ... Twenty Twenty-Two.
+
+This plugin expands on the functionality to manage (export / import / delete) templates and template parts that are not part of the theme without having to have a child theme.
+
+Having a block theme also removes links to the legacy Customizer. This plugin allows you to change that!
 
 This plugin will also enable the Template Editor in Gutenberg for full site editing for any theme!
@@ -27 +27 @@
 - Option to enable expandable submenus to the Navigation Block modal.
 - Option to add full block link option to Group and Cover Blocks.
-- Option to close other Details Blocks when selected one is opened giving the Details Block basic accordion functionality.
+- Option to close other Details Blocks when selected one is opened giving the Details Block a basic "accordion" functionality.
 
 = Conditional Block Logic =
@@ -75 +75 @@
 Enable an option to shrink the header site logo when you scroll down the page.
 
-= Add Google Fonts to Editor =
-
-NB: This is only relevant to WordPress v5.8 - v6.4 and classic themes as the Font Library was introduced into core in v6.5
-
-Choose Google Fonts and add them to the full screen editor global styles options!
-
-= Remove Block Theme Fonts =
-
-NB: This is only relevant to WordPress v5.8 - v6.4 as the Font Library was introduced into core in v6.5
-
-This plugin will allow you to choose which theme fonts are included in the FSE editor and if not required will prevent them from being loaded on the front end.
-
 == Installation ==
 
 Easily use this plugin to enable the Template Editor on your site ...
 
-1) Install "Template Editor" automatically or by uploading the ZIP file.
+1) Install "Options for Block Themes" automatically or by uploading the .zip file.
 2) Activate the plugin through the "Plugins" menu in WordPress.
-3) Start using the Template Editor with your theme.
+3) Start using the Options for Block Themes.
 
 == Changelog ==
+
+= 1.4.2 =
+* General housekeeping preparing for "Plugin Check" code review
 
 = 1.4.1 =
@@ -225 +216 @@
 == Upgrade Notice ==
 
-= 1.4.1 =
-* Fixed a margin / block spacing bug with "Full Block Link" option
+= 1.4.2 =
+* General housekeeping preparing for "Plugin Check" code review

template-editor/trunk/template-editor.php

@@ -2 +2 @@
 /*
  * Plugin Name: Options for Block Themes
- * Version: 1.4.1
+ * Version: 1.4.2
  * Plugin URI: https://webd.uk/support/
- * Description: Import / Export global styles, templates and template parts to Full Site Editing / Block Themes without a child theme!
+ * Description: Adds options to core blocks and allows import / export of global styles, templates and template parts!
  * Author: Webd Ltd
  * Author URI: https://webd.uk
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  * Text Domain: template-editor
  */
@@ -22 +24 @@
     class template_editor_class {
 
-        public static $version = '1.4.1';
+        public static $version = '1.4.2';
         public $is_block_theme = false;
 
@@ -385 +387 @@
                         unset($submenu['themes.php'][7]);
 
+                    } elseif (isset($_SERVER['REQUEST_URI'])) {
+
+                        $customize_url = add_query_arg(
+                            'return',
+                            urlencode(remove_query_arg(wp_removable_query_args(), sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])))),
+                            'customize.php'
+                        );
+                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url($customize_url), '', 'hide-if-no-customize');
+
                     } else {
 
-                        $customize_url = add_query_arg('return', urlencode(remove_query_arg(wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI']))), 'customize.php');
-                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url($customize_url), '', 'hide-if-no-customize');
+                        $submenu['themes.php'][7] = array(__('Customize','template-editor'), 'customize', esc_url('customize.php'), '', 'hide-if-no-customize');
 
                     }
@@ -423 +433 @@
         public static function settings_page() {
 
+// phpcs:ignore WordPress.Security.NonceVerification.Recommended
             if (isset($_GET['tab']) && in_array(sanitize_key($_GET['tab']), array('theme_options', 'manage_template_parts'))) {
 
+// phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 $current_tab = sanitize_key($_GET['tab']);
 
@@ -449 +461 @@
 
 ?>
-<a id="<?php echo esc_attr($tab); ?>" class="nav-tab<?php echo $class; ?>" href="#" title="<?php echo esc_attr($title); ?>"><?php echo esc_html($title); ?></a>
+<a id="<?php echo esc_attr($tab); ?>" class="nav-tab<?php echo esc_attr($class); ?>" href="#" title="<?php echo esc_attr($title); ?>"><?php echo esc_html($title); ?></a>
 <?php
 
@@ -460 +472 @@
     $('#adminmenu li.current').addClass('manage_templates');
     $('#adminmenu .current').removeClass('current');
-    $('#adminmenu .<?php echo $current_tab; ?>').addClass('current');
+    $('#adminmenu .<?php echo esc_attr($current_tab); ?>').addClass('current');
     $('.nav-tab-wrapper .nav-tab').click(function() {
         $('.tab_content').hide();
@@ -482 +494 @@
 <p><?php esc_html_e('You can then rename the slug (and title / description) of the edited template to whatever you require and either save it or save it as a copy if you want to keep the original.', 'template-editor'); ?></p>
 <p><?php esc_html_e('Using this plugin you can create new templates outside of those that are available by default <strong>without</strong> having to create a child them! :)', 'template-editor'); ?></p>
-<h2><?php printf(__('Active Theme (%s) Templates', 'template-editor'), $active_theme); ?></h2>
+<h2><?php
+/* translators: active theme slug */
+printf(esc_html__('Active Theme (%s) Templates', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -549 +563 @@
 
 ?>
-<h2><?php printf(__('Other Theme Templates', 'template-editor'), $active_theme); ?></h2>
+<h2><?php printf(esc_html__('Other Theme Templates', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -632 +646 @@
 <th scope="row"><label for="te_post_name"><?php esc_html_e( 'Template Name', 'template-editor' ); ?></label></th>
 <td><input name="te_post_name" type="text" id="te_post_name" value="" class="regular-text">.html<br />
-<?php printf(__('<strong>This is the important bit!</strong> The template name <i>has</i> to match the slug that you would expect WordPress to look for in the <a href="%1$s" title="%2$s" target="_blank">Template Heirachy</a>','template-editor'),'https://developer.wordpress.org/themes/basics/template-hierarchy/', __('Template Heirachy','template-editor')); ?></td>
+<?php
+/* translators: link to template documentation */
+printf(wp_kses(__('<strong>This is the important bit!</strong> The template name <i>has</i> to match the slug that you would expect WordPress to look for in the <a href="%s" title="Template Heirachy" target="_blank">Template Heirachy</a>','template-editor'), 'post'),'https://developer.wordpress.org/themes/basics/template-hierarchy/'); ?></td>
 </tr>
 <tr>
@@ -660 +676 @@
     $('#te_save_as_copy').click(function() { save_template(1); });
     function save_template(saveAsCopy) {
-        if (confirm('<?php _e('Are you sure you want to save your changes to the template?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to save your changes to the template?', 'template-editor'); ?>')) {
             $('#te_save').unbind('click')
             var data = {
                 action: 'te_save',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-save'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-save')); ?>',
                 post_id: $('#te_post_id').val(),
                 post_title: $('#te_post_title').val(),
@@ -677 +693 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -693 +709 @@
         var data = {
             action: 'te_download_wp_template',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-template'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-template')); ?>',
             post_id: $(this).data('template').ID,
             post_name: $(this).data('template').post_name
@@ -729 +745 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the template?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the template?', 'template-editor'); ?>')) {
             $('#te-delete').unbind('click')
             var data = {
                 action: 'te_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('template')
             };
@@ -747 +763 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -764 +780 @@
     });
     $('#te-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as an active theme template?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as an active theme template?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_template');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-template'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-template')); ?>');
             data.append('file', $('#te-json-file').prop('files')[0]);
             $.ajax({
@@ -778 +796 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg('page', 'template_editor', admin_url('themes.php')); ?>';
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg('page', 'template_editor', admin_url('themes.php'))); ?>';
                 }
             });
@@ -797 +815 @@
 <h1><?php esc_html_e('Manage Template Parts', 'template-editor'); ?></h1>
 <p><?php esc_html_e('Every theme default template part (header, footer, etc) you have edited is listed here ...', 'template-editor'); ?></p>
-<h2><?php printf(esc_html__('Active Theme (%s) Template Parts', 'template-editor'), $active_theme); ?></h2>
+<h2><?php
+/* translators: active theme slug */
+printf(esc_html__('Active Theme (%s) Template Parts', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -863 +883 @@
 
 ?>
-<h2><?php printf(__('Other Theme Template Parts', 'template-editor'), $active_theme); ?></h2>
+<h2><?php printf(esc_html__('Other Theme Template Parts', 'template-editor'), esc_html($active_theme)); ?></h2>
 <?php
 
@@ -942 +962 @@
         var data = {
             action: 'te_download_wp_template',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-template'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-template')); ?>',
             post_id: $(this).data('template-part').ID,
             post_name: $(this).data('template-part').post_name
@@ -978 +998 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-part-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the template part?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the template part?', 'template-editor'); ?>')) {
             $('#te-part-delete').unbind('click')
             var data = {
                 action: 'te_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('template-part')
             };
@@ -996 +1016 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1022 +1042 @@
     });
     $('#te-part-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as an active theme template part?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as an active theme template part?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-part-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_template_part');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-template-part'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-template-part')); ?>');
             data.append('file', $('#te-part-json-file').prop('files')[0]);
             $.ajax({
@@ -1036 +1058 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_template_parts'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1130 +1152 @@
         var data = {
             action: 'te_download_wp_global_styles',
-            _ajax_nonce: '<?php echo wp_create_nonce('download-wp-global-styles'); ?>',
+            _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('download-wp-global-styles')); ?>',
             post_id: $(this).data('global-styles').ID,
             theme: $(this).data('global-styles').theme
@@ -1166 +1188 @@
             },
             error: function() {
-                alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
+                alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
             }
         });
     });
     $('.te-styles-delete').click(function() {
-        if (confirm('<?php _e('Are you sure you want to delete the selected global styles?', 'template-editor'); ?>')) {
+        if (confirm('<?php esc_html_e('Are you sure you want to delete the selected global styles?', 'template-editor'); ?>')) {
             $('#te-styles-delete').unbind('click')
             var data = {
                 action: 'te_global_styles_delete',
-                _ajax_nonce: '<?php echo wp_create_nonce('template-editor-delete'); ?>',
+                _ajax_nonce: '<?php echo esc_attr(wp_create_nonce('template-editor-delete')); ?>',
                 post_id: $(this).data('global-styles')
             };
@@ -1184 +1206 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1210 +1232 @@
     });
     $('#te-styles-json-file').change(function() {
-        var confirmText = '<?php _e('Are you sure you want to upload %s as the active theme\\\'s global styles?', 'template-editor'); ?>';
+        var confirmText = '<?php
+/* translators: filename */
+esc_html_e('Are you sure you want to upload %s as the active theme\\\'s global styles?', 'template-editor'); ?>';
         if (confirm(confirmText.replace('%s', $('#te-styles-json-file').prop('files')[0].name))) {
             var data = new FormData();
             data.append('action', 'te_upload_wp_global_styles');
-            data.append('_ajax_nonce', '<?php echo wp_create_nonce('upload-wp-global-styles'); ?>');
+            data.append('_ajax_nonce', '<?php echo esc_attr(wp_create_nonce('upload-wp-global-styles')); ?>');
             data.append('file', $('#te-styles-json-file').prop('files')[0]);
             $.ajax({
@@ -1224 +1248 @@
                 success: function(response) {
                     if ('success' in response && response.success) {
-                        window.location.href = '<?php echo add_query_arg(array(
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     } else {
-                        alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                        window.location.href = '<?php echo add_query_arg(array(
+                        alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                        window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                     }
                 },
                 error: function() {
-                    alert('<?php _e('Something went wrong!', 'template-editor'); ?>');
-                    window.location.href = '<?php echo add_query_arg(array(
+                    alert('<?php esc_html_e('Something went wrong!', 'template-editor'); ?>');
+                    window.location.href = '<?php echo esc_url(add_query_arg(array(
                             'page' => 'template_editor',
                             'tab' => 'manage_global_styles'
-                        ), admin_url('themes.php')); ?>';
+                        ), admin_url('themes.php'))); ?>';
                 }
             });
@@ -1274 +1298 @@
                 current_user_can('manage_options') &&
                 isset($_POST['post_id']) && absint($_POST['post_id']) &&
-                isset($_POST['post_title']) && sanitize_text_field($_POST['post_title']) &&
-                isset($_POST['post_name']) && sanitize_title($_POST['post_name']) &&
-                isset($_POST['post_excerpt']) && sanitize_text_field($_POST['post_excerpt']) &&
+                isset($_POST['post_title']) && sanitize_text_field(wp_unslash($_POST['post_title'])) &&
+                isset($_POST['post_name']) && sanitize_title(wp_unslash($_POST['post_name'])) &&
+                isset($_POST['post_excerpt']) && sanitize_text_field(wp_unslash($_POST['post_excerpt'])) &&
                 isset($_POST['save_as_copy']) && in_array($_POST['save_as_copy'], ['0', '1'], true)
             ) {
 
                 $post_id = absint($_POST['post_id']);
-                $post_title = sanitize_text_field($_POST['post_title']);
-                $post_name = sanitize_title($_POST['post_name']);
-                $post_excerpt = sanitize_text_field($_POST['post_excerpt']);
+                $post_title = sanitize_text_field(wp_unslash($_POST['post_title']));
+                $post_name = sanitize_title(wp_unslash($_POST['post_name']));
+                $post_excerpt = sanitize_text_field(wp_unslash($_POST['post_excerpt']));
                 $save_as_copy = absint($_POST['save_as_copy']);
 
@@ -1454 +1478 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $template = false;
 
@@ -1532 +1556 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $global_styles = false;
 
@@ -1617 +1641 @@
             ) {
 
-                $json_data = file_get_contents($_FILES['file']['tmp_name']);
+                $json_data = file_get_contents(sanitize_text_field($_FILES['file']['tmp_name']));
                 $template = false;
 
@@ -1719 +1743 @@
             } else {
 
-                add_settings_section('te_options', __('Fonts', 'template-editor'), 'template_editor_class::fonts_text_new', 'te_fonts');
+                $options = get_option('te_options');
+
+                if (
+                    isset($options['inject_google_fonts']) &&
+                    is_array($options['inject_google_fonts']) &&
+                    $options['inject_google_fonts']
+                ) {
+
+                    add_settings_section('te_options', __('Fonts', 'template-editor'), 'template_editor_class::fonts_text_new', 'te_fonts');
+
+                }
 
             }
@@ -1728 +1762 @@
 
 ?>
-<p><?php echo sprintf(wp_kses(__('Here are some options for Full Site Editor themes. If you\'d like to see more options here, <a href="%s">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'class' => array()))), esc_url('https://wordpress.org/support/plugin/template-editor/')); ?></p>
+<p><?php
+/* translators: link to plugin support forum */
+echo sprintf(wp_kses(__('Here are some options for Full Site Editor themes. If you\'d like to see more options here, <a href="%s">let us know in the support forum</a>.', 'template-editor'), array('a' => array('href' => array(), 'class' => array()))), esc_url('https://wordpress.org/support/plugin/template-editor/')); ?></p>
 <?php
 
@@ -1795 +1831 @@
 
 ?>
-<p><?php echo __('We\'ve worked out how to inject Google Fonts into the Full Site Editor without modifying the theme or creating a child theme!', 'template-editor'); ?></p>
+<p><?php esc_html_e('We\'ve worked out how to inject Google Fonts into the Full Site Editor without modifying the theme or creating a child theme!', 'template-editor'); ?></p>
 <?php
 
@@ -1805 +1841 @@
 
 ?>
-<p><?php echo __('With the launch of WordPress v6.5 came the new "Font Library". This awesome core update allows you to manage fonts from the Site Editor.', 'template-editor'); ?></p>
-<?php
-
-            if (isset($options['inject_google_fonts']) && is_array($options['inject_google_fonts']) && $options['inject_google_fonts']) {
-
-?>
-<p style="color: red;"><strong><?php echo __('We notice that you use this plugin to inject the following Google fonts. If you haven\'t already you should use the Site Editor to add these fonts again:', 'template-editor'); ?>
-<?php
-
-                $count_fonts = 0;
-
-                foreach ($options['inject_google_fonts'] as $font => $styles) {
-
-                    if (!is_array($styles)) { $styles = array($styles); }
-
-                    foreach ($styles as $key => $style) {
+<p><?php esc_html_e('With the launch of WordPress v6.5 came the new "Font Library". This awesome core update allows you to manage fonts from the Site Editor.', 'template-editor'); ?></p>
+<p style="color: red;"><strong><?php esc_html_e('We notice that you use this plugin to inject the following Google fonts. If you haven\'t already you should use the Site Editor to add these fonts again:', 'template-editor'); ?>
+<?php
+
+            $count_fonts = 0;
+
+            foreach ($options['inject_google_fonts'] as $font => $styles) {
+
+                if (!is_array($styles)) { $styles = array($styles); }
+
+                foreach ($styles as $key => $style) {
 
 ?>
@@ -1826 +1857 @@
 <?php
 
-                        $count_fonts++;
-
-                    }
-
-                }
+                    $count_fonts++;
+
+                }
+
+            }
 
 ?>
 </strong></p>
-<p><?php echo __('Go to "Dashboard - Appearance - Editor - Styles - <edit pencil icon> - Typography". From there click on any font to enter the "Font Library". It is important that you first remove the above Google fonts then re-install them using the "Install Fonts" tab of the "Font Library".', 'template-editor'); ?></p>
-<?php
-
-            }
+<p><?php esc_html_e('Go to "Dashboard - Appearance - Editor - Styles - <edit pencil icon> - Typography". From there click on any font to enter the "Font Library". It is important that you first remove the above Google fonts then re-install them using the "Install Fonts" tab of the "Font Library".', 'template-editor'); ?></p>
+<?php
 
         }
@@ -1988 +2017 @@
                 'block' => esc_html__('"block" - Wait until the font has loaded before drawing the text.', 'template-editor'), 
                 'swap' => esc_html__('"swap" - Draw the text straight away then re-draw the text when the font has loaded.', 'template-editor'),
-                'fallback' => sprintf(esc_html__('"fallback" - Waits for a %1$svery%2$s short time before drawing the text anyway if the font hasn\'t yet loaded then re-draws the text if the font loads shortly after.', 'template-editor'),'<strong>','</strong>'),
-                'optional' => sprintf(esc_html__('"optional" - Waits for a %1$svery%2$s short time before drawing the text anyway but %1$sdoesn\'t%2$s re-draw when the font loads.', 'template-editor'),'<strong>','</strong>')
+                'fallback' => wp_kses(sprintf('%1$s<strong>%2$s</strong>%3$s', __('"fallback" - Waits for a ', 'template-editor'), __('very', 'template-editor'), __(' short time before drawing the text anyway if the font hasn\'t yet loaded then re-draws the text if the font loads shortly after.', 'template-editor')), 'post'),
+                'optional' => wp_kses(sprintf('%1$s<strong>%2$s</strong>%3$s<strong>%4$s</strong>%5$s', __('"optional" - Waits for a ', 'template-editor'), __('very', 'template-editor'), __(' short time before drawing the text anyway but ', 'template-editor'), __('doesn\'t', 'template-editor'), __(' re-draw when the font loads.', 'template-editor')), 'post'),
             );
 
@@ -2001 +2030 @@
 
 ?>
-<label for="google-font-display-<?php echo $key; ?>">
-<input type="radio" id="google-font-display-<?php echo $key; ?>" name="te_options[google_font_display]" value="<?php echo $key; ?>"<?php if (isset($options['google_font_display'])) { checked($options['google_font_display'], $key); } else { checked('auto', $key); } ?>>
-<?php echo $value ?>
+<label for="google-font-display-<?php echo esc_attr($key); ?>">
+<input type="radio" id="google-font-display-<?php echo esc_attr($key); ?>" name="te_options[google_font_display]" value="<?php echo esc_attr($key); ?>"<?php if (isset($options['google_font_display'])) { checked($options['google_font_display'], $key); } else { checked('auto', $key); } ?>>
+<?php echo esc_html($value) ?>
 </label>
 <?php
@@ -2036 +2065 @@
 
                 remove_filter('wp_theme_json_data_theme', 'template_editor_class::wp_theme_json_data_theme');
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
                 $theme_json = apply_filters('wp_theme_json_data_theme', new WP_Theme_JSON_Data($theme_json_data, 'theme'));
                 add_filter('wp_theme_json_data_theme', 'template_editor_class::wp_theme_json_data_theme');
@@ -2379 +2409 @@
                     $css_import_string .= '&display=' . (isset($options['google_font_display']) ? sanitize_key($options['google_font_display']) : 'auto');
 
-                    $google_request = wp_safe_remote_get($css_import_string,  array(
-                        'user-agent' => $_SERVER['HTTP_USER_AGENT']
-                    ));
+                    $google_request = wp_safe_remote_get($css_import_string,  (isset($_SERVER['HTTP_USER_AGENT']) ? array(
+                        'user-agent' => sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']))
+                    ) : array()));
 
                     $abort_font_download = false;
@@ -2398 +2428 @@
                             $google_fonts = array_unique($google_fonts[1]);
 
+                            global $wp_filesystem;
+
+                            if (!$wp_filesystem) {
+
+                                require_once (ABSPATH . '/wp-admin/includes/file.php');
+
+                                WP_Filesystem();
+
+                            }
+
                             if (!is_dir($filepath)) {
 
-                                mkdir($filepath);
+                                $wp_filesystem->mkdir($filepath);
 
                             } else {
@@ -2406 +2446 @@
                                 $fileSystemDirect = new WP_Filesystem_Direct(false);
                                 $fileSystemDirect->rmdir($filepath, true);
-                                mkdir($filepath);
+                                $wp_filesystem->mkdir($filepath);
 
                             }
@@ -2414 +2454 @@
                             foreach ($google_fonts as $google_font_url) {
 
-                                $google_font = wp_safe_remote_get($google_font_url,  array(
-                                    'user-agent' => $_SERVER['HTTP_USER_AGENT']
-                                ));
+                                $google_font = wp_safe_remote_get($google_font_url,  (isset($_SERVER['HTTP_USER_AGENT']) ? array(
+                                    'user-agent' => sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']))
+                                ) : array()));
 
                                 if (
@@ -2427 +2467 @@
                                     $google_font_filename = wp_basename($google_font_url);
                                     $wp_filesystem->put_contents($filepath . $google_font_filename, $google_font['body']);
-                                    $parse_url = parse_url($upload_dir['baseurl']);
+                                    $parse_url = wp_parse_url($upload_dir['baseurl']);
 
                                     $google_font_css = str_replace(
@@ -2597 +2637 @@
                         headerWrapper.classList.add('shrink-logo');
                         if ('undefined' !== customLogo.length) {
-                            customLogo.style.width = '<?php echo $new_logo_width; ?>px';
-                            customLogo.style.height = '<?php echo (false !== $new_logo_height ? $new_logo_height : 48); ?>px';
+                            customLogo.style.width = '<?php echo esc_attr($new_logo_width); ?>px';
+                            customLogo.style.height = '<?php echo esc_attr(false !== $new_logo_height ? $new_logo_height : 48); ?>px';
                         }
                     }
@@ -2757 +2797 @@
                 return str_replace(
                     '[HTTP_HOST]',
-                    'http' . (is_ssl() ? 's' : '') . '://' . $_SERVER['HTTP_HOST'],
+                    'http' . (is_ssl() ? 's' : '') . '://' . (isset($_SERVER['HTTP_HOST']) ? sanitize_url(wp_unslash($_SERVER['HTTP_HOST'])) : gethostname()),
                     $options['google_font_css']
                 );
@@ -2895 +2935 @@
     if (version_compare(get_bloginfo('version'), '5.8', '>=')) {
 
-        $template_editor_object = new template_editor_class();
+        new template_editor_class();
 
     } else {
@@ -2915 +2955 @@
 <div class="notice notice-error">
 
-<p><strong><?php esc_html_e('Template Editor Plugin Error', 'template-editor'); ?></strong><br />
+<p><strong><?php esc_html_e('Options for Block Themes Plugin Error', 'template-editor'); ?></strong><br />
 <?php
 
         printf(
-            __('This plugin requires at least WordPress v5.8 to be installed in order to function. Your WordPress version "%s" is not compatible.', 'template-editor'),
-            get_bloginfo('version')
+/* translators: WordPress version */
+            esc_html(__('This plugin requires at least WordPress v5.8 to be installed in order to function. Your WordPress version "%s" is not compatible.', 'template-editor')),
+            esc_html(get_bloginfo('version'))
         );
 
@@ -2926 +2967 @@
 
 <p><a class="button" href="<?php echo esc_url(admin_url('update-core.php')); ?>" title="<?php esc_attr_e('WordPress Updates', 'template-editor'); ?>"><?php
-        _e('WordPress Updates', 'template-editor');
+        esc_html_e('WordPress Updates', 'template-editor');
 ?></a>.</p>