Merge pull request #65 from dartiss/develop

Develop

Author: dartiss

includes/add-embeds.php

@@ -62,13 +62,11 @@ function ce_filter( $content ) {
 
 				if ( strlen( $suffix ) - 4 === $res_pos ) {
 					$responsive = true;
-				} else {
-					if ( '_' === substr( $suffix, $res_pos + 4, 1 ) ) {
-						$responsive = true;
-						$max_width  = substr( $suffix, $res_pos + 5 );
-						if ( ! is_numeric( $max_width ) ) {
-							$max_width = '';
-						}
+				} elseif ( '_' === substr( $suffix, $res_pos + 4, 1 ) ) {
+					$responsive = true;
+					$max_width  = substr( $suffix, $res_pos + 5 );
+					if ( ! is_numeric( $max_width ) ) {
+						$max_width = '';
 					}
 				}
 
@@ -140,7 +138,7 @@ function ce_quick_replace( $content = '', $options = '', $search = '' ) {
 		$end_pos = strpos( $content, $options['closing_ident'], $start_pos + 1 );
 
 		if ( false !== $end_pos ) {
-			$url  = substr( $content, $start_pos + 1, $end_pos - $start_pos - 1 );
+			$url  = substr( $content, $start_pos + 2, $end_pos - $start_pos - 2 );
 			$file = ce_get_file( $url );
 			if ( false !== $file ) {
 				$content = str_replace( $options['opening_ident'] . $url . $options['closing_ident'], $file, $content );
@@ -284,18 +282,17 @@ function ce_get_file( $filein ) {
  *
  * @param  string $error            Error message.
  * @param  string $plugin_name      The name of the plugin.
- * @param  string $echo             True or false, depending on whether you wish to return or echo the results.
+ * @param  string $echo_out         True or false, depending on whether you wish to return or echo the results.
  * @return string                   True or the output text
  */
-function ce_report_error( $error, $plugin_name, $echo = true ) {
+function ce_report_error( $error, $plugin_name, $echo_out = true ) {
 
 	$output = '<p style="color: #f00; font-weight: bold;">' . $plugin_name . ': ' . $error . "</p>\n";
 
-	if ( $echo ) {
+	if ( $echo_out ) {
 		echo esc_html( $output );
 		return true;
 	} else {
 		return $output;
 	}
-
 }

includes/add-scripts.php

@@ -14,10 +14,9 @@
  */
 function ce_main_scripts() {
 
-	wp_register_style( 'ce_responsive', plugins_url( 'css/video-container.min.css', dirname( __FILE__ ) ), array(), CODE_EMBED_VERSION );
+	wp_register_style( 'ce_responsive', plugins_url( 'css/video-container.min.css', __DIR__ ), array(), CODE_EMBED_VERSION );
 
 	wp_enqueue_style( 'ce_responsive' );
-
 }
 
 add_action( 'wp_enqueue_scripts', 'ce_main_scripts' );

includes/admin-config.php

@@ -85,7 +85,6 @@ function ce_menu() {
 	$ce_options_hook = add_submenu_page( 'options-general.php', __( 'Code Embed Settings', 'simple-embed-code' ), __( 'Code Embed', 'simple-embed-code' ), 'manage_options', 'ce-options', 'ce_options' );
 
 	add_action( 'load-' . $ce_options_hook, 'ce_add_options_help' );
-
 }
 
 add_action( 'admin_menu', 'ce_menu' );
@@ -152,7 +151,6 @@ function ce_add_search_help() {
 function ce_options() {
 
 	include_once WP_PLUGIN_DIR . '/' . str_replace( basename( __FILE__ ), '', plugin_basename( __FILE__ ) ) . 'options-screen.php';
-
 }
 
 /**
@@ -163,7 +161,6 @@ function ce_options() {
 function ce_search() {
 
 	include_once WP_PLUGIN_DIR . '/' . str_replace( basename( __FILE__ ), '', plugin_basename( __FILE__ ) ) . 'search-screen.php';
-
 }
 
 /**

includes/initialise.php

@@ -6,6 +6,12 @@
  *
  * @package  simple-embed-code
  */
+
+/**
+ * Initialisation
+ *
+ * All initial processes.
+ */
 function ce_initialisation() {
 
 	// Add exerpt filter, if required.

readme.txt

@@ -5,7 +5,7 @@ Tags: code, embed, html, css, javascript, script
 Requires at least: 4.6
 Tested up to: 6.4
 Requires PHP: 7.4
-Stable tag: 2.3.6
+Stable tag: 2.3.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -195,6 +195,10 @@ It is, in that it doesn't save any data that could be odds with GDPR compliance
 
 I use semantic versioning, with the first release being 1.0.
 
+= 2.3.7 =
+* Bug: Fixed a bug which created a potentual vulnerabilty
+* Enhancement: Improved code quality, using the latest version of PHPCS and WordPress sniffs
+
 = 2.3.6 =
 * Bug: Fixed a variable that was incorrectly assigned. It happens. I guess.
 
@@ -320,5 +324,5 @@ versions of this plugin
 
 == Upgrade Notice ==
 
-= 2.3.6 =
-* Minor bug fix
+= 2.3.7 =
+* Important vulnerability fix

simple-code-embed.php

@@ -9,7 +9,7 @@
  * Plugin Name:       Code Embed
  * Plugin URI:        https://wordpress.org/plugins/simple-embed-code/
  * Description:       🧩 Code Embed provides a very easy and efficient way to embed code (JavaScript and HTML) in your posts and pages.
- * Version:           2.3.6
+ * Version:           2.3.7
  * Requires at least: 4.6
  * Requires PHP:      7.4
  * Author:            David Artiss
@@ -26,7 +26,7 @@
  * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-define( 'CODE_EMBED_VERSION', '2.3.6' );
+define( 'CODE_EMBED_VERSION', '2.3.7' );
 
 // Include all the various functions.