Bugfix 1.5.1

Author: Tofandel

WPlusPlusCore.php

@@ -19,7 +19,7 @@
  * Plugin Name: W++ Core
  * Plugin URI: https://github.com/tofandel/wplusplus-core/
  * Description: A Wordpress Plugin acting as core for other of my plugins and including the Ultimate Redux Framework Bundle and OOP APIs to use it
- * Version: 1.5
+ * Version: 1.5.1
  * Author: Adrien Foulon <tofandel@tukan.hu>
  * Author URI: https://tukan.fr/a-propos/#adrien-foulon
  * Text Domain: wplusplus-core

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "tofandel/wplusplus-core",
-  "version": "1.2.7",
+  "version": "1.5.1",
   "authors": [
     {
       "name": "Tofandel"

functions.php

@@ -10,6 +10,34 @@ function wpp_admin_notice( $text, $type = 'success' ) {
 	} );
 }
 
+/**
+ * @param WP_Post $post
+ * @param string|array $shortcode
+ *
+ * @return bool
+ */
+function wpp_has_shortcode( $post, $shortcode ) {
+	if ( is_array( $shortcode ) ) {
+		foreach ( $shortcode as $sh ) {
+			if ( has_shortcode( $post->post_content, $sh ) ) {
+				return true;
+			}
+			if ( has_shortcode( $post->post_content, strtolower( $sh ) ) ) {
+				return true;
+			}
+		}
+	} else {
+		if ( has_shortcode( $post->post_content, $shortcode ) ) {
+			return true;
+		}
+		if ( has_shortcode( $post->post_content, strtolower( $shortcode ) ) ) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * @param string $string The string to slugifiy
  * @param bool $prepend Can be (and should) be used as a vendor name to separate slugs

plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "W++ Core",
-  "version": "1.5",
+  "version": "1.5.1",
   "download_url": "https://github.com/Tofandel/wplusplus-core",
   "homepage": "https://tukangroup.com/about-us/#adrien-foulon",
   "requires": "4.6",

plugins/redux-extensions/action_button/action_button/field_action_button.php

@@ -118,7 +118,7 @@ public function enqueue() {
 			wp_enqueue_script(
 				'redux-field-action-button-js',
 				apply_filters( "redux/action_button/{$this->parent->args['opt_name']}/enqueue/redux-field-action-button-js", $this->extension_url . 'field_action_button' . $min . '.js' ),
-				array( 'jquery' ),
+				array( 'jquery', 'redux-js' ),
 				time(),
 				true
 			);

plugins/redux-extensions/js_button/js_button/field_js_button.php

@@ -101,7 +101,6 @@ public function render() {
 		 * @return      void
 		 */
 		public function enqueue() {
-			$extension = ReduxFramework_extension_js_button::getInstance();
 
 			// Make sure script data exists first
 			if ( isset( $this->field['script'] ) && ! empty( $this->field['script'] ) ) {
@@ -145,7 +144,7 @@ public function enqueue() {
 			wp_enqueue_script(
 				'redux-field-js-button-js',
 				apply_filters( "redux/js_button/{$this->parent->args['opt_name']}/enqueue/redux-field-js-button-js", $this->extension_url . 'field_js_button' . $min . '.js' ),
-				array( 'jquery' ),
+				array( 'jquery', 'redux-js' ),
 				time(),
 				true
 			);

plugins/redux-extensions/repeater/repeater/field_repeater.php

@@ -276,8 +276,6 @@ public function render() {
 		 */
 		public function enqueue() {
 
-			$extension = ReduxFramework_extension_repeater::getInstance();
-
 			// Set up min files for dev_mode = false.
 			$min = Redux_Functions::isMin();
 

plugins/redux-framework/ReduxCore/assets/css/redux-admin.css

@@ -1293,7 +1293,7 @@ pre {
 }
 
 @media screen and (max-width: 640px) {
-  #redux-defaults-section {
+  #redux-defaults-section-header, #redux-defaults-section-footer {
     display: none;
   }
 }
@@ -1305,9 +1305,6 @@ pre {
 }
 
 @media screen and (max-width: 730px) {
-  #redux-defaults-section2 {
-    display: none;
-  }
   #redux-share {
     display: none;
   }

plugins/redux-framework/ReduxCore/assets/css/redux-admin.scss

@@ -26,9 +26,7 @@ function __construct( $parent, $field, $value, $current ) {
 		 * @since ReduxFramework 1.0.0
 		 */
 		function validate() {
-			$this->value = preg_replace_callback( $this->field['preg']['pattern'], function ( $matches ) {
-				return $this->field['preg']['replacement'];
-			}, $this->value );
+			$this->value = preg_replace( $this->field['preg']['pattern'], $this->field['preg']['replacement'], $this->value );
 		} //function
 	} //class
 }

plugins/redux-framework/ReduxCore/inc/validation/preg_replace/validation_preg_replace.php

@@ -55,12 +55,15 @@
 			<span class="spinner"></span>
 			<?php
 			if ( false === $this->parent->args['hide_save'] ) {
-				submit_button( __( 'Save Changes', 'redux-framework' ), 'primary', 'redux_save', false );
+				submit_button( __( 'Save Changes', 'redux-framework' ), 'primary', 'redux_save', false, array( 'id' => 'redux-save-footer' ) );
 			}
 
-			if ( false === $this->parent->args['hide_reset'] ) {
-				submit_button( __( 'Reset Section', 'redux-framework' ), 'secondary', $this->parent->args['opt_name'] . '[defaults-section]', false, array( 'id' => 'redux-defaults-section' ) );
-				submit_button( __( 'Reset All', 'redux-framework' ), 'secondary', $this->parent->args['opt_name'] . '[defaults]', false, array( 'id' => 'redux-defaults' ) );
+			if ( false === $this->parent->args['hide_reset'] ) { ?>
+				<?php submit_button( esc_attr__( 'Reset Section', 'redux-framework' ), 'secondary',
+					$this->parent->args['opt_name'] . '[defaults-section]', false, array( 'id' => 'redux-defaults-section-footer' ) ); ?>
+				<?php submit_button( esc_attr__( 'Reset All', 'redux-framework' ), 'secondary',
+					$this->parent->args['opt_name'] . '[defaults]', false, array( 'id' => 'redux-defaults-footer' ) ); ?>
+				<?php
 			}
 			?>
 		</div>

plugins/redux-framework/ReduxCore/templates/panel/footer.tpl.php

@@ -19,12 +19,15 @@ class="expand_options<?php echo esc_attr( ( $this->parent->args['open_expanded']
 		<div class="redux-action_bar">
 			<span class="spinner"></span>
 			<?php if ( false === $this->parent->args['hide_save'] ) { ?>
-				<?php submit_button( esc_attr__( 'Save Changes', 'redux-framework' ), 'primary', 'redux_save', false ); ?>
+				<?php submit_button( esc_attr__( 'Save Changes', 'redux-framework' ), 'primary',
+					'redux_save', false, array( 'id' => 'redux-save-header' ) ); ?>
 			<?php } ?>
 
 			<?php if ( false === $this->parent->args['hide_reset'] ) { ?>
-				<?php submit_button( esc_attr__( 'Reset Section', 'redux-framework' ), 'secondary', $this->parent->args['opt_name'] . '[defaults-section]', false, array( 'id' => 'redux-defaults-section' ) ); ?>
-				<?php submit_button( esc_attr__( 'Reset All', 'redux-framework' ), 'secondary', $this->parent->args['opt_name'] . '[defaults]', false, array( 'id' => 'redux-defaults' ) ); ?>
+				<?php submit_button( esc_attr__( 'Reset Section', 'redux-framework' ), 'secondary',
+					$this->parent->args['opt_name'] . '[defaults-section]', false, array( 'id' => 'redux-defaults-section-header' ) ); ?>
+				<?php submit_button( esc_attr__( 'Reset All', 'redux-framework' ), 'secondary',
+					$this->parent->args['opt_name'] . '[defaults]', false, array( 'id' => 'redux-defaults-header' ) ); ?>
 			<?php } ?>
 		</div>
 		<div class="redux-ajax-loading" alt="<?php esc_attr_e( 'Working...', 'redux-framework' ) ?>">&nbsp;</div>

plugins/redux-framework/ReduxCore/templates/panel/header_stickybar.tpl.php

@@ -179,7 +179,7 @@ private function _checkLicence() {
 		}
 
 		$data = $this->doRequest( 'status' );
-		if ( $data['status_check'] == 'active' ) {
+		if ( ! empty( $data['status_check'] ) && $data['status_check'] == 'active' ) {
 			$this->setMessage( $data['activations_remaining'] );
 			$this->setActivated();
 			$this->setLicenceTransient();

plugins/zips/redux-framework.zip

@@ -32,8 +32,9 @@ public function integrateToVC() {
 		vc_add_shortcode_param( 'hidden', '__return_false' );
 	}
 
-	public function createVCPro() {
-		return '<strong>' . sprintf( esc_html( __( 'This is a pro feature, %sgo pro now !%s', $this->getTextDomain() ) ), '<a href="' . $this->parent->getBuyUrl() . '" target="_blank" rel="noopener">', '</a>' ) . '</strong>';
+
+	public function createVCPro( $settings ) {
+		return '<strong>' . sprintf( esc_html( __( 'This is a pro feature, %sgo pro now !%s', $this->getTextDomain() ) ), '<a href="' . $settings['buy_url'] . '" target="_blank" rel="noopener">', '</a>' ) . '</strong>';
 	}
 
 	/**

src/Modules/LicenceManager.php

@@ -26,7 +26,7 @@ public static function __init__() {
 			return;
 		}
 
-		static::$_name = static::$reflectionClass->getShortName();
+		static::getName();
 
 		new \Tofandel\Core\Objects\WP_Shortcode( static::$_name, [ static::class, 'shortcode' ], static::$atts );
 	}
@@ -41,10 +41,26 @@ public static function __init__() {
 	//abstract public function shortcode( $attributes, $content, $name );
 
 	/**
-	 * @return mixed
+	 * @throws \ReflectionException
 	 */
-	public function getName() {
-		return static::$_name;
+	public static function getName() {
+		if ( ! empty( static::$_name ) ) {
+			return static::$_name;
+		}
+		if ( ! isset( static::$reflectionClass ) ) {
+			static::$reflectionClass = new \ReflectionClass( static::class );
+		}
+
+		return static::$_name = static::$reflectionClass->getShortName();
+	}
+
+	/**
+	 * @return array
+	 */
+	public static function getNames() {
+		$name = static::getName();
+
+		return array( $name, strtolower( $name ) );
 	}
 
 }

src/Modules/VC_Integration.php

@@ -63,7 +63,7 @@ public static function __init__() {
 			return;
 		}
 
-		static::$_name = static::$reflectionClass->getShortName();
+		static::getName();
 
 		static::$vc_params = array_merge( array(
 			'base' => static::$_name