Changeset 3380394

Timestamp:

10/18/2025 06:08:15 AM (5 weeks ago)

Author:

nalam

Message:

update widget and code organize

Location:

magical-posts-display/trunk

Files:

• README.txt (modified) (3 diffs)
• admin/admin-page/admin-info.php (modified) (5 diffs)
• admin/admin-page/admin-page.php (modified) (2 diffs)
• admin/admin-page/welcome-page.php (modified) (2 diffs)
• admin/extra-function.php (modified) (1 diff)
• admin/src/cmb2/includes/CMB2.php (modified) (79 diffs)
• assets/css/admin-style.css (modified) (7 diffs)
• assets/css/mgadmin-page.css (modified) (1 diff)
• assets/css/mp-style.css (modified) (3 diffs)
• assets/js/main.js (modified) (1 diff)
• assets/js/mgpd-premium-features.js (added)
• composer.json (modified) (1 diff)
• file-include.php (modified) (5 diffs)
• includes/blocks/posts-tab.php (modified) (1 diff)
• includes/class-ajax-handler.php (added)
• includes/class-assets-manager.php (added)
• includes/class-error-checker.php (added)
• includes/class-hooks-handler.php (added)
• includes/elementor/elementor-main.php (modified) (3 diffs)
• includes/elementor/widgets/advanced-posts-grid1.php (modified) (1 diff)
• includes/elementor/widgets/advanced-posts-grid2.php (modified) (1 diff)
• includes/elementor/widgets/advanced-posts-img-grid.php (modified) (39 diffs)
• includes/elementor/widgets/posts-carousel.php (modified) (1 diff)
• includes/elementor/widgets/posts-cat.php (modified) (1 diff)
• includes/elementor/widgets/posts-grid.php (modified) (88 diffs)
• includes/elementor/widgets/posts-list.php (modified) (1 diff)
• includes/elementor/widgets/posts-slider.php (modified) (4 diffs)
• includes/elementor/widgets/posts-tab.php (modified) (1 diff)
• includes/elementor/widgets/posts-ticker.php (modified) (1 diff)
• includes/mp-posts-function.php (modified) (2 diffs)
• includes/traits (added)
• includes/traits/Advanced_Media_Trait.php (added)
• includes/traits/Premium_Features_Trait.php (added)
• includes/traits/SVG_Icons_Trait.php (added)
• magical-posts-display.php (modified) (8 diffs)

magical-posts-display/trunk/README.txt

@@ -3 +3 @@
 Donate link: https://wpthemespace.com/donation
 Tags: post display, Page display, custom Post, elementor widget, post slider
-Requires at least: 5.0
+Requires at least: 6.0
 Tested up to: 6.8
 Stable tag: trunk
@@ -57 +57 @@
     <li><strong>All options show hide features. </strong></li>
     <li><strong>User-friendly Editor.</strong></li>
+    <li><strong>Ajax Loadmore button.</strong></li>
+    <li><strong>Ajax Categories filter.</strong></li>
     
 </ul>
@@ -137 +139 @@
 
 == Changelog ==
+
+= 1.2.54 =
+ * Enhanced Security: Added comprehensive nonce verification and input sanitization across all AJAX handlers
+ * Premium Features: Reading Time, View Count, and Social Share Buttons
+ * Code Quality: Refactored AJAX methods following WordPress coding standards
+ * Advanced Media Support: Video, Gallery with priority fallback system
+ * Hover Effects added: Zoom, Lift, Tilt animations for cards
+ * Categories Filter Buttons Added 
+ * Improved: Better error handling and default values for AJAX requests
+ * Performance: Optimized category filtering and infinite scroll functionality
 
 = 1.2.53 =

magical-posts-display/trunk/admin/admin-page/admin-info.php

@@ -16 +16 @@
         add_action('admin_notices', [__CLASS__, 'mp_display_admin_info']);
         add_action('init', [__CLASS__, 'mp_display_admin_info_init']);
+        add_action('admin_notices', [__CLASS__, 'admin_notice_update_info']);
+        add_action('admin_notices', [__CLASS__, 'admin_notice_minimum_php_version']);
+        add_action('admin_notices', [__CLASS__, 'admin_notice_missing_main_plugin']);
+        add_action('init', [__CLASS__, 'elementor_notice_hide_options']);
     }
 
@@ -26 +30 @@
                 <div class="mge-info-hello">
                     <?php
-                    $addons_name = esc_html__('Magical Addons, ', 'magical-addons-for-elementor');
+                    $addons_name = esc_html__('Magical Posts Display, ', 'magical-posts-display');
                     $current_user = wp_get_current_user();
 
@@ -32 +36 @@
                     $pricing_link = esc_url('https://wpthemespace.com/product/magical-posts-display-pro/');
 
-                    esc_html_e('Hello, ', 'magical-addons-for-elementor');
+                    esc_html_e('Hey there, ', 'magical-posts-display');
                     echo esc_html($current_user->display_name);
                     ?>
 
-                    <?php esc_html_e('👋🏻', 'magical-addons-for-elementor'); ?>
+                    <?php esc_html_e('�', 'magical-posts-display'); ?>
                 </div>
                 <div class="mge-info-desc">
-                    <div><?php printf(esc_html__('Thank you for choosing Magical Posts Display! ✨ We\'re excited to share that our Pro version is now available, with all custom posts display features. Plus, Pagination, QR code, Share button, reading time, wordcount, filters,popup, lightbox and more 🔥', 'magical-addons-for-elementor'), esc_html($addons_name)); ?></div>
-                    <div class="mge-offer"><?php printf(esc_html__('Upgrade to Magical Posts Display Pro today and Display your posts the way you want just $21! 🚀', 'magical-addons-for-elementor'), esc_html($addons_name)); ?></div>
+                    <div><?php printf(esc_html__('Ready to SUPERCHARGE your content display? 🚀 Our PRO version transforms your website with advanced post layouts, lightning-fast AJAX filters, social sharing, reading time, and 50+ premium features that drive MORE engagement! ⚡', 'magical-posts-display'), esc_html($addons_name)); ?></div>
+                    <div class="mge-offer"><?php printf(esc_html__('💥 LIMITED TIME: Get PRO for just $21 and unlock UNLIMITED possibilities! Join 10,000+ happy customers! �', 'magical-posts-display'), esc_html($addons_name)); ?></div>
                 </div>
                 <div class="mge-info-actions">
                     <a href="<?php echo esc_url($pro_link); ?>" target="_blank" class="button button-primary upgrade-btn">
-                        <?php esc_html_e('Upgrade Now', 'magical-addons-for-elementor'); ?>
+                        <?php esc_html_e('🚀 GET PRO NOW - $21', 'magical-posts-display'); ?>
                     </a>
                     <a href="<?php echo esc_url($pricing_link); ?>" target="_blank" class="button button-primary demo-btn">
-                        <?php esc_html_e('View Details', 'magical-addons-for-elementor'); ?>
+                        <?php esc_html_e('💎 See All Features', 'magical-posts-display'); ?>
                     </a>
-                    <button class="button button-info mgad-dismiss mgade-notice-hide"><?php esc_html_e('Dismiss this notice', 'magical-addons-for-elementor') ?></button>
+                    <button class="button button-info mgad-dismiss mgade-notice-hide"><?php esc_html_e('Maybe Later', 'magical-posts-display') ?></button>
                 </div>
             </div>
@@ -58 +62 @@
 
 
-
+    /**
+     * Show update notice for new features
+     *
+     * @since 1.2.53
+     * @access public
+     */
+    public static function admin_notice_update_info()
+    {
+        $hide_notice_update = get_option('mgpd_update_notice_1_2_53');
+        if (!empty($hide_notice_update)) {
+            return;
+        }
+
+        $dismiss_url = wp_nonce_url(
+            add_query_arg('mgpd_update_hide', '1'),
+            'mgpd_update_notice',
+            '_wpnonce'
+        );
+    ?>
+        <div class="notice notice-info is-dismissible mgpd-update-notice" style="border-left-color: #00a0d2; padding: 15px;">
+            <h3 style="margin: 0 0 10px 0;"><?php echo esc_html__('🎉 Magical Posts Display v1.2.53 - Major Update!', 'magical-posts-display'); ?></h3>
+            <p><strong><?php echo esc_html__('What\'s New:', 'magical-posts-display'); ?></strong></p>
+            <ul style="list-style: disc; margin-left: 20px;">
+                <li><?php echo esc_html__('✨ Premium Features: Reading Time, View Count, and Social Share Buttons', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('🎨 Three Display Styles: Default, Image Top, and Image Overlay positions', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('📹 Advanced Media Support: Video, Gallery with priority fallback system', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('🎭 Hover Effects: Zoom, Lift, Tilt animations for cards', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('🔧 AJAX Optimization: Category filtering and infinite scroll improvements', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('🎯 Filter Buttons: Complete styling controls in Style tab', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('🔒 Security: Enhanced nonce verification and sanitization', 'magical-posts-display'); ?></li>
+                <li><?php echo esc_html__('♻️ Code Quality: Refactored for better performance and maintainability', 'magical-posts-display'); ?></li>
+            </ul>
+            <p>
+                <a href="<?php echo esc_url($dismiss_url); ?>" class="button button-primary"><?php echo esc_html__('Got it, thanks!', 'magical-posts-display'); ?></a>
+                <a href="https://wpthemespace.com/product/magical-posts-display-pro/" target="_blank" class="button button-secondary" style="margin-left: 10px;"><?php echo esc_html__('Upgrade to Pro', 'magical-posts-display'); ?></a>
+            </p>
+        </div>
+    <?php
+    }
 
     public static function mp_display_admin_info()
     {
 
-        $hide_date = get_option('mgpd_info_protext');
+        $hide_date = get_option('mgpd_pro_infotext');
         if (!empty($hide_date)) {
             $clickhide = round((time() - strtotime($hide_date)) / 24 / 60 / 60);
@@ -90 +132 @@
     public static function mp_display_admin_info_init()
     {
-        if (isset($_GET['mgrecnot']) && $_GET['mgrecnot'] == 1) {
-            update_option('mgpd_info_protext', current_time('mysql'));
-        }
+        if (isset($_GET['mgrecnot']) && absint($_GET['mgrecnot']) === 1) {
+            update_option('mgpd_pro_infotext', current_time('mysql'));
+        }
+
+        // Hide update notice
+        if (isset($_GET['mgpd_update_hide']) && absint($_GET['mgpd_update_hide']) === 1 && isset($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'mgpd_update_notice')) {
+            update_option('mgpd_update_notice_1_2_53', 1);
+        }
+    }
+
+    /**
+     * Hide Elementor notice options handler
+     */
+    public static function elementor_notice_hide_options()
+    {
+        // Security check with nonce verification
+        if (isset($_GET['mgelhide']) && absint($_GET['mgelhide']) === 1 && isset($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'mgpd_hide_notice')) {
+            update_option('mgelhide9', 1);
+        }
+    }
+
+    /**
+     * Admin notice for minimum PHP version
+     * Warning when the site doesn't have a minimum required PHP version.
+     */
+    public static function admin_notice_minimum_php_version()
+    {
+        // Check if we should show this notice
+        if (version_compare(PHP_VERSION, '5.6', '>=')) {
+            return;
+        }
+
+        if (isset($_GET['activate'])) unset($_GET['activate']);
+
+        $message = sprintf(
+            /* translators: 1: Plugin name 2: PHP 3: Required PHP version */
+            esc_html__('"%1$s" requires "%2$s" version %3$s or greater.', 'magical-posts-display'),
+            '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
+            '<strong>' . esc_html__('PHP', 'magical-posts-display') . '</strong>',
+            '5.6'
+        );
+
+        printf(
+            '<div class="notice notice-warning is-dismissible"><p>%1$s</p></div>',
+            wp_kses_post($message)
+        );
+    }
+
+    /**
+     * Admin notice for missing Elementor plugin
+     * Warning when the site doesn't have Elementor installed or activated.
+     */
+    public static function admin_notice_missing_main_plugin()
+    {
+        if (get_option('mgelhide9')) {
+            return;
+        }
+
+        // Only show on specific pages
+        global $pagenow;
+        if (!in_array($pagenow, array('plugins.php', 'admin.php'))) {
+            return;
+        }
+
+        // Don't show if Elementor is loaded
+        if (did_action('elementor/loaded')) {
+            return;
+        }
+
+        if (isset($_GET['activate'])) unset($_GET['activate']);
+
+        if (file_exists(WP_PLUGIN_DIR . '/elementor/elementor.php')) {
+            $magial_eactive_url = wp_nonce_url('plugins.php?action=activate&plugin=elementor/elementor.php&plugin_status=all&paged=1', 'activate-plugin_elementor/elementor.php');
+            $message = sprintf(
+                /* translators: 1: Plugin name 2: Elementor 3: Elementor installation link */
+                esc_html__('%1$s Recommended %2$s plugin, which is currently NOT RUNNING  %3$s', 'magical-posts-display'),
+                '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
+                '<strong>' . esc_html__('Elementor', 'magical-posts-display') . '</strong>',
+                '<a class="button button-primary" style="margin-left:20px" href="' . $magial_eactive_url . '">' . __('Activate Elementor', 'magical-posts-display') . '</a>'
+            );
+        } else {
+            $magial_einstall_url =  wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=elementor'), 'install-plugin_elementor');
+            $message = sprintf(
+                /* translators: 1: Plugin name 2: Elementor 3: Elementor installation link */
+                esc_html__('%1$s Recommended %2$s plugin for use all Elementor addons, which is currently NOT RUNNING  %3$s', 'magical-posts-display'),
+                '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
+                '<strong>' . esc_html__('Elementor', 'magical-posts-display') . '</strong>',
+                '<a class="button button-primary" style="margin-left:20px" href="' . $magial_einstall_url . '">' . __('Install Elementor', 'magical-posts-display') . '</a>'
+            );
+        }
+
+        printf('<div class="notice notice-warning is-dismissible mgpd-notice"><p style="padding: 13px 0">%1$s</p></div>', wp_kses_post($message));
     }
 }
-mgpAdminInfo::init();
+
+// Initialize only if we're in admin and not in pro version
+if (is_admin() && !mpd_check_plugin_active('magical-posts-display-pro/magical-posts-display-pro.php')) {
+    mgpAdminInfo::init();
+}

magical-posts-display/trunk/admin/admin-page/admin-page.php

@@ -37 +37 @@
             add_menu_page($menu_text, $menu_text, 'manage_options', 'mgpd-page', array($this, 'plugin_page'), 'dashicons-tickets-alt', 20);
 
-            add_submenu_page('mgpd-page', esc_html__("WelCome Page", 'gbox'), esc_html__("WelCome Page", 'gbox'), "manage_options",  'mgpd-page', array($this, 'plugin_page'));
+            add_submenu_page('mgpd-page', esc_html__("WelCome Page", 'magical-posts-display' ), esc_html__("WelCome Page", 'magical-posts-display' ), "manage_options",  'mgpd-page', array($this, 'plugin_page'));
         }
 
@@ -46 +46 @@
                 array(
                     'id'    => 'magical_ptab_home',
-                    'title' => __('Home', 'magical-addons-for-elementor')
+                    'title' => __('Home', 'magical-posts-display')
                 ),
                 /*array(
                 'id'    => 'magical_addons',
-                'title' => __( 'Addons', 'magical-addons-for-elementor' )
+                'title' => __( 'Addons', 'magical-posts-display'  )
             )*/
             );

magical-posts-display/trunk/admin/admin-page/welcome-page.php

@@ -10 +10 @@
 <div id="mgpdp1" class="magical-post-display mgpdp1">
     <div class="mg-cols">
-        <section class="sec-wel" <?php if (!class_exists('magicalPostDisplayPro')) : ?> style="background-image: url(<?php echo esc_url(MAGICAL_POSTS_DISPLAY_ASSETS . 'img/blue.svg'); ?>);" <?php else : ?>style="background-image: url(<?php echo esc_url(MAGICAL_POSTS_DISPLAY_ASSETS . 'mg/purple.svg'); ?>);" <?php endif; ?>>
+        <section class="sec-wel" <?php if (!class_exists('magicalPostDisplayPro')) : ?> style="background-image: url(<?php echo esc_url(MAGICAL_POSTS_DISPLAY_ASSETS . 'img/blue.svg'); ?>);" <?php else : ?>style="background-image: url(<?php echo esc_url(MAGICAL_POSTS_DISPLAY_ASSETS . 'img/purple.svg'); ?>);" <?php endif; ?>>
             <div class="wel-center-text">
                 <div class="welsec-icon">
@@ -21 +21 @@
                         <?php esc_html_e('See Short Video', 'magical-posts-display'); ?>
                     </a>
-
                     <?php if (!class_exists('magicalPostDisplayPro')) : ?>
-                        <a href="https://wpthemespace.com/product/magical-posts-display-pro/" class="button button-mgp1 button-mgp2"><?php esc_html_e('Buy Pro Now', 'magical-posts-display'); ?></a>
+                        <a href="https://wpthemespace.com/product/magical-posts-display-pro/" class="button button-mgp1 button-mgp2"><?php esc_html_e('View Pro Version', 'magical-posts-display'); ?></a>
                     <?php endif; ?>
                 </div>

magical-posts-display/trunk/admin/extra-function.php

@@ -61 +61 @@
         $url1 = esc_url('https://wpthemespace.com/product-category/pro-theme/');
 
-        $message = __('<strong><span style="color:red;">Latest WordPress Theme:</span>  <span style="color:green"> If you find a Secure, SEO friendly, full functional premium WordPress theme for your site then </span>  </strong>', 'niso');
+        $message = __('<strong><span style="color:red;">Latest WordPress Theme:</span>  <span style="color:green"> If you find a Secure, SEO friendly, full functional premium WordPress theme for your site then </span>  </strong>', 'magical-posts-display');
 
         printf(

magical-posts-display/trunk/admin/src/cmb2/includes/CMB2.php

@@ -1 +1 @@
 <?php
+
 /**
  * CMB2 - The core metabox object
@@ -19 +20 @@
  * The main CMB2 object for storing box data/properties.
  */
-class CMB2 extends CMB2_Base {
+class CMB2 extends CMB2_Base
+{
 
     /**
@@ -194 +196 @@
      * @param integer $object_id Optional object id.
      */
-    public function __construct( $config, $object_id = 0 ) {
-
-        if ( empty( $config['id'] ) ) {
-            wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
+    public function __construct($config, $object_id = 0)
+    {
+
+        if (empty($config['id'])) {
+            wp_die(esc_html__('Metabox configuration is required to have an ID parameter.', 'cmb2'));
         }
 
         $this->cmb_id = $config['id'];
-        $this->meta_box = wp_parse_args( $config, $this->mb_defaults );
+        $this->meta_box = wp_parse_args($config, $this->mb_defaults);
         $this->meta_box['fields'] = array();
 
         // Ensures object_types is an array.
-        $this->set_prop( 'object_types', $this->box_types() );
-        $this->object_id( $object_id );
-
-        if ( $this->is_options_page_mb() ) {
+        $this->set_prop('object_types', $this->box_types());
+        $this->object_id($object_id);
+
+        if ($this->is_options_page_mb()) {
             $this->init_options_mb();
         }
@@ -214 +217 @@
         $this->mb_object_type();
 
-        if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
-            $this->add_fields( $config['fields'] );
-        }
-
-        CMB2_Boxes::add( $this );
+        if (! empty($config['fields']) && is_array($config['fields'])) {
+            $this->add_fields($config['fields']);
+        }
+
+        CMB2_Boxes::add($this);
 
         /**
@@ -227 +230 @@
          * @param array $cmb This CMB2 object
          */
-        do_action( "cmb2_init_{$this->cmb_id}", $this );
+        do_action("cmb2_init_{$this->cmb_id}", $this);
 
         // Hook in the hookup... how meta.
-        add_action( "cmb2_init_hookup_{$this->cmb_id}", array( 'CMB2_hookup', 'maybe_init_and_hookup' ) );
+        add_action("cmb2_init_hookup_{$this->cmb_id}", array('CMB2_hookup', 'maybe_init_and_hookup'));
 
         // Hook in the rest api functionality.
-        add_action( "cmb2_init_hookup_{$this->cmb_id}", array( 'CMB2_REST', 'maybe_init_and_hookup' ) );
+        add_action("cmb2_init_hookup_{$this->cmb_id}", array('CMB2_REST', 'maybe_init_and_hookup'));
     }
 
@@ -245 +248 @@
      * @return CMB2
      */
-    public function show_form( $object_id = 0, $object_type = '' ) {
-        $this->render_form_open( $object_id, $object_type );
-
-        foreach ( $this->prop( 'fields' ) as $field_args ) {
-            $this->render_field( $field_args );
-        }
-
-        return $this->render_form_close( $object_id, $object_type );
+    public function show_form($object_id = 0, $object_type = '')
+    {
+        $this->render_form_open($object_id, $object_type);
+
+        foreach ($this->prop('fields') as $field_args) {
+            $this->render_field($field_args);
+        }
+
+        return $this->render_form_close($object_id, $object_type);
     }
 
@@ -265 +269 @@
      * @return CMB2
      */
-    public function render_form_open( $object_id = 0, $object_type = '' ) {
-        $object_type = $this->object_type( $object_type );
-        $object_id = $this->object_id( $object_id );
+    public function render_form_open($object_id = 0, $object_type = '')
+    {
+        $object_type = $this->object_type($object_type);
+        $object_id = $this->object_id($object_id);
 
         echo "\n<!-- Begin CMB2 Fields -->\n";
@@ -283 +288 @@
          * @param array  $cmb         This CMB2 object.
          */
-        do_action( 'cmb2_before_form', $this->cmb_id, $object_id, $object_type, $this );
+        do_action('cmb2_before_form', $this->cmb_id, $object_id, $object_type, $this);
 
         /**
@@ -298 +303 @@
          * @param array  $cmb         This CMB2 object
          */
-        do_action( "cmb2_before_{$object_type}_form_{$this->cmb_id}", $object_id, $this );
-
-        echo '<div class="', esc_attr( $this->box_classes() ), '"><div id="cmb2-metabox-', sanitize_html_class( $this->cmb_id ), '" class="cmb2-metabox cmb-field-list">';
+        do_action("cmb2_before_{$object_type}_form_{$this->cmb_id}", $object_id, $this);
+
+        echo '<div class="', esc_attr($this->box_classes()), '"><div id="cmb2-metabox-', sanitize_html_class($this->cmb_id), '" class="cmb2-metabox cmb-field-list">';
 
         return $this;
@@ -311 +316 @@
      * @return string Space concatenated list of classes
      */
-    public function box_classes() {
-
-        $classes = array( 'cmb2-wrap', 'form-table' );
+    public function box_classes()
+    {
+
+        $classes = array('cmb2-wrap', 'form-table');
 
         // Use the callback to fetch classes.
-        if ( $added_classes = $this->get_param_callback_result( 'classes_cb' ) ) {
-            $added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-            $classes = array_merge( $classes, $added_classes );
-        }
-
-        if ( $added_classes = $this->prop( 'classes' ) ) {
-            $added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-            $classes = array_merge( $classes, $added_classes );
+        if ($added_classes = $this->get_param_callback_result('classes_cb')) {
+            $added_classes = is_array($added_classes) ? $added_classes : array($added_classes);
+            $classes = array_merge($classes, $added_classes);
+        }
+
+        if ($added_classes = $this->prop('classes')) {
+            $added_classes = is_array($added_classes) ? $added_classes : array($added_classes);
+            $classes = array_merge($classes, $added_classes);
         }
 
@@ -331 +337 @@
          * @since 2.2.4
          */
-        if ( $this->is_alternate_context_box() ) {
+        if ($this->is_alternate_context_box()) {
             $context = array();
 
             // Include custom class if requesting no title.
-            if ( ! $this->prop( 'title' ) && ! $this->prop( 'remove_box_wrap' ) ) {
+            if (! $this->prop('title') && ! $this->prop('remove_box_wrap')) {
                 $context[] = 'cmb2-context-wrap-no-title';
             }
@@ -343 +349 @@
 
             // Include a context-type based context wrapper.
-            $context[] = 'cmb2-context-wrap-' . $this->prop( 'context' );
+            $context[] = 'cmb2-context-wrap-' . $this->prop('context');
 
             // Include an ID based context wrapper as well.
-            $context[] = 'cmb2-context-wrap-' . $this->prop( 'id' );
+            $context[] = 'cmb2-context-wrap-' . $this->prop('id');
 
             // And merge all the classes back into the array.
-            $classes = array_merge( $classes, $context );
+            $classes = array_merge($classes, $context);
         }
 
@@ -360 +366 @@
          * @param CMB2   $cmb     This CMB2 object.
          */
-        $classes = apply_filters( 'cmb2_wrap_classes', $classes, $this );
+        $classes = apply_filters('cmb2_wrap_classes', $classes, $this);
 
         // Clean up.
-        $classes = array_map( 'strip_tags', array_filter( $classes ) );
+        $classes = array_map('wp_strip_all_tags', array_filter($classes));
 
         // Remove any duplicates.
-        $classes = array_unique( $classes );
+        $classes = array_unique($classes);
 
         // Make a string.
-        return implode( ' ', $classes );
+        return implode(' ', $classes);
     }
 
@@ -382 +388 @@
      * @return CMB2
      */
-    public function render_form_close( $object_id = 0, $object_type = '' ) {
-        $object_type = $this->object_type( $object_type );
-        $object_id = $this->object_id( $object_id );
+    public function render_form_close($object_id = 0, $object_type = '')
+    {
+        $object_type = $this->object_type($object_type);
+        $object_id = $this->object_id($object_id);
 
         echo '</div></div>';
@@ -402 +409 @@
          * @param array  $cmb         This CMB2 object
          */
-        do_action( "cmb2_after_{$object_type}_form_{$this->cmb_id}", $object_id, $this );
+        do_action("cmb2_after_{$object_type}_form_{$this->cmb_id}", $object_id, $this);
 
         /**
@@ -414 +421 @@
          * @param array  $cmb         This CMB2 object.
          */
-        do_action( 'cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this );
+        do_action('cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this);
 
         echo "\n<!-- End CMB2 Fields -->\n";
@@ -428 +435 @@
      * @return mixed CMB2_Field object if successful.
      */
-    public function render_field( $field_args ) {
-        $field_args['context'] = $this->prop( 'context' );
-
-        if ( 'group' === $field_args['type'] ) {
-
-            if ( ! isset( $field_args['show_names'] ) ) {
-                $field_args['show_names'] = $this->prop( 'show_names' );
+    public function render_field($field_args)
+    {
+        $field_args['context'] = $this->prop('context');
+
+        if ('group' === $field_args['type']) {
+
+            if (! isset($field_args['show_names'])) {
+                $field_args['show_names'] = $this->prop('show_names');
             }
-            $field = $this->render_group( $field_args );
-
-        } elseif ( 'hidden' === $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
+            $field = $this->render_group($field_args);
+        } elseif ('hidden' === $field_args['type'] && $this->get_field($field_args)->should_show()) {
             // Save rendering for after the metabox.
-            $field = $this->add_hidden_field( $field_args );
-
+            $field = $this->add_hidden_field($field_args);
         } else {
 
-            $field_args['show_names'] = $this->prop( 'show_names' );
+            $field_args['show_names'] = $this->prop('show_names');
 
             // Render default fields.
-            $field = $this->get_field( $field_args )->render_field();
+            $field = $this->get_field($field_args)->render_field();
         }
 
@@ -459 +465 @@
      * @return CMB2_Field|null Group field object.
      */
-    public function render_group( $args ) {
+    public function render_group($args)
+    {
         $field_group = false;
 
-        if ( $args instanceof CMB2_Field ) {
+        if ($args instanceof CMB2_Field) {
             $field_group = 'group' === $args->type() ? $args : false;
-        } elseif ( isset( $args['id'], $args['fields'] ) && is_array( $args['fields'] ) ) {
-            $field_group = $this->get_field( $args );
-        }
-
-        if ( ! $field_group ) {
+        } elseif (isset($args['id'], $args['fields']) && is_array($args['fields'])) {
+            $field_group = $this->get_field($args);
+        }
+
+        if (! $field_group) {
             return;
         }
 
         $field_group->render_context = 'edit';
-        $field_group->peform_param_callback( 'render_row_cb' );
+        $field_group->peform_param_callback('render_row_cb');
 
         return $field_group;
@@ -488 +495 @@
      * @return CMB2_Field|null Group field object.
      */
-    public function render_group_callback( $field_args, $field_group ) {
+    public function render_group_callback($field_args, $field_group)
+    {
 
         // If field is requesting to be conditionally shown.
-        if ( ! $field_group || ! $field_group->should_show() ) {
+        if (! $field_group || ! $field_group->should_show()) {
             return;
         }
@@ -497 +505 @@
         $field_group->index = 0;
 
-        $field_group->peform_param_callback( 'before_group' );
-
-        $desc      = $field_group->args( 'description' );
-        $label     = $field_group->args( 'name' );
+        $field_group->peform_param_callback('before_group');
+
+        $desc      = $field_group->args('description');
+        $label     = $field_group->args('name');
         $group_val = (array) $field_group->value();
 
-        echo '<div class="cmb-row cmb-repeat-group-wrap ', esc_attr( $field_group->row_classes() ), '" data-fieldtype="group"><div class="cmb-td"><div data-groupid="', esc_attr( $field_group->id() ), '" id="', esc_attr( $field_group->id() ), '_repeat" ', $this->group_wrap_attributes( $field_group ), '>';
-
-        if ( $desc || $label ) {
+        echo '<div class="cmb-row cmb-repeat-group-wrap ', esc_attr($field_group->row_classes()), '" data-fieldtype="group"><div class="cmb-td"><div data-groupid="', esc_attr($field_group->id()), '" id="', esc_attr($field_group->id()), '_repeat" ', $this->group_wrap_attributes($field_group), '>';
+
+        if ($desc || $label) {
             $class = $desc ? ' cmb-group-description' : '';
             echo '<div class="cmb-row', $class, '"><div class="cmb-th">';
-            if ( $label ) {
+            if ($label) {
                 echo '<h2 class="cmb-group-name">', $label, '</h2>';
             }
-            if ( $desc ) {
+            if ($desc) {
                 echo '<p class="cmb2-metabox-description">', $desc, '</p>';
             }
@@ -517 +525 @@
         }
 
-        if ( ! empty( $group_val ) ) {
-            foreach ( $group_val as $group_key => $field_id ) {
-                $this->render_group_row( $field_group );
+        if (! empty($group_val)) {
+            foreach ($group_val as $group_key => $field_id) {
+                $this->render_group_row($field_group);
                 $field_group->index++;
             }
         } else {
-            $this->render_group_row( $field_group );
-        }
-
-        if ( $field_group->args( 'repeatable' ) ) {
-            echo '<div class="cmb-row"><div class="cmb-td"><p class="cmb-add-row"><button type="button" data-selector="', esc_attr( $field_group->id() ), '_repeat" data-grouptitle="', esc_attr( $field_group->options( 'group_title' ) ), '" class="cmb-add-group-row button-secondary">', $field_group->options( 'add_button' ), '</button></p></div></div>';
+            $this->render_group_row($field_group);
+        }
+
+        if ($field_group->args('repeatable')) {
+            echo '<div class="cmb-row"><div class="cmb-td"><p class="cmb-add-row"><button type="button" data-selector="', esc_attr($field_group->id()), '_repeat" data-grouptitle="', esc_attr($field_group->options('group_title')), '" class="cmb-add-group-row button-secondary">', $field_group->options('add_button'), '</button></p></div></div>';
         }
 
         echo '</div></div></div>';
 
-        $field_group->peform_param_callback( 'after_group' );
+        $field_group->peform_param_callback('after_group');
 
         return $field_group;
@@ -544 +552 @@
      * @return string                  The attributes string.
      */
-    public function group_wrap_attributes( $field_group ) {
+    public function group_wrap_attributes($field_group)
+    {
         $classes = 'cmb-nested cmb-field-list cmb-repeatable-group';
-        $classes .= $field_group->options( 'sortable' ) ? ' sortable' : ' non-sortable';
-        $classes .= $field_group->args( 'repeatable' ) ? ' repeatable' : ' non-repeatable';
+        $classes .= $field_group->options('sortable') ? ' sortable' : ' non-sortable';
+        $classes .= $field_group->args('repeatable') ? ' repeatable' : ' non-repeatable';
 
         $group_wrap_attributes = array(
@@ -564 +573 @@
          * @param CMB2_Field $field_group           The group CMB2_Field object.
          */
-        $group_wrap_attributes = apply_filters( 'cmb2_group_wrap_attributes', $group_wrap_attributes, $field_group );
+        $group_wrap_attributes = apply_filters('cmb2_group_wrap_attributes', $group_wrap_attributes, $field_group);
 
         $atts = array();
-        foreach ( $group_wrap_attributes as $att => $att_value ) {
-            if ( ! CMB2_Utils::is_data_attribute( $att ) ) {
-                $att_value = htmlspecialchars( $att_value );
+        foreach ($group_wrap_attributes as $att => $att_value) {
+            if (! CMB2_Utils::is_data_attribute($att)) {
+                $att_value = htmlspecialchars($att_value);
             }
 
-            $atts[ sanitize_html_class( $att ) ] = sanitize_text_field( strip_tags( $att_value ) );
-        }
-
-        return CMB2_Utils::concat_attrs( $atts );
+            $atts[sanitize_html_class($att)] = sanitize_text_field(wp_strip_all_tags($att_value));
+        }
+
+        return CMB2_Utils::concat_attrs($atts);
     }
 
@@ -586 +595 @@
      * @return CMB2
      */
-    public function render_group_row( $field_group ) {
-
-        $field_group->peform_param_callback( 'before_group_row' );
-        $closed_class     = $field_group->options( 'closed' ) ? ' closed' : '';
-        $confirm_deletion = $field_group->options( 'remove_confirm' );
-        $confirm_deletion = ! empty( $confirm_deletion ) ? $confirm_deletion : '';
+    public function render_group_row($field_group)
+    {
+
+        $field_group->peform_param_callback('before_group_row');
+        $closed_class     = $field_group->options('closed') ? ' closed' : '';
+        $confirm_deletion = $field_group->options('remove_confirm');
+        $confirm_deletion = ! empty($confirm_deletion) ? $confirm_deletion : '';
 
         echo '
         <div id="cmb-group-', $field_group->id(), '-', $field_group->index, '" class="postbox cmb-row cmb-repeatable-grouping', $closed_class, '" data-iterator="', $field_group->index, '">';
 
-        if ( $field_group->args( 'repeatable' ) ) {
-            echo '<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr( $confirm_deletion ), '" class="dashicons-before dashicons-no-alt cmb-remove-group-row" title="', esc_attr( $field_group->options( 'remove_button' ) ), '"></button>';
-        }
-
-            echo '
-            <div class="cmbhandle" title="' , esc_attr__( 'Click to toggle', 'cmb2' ), '"><br></div>
-            <h3 class="cmb-group-title cmbhandle-title"><span>', $field_group->replace_hash( $field_group->options( 'group_title' ) ), '</span></h3>
+        if ($field_group->args('repeatable')) {
+            echo '<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr($confirm_deletion), '" class="dashicons-before dashicons-no-alt cmb-remove-group-row" title="', esc_attr($field_group->options('remove_button')), '"></button>';
+        }
+
+        echo '
+            <div class="cmbhandle" title="', esc_attr__('Click to toggle', 'cmb2'), '"><br></div>
+            <h3 class="cmb-group-title cmbhandle-title"><span>', $field_group->replace_hash($field_group->options('group_title')), '</span></h3>
 
             <div class="inside cmb-td cmb-nested cmb-field-list">';
-                // Loop and render repeatable group fields.
-        foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-            if ( 'hidden' === $field_args['type'] ) {
+        // Loop and render repeatable group fields.
+        foreach (array_values($field_group->args('fields')) as $field_args) {
+            if ('hidden' === $field_args['type']) {
 
                 // Save rendering for after the metabox.
-                $this->add_hidden_field( $field_args, $field_group );
-
+                $this->add_hidden_field($field_args, $field_group);
             } else {
 
-                $field_args['show_names'] = $field_group->args( 'show_names' );
-                $field_args['context']    = $field_group->args( 'context' );
-
-                $this->get_field( $field_args, $field_group )->render_field();
+                $field_args['show_names'] = $field_group->args('show_names');
+                $field_args['context']    = $field_group->args('context');
+
+                $this->get_field($field_args, $field_group)->render_field();
             }
         }
 
-        if ( $field_group->args( 'repeatable' ) ) {
+        if ($field_group->args('repeatable')) {
             echo '
                     <div class="cmb-row cmb-remove-field-row">
                         <div class="cmb-remove-row">
-                            <button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr( $confirm_deletion ), '" class="cmb-remove-group-row cmb-remove-group-row-button alignright button-secondary">', $field_group->options( 'remove_button' ), '</button>
+                            <button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr($confirm_deletion), '" class="cmb-remove-group-row cmb-remove-group-row-button alignright button-secondary">', $field_group->options('remove_button'), '</button>
                         </div>
                     </div>
                     ';
         }
-            echo '
+        echo '
             </div>
         </div>
         ';
 
-        $field_group->peform_param_callback( 'after_group_row' );
+        $field_group->peform_param_callback('after_group_row');
 
         return $this;
@@ -649 +658 @@
      * @return CMB2_Field
      */
-    public function add_hidden_field( $field_args, $field_group = null ) {
-        if ( isset( $field_args['field_args'] ) ) {
+    public function add_hidden_field($field_args, $field_group = null)
+    {
+        if (isset($field_args['field_args'])) {
             // For back-compatibility.
-            $field = new CMB2_Field( $field_args );
+            $field = new CMB2_Field($field_args);
         } else {
-            $field = $this->get_new_field( $field_args, $field_group );
-        }
-
-        $types = new CMB2_Types( $field );
-
-        if ( $field_group ) {
+            $field = $this->get_new_field($field_args, $field_group);
+        }
+
+        $types = new CMB2_Types($field);
+
+        if ($field_group) {
             $types->iterator = $field_group->index;
         }
@@ -675 +685 @@
      * @return CMB2
      */
-    public function render_hidden_fields() {
-        if ( ! empty( $this->hidden_fields ) ) {
-            foreach ( $this->hidden_fields as $hidden ) {
+    public function render_hidden_fields()
+    {
+        if (! empty($this->hidden_fields)) {
+            foreach ($this->hidden_fields as $hidden) {
                 $hidden->render();
             }
@@ -692 +703 @@
      * @return mixed
      */
-    public function get_sanitized_values( array $data_to_sanitize ) {
+    public function get_sanitized_values(array $data_to_sanitize)
+    {
         $this->data_to_save = $data_to_sanitize;
         $stored_id          = $this->object_id();
 
         // We do this So CMB will sanitize our data for us, but not save it.
-        $this->object_id( '_' );
+        $this->object_id('_');
 
         // Ensure temp. data store is empty.
-        cmb2_options( 0 )->set();
+        cmb2_options(0)->set();
 
         // We want to get any taxonomy values back.
-        add_filter( "cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true' );
+        add_filter("cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true');
 
         // Process/save fields.
@@ -709 +721 @@
 
         // Put things back the way they were.
-        remove_filter( "cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true' );
+        remove_filter("cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true');
 
         // Get data from temp. data store.
-        $sanitized_values = cmb2_options( 0 )->get_options();
+        $sanitized_values = cmb2_options(0)->get_options();
 
         // Empty out temp. data store again.
-        cmb2_options( 0 )->set();
+        cmb2_options(0)->set();
 
         // Reset the object id.
-        $this->object_id( $stored_id );
+        $this->object_id($stored_id);
 
         return $sanitized_values;
@@ -733 +745 @@
      * @return CMB2
      */
-    public function save_fields( $object_id = 0, $object_type = '', $data_to_save = array() ) {
+    public function save_fields($object_id = 0, $object_type = '', $data_to_save = array())
+    {
 
         // Fall-back to $_POST data.
-        $this->data_to_save = ! empty( $data_to_save ) ? $data_to_save : $_POST;
-        $object_id = $this->object_id( $object_id );
-        $object_type = $this->object_type( $object_type );
+        $this->data_to_save = ! empty($data_to_save) ? $data_to_save : $_POST;
+        $object_id = $this->object_id($object_id);
+        $object_type = $this->object_type($object_type);
 
         $this->process_fields();
 
         // If options page, save the updated options.
-        if ( 'options-page' === $object_type ) {
-            cmb2_options( $object_id )->set();
+        if ('options-page' === $object_type) {
+            cmb2_options($object_id)->set();
         }
 
@@ -757 +770 @@
      * @return CMB2
      */
-    public function process_fields() {
+    public function process_fields()
+    {
 
         $this->pre_process();
 
         // Remove the show_on properties so saving works.
-        $this->prop( 'show_on', array() );
+        $this->prop('show_on', array());
 
         // save field ids of those that are updated.
         $this->updated = array();
 
-        foreach ( $this->prop( 'fields' ) as $field_args ) {
-            $this->process_field( $field_args );
+        foreach ($this->prop('fields') as $field_args) {
+            $this->process_field($field_args);
         }
 
@@ -782 +796 @@
      * @return CMB2
      */
-    public function process_field( $field_args ) {
-
-        switch ( $field_args['type'] ) {
+    public function process_field($field_args)
+    {
+
+        switch ($field_args['type']) {
 
             case 'group':
-                if ( $this->save_group( $field_args ) ) {
+                if ($this->save_group($field_args)) {
                     $this->updated[] = $field_args['id'];
                 }
@@ -798 +813 @@
 
             default:
-                $field = $this->get_new_field( $field_args );
-
-                if ( $field->save_field_from_data( $this->data_to_save ) ) {
+                $field = $this->get_new_field($field_args);
+
+                if ($field->save_field_from_data($this->data_to_save)) {
                     $this->updated[] = $field->id();
                 }
@@ -817 +832 @@
      * @return CMB2
      */
-    public function pre_process() {
+    public function pre_process()
+    {
         $object_type = $this->object_type();
 
@@ -833 +849 @@
          * @param int   $object_id The ID of the current object
          */
-        do_action( "cmb2_{$object_type}_process_fields_{$this->cmb_id}", $this, $this->object_id() );
+        do_action("cmb2_{$object_type}_process_fields_{$this->cmb_id}", $this, $this->object_id());
 
         return $this;
@@ -846 +862 @@
      * @return CMB2
      */
-    public function after_save() {
+    public function after_save()
+    {
         $object_type = $this->object_type();
         $object_id   = $this->object_id();
@@ -863 +880 @@
          * @param array  $cmb         This CMB2 object
          */
-        do_action( "cmb2_save_{$object_type}_fields", $object_id, $this->cmb_id, $this->updated, $this );
+        do_action("cmb2_save_{$object_type}_fields", $object_id, $this->cmb_id, $this->updated, $this);
 
         /**
@@ -879 +896 @@
          * @param array  $cmb         This CMB2 object
          */
-        do_action( "cmb2_save_{$object_type}_fields_{$this->cmb_id}", $object_id, $this->updated, $this );
+        do_action("cmb2_save_{$object_type}_fields_{$this->cmb_id}", $object_id, $this->updated, $this);
 
         return $this;
@@ -891 +908 @@
      * @return mixed        Return of CMB2_Field::update_data().
      */
-    public function save_group( $args ) {
-        if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+    public function save_group($args)
+    {
+        if (! isset($args['id'], $args['fields']) || ! is_array($args['fields'])) {
             return;
         }
 
-        return $this->save_group_field( $this->get_new_field( $args ) );
+        return $this->save_group_field($this->get_new_field($args));
     }
 
@@ -906 +924 @@
      * @return mixed                   Return of CMB2_Field::update_data().
      */
-    public function save_group_field( $field_group ) {
+    public function save_group_field($field_group)
+    {
         $base_id = $field_group->id();
 
-        if ( ! isset( $this->data_to_save[ $base_id ] ) ) {
+        if (! isset($this->data_to_save[$base_id])) {
             return;
         }
@@ -915 +934 @@
         $old        = $field_group->get_data();
         // Check if group field has sanitization_cb.
-        $group_vals = $field_group->sanitization_cb( $this->data_to_save[ $base_id ] );
+        $group_vals = $field_group->sanitization_cb($this->data_to_save[$base_id]);
         $saved      = array();
 
@@ -921 +940 @@
         $field_group->data_to_save = $this->data_to_save;
 
-        foreach ( array_values( $field_group->fields() ) as $field_args ) {
-            if ( 'title' === $field_args['type'] ) {
+        foreach (array_values($field_group->fields()) as $field_args) {
+            if ('title' === $field_args['type']) {
                 // Don't process title fields.
                 continue;
             }
 
-            $field  = $this->get_new_field( $field_args, $field_group );
-            $sub_id = $field->id( true );
-            if ( empty( $saved[ $field_group->index ] ) ) {
-                $saved[ $field_group->index ] = array();
+            $field  = $this->get_new_field($field_args, $field_group);
+            $sub_id = $field->id(true);
+            if (empty($saved[$field_group->index])) {
+                $saved[$field_group->index] = array();
             }
 
-            foreach ( (array) $group_vals as $field_group->index => $post_vals ) {
+            foreach ((array) $group_vals as $field_group->index => $post_vals) {
 
                 // Get value.
-                $new_val = isset( $group_vals[ $field_group->index ][ $sub_id ] )
-                    ? $group_vals[ $field_group->index ][ $sub_id ]
+                $new_val = isset($group_vals[$field_group->index][$sub_id])
+                    ? $group_vals[$field_group->index][$sub_id]
                     : false;
 
                 // Sanitize.
-                $new_val = $field->sanitization_cb( $new_val );
-
-                if ( is_array( $new_val ) && $field->args( 'has_supporting_data' ) ) {
-                    if ( $field->args( 'repeatable' ) ) {
+                $new_val = $field->sanitization_cb($new_val);
+
+                if (is_array($new_val) && $field->args('has_supporting_data')) {
+                    if ($field->args('repeatable')) {
                         $_new_val = array();
-                        foreach ( $new_val as $group_index => $grouped_data ) {
+                        foreach ($new_val as $group_index => $grouped_data) {
                             // Add the supporting data to the $saved array stack.
-                            $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
+                            $saved[$field_group->index][$grouped_data['supporting_field_id']][] = $grouped_data['supporting_field_value'];
                             // Reset var to the actual value.
-                            $_new_val[ $group_index ] = $grouped_data['value'];
+                            $_new_val[$group_index] = $grouped_data['value'];
                         }
                         $new_val = $_new_val;
                     } else {
                         // Add the supporting data to the $saved array stack.
-                        $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
+                        $saved[$field_group->index][$new_val['supporting_field_id']] = $new_val['supporting_field_value'];
                         // Reset var to the actual value.
                         $new_val = $new_val['value'];
@@ -962 +981 @@
 
                 // Get old value.
-                $old_val = is_array( $old ) && isset( $old[ $field_group->index ][ $sub_id ] )
-                    ? $old[ $field_group->index ][ $sub_id ]
+                $old_val = is_array($old) && isset($old[$field_group->index][$sub_id])
+                    ? $old[$field_group->index][$sub_id]
                     : false;
 
-                $is_updated = ( ! CMB2_Utils::isempty( $new_val ) && $new_val !== $old_val );
-                $is_removed = ( CMB2_Utils::isempty( $new_val ) && ! CMB2_Utils::isempty( $old_val ) );
+                $is_updated = (! CMB2_Utils::isempty($new_val) && $new_val !== $old_val);
+                $is_removed = (CMB2_Utils::isempty($new_val) && ! CMB2_Utils::isempty($old_val));
 
                 // Compare values and add to `$updated` array.
-                if ( $is_updated || $is_removed ) {
+                if ($is_updated || $is_removed) {
                     $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
                 }
 
                 // Add to `$saved` array.
-                $saved[ $field_group->index ][ $sub_id ] = $new_val;
-
-            }// End foreach.
-
-            $saved[ $field_group->index ] = CMB2_Utils::filter_empty( $saved[ $field_group->index ] );
-        }// End foreach.
-
-        $saved = CMB2_Utils::filter_empty( $saved );
-
-        return $field_group->update_data( $saved, true );
+                $saved[$field_group->index][$sub_id] = $new_val;
+            } // End foreach.
+
+            $saved[$field_group->index] = CMB2_Utils::filter_empty($saved[$field_group->index]);
+        } // End foreach.
+
+        $saved = CMB2_Utils::filter_empty($saved);
+
+        return $field_group->update_data($saved, true);
     }
 
@@ -994 +1012 @@
      * @return integer|string $object_id Object ID.
      */
-    public function object_id( $object_id = 0 ) {
+    public function object_id($object_id = 0)
+    {
         global $pagenow;
 
-        if ( $object_id ) {
+        if ($object_id) {
             $this->object_id = $object_id;
             return $this->object_id;
         }
 
-        if ( $this->object_id ) {
+        if ($this->object_id) {
             return $this->object_id;
         }
 
         // Try to get our object ID from the global space.
-        switch ( $this->object_type() ) {
+        switch ($this->object_type()) {
             case 'user':
-                $object_id = isset( $_REQUEST['user_id'] ) ? wp_unslash( $_REQUEST['user_id'] ) : $object_id;
-                $object_id = ! $object_id && 'user-new.php' !== $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
+                $object_id = isset($_REQUEST['user_id']) ? wp_unslash($_REQUEST['user_id']) : $object_id;
+                $object_id = ! $object_id && 'user-new.php' !== $pagenow && isset($GLOBALS['user_ID']) ? $GLOBALS['user_ID'] : $object_id;
                 break;
 
             case 'comment':
-                $object_id = isset( $_REQUEST['c'] ) ? wp_unslash( $_REQUEST['c'] ) : $object_id;
-                $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
+                $object_id = isset($_REQUEST['c']) ? wp_unslash($_REQUEST['c']) : $object_id;
+                $object_id = ! $object_id && isset($GLOBALS['comments']->comment_ID) ? $GLOBALS['comments']->comment_ID : $object_id;
                 break;
 
             case 'term':
-                $object_id = isset( $_REQUEST['tag_ID'] ) ? wp_unslash( $_REQUEST['tag_ID'] ) : $object_id;
+                $object_id = isset($_REQUEST['tag_ID']) ? wp_unslash($_REQUEST['tag_ID']) : $object_id;
                 break;
 
             case 'options-page':
                 $key = $this->doing_options_page();
-                if ( ! empty( $key ) ) {
+                if (! empty($key)) {
                     $object_id = $key;
                 }
@@ -1030 +1049 @@
 
             default:
-                $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
-                $object_id = isset( $_REQUEST['post'] ) ? wp_unslash( $_REQUEST['post'] ) : $object_id;
+                $object_id = isset($GLOBALS['post']->ID) ? $GLOBALS['post']->ID : $object_id;
+                $object_id = isset($_REQUEST['post']) ? wp_unslash($_REQUEST['post']) : $object_id;
                 break;
         }
@@ -1047 +1066 @@
      * @return string Object type.
      */
-    public function mb_object_type() {
-        if ( null !== $this->mb_object_type ) {
+    public function mb_object_type()
+    {
+        if (null !== $this->mb_object_type) {
             return $this->mb_object_type;
         }
 
-        if ( $this->is_options_page_mb() ) {
+        if ($this->is_options_page_mb()) {
             $this->mb_object_type = 'options-page';
             return $this->mb_object_type;
@@ -1062 +1082 @@
 
         // if it's an array of one, extract it.
-        if ( 1 === count( $registered_types ) ) {
-            $last = end( $registered_types );
-            if ( is_string( $last ) ) {
+        if (1 === count($registered_types)) {
+            $last = end($registered_types);
+            if (is_string($last)) {
                 $type = $last;
             }
-        } elseif ( ( $curr_type = $this->current_object_type() ) && in_array( $curr_type, $registered_types, true ) ) {
+        } elseif (($curr_type = $this->current_object_type()) && in_array($curr_type, $registered_types, true)) {
             $type = $curr_type;
         }
 
         // Get our object type.
-        switch ( $type ) {
+        switch ($type) {
 
             case 'user':
@@ -1096 +1116 @@
      * @return array Object types.
      */
-    public function box_types( $fallback = array() ) {
-        return CMB2_Utils::ensure_array( $this->prop( 'object_types' ), $fallback );
+    public function box_types($fallback = array())
+    {
+        return CMB2_Utils::ensure_array($this->prop('object_types'), $fallback);
     }
 
@@ -1107 +1128 @@
      * @return void
      */
-    public function init_options_mb() {
+    public function init_options_mb()
+    {
         $keys  = $this->options_page_keys();
         $types = $this->box_types();
 
-        if ( empty( $keys ) ) {
+        if (empty($keys)) {
             $keys = '';
-            $types = $this->deinit_options_mb( $types );
+            $types = $this->deinit_options_mb($types);
         } else {
 
@@ -1121 +1143 @@
 
         // Set/Reset the option_key property.
-        $this->set_prop( 'option_key', $keys );
+        $this->set_prop('option_key', $keys);
 
         // Reset the object types.
-        $this->set_prop( 'object_types', array_unique( $types ) );
+        $this->set_prop('object_types', array_unique($types));
     }
 
@@ -1135 +1157 @@
      * @return array
      */
-    protected function deinit_options_mb( $types ) {
-        if ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] ) {
-            unset( $this->meta_box['show_on']['key'] );
-        }
-
-        if ( array_key_exists( 'options-page', $this->meta_box['show_on'] ) ) {
-            unset( $this->meta_box['show_on']['options-page'] );
-        }
-
-        $index = array_search( 'options-page', $types );
-
-        if ( false !== $index ) {
-            unset( $types[ $index ] );
+    protected function deinit_options_mb($types)
+    {
+        if (isset($this->meta_box['show_on']['key']) && 'options-page' === $this->meta_box['show_on']['key']) {
+            unset($this->meta_box['show_on']['key']);
+        }
+
+        if (array_key_exists('options-page', $this->meta_box['show_on'])) {
+            unset($this->meta_box['show_on']['options-page']);
+        }
+
+        $index = array_search('options-page', $types);
+
+        if (false !== $index) {
+            unset($types[$index]);
         }
 
@@ -1159 +1182 @@
      * @return boolean True/False.
      */
-    public function is_options_page_mb() {
+    public function is_options_page_mb()
+    {
         return (
             // 'show_on' values checked for back-compatibility.
             $this->is_old_school_options_page_mb()
-            || in_array( 'options-page', $this->box_types() )
+            || in_array('options-page', $this->box_types())
         );
     }
@@ -1173 +1197 @@
      * @return boolean True/False.
      */
-    public function is_old_school_options_page_mb() {
+    public function is_old_school_options_page_mb()
+    {
         return (
             // 'show_on' values checked for back-compatibility.
-            isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key']
-            || array_key_exists( 'options-page', $this->meta_box['show_on'] )
+            isset($this->meta_box['show_on']['key']) && 'options-page' === $this->meta_box['show_on']['key']
+            || array_key_exists('options-page', $this->meta_box['show_on'])
         );
     }
@@ -1188 +1213 @@
      * @return bool
      */
-    public function doing_options_page() {
+    public function doing_options_page()
+    {
         $found_key = false;
         $keys = $this->options_page_keys();
 
-        if ( empty( $keys ) ) {
+        if (empty($keys)) {
             return $found_key;
         }
 
-        if ( ! empty( $_GET['page'] ) && in_array( $_GET['page'], $keys ) ) {
+        if (! empty($_GET['page']) && in_array($_GET['page'], $keys)) {
             $found_key = $_GET['page'];
         }
 
-        if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $keys ) ) {
+        if (! empty($_POST['action']) && in_array($_POST['action'], $keys)) {
             $found_key = $_POST['action'];
         }
@@ -1213 +1239 @@
      * @return string|array
      */
-    public function options_page_keys() {
+    public function options_page_keys()
+    {
         $key = '';
-        if ( ! $this->is_options_page_mb() ) {
+        if (! $this->is_options_page_mb()) {
             return $key;
         }
 
         $values = null;
-        if ( ! empty( $this->meta_box['show_on']['value'] ) ) {
+        if (! empty($this->meta_box['show_on']['value'])) {
             $values = $this->meta_box['show_on']['value'];
-        } elseif ( ! empty( $this->meta_box['show_on']['options-page'] ) ) {
+        } elseif (! empty($this->meta_box['show_on']['options-page'])) {
             $values = $this->meta_box['show_on']['options-page'];
-        } elseif ( $this->prop( 'option_key' ) ) {
-            $values = $this->prop( 'option_key' );
-        }
-
-        if ( $values ) {
+        } elseif ($this->prop('option_key')) {
+            $values = $this->prop('option_key');
+        }
+
+        if ($values) {
             $key = $values;
         }
 
-        if ( ! is_array( $key ) ) {
-            $key = array( $key );
+        if (! is_array($key)) {
+            $key = array($key);
         }
 
@@ -1246 +1273 @@
      * @return string Object type.
      */
-    public function object_type( $object_type = '' ) {
-        if ( $object_type ) {
+    public function object_type($object_type = '')
+    {
+        if ($object_type) {
             $this->object_type = $object_type;
             return $this->object_type;
         }
 
-        if ( $this->object_type ) {
+        if ($this->object_type) {
             return $this->object_type;
         }
@@ -1267 +1295 @@
      * @return string  Page object type name.
      */
-    public function current_object_type() {
+    public function current_object_type()
+    {
         global $pagenow;
         $type = 'post';
 
-        if ( in_array( $pagenow, array( 'user-edit.php', 'profile.php', 'user-new.php' ), true ) ) {
+        if (in_array($pagenow, array('user-edit.php', 'profile.php', 'user-new.php'), true)) {
             $type = 'user';
         }
 
-        if ( in_array( $pagenow, array( 'edit-comments.php', 'comment.php' ), true ) ) {
+        if (in_array($pagenow, array('edit-comments.php', 'comment.php'), true)) {
             $type = 'comment';
         }
 
-        if ( in_array( $pagenow, array( 'edit-tags.php', 'term.php' ), true ) ) {
+        if (in_array($pagenow, array('edit-tags.php', 'term.php'), true)) {
             $type = 'term';
         }
 
-        if ( defined( 'DOING_AJAX' ) && isset( $_POST['action'] ) && 'add-tag' === $_POST['action'] ) {
+        if (defined('DOING_AJAX') && isset($_POST['action']) && 'add-tag' === $_POST['action']) {
             $type = 'term';
         }
 
         if (
-            in_array( $pagenow, array( 'admin.php', 'admin-post.php' ), true )
+            in_array($pagenow, array('admin.php', 'admin-post.php'), true)
             && $this->doing_options_page()
         ) {
@@ -1305 +1334 @@
      * @return mixed            Metabox config property value or false.
      */
-    public function set_prop( $property, $value ) {
-        $this->meta_box[ $property ] = $value;
-
-        return $this->prop( $property );
+    public function set_prop($property, $value)
+    {
+        $this->meta_box[$property] = $value;
+
+        return $this->prop($property);
     }
 
@@ -1319 +1349 @@
      * @return mixed            Metabox config property value or false.
      */
-    public function prop( $property, $fallback = null ) {
-        if ( array_key_exists( $property, $this->meta_box ) ) {
-            return $this->meta_box[ $property ];
-        } elseif ( $fallback ) {
-            return $this->meta_box[ $property ] = $fallback;
+    public function prop($property, $fallback = null)
+    {
+        if (array_key_exists($property, $this->meta_box)) {
+            return $this->meta_box[$property];
+        } elseif ($fallback) {
+            return $this->meta_box[$property] = $fallback;
         }
     }
@@ -1338 +1369 @@
      * @return CMB2_Field|false                     CMB2_Field object (or false).
      */
-    public function get_field( $field, $field_group = null, $reset_cached = false ) {
-        if ( $field instanceof CMB2_Field ) {
+    public function get_field($field, $field_group = null, $reset_cached = false)
+    {
+        if ($field instanceof CMB2_Field) {
             return $field;
         }
 
-        $field_id = is_string( $field ) ? $field : $field['id'];
-
-        $parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
-        $ids = $this->get_field_ids( $field_id, $parent_field_id );
-
-        if ( ! $ids ) {
+        $field_id = is_string($field) ? $field : $field['id'];
+
+        $parent_field_id = ! empty($field_group) ? $field_group->id() : '';
+        $ids = $this->get_field_ids($field_id, $parent_field_id);
+
+        if (! $ids) {
             return false;
         }
 
-        list( $field_id, $sub_field_id ) = $ids;
-
-        $index = implode( '', $ids ) . ( $field_group ? $field_group->index : '' );
-
-        if ( array_key_exists( $index, $this->fields ) && ! $reset_cached ) {
-            return $this->fields[ $index ];
-        }
-
-        $this->fields[ $index ] = new CMB2_Field( $this->get_field_args( $field_id, $field, $sub_field_id, $field_group ) );
-
-        return $this->fields[ $index ];
+        list($field_id, $sub_field_id) = $ids;
+
+        $index = implode('', $ids) . ($field_group ? $field_group->index : '');
+
+        if (array_key_exists($index, $this->fields) && ! $reset_cached) {
+            return $this->fields[$index];
+        }
+
+        $this->fields[$index] = new CMB2_Field($this->get_field_args($field_id, $field, $sub_field_id, $field_group));
+
+        return $this->fields[$index];
     }
 
@@ -1375 +1407 @@
      * @return array                         Array of CMB2_Field arguments.
      */
-    public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) {
+    public function get_field_args($field_id, $field_args, $sub_field_id, $field_group)
+    {
 
         // Check if group is passed and if fields were added in the old-school fields array.
-        if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
+        if ($field_group && ($sub_field_id || 0 === $sub_field_id)) {
 
             // Update the fields array w/ any modified properties inherited from the group field.
-            $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
-
-            return $this->get_default_args( $field_args, $field_group );
-        }
-
-        if ( is_array( $field_args ) ) {
-            $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
-        }
-
-        return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
+            $this->meta_box['fields'][$field_id]['fields'][$sub_field_id] = $field_args;
+
+            return $this->get_default_args($field_args, $field_group);
+        }
+
+        if (is_array($field_args)) {
+            $this->meta_box['fields'][$field_id] = array_merge($field_args, $this->meta_box['fields'][$field_id]);
+        }
+
+        return $this->get_default_args($this->meta_box['fields'][$field_id]);
     }
 
@@ -1401 +1434 @@
      * @return array                   Array of field arguments.
      */
-    protected function get_default_args( $field_args, $field_group = null ) {
-        if ( $field_group ) {
+    protected function get_default_args($field_args, $field_group = null)
+    {
+        if ($field_group) {
             $args = array(
                 'field_args'  => $field_args,
@@ -1428 +1462 @@
      * @return CMB2
      */
-    protected function add_fields( $fields, $parent_field_id = null ) {
-        foreach ( $fields as $field ) {
+    protected function add_fields($fields, $parent_field_id = null)
+    {
+        foreach ($fields as $field) {
 
             $sub_fields = false;
-            if ( array_key_exists( 'fields', $field ) ) {
+            if (array_key_exists('fields', $field)) {
                 $sub_fields = $field['fields'];
-                unset( $field['fields'] );
+                unset($field['fields']);
             }
 
             $field_id = $parent_field_id
-                ? $this->add_group_field( $parent_field_id, $field )
-                : $this->add_field( $field );
-
-            if ( $sub_fields ) {
-                $this->add_fields( $sub_fields, $field_id );
+                ? $this->add_group_field($parent_field_id, $field)
+                : $this->add_field($field);
+
+            if ($sub_fields) {
+                $this->add_fields($sub_fields, $field_id);
             }
         }
@@ -1457 +1492 @@
      * @return string|false    Field id or false.
      */
-    public function add_field( array $field, $position = 0 ) {
-        if ( ! array_key_exists( 'id', $field ) ) {
+    public function add_field(array $field, $position = 0)
+    {
+        if (! array_key_exists('id', $field)) {
             return false;
         }
 
         // Perform some field-type-specific initiation actions.
-        switch ( $field['type'] ) {
+        switch ($field['type']) {
             case 'file':
             case 'file_list':
                 // Initiate attachment JS hooks.
-                add_filter( 'wp_prepare_attachment_for_js', array( 'CMB2_Type_File_Base', 'prepare_image_sizes_for_js' ), 10, 3 );
+                add_filter('wp_prepare_attachment_for_js', array('CMB2_Type_File_Base', 'prepare_image_sizes_for_js'), 10, 3);
                 break;
 
@@ -1476 +1512 @@
 
             case 'group':
-                if ( empty( $field['render_row_cb'] ) ) {
-                    $field['render_row_cb'] = array( $this, 'render_group_callback' );
+                if (empty($field['render_row_cb'])) {
+                    $field['render_row_cb'] = array($this, 'render_group_callback');
                 }
                 break;
@@ -1484 +1520 @@
                 // Dequeue the rgba_colorpicker custom field script if it is used,
                 // since we now enqueue our own more current version.
-                add_action( 'admin_enqueue_scripts', array( 'CMB2_Type_Colorpicker', 'dequeue_rgba_colorpicker_script' ), 99 );
+                add_action('admin_enqueue_scripts', array('CMB2_Type_Colorpicker', 'dequeue_rgba_colorpicker_script'), 99);
                 break;
         }
 
-        if ( isset( $field['column'] ) && false !== $field['column'] ) {
-            $field = $this->define_field_column( $field );
-        }
-
-        if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
-            $this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
+        if (isset($field['column']) && false !== $field['column']) {
+            $field = $this->define_field_column($field);
+        }
+
+        if (isset($field['taxonomy']) && ! empty($field['remove_default'])) {
+            $this->tax_metaboxes_to_remove[$field['taxonomy']] = $field['taxonomy'];
         }
 
@@ -1512 +1548 @@
      * @return array         Modified metabox field config array.
      */
-    protected function define_field_column( array $field ) {
+    protected function define_field_column(array $field)
+    {
         $this->has_columns = true;
 
-        $column = is_array( $field['column'] ) ? $field['column'] : array();
-
-        $field['column'] = wp_parse_args( $column, array(
-            'name'     => isset( $field['name'] ) ? $field['name'] : '',
+        $column = is_array($field['column']) ? $field['column'] : array();
+
+        $field['column'] = wp_parse_args($column, array(
+            'name'     => isset($field['name']) ? $field['name'] : '',
             'position' => false,
-        ) );
+        ));
 
         return $field;
@@ -1534 +1571 @@
      * @return mixed                   Array of parent/field ids or false.
      */
-    public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
-        if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
+    public function add_group_field($parent_field_id, array $field, $position = 0)
+    {
+        if (! array_key_exists($parent_field_id, $this->meta_box['fields'])) {
             return false;
         }
 
-        $parent_field = $this->meta_box['fields'][ $parent_field_id ];
-
-        if ( 'group' !== $parent_field['type'] ) {
+        $parent_field = $this->meta_box['fields'][$parent_field_id];
+
+        if ('group' !== $parent_field['type']) {
             return false;
         }
 
-        if ( ! isset( $parent_field['fields'] ) ) {
-            $this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
+        if (! isset($parent_field['fields'])) {
+            $this->meta_box['fields'][$parent_field_id]['fields'] = array();
         }
 
         $this->_add_field_to_array(
             $field,
-            $this->meta_box['fields'][ $parent_field_id ]['fields'],
+            $this->meta_box['fields'][$parent_field_id]['fields'],
             $position
         );
 
-        return array( $parent_field_id, $field['id'] );
+        return array($parent_field_id, $field['id']);
     }
 
@@ -1566 +1604 @@
      * @param integer $position Optionally specify a position in the array to be inserted.
      */
-    protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
-        if ( $position ) {
-            CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
+    protected function _add_field_to_array($field, &$fields, $position = 0)
+    {
+        if ($position) {
+            CMB2_Utils::array_insert($fields, array($field['id'] => $field), $position);
         } else {
-            $fields[ $field['id'] ] = $field;
+            $fields[$field['id']] = $field;
         }
     }
@@ -1582 +1621 @@
      * @return bool                    True if field was removed.
      */
-    public function remove_field( $field_id, $parent_field_id = '' ) {
-        $ids = $this->get_field_ids( $field_id, $parent_field_id );
-
-        if ( ! $ids ) {
+    public function remove_field($field_id, $parent_field_id = '')
+    {
+        $ids = $this->get_field_ids($field_id, $parent_field_id);
+
+        if (! $ids) {
             return false;
         }
 
-        list( $field_id, $sub_field_id ) = $ids;
-
-        unset( $this->fields[ implode( '', $ids ) ] );
-
-        if ( ! $sub_field_id ) {
-            unset( $this->meta_box['fields'][ $field_id ] );
+        list($field_id, $sub_field_id) = $ids;
+
+        unset($this->fields[implode('', $ids)]);
+
+        if (! $sub_field_id) {
+            unset($this->meta_box['fields'][$field_id]);
             return true;
         }
 
-        if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
-            unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
-        }
-        if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
-            unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
+        if (isset($this->fields[$field_id]->args['fields'][$sub_field_id])) {
+            unset($this->fields[$field_id]->args['fields'][$sub_field_id]);
+        }
+        if (isset($this->meta_box['fields'][$field_id]['fields'][$sub_field_id])) {
+            unset($this->meta_box['fields'][$field_id]['fields'][$sub_field_id]);
         }
 
@@ -1618 +1658 @@
      * @return mixed                   Field id. Strict compare to false, as success can return a falsey value (like 0).
      */
-    public function update_field_property( $field_id, $property, $value, $parent_field_id = '' ) {
-        $ids = $this->get_field_ids( $field_id, $parent_field_id );
-
-        if ( ! $ids ) {
+    public function update_field_property($field_id, $property, $value, $parent_field_id = '')
+    {
+        $ids = $this->get_field_ids($field_id, $parent_field_id);
+
+        if (! $ids) {
             return false;
         }
 
-        list( $field_id, $sub_field_id ) = $ids;
-
-        if ( ! $sub_field_id ) {
-            $this->meta_box['fields'][ $field_id ][ $property ] = $value;
+        list($field_id, $sub_field_id) = $ids;
+
+        if (! $sub_field_id) {
+            $this->meta_box['fields'][$field_id][$property] = $value;
             return $field_id;
         }
 
-        $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
+        $this->meta_box['fields'][$field_id]['fields'][$sub_field_id][$property] = $value;
         return $field_id;
     }
@@ -1644 +1685 @@
      * @return mixed                    Array of field/parent ids, or false.
      */
-    public function get_field_ids( $field_id, $parent_field_id = '' ) {
+    public function get_field_ids($field_id, $parent_field_id = '')
+    {
         $sub_field_id = $parent_field_id ? $field_id : '';
         $field_id     = $parent_field_id ? $parent_field_id : $field_id;
-        $fields       =& $this->meta_box['fields'];
-
-        if ( ! array_key_exists( $field_id, $fields ) ) {
-            $field_id = $this->search_old_school_array( $field_id, $fields );
-        }
-
-        if ( false === $field_id ) {
+        $fields       = &$this->meta_box['fields'];
+
+        if (! array_key_exists($field_id, $fields)) {
+            $field_id = $this->search_old_school_array($field_id, $fields);
+        }
+
+        if (false === $field_id) {
             return false;
         }
 
-        if ( ! $sub_field_id ) {
-            return array( $field_id, $sub_field_id );
-        }
-
-        if ( 'group' !== $fields[ $field_id ]['type'] ) {
+        if (! $sub_field_id) {
+            return array($field_id, $sub_field_id);
+        }
+
+        if ('group' !== $fields[$field_id]['type']) {
             return false;
         }
 
-        if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
-            $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
-        }
-
-        return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
+        if (! array_key_exists($sub_field_id, $fields[$field_id]['fields'])) {
+            $sub_field_id = $this->search_old_school_array($sub_field_id, $fields[$field_id]['fields']);
+        }
+
+        return false === $sub_field_id ? false : array($field_id, $sub_field_id);
     }
 
@@ -1680 +1722 @@
      * @return mixed            Field index or false.
      */
-    public function search_old_school_array( $field_id, $fields ) {
-        $ids = wp_list_pluck( $fields, 'id' );
-        $index = array_search( $field_id, $ids );
+    public function search_old_school_array($field_id, $fields)
+    {
+        $ids = wp_list_pluck($fields, 'id');
+        $index = array_search($field_id, $ids);
         return false !== $index ? $index : false;
     }
@@ -1694 +1737 @@
      * @return mixed                       Return of the callback function.
      */
-    public function do_callback( $cb, $additional_params = null ) {
-        return call_user_func( $cb, $this, $additional_params );
+    public function do_callback($cb, $additional_params = null)
+    {
+        return call_user_func($cb, $this, $additional_params);
     }
 
@@ -1704 +1748 @@
      * @return void
      */
-    public function nonce_field() {
-        wp_nonce_field( $this->nonce(), $this->nonce(), false, true );
+    public function nonce_field()
+    {
+        wp_nonce_field($this->nonce(), $this->nonce(), false, true);
     }
 
@@ -1714 +1759 @@
      * @return string unique nonce string.
      */
-    public function nonce() {
-        if ( ! $this->generated_nonce ) {
-            $this->generated_nonce = sanitize_html_class( 'nonce_' . basename( __FILE__ ) . $this->cmb_id );
+    public function nonce()
+    {
+        if (! $this->generated_nonce) {
+            $this->generated_nonce = sanitize_html_class('nonce_' . basename(__FILE__) . $this->cmb_id);
         }
 
@@ -1729 +1775 @@
      * @return bool
      */
-    public function was_updated() {
-        return ! empty( $this->updated );
+    public function was_updated()
+    {
+        return ! empty($this->updated);
     }
 
@@ -1740 +1787 @@
      * @return bool
      */
-    public function is_alternate_context_box() {
-        return $this->prop( 'context' ) && in_array( $this->prop( 'context' ), array( 'form_top', 'before_permalink', 'after_title', 'after_editor' ), true );
+    public function is_alternate_context_box()
+    {
+        return $this->prop('context') && in_array($this->prop('context'), array('form_top', 'before_permalink', 'after_title', 'after_editor'), true);
     }
 
@@ -1751 +1799 @@
      * @return mixed
      */
-    public function __get( $property ) {
-        switch ( $property ) {
+    public function __get($property)
+    {
+        switch ($property) {
             case 'updated':
             case 'has_columns':
@@ -1758 +1807 @@
                 return $this->{$property};
             default:
-                return parent::__get( $property );
-        }
-    }
-
+                return parent::__get($property);
+        }
+    }
 }

magical-posts-display/trunk/assets/css/admin-style.css

@@ -53 +53 @@
 }
 
-
+/* Enhanced Admin Notice Styles with Animation */
 .mgadin-hero {
-    padding: 20px 10px;
+    background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
+    border: 2px solid #e3f2fd;
+    border-radius: 12px;
+    padding: 25px;
+    margin: 20px 0;
     display: flex;
     align-items: center;
+    box-shadow: 0 8px 25px rgba(0, 123, 255, 0.1);
+    position: relative;
+    overflow: hidden;
+    animation: slideInFromTop 0.6s ease-out;
+    transition: all 0.3s ease;
+}
+
+.mgadin-hero:hover {
+    box-shadow: 0 12px 35px rgba(0, 123, 255, 0.15);
+    transform: translateY(-2px);
+}
+
+/* Animated Background Gradient */
+.mgadin-hero::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(0, 123, 255, 0.05), transparent);
+    animation: shimmer 3s infinite;
+}
+
+/* Content Container */
+.mge-info-content {
+    flex: 1;
+    z-index: 2;
+    position: relative;
 }
 
 .mge-info-hello {
     font-weight: 700;
-    font-size: 16px;
+    font-size: 18px;
+    color: #2c3e50;
+    margin-bottom: 8px;
+    animation: fadeInUp 0.8s ease-out 0.2s both;
 }
 
 .mge-info-title {
-    font-size: 22px;
+    font-size: 24px;
     display: block;
-    line-height: 1.5;
-    font-weight: 500;
-}
-
-.mge-info-desc div {
-    margin-bottom: 10px;
+    line-height: 1.4;
+    font-weight: 600;
+    color: #1a202c;
+    animation: fadeInUp 0.8s ease-out 0.3s both;
 }
 
 .mge-info-desc {
     font-size: 16px;
-    line-height: 1.3;
-    margin: 10px 0 20px;
+    line-height: 1.5;
+    margin: 15px 0 25px;
+    color: #4a5568;
+}
+
+.mge-info-desc div {
+    margin-bottom: 12px;
+    animation: fadeInUp 0.8s ease-out 0.4s both;
+}
+
+.mge-info-desc div.mge-offer {
+    background: linear-gradient(45deg, #ff6b6b, #ff8e53);
+    background-clip: text;
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    font-weight: 700;
+    font-size: 17px;
+    padding: 10px 15px;
+    border-left: 4px solid #ff6b6b;
+    background-color: rgba(255, 107, 107, 0.1);
+    border-radius: 6px;
+    animation: pulse 2s infinite, fadeInUp 0.8s ease-out 0.5s both;
 }
 
@@ -85 +139 @@
     display: flex;
     align-items: center;
+    gap: 15px;
+    animation: fadeInUp 0.8s ease-out 0.6s both;
 }
 
@@ -90 +146 @@
     display: inline-flex;
     align-items: center;
-    padding: 5px 20px;
+    padding: 12px 24px;
     font-size: 16px;
-    margin-right: 15px;
+    font-weight: 600;
+    border-radius: 8px;
+    text-decoration: none;
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+}
+
+.mge-info-actions a.button::before {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0;
+    height: 0;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 50%;
+    transform: translate(-50%, -50%);
+    transition: width 0.3s ease, height 0.3s ease;
+}
+
+.mge-info-actions a.button:hover::before {
+    width: 300px;
+    height: 300px;
+}
+
+.mge-info-actions .upgrade-btn {
+    background: linear-gradient(45deg, #007cba, #0096dc);
+    color: white;
+    border: none;
+    box-shadow: 0 4px 15px rgba(0, 124, 186, 0.3);
+    animation: buttonBounce 2s infinite;
+}
+
+.mge-info-actions .upgrade-btn:hover {
+    background: linear-gradient(45deg, #005a87, #007bb5);
+    box-shadow: 0 6px 20px rgba(0, 124, 186, 0.4);
+    transform: translateY(-2px);
+}
+
+.mge-info-actions .demo-btn {
+    background: linear-gradient(45deg, #28a745, #20c997);
+    color: white;
+    border: none;
+    box-shadow: 0 4px 15px rgba(40, 167, 69, 0.3);
+}
+
+.mge-info-actions .demo-btn:hover {
+    background: linear-gradient(45deg, #218838, #1ea379);
+    box-shadow: 0 6px 20px rgba(40, 167, 69, 0.4);
+    transform: translateY(-2px);
+}
+
+.mge-info-actions .mgad-dismiss {
+    background: transparent;
+    border: 2px solid #6c757d;
+    color: #6c757d;
+    padding: 10px 20px;
+    border-radius: 6px;
+    font-size: 14px;
+    transition: all 0.3s ease;
+}
+
+.mge-info-actions .mgad-dismiss:hover {
+    background: #6c757d;
+    color: white;
+    transform: translateY(-1px);
 }
 
@@ -99 +221 @@
 }
 
+/* Keyframe Animations */
+@keyframes slideInFromTop {
+    0% {
+        opacity: 0;
+        transform: translateY(-30px);
+    }
+    100% {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        transform: translateY(20px);
+    }
+    100% {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+@keyframes shimmer {
+    0% {
+        left: -100%;
+    }
+    100% {
+        left: 100%;
+    }
+}
+
+@keyframes pulse {
+    0%, 100% {
+        transform: scale(1);
+    }
+    50% {
+        transform: scale(1.02);
+    }
+}
+
+@keyframes buttonBounce {
+    0%, 20%, 50%, 80%, 100% {
+        transform: translateY(0);
+    }
+    40% {
+        transform: translateY(-3px);
+    }
+    60% {
+        transform: translateY(-2px);
+    }
+}
+
+/* Responsive Design */
+@media (max-width: 768px) {
+    .mgadin-hero {
+        flex-direction: column;
+        text-align: center;
+        padding: 20px;
+    }
+    
+    .mge-info-actions {
+        flex-direction: column;
+        width: 100%;
+        gap: 10px;
+    }
+    
+    .mge-info-actions a.button {
+        width: 100%;
+        justify-content: center;
+    }
+}
+
+/* Additional Enhancement Elements */
+.mgadin-hero::after {
+    content: '🚀';
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    font-size: 24px;
+    animation: float 3s ease-in-out infinite;
+}
+
+@keyframes float {
+    0%, 100% {
+        transform: translateY(0);
+    }
+    50% {
+        transform: translateY(-10px);
+    }
+}
+
+/* Enhanced Image and Review Styles */
 .mge-info-image {
     flex: 0 0 400px;
     overflow: hidden;
+    border-radius: 8px;
+    animation: fadeInUp 0.8s ease-out 0.7s both;
 }
 
@@ -107 +324 @@
     max-width: 100%;
     min-width: 200px;
+    border-radius: 8px;
+    transition: transform 0.3s ease;
+}
+
+.mge-info-image img:hover {
+    transform: scale(1.05);
 }
 
@@ -113 +336 @@
     display: block;
     font-size: 15px;
+    color: #2c3e50;
+    font-weight: 600;
 }
 
@@ -118 +343 @@
     display: flex;
     align-items: center;
-}
-
-.mge-info-desc div.mge-offer {
-    color: #a30000;
-    font-weight: 700;
+    gap: 15px;
 }
 
 .mge-info-rev .button {
-    padding: 5px 20px !important;
+    padding: 8px 20px !important;
     display: inline-flex;
     justify-content: center;
     align-items: center;
     height: 100%;
-    margin-right: 10px;
     font-size: 15px !important;
-}
+    border-radius: 6px;
+    transition: all 0.3s ease;
+}

magical-posts-display/trunk/assets/css/mgadmin-page.css

@@ -84 +84 @@
 }
 a.button.button-mgp1 {
-    background: #000;
-    color: #fff;
-    padding: 5px 25px;
-    margin-top: 10px;
+    background: #000000;
+    color: #fff;
+    padding: 12px 45px;
+    margin: 10px;
     font-size: 1rem;
     min-height: 38px;
     display: inline-block;
+    border-radius: 5px;
+    transition: 0.5s;
+    border: none;
+    font-weight: 600;
+}
+a.button.button-mgp1.btnprohas {
+    background: #700000;
+    color: #fff;
+}
+a.button.button-mgp1.btnprohas:hover {
+    background: #460000;
+    color: #fff;
 }
 .mgftext {

magical-posts-display/trunk/assets/css/mp-style.css

@@ -884 +884 @@
   font-size: 18px;
   color: #fff;
-  line-height: 20px;
+  line-height: 1.5;
 }
 .mgs-btn {
@@ -920 +920 @@
   padding: 3px 0px 4px;
   font-size: 14px;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
+  display: inline-block;
 }
 .mgs-content a.mp-post-btn.link1 {
@@ -1657 +1658 @@
   }
 }
+
+/* Enhanced Masonry Layout Styles */
+.mgpd-masonry-container {
+  position: relative;
+  margin-bottom: 30px;
+  overflow: hidden;
+}
+
+.mgpd-masonry {
+  align-items: flex-start;
+  position: relative !important;
+  height: auto !important;
+  min-height: 400px;
+}
+
+.mgpd-masonry-item {
+  margin-bottom: 1.5rem;
+  width: 100%;
+  position: relative;
+}
+
+/* Prevent layout jumping during load */
+.mgpd-masonry-container:not(.masonry-loaded) .mgpd-masonry {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.mgpd-masonry-container.masonry-loaded .mgpd-masonry {
+  opacity: 1;
+}
+
+/* Fix for items overlapping footer */
+.mgpd-masonry::after {
+  content: '';
+  display: block;
+  clear: both;
+  height: 0;
+}
+
+/* Ensure proper container bounds */
+.mgpd {
+  position: relative;
+  z-index: 1;
+  margin-bottom: 40px;
+}
+
+/* Specific column widths for masonry */
+.mgpd-masonry .mgpd-masonry-item.col-lg-4 {
+  width: 33.333333%;
+}
+
+.mgpd-masonry .mgpd-masonry-item.col-lg-3 {
+  width: 25%;
+}
+
+.mgpd-masonry .mgpd-masonry-item.col-lg-6 {
+  width: 50%;
+}
+
+.mgpd-masonry .mgpd-masonry-item.col-lg-12 {
+  width: 100%;
+}
+
+.mgpd-masonry .mgpd-masonry-item.col-lg-2 {
+  width: 16.666667%;
+}
+
+/* Ensure images are responsive in masonry layout */
+.mgpd-masonry .mg-card img {
+  width: 100%;
+  height: auto;
+  display: block;
+}
+
+/* Masonry item transition effects */
+.mgpd-masonry-item {
+  transition: transform 0.3s ease;
+}
+
+.mgpd-masonry-item:hover {
+  transform: translateY(-2px);
+}
+
+/* Responsive masonry adjustments */
+@media (max-width: 991.98px) {
+  .mgpd-masonry .mgpd-masonry-item.col-lg-4,
+  .mgpd-masonry .mgpd-masonry-item.col-lg-3,
+  .mgpd-masonry .mgpd-masonry-item.col-lg-2 {
+    width: 50%;
+  }
+  
+  .mgpd-masonry-item {
+    margin-bottom: 1rem;
+  }
+}
+
+@media (max-width: 767.98px) {
+  .mgpd-masonry .mgpd-masonry-item {
+    width: 100% !important;
+    margin-bottom: 1rem;
+  }
+}
+
+/* Loading state for masonry */
+.mgpd-masonry-container:not(.masonry-loaded) .mgpd-masonry-item {
+  opacity: 0;
+  transform: translateY(20px);
+}
+
+.mgpd-masonry-container.masonry-loaded .mgpd-masonry-item {
+  opacity: 1;
+  transform: translateY(0);
+  transition: opacity 0.3s ease, transform 0.3s ease;
+}
+
+/* Elementor Editor Mode Fix - Ensure items always visible in editor */
+.elementor-editor-active .mgpd-masonry-container .mgpd-masonry-item {
+  opacity: 1 !important;
+  transform: none !important;
+  visibility: visible !important;
+  position: relative !important;
+}
+
+/* Force masonry container to show properly in editor */
+.elementor-editor-active .mgpd-masonry {
+  display: flex !important;
+  flex-wrap: wrap !important;
+  height: auto !important;
+}
+
+/* Masonry Style Variations */
+
+/* Style 1 - Default Heights (all images same height) */
+.mgpd-masonry-style1 .mgpd-masonry-item .mg-card .mp-post-img figure {
+  height: 200px;
+}
+
+/* Style 2 - Alternating Heights (big then small pattern) */
+.mgpd-masonry-style2 .mgpd-masonry-item:nth-child(odd) .mg-card .mp-post-img figure {
+  height: 300px;
+}
+
+.mgpd-masonry-style2 .mgpd-masonry-item:nth-child(even) .mg-card .mp-post-img figure {
+  height: 180px;
+}
+
+/* Style 3 - Pattern Heights (two big, one small repeating pattern) */
+.mgpd-masonry-style3 .mgpd-masonry-item:nth-child(3n+1) .mg-card .mp-post-img figure,
+.mgpd-masonry-style3 .mgpd-masonry-item:nth-child(3n+2) .mg-card .mp-post-img figure {
+  height: 280px;
+}
+
+.mgpd-masonry-style3 .mgpd-masonry-item:nth-child(3n) .mg-card .mp-post-img figure {
+  height: 160px;
+}
+
+/* Ensure images cover the full height */
+.mgpd-masonry-container .mg-card .mp-post-img figure img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  object-position: center;
+}
+
+/* Responsive adjustments for masonry styles */
+@media (max-width: 991.98px) {
+  .mgpd-masonry-style1 .mgpd-masonry-item .mg-card .mp-post-img figure,
+  .mgpd-masonry-style2 .mgpd-masonry-item .mg-card .mp-post-img figure,
+  .mgpd-masonry-style3 .mgpd-masonry-item .mg-card .mp-post-img figure {
+    height: 200px;
+  }
+}
+
+@media (max-width: 767.98px) {
+  .mgpd-masonry-style1 .mgpd-masonry-item .mg-card .mp-post-img figure,
+  .mgpd-masonry-style2 .mgpd-masonry-item .mg-card .mp-post-img figure,
+  .mgpd-masonry-style3 .mgpd-masonry-item .mg-card .mp-post-img figure {
+    height: 180px;
+  }
+}
+
+/* Premium Features Styles (Pro Only) */
+
+/* AJAX Filter Buttons */
+.mgpd-ajax-filter-container {
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+.mgpd-filter-buttons {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 10px;
+}
+
+.mgpd-filter-btn {
+  background: #f8f9fa;
+  border: 2px solid #dee2e6;
+  color: #495057;
+  padding: 8px 16px;
+  border-radius: 25px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  font-weight: 500;
+  text-transform: capitalize;
+}
+
+.mgpd-filter-btn:hover,
+.mgpd-filter-btn.active {
+  background: #007cba;
+  border-color: #007cba;
+  color: #ffffff;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 124, 186, 0.3);
+}
+
+/* Loading State */
+.mgpd-loading .mg-card {
+  opacity: 0.5;
+  transition: opacity 0.3s ease;
+}
+
+.mgpd-loading-spinner {
+  color: #007cba;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+}
+
+.mgpd-loading-spinner .mgpd-spinner {
+  animation: mgpd-spin 1s linear infinite;
+}
+
+@keyframes mgpd-spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+/* Reading Time */
+.mgpd-reading-time {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  background: #e7f3ff;
+  color: #0066cc;
+  padding: 4px 10px;
+  border-radius: 15px;
+  font-size: 12px;
+  margin: 8px 8px 8px 0;
+  font-weight: 500;
+}
+
+.mgpd-reading-time svg {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+
+/* View Count */
+.mgpd-view-count {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  background: #f0f8f0;
+  color: #28a745;
+  padding: 4px 10px;
+  border-radius: 15px;
+  font-size: 12px;
+  margin: 8px 8px 8px 0;
+  font-weight: 500;
+}
+
+.mgpd-view-count svg {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+
+/* Social Share Buttons */
+.mgpd-social-share {
+  display: flex;
+  gap: 8px;
+  margin: 12px 0;
+}
+
+.mgpd-social-share a {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  text-decoration: none;
+  transition: all 0.3s ease;
+  font-size: 14px;
+}
+
+.mgpd-share-facebook {
+  background: #3b5998;
+  color: #ffffff;
+}
+
+.mgpd-share-facebook:hover {
+  background: #2d4373;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(59, 89, 152, 0.4);
+}
+
+.mgpd-share-twitter {
+  background: #000000;
+  color: #ffffff;
+}
+
+.mgpd-share-twitter:hover {
+  background: #333333;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
+}
+
+.mgpd-share-linkedin {
+  background: #0077b5;
+  color: #ffffff;
+}
+
+.mgpd-share-linkedin:hover {
+  background: #005885;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 119, 181, 0.4);
+}
+
+.mgpd-share-pinterest {
+  background: #bd081c;
+  color: #ffffff;
+}
+
+.mgpd-share-pinterest:hover {
+  background: #8c0613;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(189, 8, 28, 0.4);
+}
+
+.mgpd-share-instagram {
+  background: linear-gradient(45deg, #f09433 0%, #e6683c 25%, #dc2743 50%, #cc2366 75%, #bc1888 100%);
+  color: #ffffff;
+}
+
+.mgpd-share-instagram:hover {
+  opacity: 0.8;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(188, 24, 136, 0.4);
+}
+
+/* Premium Features Display Styles */
+/* Image Top Style */
+.mgpd-premium-image-top .mp-post-img {
+  position: relative;
+}
+
+.mgpd-premium-image-top .mgpd-premium-features {
+    position: absolute;
+    bottom: 10px;
+    left: 0;
+    right: 10px;
+    z-index: 2;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+    width: 100%;
+    justify-content: center;
+}
+
+.mgpd-premium-image-top .mgpd-reading-time,
+.mgpd-premium-image-top .mgpd-view-count {
+  background: rgba(255, 255, 255, 0.95);
+  backdrop-filter: blur(10px);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+.mgpd-premium-image-top .mgpd-social-share {
+  margin: 0;
+  background: rgba(255, 255, 255, 0.95);
+  backdrop-filter: blur(10px);
+  padding: 6px;
+  border-radius: 20px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+/* Image Overlay Style */
+.mgpd-premium-image-overlay .mp-post-img {
+  position: relative;
+}
+.mp-post-img .mgpd-time-count-wrap {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    padding: 0 20px;
+}
+.mgpd-premium-image-overlay .mgpd-premium-features {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: linear-gradient(to top, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.6) 60%, transparent 100%);
+  padding: 15px;
+  opacity: 0;
+  transform: translateY(10px);
+  transition: all 0.3s ease;
+  z-index: 2;
+}
+
+.mgpd-premium-image-overlay .mg-card:hover .mgpd-premium-features {
+  opacity: 1;
+  transform: translateY(0);
+}
+
+.mgpd-premium-image-overlay .mgpd-reading-time,
+.mgpd-premium-image-overlay .mgpd-view-count {
+  background: rgba(255, 255, 255, 0.2);
+  backdrop-filter: blur(10px);
+  color: #ffffff;
+  border: 1px solid rgba(255, 255, 255, 0.3);
+}
+
+.mgpd-premium-image-overlay .mgpd-reading-time svg,
+.mgpd-premium-image-overlay .mgpd-view-count svg {
+  fill: #ffffff;
+}
+
+.mgpd-premium-image-overlay .mgpd-social-share {
+  margin: 10px 0 0 0;
+  justify-content: center;
+}
+
+.mgpd-premium-image-overlay .mgpd-social-share a {
+  border: 1px solid rgba(255, 255, 255, 0.3);
+  backdrop-filter: blur(10px);
+}
+
+/* Video Wrapper */
+.mgpd-video-wrapper {
+  position: relative;
+  display: block;
+  width: 100%;
+  text-decoration: none;
+}
+
+.mgpd-video-wrapper img {
+  width: 100%;
+  height: auto;
+  display: block;
+}
+
+.mgpd-video-wrapper .mgpd-video-play-icon {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 60px;
+  height: 60px;
+  background: rgba(255, 0, 0, 0.9);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2;
+  transition: all 0.3s ease;
+  pointer-events: none;
+}
+
+.mgpd-video-wrapper:hover .mgpd-video-play-icon {
+  background: rgba(255, 0, 0, 1);
+  transform: translate(-50%, -50%) scale(1.15);
+}
+
+.mgpd-video-wrapper .mgpd-video-play-icon::before {
+  content: '';
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 12px 0 12px 20px;
+  border-color: transparent transparent transparent #ffffff;
+  margin-left: 3px;
+}
+
+/* Hide premium features when video is present */
+.mgpd-video-wrapper ~ .mgpd-premium-features,
+.mp-post-img:has(.mgpd-video-wrapper) .mgpd-premium-features {
+  display: none !important;
+}
+
+/* Placeholder Image */
+.mgpd-placeholder-img {
+  width: 100%;
+  min-height: 250px;
+  background: #ddd;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+
+.mgpd-placeholder-img::before {
+  content: 'No Image';
+  color: #999;
+  font-size: 18px;
+  font-weight: 500;
+  text-transform: uppercase;
+  letter-spacing: 2px;
+}
+
+/* Advanced Hover Effects */
+.mgpd-hover-zoom .mg-card {
+  transition: transform 0.3s ease;
+  overflow: hidden;
+}
+
+.mgpd-hover-zoom .mg-card.mgpd-hover-active {
+  transform: scale(1.05);
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
+}
+
+.mgpd-hover-zoom .mg-card .mp-post-img img {
+  transition: transform 0.3s ease;
+}
+
+.mgpd-hover-zoom .mg-card.mgpd-hover-active .mp-post-img img {
+  transform: scale(1.1);
+}
+
+.mgpd-hover-slide .mg-card {
+  transition: transform 0.3s ease;
+}
+
+.mgpd-hover-slide .mg-card.mgpd-hover-active {
+  transform: translateY(-10px);
+  box-shadow: 0 15px 35px rgba(0, 0, 0, 0.15);
+}
+
+.mgpd-hover-fade .mg-card {
+  transition: opacity 0.3s ease;
+}
+
+.mgpd-hover-fade .mg-card.mgpd-hover-active {
+  opacity: 0.9;
+  box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15);
+}
+
+.mgpd-hover-rotate .mg-card {
+  transition: transform 0.3s ease;
+}
+
+.mgpd-hover-rotate .mg-card.mgpd-hover-active {
+  transform: rotate(2deg) scale(1.02);
+  box-shadow: 0 12px 28px rgba(0, 0, 0, 0.15);
+}
+
+/* Infinite Scroll Enhancements */
+.mgpd-infinite-scroll-enabled {
+  position: relative;
+}
+
+.mgpd-infinite-scroll-trigger {
+  visibility: hidden;
+}
+
+/* Responsive Design for Premium Features */
+@media (max-width: 768px) {
+  .mgpd-filter-buttons {
+    gap: 5px;
+  }
+  
+  .mgpd-filter-btn {
+    padding: 6px 12px;
+    font-size: 14px;
+  }
+  
+  .mgpd-social-share a {
+    width: 28px;
+    height: 28px;
+    font-size: 12px;
+  }
+  
+  .mgpd-reading-time,
+  .mgpd-view-count {
+    font-size: 11px;
+    padding: 3px 8px;
+  }
+}
+
+@media (max-width: 576px) {
+  .mgpd-ajax-filter-container {
+    margin-bottom: 20px;
+  }
+  
+  .mgpd-social-share {
+    justify-content: center;
+    gap: 6px;
+  }
+  
+  /* Disable complex hover effects on mobile */
+  .mgpd-hover-zoom .mg-card.mgpd-hover-active,
+  .mgpd-hover-slide .mg-card.mgpd-hover-active,
+  .mgpd-hover-rotate .mg-card.mgpd-hover-active {
+    transform: none;
+  }
+}

magical-posts-display/trunk/assets/js/main.js

@@ -2 +2 @@
     "use strict";
     
-    //document ready function
+    // Document ready function
     jQuery(document).ready(function($){
-/*-----
-Bootstrap carousel active
-----------------------*/ 
-        /*var mobileSlider = $('.carousel');
-        mobileSlider.carousel({
-          interval: 8000,
+        // Show sticker lists
+        $('.mgpd-sticker ul').show();
+    });
+    
+// Enhanced masonry initialization for multiple containers
+$(window).on('load', function() {
+    $('.mgpd-masonry').each(function() {
+        var $container = $(this);
+        var $wrapper = $container.closest('.mgpd-masonry-container');
+        var container = this;
+        
+        // Wait for images to load before initializing masonry
+        imagesLoaded(container, function() {
+            try {
+                var masonryInstance = new Masonry(container, {
+                    itemSelector: '.mgpd-masonry-item',
+                    percentPosition: true,
+                    gutter: 0,
+                    horizontalOrder: true,
+                    fitWidth: false,
+                    transitionDuration: 0 // Disable animation for initial load
+                });
+                
+                // Store masonry instance for later use
+                $container.data('masonry', masonryInstance);
+                
+                // Force layout calculation after initialization
+                setTimeout(function() {
+                    masonryInstance.layout();
+                    $container.css('height', 'auto');
+                }, 100);
+                
+                // Add loaded class for smooth appearance
+                $wrapper.addClass('masonry-loaded');
+                
+            } catch (error) {
+                console.error('MGPD: Error initializing masonry:', error);
+            }
         });
+    });
+    
+    // Initialize Premium Features if available
+    if (typeof initMGPDPremiumFeatures === 'function') {
+        initMGPDPremiumFeatures();
+    }
+}); 
 
-        $('.awesome-carousel .carousel-inner .item:first-child').addClass('active');*/
-      
-        $('.mgpd-sticker ul').show();
+// Also initialize on DOM ready for faster loading
+$(document).ready(function() {
+    // Pre-initialize masonry containers
+    $('.mgpd-masonry').each(function() {
+        var $container = $(this);
+        $container.css('min-height', '600px'); // Temporary min-height
+    });
+});
 
-    });//End document ready function
-// masonry active
-        
-            var container = document.querySelector('.mgpd-masonry');
-            //create empty var msnry
-            var msnry;
-            // initialize Masonry after all images have loaded
-         if ( $(container).length > 0 ){
-            imagesLoaded( container, function() {
-                msnry = new Masonry( container, {
-                    itemSelector: '.mgpd-masonry-item'
-                });
-            });
+// Global function to reinitialize masonry (can be called by premium features)
+// Add throttling to prevent excessive calls
+var mgpdMasonryThrottle = false;
 
-        } 
+window.mgpdReinitializeMasonry = function() {
+    if (mgpdMasonryThrottle) {
+        return; // Silent throttle
+    }
+    
+    mgpdMasonryThrottle = true;
+    
+    setTimeout(function() {
+        mgpdMasonryThrottle = false;
+    }, 500); // Throttle for 500ms
+    
+    $('.mgpd-masonry').each(function() {
+        var $container = $(this);
+        var container = this;
+        var masonryInstance = $container.data('masonry');
+        
+        // Check if masonry is already initialized on this container
+        if (masonryInstance) {
+            // Masonry is initialized, reload items
+            imagesLoaded(container, function() {
+                try {
+                    // Use direct instance methods instead of jQuery plugin
+                    masonryInstance.reloadItems();
+                    masonryInstance.layout();
+                    
+                    // Reset height to auto to allow proper calculation
+                    $container.css('height', 'auto');
+                    
+                } catch (error) {
+                    console.error('MGPD: Error reloading masonry:', error);
+                }
+            });
+        } else {
+            // Masonry not initialized, initialize it first
+            imagesLoaded(container, function() {
+                try {
+                    var newMasonryInstance = new Masonry(container, {
+                        itemSelector: '.mgpd-masonry-item',
+                        percentPosition: true,
+                        gutter: 0,
+                        horizontalOrder: true,
+                        fitWidth: false
+                    });
+                    
+                    // Store masonry instance
+                    $container.data('masonry', newMasonryInstance);
+                    
+                    // Add loaded class for smooth appearance
+                    $container.closest('.mgpd-masonry-container').addClass('masonry-loaded');
+                    
+                } catch (error) {
+                    console.error('MGPD: Error initializing masonry:', error);
+                }
+            });
+        }
+    });
+};
+
+}(jQuery));
 
 
-}(jQuery)); 
-
-

magical-posts-display/trunk/composer.json

@@ -1 +1 @@
 {
+    "name": "magical-posts-display/wordpress-plugin",
+    "description": "Magical Posts Display - Elementor Advanced Posts widgets",
+    "type": "wordpress-plugin",
+    "license": "GPL-2.0-or-later",
     "require": {
+        "php": ">=7.4",
         "appsero/client": "^2.0.4",
         "htmlburger/carbon-fields": "^3.6"
+    },
+    "require-dev": {
+        "phpstan/phpstan": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "MagicalPostsDisplay\\": "includes/"
+        }
     }
 }

magical-posts-display/trunk/file-include.php

@@ -1 +1 @@
 <?php
-/*
-*
-* Magical posts display 
-* All files includes
-*
-*
-*
-*/
 
+/**
+ * File Include Manager
+ * 
+ * Manages all file inclusions for the plugin
+ * Organized by functionality and context
+ *
+ * REORGANIZATION SUMMARY:
+ * - Admin notices moved to admin/admin-page/admin-info.php
+ * - Assets (CSS/JS) handling moved to includes/class-assets-manager.php
+ * - AJAX handlers moved to includes/class-ajax-handler.php
+ * - WordPress hooks moved to includes/class-hooks-handler.php
+ * - Main plugin class cleaned up to focus on core initialization
+ *
+ * @package Magical Posts Display
+ * @since 1.2.54
+ */
+
+if (!defined('ABSPATH')) {
+    exit; // Exit if accessed directly.
+}
+
+// Initialize plugin data
 $mg_args = array(
     'posts_per_page' => -1,
     'ignore_sticky_posts' => 1,
     'post_type' => 'mp-display',
-
 );
 
@@ -19 +32 @@
 $install_date = gmdate("Y-m-d", strtotime(get_option('mgposte_install_date')));
 $compare_date = '2023-03-07';
+
+// Include core classes
+require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/class-assets-manager.php');
+require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/class-ajax-handler.php');
+require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/class-hooks-handler.php');
+
+// Initialize core handlers
+if (class_exists('MPD_Assets_Manager')) {
+    MPD_Assets_Manager::init();
+}
+
+if (class_exists('MPD_Ajax_Handler')) {
+    MPD_Ajax_Handler::init();
+}
+
+if (class_exists('MPD_Hooks_Handler')) {
+    MPD_Hooks_Handler::init();
+}
 
 if (is_admin()) {
@@ -53 +84 @@
 require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/mp-posts-function.php');
 
-//admin info
-if (!mpd_check_plugin_active('magical-posts-display-pro/magical-posts-display-pro.php')) {
+// Load traits
+if (file_exists(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/SVG_Icons_Trait.php')) {
+    require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/SVG_Icons_Trait.php');
+}
+if (file_exists(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/Advanced_Media_Trait.php')) {
+    require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/Advanced_Media_Trait.php');
+}
+if (file_exists(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/Premium_Features_Trait.php')) {
+    require_once(MAGICAL_POSTS_DISPLAY_DIR . 'includes/traits/Premium_Features_Trait.php');
+}
+
+// Admin info (moved to conditional include based on context)
+if (is_admin() && !mpd_check_plugin_active('magical-posts-display-pro/magical-posts-display-pro.php')) {
     require_once(MAGICAL_POSTS_DISPLAY_DIR . 'admin/admin-page/admin-info.php');
 }
@@ -84 +126 @@
 
 
-/*
-    *
-    * Plugin activation hook
-    *
-    */
-function mp_display_activation_setup()
-{
-    // Trigger our function that registers the custom post type
-    mp_display_post_type();
-
-    // Clear the permalinks after the post type has been registered
-    flush_rewrite_rules();
-    // Add new administrator role
-    mp_display_admin_role();
-}
-
-/*
-    *
-    * Plugin deactivation hook
-    *
-    */
-
-function mp_display_deactivation_setup()
-{
-
-    // Clear the permalinks to remove our post type's rules
-    flush_rewrite_rules();
-
-    // gets the administrator role remove
-    mp_display_admin_role_remove();
-}
-
-register_activation_hook(__FILE__, 'mp_display_activation_setup');
-register_deactivation_hook(__FILE__, 'mp_display_deactivation_setup');
+// Plugin activation and deactivation hooks are now handled by MPD_Hooks_Handler class
 
 
@@ -177 +186 @@
 }
 
-if (!function_exists('mpd_count_post_visits')) {
-    function mpd_count_post_visits()
-    {
-        if (is_single()) {
-            global $post;
-            $views = get_post_meta($post->ID, 'mpd_my_post_viewed', true);
-            if ($views == '') {
-                update_post_meta($post->ID, 'mpd_my_post_viewed', '1');
-            } else {
-                $views_no = intval($views);
-                update_post_meta($post->ID, 'mpd_my_post_viewed', ++$views_no);
-            }
-        }
-    }
-    add_action('wp_head', 'mpd_count_post_visits');
-}
+// Post visit counting is now handled by MPD_Hooks_Handler class

magical-posts-display/trunk/includes/blocks/posts-tab.php

@@ -477 +477 @@
                                                 endwhile;
 
-                                                wp_reset_query();
+                                                wp_reset_postdata();
                                                 wp_reset_postdata();
                                             else :

magical-posts-display/trunk/includes/elementor/elementor-main.php

@@ -66 +66 @@
         require_once(MAGICAL_POSTS_DISPLAY_DIR . '/includes/elementor/widgets/news-magazine-grid.php');
         $widgets_manager->register(new \mgpdNewsMagazineGrid());
-        
+
         // News Magazine Image Grid
         require_once(MAGICAL_POSTS_DISPLAY_DIR . '/includes/elementor/widgets/news-magazine-img-grid.php');
@@ -76 +76 @@
 
         $category_prefix = 'mgp-';
-            $category_slug   = $category_prefix . 'mgposts';
+        $category_slug   = $category_prefix . 'mgposts';
 
-            $elements_manager->add_category( $category_slug, [
-                'title' => esc_html__( 'Magical Posts Display', 'magical-posts-display' ),
-                'icon'  => 'fa fa-magic',
-            ] );
+        $elements_manager->add_category($category_slug, [
+            'title' => esc_html__('Magical Posts Display', 'magical-posts-display'),
+            'icon'  => 'fa fa-magic',
+        ]);
 
-            // Get all existing categories
-            $categories = $elements_manager->get_categories();
+        // Get all existing categories
+        $categories = $elements_manager->get_categories();
 
-            // Remove your custom category from the list to reposition it
-            $magical_category = $categories[ $category_slug ] ?? null;
-            unset( $categories[ $category_slug ] );
+        // Remove your custom category from the list to reposition it
+        $magical_category = $categories[$category_slug] ?? null;
+        unset($categories[$category_slug]);
 
-            if ( ! $magical_category ) {
-                return; // Stop if not found
-            }
+        if (! $magical_category) {
+            return; // Stop if not found
+        }
 
-            // Insert at index 3 (4th position)
-            $before    = array_slice( $categories, 0, 3, true );
-            $after     = array_slice( $categories, 3, null, true );
-            $reordered = $before + [ $category_slug => $magical_category ] + $after;
+        // Insert at index 3 (4th position)
+        $before    = array_slice($categories, 0, 4, true);
+        $after     = array_slice($categories, 4, null, true);
+        $reordered = $before + [$category_slug => $magical_category] + $after;
 
-            // Use reflection to inject reordered categories
-            $reflection = new \ReflectionClass( $elements_manager );
-            $property   = $reflection->getProperty( 'categories' );
-            $property->setAccessible( true );
-            $property->setValue( $elements_manager, $reordered );
-
+        // Use reflection to inject reordered categories
+        $reflection = new \ReflectionClass($elements_manager);
+        $property   = $reflection->getProperty('categories');
+        $property->setAccessible(true);
+        $property->setValue($elements_manager, $reordered);
     }
 
@@ -125 +124 @@
 
         wp_enqueue_style("mp-tab-style", MAGICAL_POSTS_DISPLAY_ASSETS . 'css/widget-style/mp-tabs.css', array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-        
+
         // Register News Magazine Grid styles
         wp_register_style('magical-news-magazine-grid', MAGICAL_POSTS_DISPLAY_ASSETS . 'css/news-magazine-grid.css', array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-        
+
         // Register News Magazine Image Grid styles
         wp_register_style('magical-news-magazine-img-grid', MAGICAL_POSTS_DISPLAY_ASSETS . 'css/news-magazine-img-grid.css', array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');

magical-posts-display/trunk/includes/elementor/widgets/advanced-posts-grid1.php

@@ -1925 +1925 @@
                         endif;
                     endwhile;
-                    wp_reset_query();
+                    wp_reset_postdata();
                     wp_reset_postdata();
                     ?>

magical-posts-display/trunk/includes/elementor/widgets/advanced-posts-grid2.php

@@ -1995 +1995 @@
                         endif;
                     endwhile;
-                    wp_reset_query();
+                    wp_reset_postdata();
                     wp_reset_postdata();
                     ?>

magical-posts-display/trunk/includes/elementor/widgets/advanced-posts-img-grid.php

@@ -1333 +1333 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_description_padding',
@@ -1345 +1345 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_description_margin',
@@ -1357 +1357 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_color',
@@ -1368 +1368 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_bgcolor',
@@ -1379 +1379 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_radius',
@@ -1391 +1391 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End of Normal Tab
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1401 +1401 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_hover_color',
@@ -1412 +1412 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_hover_bgcolor',
@@ -1423 +1423 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_des_hover_transition',
@@ -1441 +1441 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End of Hover Tab
-        
+
         $this->end_controls_tabs();
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1454 +1454 @@
             ]
         );
-        
+
         $this->end_controls_section();
         $this->start_controls_section(
@@ -1478 +1478 @@
 
 
- $this->start_controls_tabs('mgpg_meta_cat_tabs');
-        
+        $this->start_controls_tabs('mgpg_meta_cat_tabs');
+
         // Normal Tab
         $this->start_controls_tab(
@@ -1487 +1487 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_text_color',
@@ -1498 +1498 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_bg_color',
@@ -1509 +1509 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_cat_margin',
@@ -1520 +1520 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_cat_padding',
@@ -1531 +1531 @@
             ]
         );
-                
+
         $this->add_control(
             'mgpg_meta_cat_border_radius',
@@ -1543 +1543 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1552 +1552 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1561 +1561 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End Normal Tab
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1571 +1571 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_text_color_hover',
@@ -1582 +1582 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_bg_color_hover',
@@ -1593 +1593 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1602 +1602 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1611 +1611 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End Hover Tab
-        
+
         $this->end_controls_tabs(); // End Tabs
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1643 +1643 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_style_section',
@@ -1653 +1653 @@
         );
 
-        
+
         $this->start_controls_tabs('mgpg_author_tabs');
-        
+
         // Normal Tab
         $this->start_controls_tab(
@@ -1663 +1663 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1702 +1702 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_background_color',
@@ -1713 +1713 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1722 +1722 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_author_margin',
@@ -1733 +1733 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_author_padding',
@@ -1744 +1744 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1754 +1754 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_hover_text_color',
@@ -1765 +1765 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_hover_background_color',
@@ -1776 +1776 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1785 +1785 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_transition_duration',
@@ -1803 +1803 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         $this->end_controls_tabs();
-        
+
 
 
@@ -1990 +1990 @@
                             }
                         endwhile;
-                        wp_reset_query();
+                        wp_reset_postdata();
                         wp_reset_postdata();
                         ?>

magical-posts-display/trunk/includes/elementor/widgets/posts-carousel.php

@@ -2290 +2290 @@
                             <?php
                             endwhile;
-                            wp_reset_query();
+                            wp_reset_postdata();
                             wp_reset_postdata();
                             ?>

magical-posts-display/trunk/includes/elementor/widgets/posts-cat.php

@@ -421 +421 @@
             'content_grid_boxshadow',
             [
-                'label' => __('Use Box shadow?', 'magical-addons-for-elementor'),
+                'label' => __('Use Box shadow?', 'magical-posts-display'),
                 'type' => \Elementor\Controls_Manager::SWITCHER,
-                'yes' => __('Yes', 'magical-addons-for-elementor'),
-                'no' => __('No', 'magical-addons-for-elementor'),
+                'yes' => __('Yes', 'magical-posts-display'),
+                'no' => __('No', 'magical-posts-display'),
                 'default' => 'yes',
             ]

magical-posts-display/trunk/includes/elementor/widgets/posts-grid.php

@@ -1 +1 @@
 <?php
-
 
 class mgpdEPostsGrid extends \Elementor\Widget_Base
 {
+    use SVG_Icons_Trait;
+    use Advanced_Media_Trait;
 
     /**
@@ -126 +127 @@
                     'show_byid' => esc_html__('Show By Id (Post Only)', 'magical-posts-display'),
                     'show_byid_manually' => esc_html__('Add ID Manually', 'magical-posts-display'),
+                    'advanced_query' => esc_html__('Advanced Query Builder (Pro Only)', 'magical-posts-display'),
+                    'custom_fields' => esc_html__('Custom Fields Filter (Pro Only)', 'magical-posts-display'),
+                    'exclude_current' => esc_html__('Exclude Current Post (Pro Only)', 'magical-posts-display'),
                 ],
             ]
@@ -239 +243 @@
         );
         $this->add_control(
+            'mgpg_layout_type',
+            [
+                'label'   => __('Layout Type', 'magical-posts-display'),
+                'type'    => \Elementor\Controls_Manager::SELECT,
+                'default' => 'static',
+                'options' => [
+                    'static'   => __('Static', 'magical-posts-display'),
+                    'masonry'  => __('Masonry', 'magical-posts-display'),
+                ],
+                'description' => __('Choose between static grid layout or masonry layout. Masonry creates a dynamic, Pinterest-style layout. <strong>Note: Masonry only works on frontend, not in editor preview.</strong>', 'magical-posts-display'),
+            ]
+        );
+        $this->add_control(
+            'mgpg_masonry_style',
+            [
+                'label'   => __('Masonry Style', 'magical-posts-display'),
+                'type'    => \Elementor\Controls_Manager::SELECT,
+                'default' => 'style1',
+                'options' => [
+                    'style1'   => __('Style 1 - Default Heights', 'magical-posts-display'),
+                    'style2'   => __('Style 2 - Alternating Heights', 'magical-posts-display'),
+                    'style3'   => __('Style 3 - Pattern Heights', 'magical-posts-display'),
+                ],
+                'condition' => [
+                    'mgpg_layout_type' => 'masonry',
+                ],
+                'description' => __('Choose different image height patterns for masonry layout. <strong>Note: Masonry preview only works on frontend.</strong>', 'magical-posts-display'),
+            ]
+        );
+        $this->add_control(
             'mgpg_post_style',
             [
@@ -284 +318 @@
             ]
         );
+
+        $this->add_control(
+            'mgpg_media_source',
+            [
+                'label' => __('Advanced Media Source (Pro Only)', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SELECT,
+                'options' => [
+                    'featured' => __('Featured Image Only', 'magical-posts-display'),
+                    'content' => __('First Content Image (Pro Only)', 'magical-posts-display'),
+                    'video' => __('Video Embed (YouTube/Vimeo) (Pro Only)', 'magical-posts-display'),
+                    'priority' => __('Priority Fallback (Pro Only)', 'magical-posts-display'),
+                ],
+                'default' => 'featured',
+                'description' => __('Choose media source with priority fallback system (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+                'condition' => [
+                    'mgpg_post_img_show' => 'yes',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_media_priority',
+            [
+                'label' => __('Priority Order (Pro Only)', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SELECT2,
+                'multiple' => true,
+                'options' => [
+                    'video' => __('Video Embed', 'magical-posts-display'),
+                    'featured' => __('Featured Image', 'magical-posts-display'),
+                    'content' => __('First Content Image', 'magical-posts-display'),
+                    'placeholder' => __('Placeholder Image', 'magical-posts-display'),
+                ],
+                'default' => ['video', 'featured', 'content', 'placeholder'],
+                'description' => __('Set priority order for media fallback. First available source will be used (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+                'condition' => [
+                    'mgpg_post_img_show' => 'yes',
+                    'mgpg_media_source' => 'priority',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_video_play_icon',
+            [
+                'label' => __('Show Video Play Icon', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'default' => 'yes',
+                'description' => __('Display play icon overlay on video thumbnails (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+                'condition' => [
+                    'mgpg_post_img_show' => 'yes',
+                    'mgpg_media_source' => ['video', 'priority'],
+                ],
+                'condition_type' => 'or',
+            ]
+        );
+
         $this->add_control(
             'mgpg_show_title',
@@ -590 +683 @@
         );
         $this->end_controls_section();
+
+        // Premium Features Section
+        $this->start_controls_section(
+            'mgpg_premium_features',
+            [
+                'label' => sprintf('%s %s', __('Premium Features', 'magical-posts-display'), mp_display__pro_only_text()),
+                'tab'   => \Elementor\Controls_Manager::TAB_CONTENT,
+            ]
+        );
+        if (empty(mp_display_check_main_ok())) {
+            $this->add_control(
+                'mgpg_premium_info',
+                [
+                    'type' => \Elementor\Controls_Manager::RAW_HTML,
+                    'raw' => sprintf('<span style="color:red">%s</span>', __('These advanced features are only available in the Pro version.', 'magical-posts-display')),
+                ]
+            );
+        }
+        $this->add_control(
+            'mgpg_ajax_filter',
+            [
+                'label' => __('AJAX Category Filter', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'description' => __('Enable dynamic category filtering without page reload (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_infinite_scroll',
+            [
+                'label' => __('Infinite Scroll', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'description' => __('Load more posts automatically when scrolling (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_reading_time',
+            [
+                'label' => __('Reading Time Display', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'description' => __('Show estimated reading time for each post (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_view_count',
+            [
+                'label' => __('Post Views Counter', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'description' => __('Display post view counts with analytics (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_share',
+            [
+                'label' => __('Social Share Buttons', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'description' => __('Add social sharing buttons to each post card (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_premium_features_style',
+            [
+                'label' => __('Premium Features Display Style', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SELECT,
+                'options' => [
+                    'default' => __('Default (Below Content)', 'magical-posts-display'),
+                    'image-top' => __('Top of Image (Pro Only)', 'magical-posts-display'),
+                    'image-overlay' => __('Image Overlay on Hover (Pro Only)', 'magical-posts-display'),
+                ],
+                'default' => 'default',
+                'description' => __('Choose where to display reading time, views, and social buttons (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+                'condition' => [
+                    'mgpg_reading_time' => 'yes',
+                    'mgpg_view_count' => 'yes',
+                    'mgpg_social_share' => 'yes',
+                ],
+                'condition_type' => 'or',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_hover_effects',
+            [
+                'label' => __('Advanced Hover Effects', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SELECT,
+                'options' => [
+                    'none' => __('None', 'magical-posts-display'),
+                    'zoom' => __('Zoom Effect (Pro Only)', 'magical-posts-display'),
+                    'slide' => __('Slide Effect (Pro Only)', 'magical-posts-display'),
+                    'fade' => __('Fade Effect (Pro Only)', 'magical-posts-display'),
+                    'rotate' => __('Rotate Effect (Pro Only)', 'magical-posts-display'),
+                ],
+                'default' => 'none',
+                'description' => __('Choose advanced hover animations for post cards (Pro Only)', 'magical-posts-display'),
+                'classes' => 'mpd-pro-control',
+            ]
+        );
+        if (mp_display_check_main_ok()) {
+            $this->add_control(
+                'mgpg_ajax_info',
+                [
+                    'type' => \Elementor\Controls_Manager::RAW_HTML,
+                    'raw' => sprintf('<span style="color:red">%s</span>', __('All Ajax features only work in the frontend', 'magical-posts-display')),
+                ]
+            );
+        }
+        $this->end_controls_section();
+
         $this->start_controls_section(
             'mgpg_pagination',
@@ -933 +1144 @@
         $this->end_controls_section();
 
+        // Filter Buttons Style Section
+        $this->start_controls_section(
+            'mgpd_filter_buttons_style',
+            [
+                'label' => __('Filter Buttons', 'magical-posts-display'),
+                'tab'   => \Elementor\Controls_Manager::TAB_STYLE,
+                'condition' => [
+                    'mgpg_ajax_filter' => 'yes',
+                ]
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpd_filter_align',
+            [
+                'label' => __('Alignment', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::CHOOSE,
+                'options' => [
+                    'left' => [
+                        'title' => __('Left', 'magical-posts-display'),
+                        'icon' => 'eicon-text-align-left',
+                    ],
+                    'center' => [
+                        'title' => __('Center', 'magical-posts-display'),
+                        'icon' => 'eicon-text-align-center',
+                    ],
+                    'right' => [
+                        'title' => __('Right', 'magical-posts-display'),
+                        'icon' => 'eicon-text-align-right',
+                    ],
+                ],
+                'default' => 'center',
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons' => 'text-align: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpd_filter_spacing',
+            [
+                'label' => __('Buttons Spacing', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SLIDER,
+                'size_units' => ['px'],
+                'range' => [
+                    'px' => [
+                        'min' => 0,
+                        'max' => 50,
+                        'step' => 1,
+                    ],
+                ],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn' => 'margin: 0 {{SIZE}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpd_filter_margin',
+            [
+                'label' => __('Container Margin', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons' => 'margin: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpd_filter_padding',
+            [
+                'label' => __('Container Padding', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        // Button Tabs for Normal and Active states
+        $this->start_controls_tabs('mgpd_filter_btn_tabs');
+
+        // Normal State Tab
+        $this->start_controls_tab(
+            'mgpd_filter_btn_normal',
+            [
+                'label' => __('Normal', 'magical-posts-display'),
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Typography::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_typography',
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn',
+            ]
+        );
+
+        $this->add_control(
+            'mgpd_filter_btn_color',
+            [
+                'label' => __('Text Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'default' => '#333333',
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn' => 'color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Background::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_bg',
+                'label' => __('Background', 'magical-posts-display'),
+                'types' => ['classic', 'gradient'],
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn',
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpd_filter_btn_padding',
+            [
+                'label' => __('Padding', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'default' => [
+                    'top' => 10,
+                    'right' => 20,
+                    'bottom' => 10,
+                    'left' => 20,
+                    'unit' => 'px',
+                ],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpd_filter_btn_border_radius',
+            [
+                'label' => __('Border Radius', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Border::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_border',
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn',
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Box_Shadow::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_shadow',
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn',
+            ]
+        );
+
+        $this->end_controls_tab();
+
+        // Active/Hover State Tab
+        $this->start_controls_tab(
+            'mgpd_filter_btn_active',
+            [
+                'label' => __('Active/Hover', 'magical-posts-display'),
+            ]
+        );
+
+        $this->add_control(
+            'mgpd_filter_btn_active_color',
+            [
+                'label' => __('Text Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'default' => '#ffffff',
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn.active' => 'color: {{VALUE}};',
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn:hover' => 'color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Background::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_active_bg',
+                'label' => __('Background', 'magical-posts-display'),
+                'types' => ['classic', 'gradient'],
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn.active, {{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn:hover',
+            ]
+        );
+
+        $this->add_control(
+            'mgpd_filter_btn_active_border_color',
+            [
+                'label' => __('Border Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn.active' => 'border-color: {{VALUE}};',
+                    '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn:hover' => 'border-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Box_Shadow::get_type(),
+            [
+                'name' => 'mgpd_filter_btn_active_shadow',
+                'selector' => '{{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn.active, {{WRAPPER}} .mgpd-filter-buttons .mgpd-filter-btn:hover',
+            ]
+        );
+
+        $this->end_controls_tab();
+
+        $this->end_controls_tabs();
+
+        $this->end_controls_section();
+
         $this->start_controls_section(
             'mgpg_title_style',
@@ -940 +1379 @@
             ]
         );
-        
+
         // Adding Tabs for Normal and Hover
         $this->start_controls_tabs('mgpg_title_tabs');
-        
+
         // Normal Tab
         $this->start_controls_tab(
@@ -951 +1390 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_title_padding',
@@ -963 +1402 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_title_margin',
@@ -975 +1414 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_title_color',
@@ -986 +1425 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_title_bgcolor',
@@ -997 +1436 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_descb_radius',
@@ -1009 +1448 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1018 +1457 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1028 +1467 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_hover_transition',
@@ -1057 +1496 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_title_hover_bgcolor',
@@ -1068 +1507 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_descb_hover_radius',
@@ -1080 +1519 @@
             ]
         );
-        
-        $this->end_controls_tab(); 
+
+        $this->end_controls_tab();
         $this->end_controls_tabs();
         $this->end_controls_section();
-        
+
 
         $this->start_controls_section(
@@ -1093 +1532 @@
             ]
         );
-        
+
         $this->start_controls_tabs('mgpg_description_tabs');
-        
+
         // Normal Tab
         $this->start_controls_tab(
@@ -1103 +1542 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_description_padding',
@@ -1115 +1554 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_description_margin',
@@ -1127 +1566 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_color',
@@ -1138 +1577 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_bgcolor',
@@ -1149 +1588 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_radius',
@@ -1161 +1600 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End of Normal Tab
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1171 +1610 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_hover_color',
@@ -1182 +1621 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_description_hover_bgcolor',
@@ -1193 +1632 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_des_hover_transition',
@@ -1211 +1650 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End of Hover Tab
-        
+
         $this->end_controls_tabs();
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1224 +1663 @@
             ]
         );
-        
+
         $this->end_controls_section();
-        
+
         $this->start_controls_section(
             'mgpg_meta_style',
@@ -1246 +1685 @@
             ]
         );
-        
+
         $this->start_controls_tabs('mgpg_meta_cat_tabs');
-        
+
         // Normal Tab
         $this->start_controls_tab(
@@ -1256 +1695 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_text_color',
@@ -1267 +1706 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_bg_color',
@@ -1278 +1717 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_cat_margin',
@@ -1289 +1728 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_cat_padding',
@@ -1300 +1739 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_border_radius',
@@ -1321 +1760 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1330 +1769 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End Normal Tab
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1340 +1779 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_text_color_hover',
@@ -1351 +1790 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_cat_bg_color_hover',
@@ -1362 +1801 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1371 +1810 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1380 +1819 @@
             ]
         );
-        
+
         $this->end_controls_tab(); // End Hover Tab
-        
+
         $this->end_controls_tabs(); // End Tabs
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1434 +1873 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_style_section',
@@ -1442 +1881 @@
                 'separator' => 'before',
                 'condition' => [
-                            'mgpg_author_show' => 'yes',
-                ],
-            ]
-        );
-
-        
+                    'mgpg_author_show' => 'yes',
+                ],
+            ]
+        );
+
+
         $this->start_controls_tabs('mgpg_author_tabs');
-        
+
         // Normal Tab
         $this->start_controls_tab(
@@ -1457 +1896 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1496 +1935 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_background_color',
@@ -1507 +1946 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1516 +1955 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_author_margin',
@@ -1527 +1966 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_author_padding',
@@ -1538 +1977 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         // Hover Tab
         $this->start_controls_tab(
@@ -1548 +1987 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_hover_text_color',
@@ -1559 +1998 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_hover_background_color',
@@ -1570 +2009 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1579 +2018 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_author_transition_duration',
@@ -1597 +2036 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         $this->end_controls_tabs();
-        
-
-        
+
+
+
         $this->add_control(
             'mgpg_meta_date',
@@ -1621 +2060 @@
             'label' => __('Normal', 'magical-posts-display'),
         ]);
-        
+
         $this->add_control(
             'mgpg_meta_date_color',
@@ -1632 +2071 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_date_background_color',
@@ -1643 +2082 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_date_margin',
@@ -1654 +2093 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_date_padding',
@@ -1665 +2104 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1673 +2112 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1681 +2120 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         // Hover Tab
         $this->start_controls_tab('mgpg_meta_date_hover', [
             'label' => __('Hover', 'magical-posts-display'),
         ]);
-        
+
         $this->add_control(
             'mgpg_meta_date_hover_color',
@@ -1699 +2138 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_date_hover_background_color',
@@ -1710 +2149 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1718 +2157 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1726 +2165 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_date_transition',
@@ -1745 +2184 @@
             ]
         );
-        
+
         $this->end_controls_tab();
         $this->end_controls_tabs();
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -1757 +2196 @@
             ]
         );
-        
-        
+
+
         $this->add_responsive_control(
             'mgpg_meta_date_icon_size',
@@ -1776 +2215 @@
                 ],
             ]
-        ); 
+        );
 
         $this->add_control(
@@ -1796 +2235 @@
             'label' => __('Normal', 'magical-posts-display'),
         ]);
-        
+
         $this->add_control(
             'mgpg_meta_tag_color',
@@ -1808 +2247 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_tag_background_color',
@@ -1819 +2258 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_tag_margin',
@@ -1831 +2270 @@
             ]
         );
-        
+
         $this->add_responsive_control(
             'mgpg_meta_tag_padding',
@@ -1843 +2282 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1851 +2290 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1859 +2298 @@
             ]
         );
-        
+
         $this->end_controls_tab();
-        
+
         // Hover Tab
         $this->start_controls_tab('mgpg_meta_tag_hover', [
             'label' => __('Hover', 'magical-posts-display'),
         ]);
-        
+
         $this->add_control(
             'mgpg_meta_tag_hover_color',
@@ -1878 +2317 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_tag_hover_background_color',
@@ -1889 +2328 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Border::get_type(),
@@ -1897 +2336 @@
             ]
         );
-        
+
         $this->add_group_control(
             \Elementor\Group_Control_Box_Shadow::get_type(),
@@ -1905 +2344 @@
             ]
         );
-        
+
         $this->add_control(
             'mgpg_meta_tag_transition',
@@ -1924 +2363 @@
             ]
         );
-        
+
         $this->end_controls_tab();
         $this->end_controls_tabs();
@@ -1963 +2402 @@
                 ],
             ]
-        ); 
+        );
 
         $this->end_controls_section();
@@ -2016 +2455 @@
             ]
         );
- 
+
         $this->add_group_control(
             \Elementor\Group_Control_Typography::get_type(),
@@ -2378 +2817 @@
         $this->end_controls_tabs();
         $this->end_controls_section();
+
+        // Premium Features Style Section
+        $this->start_controls_section(
+            'mgpg_premium_style',
+            [
+                'label' => sprintf('%s %s', __('✨ Premium Features Style', 'magical-posts-display'), mp_display__pro_only_text()),
+                'tab' => \Elementor\Controls_Manager::TAB_STYLE,
+            ]
+        );
+
+        if (empty(mp_display_check_main_ok())) {
+            $this->add_control(
+                'mgpg_premium_style_info',
+                [
+                    'label' => sprintf('<span style="color:red">%s</span>', __('Premium features styling only works with pro version.', 'magical-posts-display')),
+                    'type' => \Elementor\Controls_Manager::HEADING,
+                    'separator' => 'before',
+                ]
+            );
+        }
+
+        // Reading Time Style
+        $this->add_control(
+            'mgpg_reading_time_heading',
+            [
+                'label' => __('Reading Time', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::HEADING,
+                'separator' => 'before',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_reading_time_color',
+            [
+                'label' => __('Text Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-reading-time' => 'color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_reading_time_bg',
+            [
+                'label' => __('Background Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-reading-time' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Typography::get_type(),
+            [
+                'name' => 'mgpg_reading_time_typography',
+                'label' => __('Typography', 'magical-posts-display'),
+                'selector' => '{{WRAPPER}} .mgpd-reading-time',
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_reading_time_padding',
+            [
+                'label' => __('Padding', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-reading-time' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_reading_time_margin',
+            [
+                'label' => __('Margin', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-reading-time' => 'margin: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_reading_time_border_radius',
+            [
+                'label' => __('Border Radius', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-reading-time' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        // View Count Style
+        $this->add_control(
+            'mgpg_view_count_heading',
+            [
+                'label' => __('View Count', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::HEADING,
+                'separator' => 'before',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_view_count_color',
+            [
+                'label' => __('Text Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-view-count' => 'color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_view_count_bg',
+            [
+                'label' => __('Background Color', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-view-count' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_group_control(
+            \Elementor\Group_Control_Typography::get_type(),
+            [
+                'name' => 'mgpg_view_count_typography',
+                'label' => __('Typography', 'magical-posts-display'),
+                'selector' => '{{WRAPPER}} .mgpd-view-count',
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_view_count_padding',
+            [
+                'label' => __('Padding', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-view-count' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_view_count_margin',
+            [
+                'label' => __('Margin', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-view-count' => 'margin: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_view_count_border_radius',
+            [
+                'label' => __('Border Radius', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-view-count' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        // Social Share Buttons Style
+        $this->add_control(
+            'mgpg_social_share_heading',
+            [
+                'label' => __('Social Share Buttons', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::HEADING,
+                'separator' => 'before',
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_social_share_size',
+            [
+                'label' => __('Button Size', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SLIDER,
+                'size_units' => ['px'],
+                'range' => [
+                    'px' => [
+                        'min' => 20,
+                        'max' => 60,
+                        'step' => 1,
+                    ],
+                ],
+                'default' => [
+                    'unit' => 'px',
+                    'size' => 32,
+                ],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-social-share a' => 'width: {{SIZE}}{{UNIT}}; height: {{SIZE}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_social_share_gap',
+            [
+                'label' => __('Gap Between Buttons', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SLIDER,
+                'size_units' => ['px'],
+                'range' => [
+                    'px' => [
+                        'min' => 0,
+                        'max' => 30,
+                        'step' => 1,
+                    ],
+                ],
+                'default' => [
+                    'unit' => 'px',
+                    'size' => 8,
+                ],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-social-share' => 'gap: {{SIZE}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        $this->add_responsive_control(
+            'mgpg_social_share_margin',
+            [
+                'label' => __('Margin', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::DIMENSIONS,
+                'size_units' => ['px', 'em', '%'],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-social-share' => 'margin: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
+                ],
+            ]
+        );
+
+        // Social Button Colors with Tabs
+        $this->add_control(
+            'mgpg_social_colors_heading',
+            [
+                'label' => __('Individual Button Colors', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::HEADING,
+                'separator' => 'before',
+            ]
+        );
+
+        $this->start_controls_tabs('mgpg_social_colors_tabs');
+
+        // Normal State Tab
+        $this->start_controls_tab(
+            'mgpg_social_normal_tab',
+            [
+                'label' => __('Normal', 'magical-posts-display'),
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_facebook_color',
+            [
+                'label' => __('Facebook', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-facebook' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_twitter_color',
+            [
+                'label' => __('X (Twitter)', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-twitter' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_linkedin_color',
+            [
+                'label' => __('LinkedIn', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-linkedin' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_pinterest_color',
+            [
+                'label' => __('Pinterest', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-pinterest' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_instagram_color',
+            [
+                'label' => __('Instagram', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-instagram' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->end_controls_tab();
+
+        // Hover State Tab
+        $this->start_controls_tab(
+            'mgpg_social_hover_tab',
+            [
+                'label' => __('Hover', 'magical-posts-display'),
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_facebook_hover_color',
+            [
+                'label' => __('Facebook', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-facebook:hover' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_twitter_hover_color',
+            [
+                'label' => __('X (Twitter)', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-twitter:hover' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_linkedin_hover_color',
+            [
+                'label' => __('LinkedIn', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-linkedin:hover' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_pinterest_hover_color',
+            [
+                'label' => __('Pinterest', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-pinterest:hover' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_instagram_hover_color',
+            [
+                'label' => __('Instagram', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::COLOR,
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-share-instagram:hover' => 'background-color: {{VALUE}};',
+                ],
+            ]
+        );
+
+        $this->end_controls_tab();
+        $this->end_controls_tabs();
+
+        // Hover Effects
+        $this->add_control(
+            'mgpg_social_hover_heading',
+            [
+                'label' => __('Hover Effects', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::HEADING,
+                'separator' => 'before',
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_hover_scale',
+            [
+                'label' => __('Scale on Hover', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'label_on' => __('Yes', 'magical-posts-display'),
+                'label_off' => __('No', 'magical-posts-display'),
+                'return_value' => 'yes',
+                'default' => 'yes',
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-social-share a:hover' => 'transform: scale(1.1);',
+                ],
+            ]
+        );
+
+        $this->add_control(
+            'mgpg_social_transition_speed',
+            [
+                'label' => __('Transition Speed (ms)', 'magical-posts-display'),
+                'type' => \Elementor\Controls_Manager::SLIDER,
+                'range' => [
+                    'px' => [
+                        'min' => 100,
+                        'max' => 1000,
+                        'step' => 50,
+                    ],
+                ],
+                'default' => [
+                    'size' => 300,
+                ],
+                'selectors' => [
+                    '{{WRAPPER}} .mgpd-social-share a' => 'transition: all {{SIZE}}ms ease;',
+                ],
+            ]
+        );
+
+        $this->end_controls_section();
+    }
+
+    /**
+     * Render premium features content
+     * 
+     * @param string $reading_time Show reading time
+     * @param string $view_count Show view count
+     * @param string $social_share Show social share
+     */
+    private function render_premium_features_content($reading_time, $view_count, $social_share)
+    {
+
+        if ($reading_time || $view_count) {
+            echo '<div class="mgpd-time-count-wrap">';
+            // Reading Time Display
+            if ($reading_time) {
+                $content = get_the_content();
+                $word_count = str_word_count(wp_strip_all_tags($content));
+                $reading_time_value = ceil($word_count / 200); // Average reading speed: 200 words per minute
+                echo '<div class="mgpd-reading-time">' . $this->get_reading_time_icon(16) . ' ' . $reading_time_value . ' min read</div>';
+            }
+
+            // Post Views Counter
+            if ($view_count) {
+                $post_views = get_post_meta(get_the_ID(), 'mp_post_post_viewed', true);
+                $post_views = $post_views ? $post_views : 0;
+                echo '<div class="mgpd-view-count">' . $this->get_view_count_icon(16) . ' ' . number_format($post_views) . ' views</div>';
+            }
+            echo '</div>';
+        }
+        // Social Share Buttons
+        if ($social_share) {
+            $post_url = get_permalink();
+            $post_title = get_the_title();
+            echo '<div class="mgpd-social-share">';
+            echo $this->get_all_social_share_buttons($post_url, $post_title, null, 20);
+            echo '</div>';
+        }
+    }
+
+    /**
+     * Render single post item
+     * Reusable method for both normal render and AJAX responses
+     * 
+     * @param array $settings Widget settings
+     * @param string $item_class CSS classes for the item wrapper
+     */
+    private function render_single_post_item($settings, $item_class = '')
+    {
+        $mgpg_post_style = $settings['mgpg_post_style'];
+        $mgpg_post_type = $settings['mgpg_post_type'];
+        $mgpg_post_img_show = $settings['mgpg_post_img_show'];
+        $mgpg_media_source = $settings['mgpg_media_source'] ?? 'featured';
+        $mgpg_premium_features_style = $settings['mgpg_premium_features_style'] ?? 'default';
+        $mgpg_show_title = $settings['mgpg_show_title'];
+        $mgpg_title_tag = $settings['mgpg_title_tag'];
+        $mgpg_crop_title = $settings['mgpg_crop_title'];
+        $mgpg_desc_show = $settings['mgpg_desc_show'];
+        $mgpg_crop_desc = $settings['mgpg_crop_desc'];
+        $mgpg_post_btn = $settings['mgpg_post_btn'];
+        $mgpg_btn_title = $settings['mgpg_btn_title'];
+        $mgpg_usebtn_icon = $settings['mgpg_usebtn_icon'];
+        $mgpg_btn_icon_position = $settings['mgpg_btn_icon_position'] ?? 'right';
+        $mgpg_btn_target = $settings['mgpg_btn_target'];
+        $mgpg_reading_time = $settings['mgpg_reading_time'] ?? false;
+        $mgpg_view_count = $settings['mgpg_view_count'] ?? false;
+        $mgpg_social_share = $settings['mgpg_social_share'] ?? false;
+?>
+        <div class="<?php echo esc_attr($item_class); ?>">
+            <div class="card mg-card mg-shadow mgp-card mb-4">
+                <?php
+                if ($mgpg_post_img_show) {
+                    echo '<div class="mp-post-img">';
+
+                    // Check if using advanced media source (Pro Only)
+                    if (mp_display_check_main_ok() && $mgpg_media_source && $mgpg_media_source !== 'featured') {
+                        $media_settings = array(
+                            'mgpg_media_source' => $mgpg_media_source,
+                            'mgpg_media_priority' => $settings['mgpg_media_priority'] ?? array('video', 'featured', 'content', 'placeholder'),
+                            'mgpg_video_play_icon' => $settings['mgpg_video_play_icon'] ?? 'yes'
+                        );
+                        echo $this->get_advanced_media(get_the_ID(), $media_settings);
+                    } else {
+                        // Use default featured image
+                        mp_post_thumbnail($mgpg_post_img_show);
+                    }
+
+                    // Premium features - Image Top style
+                    if (mp_display_check_main_ok() && $mgpg_premium_features_style === 'image-top') {
+                        echo '<div class="mgpd-premium-features">';
+                        $this->render_premium_features_content($mgpg_reading_time, $mgpg_view_count, $mgpg_social_share);
+                        echo '</div>';
+                    }
+
+                    // Premium features - Image Overlay style
+                    if (mp_display_check_main_ok() && $mgpg_premium_features_style === 'image-overlay') {
+                        echo '<div class="mgpd-premium-features">';
+                        $this->render_premium_features_content($mgpg_reading_time, $mgpg_view_count, $mgpg_social_share);
+                        echo '</div>';
+                    }
+
+                    echo '</div>';
+                }
+                ?>
+                <div class="mg-card-text card-body">
+                    <?php
+                    if ($mgpg_post_style == '3') {
+                    ?>
+                        <div class="magical-post-authon-category">
+                            <?php
+                            mpd_posts_meta($settings['mgpg_author_show']);
+                            mp_post_cat_display($settings['mgpg_category_show']);
+                            ?>
+                        </div>
+                    <?php
+                    }
+                    if ($mgpg_post_type == 'post' && ($mgpg_post_style == '1' || $mgpg_post_style == '2')) {
+                        mp_post_cat_display($settings['mgpg_category_show'], $settings['mgpg_cat_type'] ?? 'one', ', ');
+                    }
+                    ?>
+                    <?php
+                    mp_post_title($mgpg_show_title, $mgpg_title_tag, $mgpg_crop_title);
+                    ?>
+                    <?php
+                    if ($mgpg_post_style == '1') {
+                        mpd_posts_meta($settings['mgpg_author_show'], $settings['mgpg_date_show'], $settings['mgpg_comment_icon_show']);
+                    }
+                    ?>
+                    <?php if ($mgpg_desc_show) : ?>
+                        <p><?php
+                            if (has_excerpt()) {
+                                echo esc_html(wp_trim_words(get_the_excerpt(), $mgpg_crop_desc, '...'));
+                            } else {
+                                echo esc_html(wp_trim_words(get_the_content(), $mgpg_crop_desc, '...'));
+                            }
+                            ?>
+                        </p>
+                    <?php endif; ?>
+
+                    <?php
+                    // Premium Features Content (Pro Only) - Only show in default position
+                    if (mp_display_check_main_ok() && (!$mgpg_premium_features_style || $mgpg_premium_features_style === 'default')) {
+                        $this->render_premium_features_content($mgpg_reading_time, $mgpg_view_count, $mgpg_social_share);
+                    }
+                    ?>
+
+                    <?php
+                    if ($mgpg_post_style == '3') {
+                    ?>
+                        <div class="mgp_there_style-time">
+                            <span>
+                                <i class="fa-regular fa-calendar-days"></i>
+                                <?php echo esc_html(get_the_date('d M Y')); ?>
+                            </span>
+                            <?php
+                            if ($mgpg_post_btn && ($mgpg_post_style == '3')) {
+                                mp_post_btn(
+                                    $text = $mgpg_btn_title,
+                                    $icon_show = $mgpg_usebtn_icon,
+                                    $icon = $settings['mgpg_btn_icon'],
+                                    $icon_position = $mgpg_btn_icon_position,
+                                    $target = $mgpg_btn_target,
+                                    $class = $settings['mgpg_link_type'] ?? ''
+                                );
+                            }
+                            ?>
+                        </div>
+                    <?php
+                    }
+                    if ($mgpg_post_btn && ($mgpg_post_style == '1' || $mgpg_post_style == '2')) {
+                        mp_post_btn(
+                            $text = $mgpg_btn_title,
+                            $icon_show = $mgpg_usebtn_icon,
+                            $icon = $settings['mgpg_btn_icon'],
+                            $icon_position = $mgpg_btn_icon_position,
+                            $target = $mgpg_btn_target,
+                            $class = $settings['mgpg_link_type'] ?? ''
+                        );
+                    }
+
+                    if ($mgpg_post_style == '2') {
+                        mpd_posts_meta_author_date($settings['mgpg_author_show'], $settings['mgpg_date_show']);
+                    }
+
+                    mpd_post_tags($settings['mgpg_tag_show']);
+
+                    ?>
+                </div>
+
+            </div>
+        </div>
+        <?php
     }
 
@@ -2481 +3545 @@
 
         //grid layout
+        $mgpg_layout_type = $this->get_settings('mgpg_layout_type');
+        $mgpg_masonry_style = $this->get_settings('mgpg_masonry_style');
         $mgpg_post_style = $this->get_settings('mgpg_post_style');
         $mgpg_rownumber = $this->get_settings('mgpg_rownumber');
@@ -2496 +3562 @@
         $mgpg_btn_target = $this->get_settings('mgpg_btn_target');
         $mgpg_btn_icon = $this->get_settings('mgpg_btn_icon');
+
+        // Premium Features Settings (Pro Only)
+        $mgpg_ajax_filter = $this->get_settings('mgpg_ajax_filter');
+        $mgpg_infinite_scroll = $this->get_settings('mgpg_infinite_scroll');
+        $mgpg_reading_time = $this->get_settings('mgpg_reading_time');
+        $mgpg_view_count = $this->get_settings('mgpg_view_count');
+        $mgpg_social_share = $this->get_settings('mgpg_social_share');
+        $mgpg_hover_effects = $this->get_settings('mgpg_hover_effects');
+        $mgpg_premium_features_style = $this->get_settings('mgpg_premium_features_style');
+        $mgpg_media_source = $this->get_settings('mgpg_media_source');
         $mgpg_btn_icon_position = $this->get_settings('mgpg_btn_icon_position');
 
@@ -2509 +3585 @@
                 $column_set = 'col-lg-' . $mgpg_rownumber . ' col-md-6';
             }
-?>
-<div id="mgp-items" class="mgpd mgp-items style<?php echo esc_attr($mgpg_post_style); ?>">
-    <div class="row" data-masonry='{"percentPosition": true }'>
-        <?php while ($mgpg_posts->have_posts()) : $mgpg_posts->the_post(); ?>
-        <div class="<?php echo esc_attr($column_set); ?>">
-            <div class="card mg-card mg-shadow mgp-card mb-4">
-                <?php mp_post_thumbnail($mgpg_post_img_show); ?>
-                <div class="mg-card-text card-body">
+
+            // Add masonry specific classes
+            $container_class = 'mgpd mgp-items style' . esc_attr($mgpg_post_style);
+            $row_class = 'row';
+            $item_class = $column_set;
+
+            // Add premium feature classes
+            if ($mgpg_ajax_filter && mp_display_check_main_ok()) {
+                $container_class .= ' mgpd-ajax-filter-enabled';
+            }
+            if ($mgpg_infinite_scroll && mp_display_check_main_ok()) {
+                $container_class .= ' mgpd-infinite-scroll';
+            }
+            if ($mgpg_hover_effects && $mgpg_hover_effects !== 'none' && mp_display_check_main_ok()) {
+                $container_class .= ' mgpd-hover-' . esc_attr($mgpg_hover_effects);
+            }
+            // Add premium features style class
+            if ($mgpg_premium_features_style && $mgpg_premium_features_style !== 'default' && mp_display_check_main_ok()) {
+                $container_class .= ' mgpd-premium-' . esc_attr($mgpg_premium_features_style);
+            }
+
+            if ($mgpg_layout_type === 'masonry') {
+                $masonry_style = $mgpg_masonry_style ? $mgpg_masonry_style : 'style1';
+                $container_class .= ' mgpd-masonry-container mgpd-masonry-' . esc_attr($masonry_style);
+                $row_class .= ' mgpd-masonry';
+                $item_class .= ' mgpd-masonry-item';
+            }
+        ?>
+
+            <?php
+            // Premium Features - Category Filter (Pro Only) - Move to top
+            if (mp_display_check_main_ok() && $mgpg_ajax_filter && $mgpg_post_type == 'post') {
+                $categories = get_categories(array('hide_empty' => true));
+                if (!empty($categories)) {
+                    echo '<div class="mgpd-ajax-filter-container">';
+                    echo '<div class="mgpd-filter-buttons">';
+                    echo '<button class="mgpd-filter-btn active" data-category="all">' . __('All', 'magical-posts-display') . '</button>';
+                    foreach ($categories as $category) {
+                        echo '<button class="mgpd-filter-btn" data-category="' . esc_attr($category->slug) . '">' . esc_html($category->name) . '</button>';
+                    }
+                    echo '</div>';
+                    echo '</div>';
+                }
+            }
+            ?>
+
+            <div id="mgp-items" class="<?php echo esc_attr($container_class); ?>">
+                <div class="<?php echo esc_attr($row_class); ?>">
+                    <?php while ($mgpg_posts->have_posts()) : $mgpg_posts->the_post(); ?>
+                        <?php $this->render_single_post_item($settings, $item_class); ?>
                     <?php
-                    if ($mgpg_post_style == '3') {
+                    endwhile;
+                    wp_reset_postdata();
+                    wp_reset_postdata();
                     ?>
-                    <div class="magical-post-authon-category">
-                        <?php                                             
-                        mpd_posts_meta($settings['mgpg_author_show']);
-                        mp_post_cat_display($settings['mgpg_category_show']);
-                    ?>
-                    </div>
-                    <?php
+                </div>
+            </div>
+
+            <?php
+            // Inline Masonry Initialization Script for better compatibility
+            if ($mgpg_layout_type === 'masonry') {
+                $widget_id = uniqid('mgpd_masonry_');
+            ?>
+                <script type="text/javascript">
+                    (function() {
+                        // Initialize masonry for this specific widget
+                        function initMasonry<?php echo $widget_id; ?>() {
+                            var container = document.querySelector('.mgpd-masonry-container');
+                            if (container && typeof Masonry !== 'undefined' && typeof imagesLoaded !== 'undefined') {
+                                var masonryGrid = container.querySelector('.mgpd-masonry');
+                                if (masonryGrid) {
+                                    // Force all images to load first
+                                    imagesLoaded(masonryGrid, function() {
+                                        // Clear any existing height to let masonry calculate properly
+                                        masonryGrid.style.height = '';
+
+                                        // Initialize masonry
+                                        var masonry = new Masonry(masonryGrid, {
+                                            itemSelector: '.mgpd-masonry-item',
+                                            columnWidth: '.mgpd-masonry-item',
+                                            percentPosition: true,
+                                            transitionDuration: 0
+                                        });
+
+                                        // Store instance for global access
+                                        window.mgpdMasonryInstance = masonry;
+
+                                        // Force layout calculation after a brief delay
+                                        setTimeout(function() {
+                                            masonry.layout();
+                                        }, 100);
+                                    });
+                                }
+                            }
                         }
-                            if ($mgpg_post_type == 'post' && ($mgpg_post_style == '1' || $mgpg_post_style == '2')) {
-                            mp_post_cat_display($settings['mgpg_category_show'], $settings['mgpg_cat_type'], ', ');
-                            }
-                        ?>
-                    <?php
-                        mp_post_title($mgpg_show_title, $mgpg_title_tag, $mgpg_crop_title);
-                        ?>
-                    <?php
-                        if ($mgpg_post_style == '1') {
-                            mpd_posts_meta($settings['mgpg_author_show'], $settings['mgpg_date_show'], $settings['mgpg_comment_icon_show']);
+
+                        // Initialize when DOM is ready
+                        if (document.readyState === 'loading') {
+                            document.addEventListener('DOMContentLoaded', initMasonry<?php echo $widget_id; ?>);
+                        } else {
+                            initMasonry<?php echo $widget_id; ?>();
                         }
-                    ?>
-                    <?php if ($mgpg_desc_show) : ?>
-                    <p><?php
-                        if (has_excerpt()) {
-                            echo esc_html(wp_trim_words(get_the_excerpt(), $mgpg_crop_desc, '...'));
-                        } else {
-                            echo esc_html(wp_trim_words(get_the_content(), $mgpg_crop_desc, '...'));
-                        }
-                        ?>
-                    </p>
-                    <?php endif; ?>
-                    <?php
-                        if ($mgpg_post_style == '3') {
-                        ?>
-                    <div class="mgp_there_style-time">
-                        <span>
-                            <i class="fa-regular fa-calendar-days"></i>
-                            <?php echo esc_html(get_the_date('d M Y')); ?>
-                        </span>
-                        <?php
-                                if ($mgpg_post_btn && ($mgpg_post_style == '3')) {
-                                mp_post_btn(
-                                    $text = $mgpg_btn_title,
-                                    $icon_show = $mgpg_usebtn_icon,
-                                    $icon = $settings['mgpg_btn_icon'],
-                                    $icon_position = $mgpg_btn_icon_position,
-                                    $target = $mgpg_btn_target,
-                                    $class = $settings['mgpg_link_type']
-                                );
-                            }
-                            ?>
-                    </div>
-                    <?php
-                            }
-                            if ($mgpg_post_btn && ($mgpg_post_style == '1' || $mgpg_post_style == '2')) {
-                                mp_post_btn(
-                                    $text = $mgpg_btn_title,
-                                    $icon_show = $mgpg_usebtn_icon,
-                                    $icon = $settings['mgpg_btn_icon'],
-                                    $icon_position = $mgpg_btn_icon_position,
-                                    $target = $mgpg_btn_target,
-                                    $class = $settings['mgpg_link_type']
-                                );
-                            }
-
-                        if ($mgpg_post_style == '2') {
-                            mpd_posts_meta_author_date($settings['mgpg_author_show'], $settings['mgpg_date_show']);
-                        }
-
-                        mpd_post_tags($settings['mgpg_tag_show']);
-
-                        ?>
-                </div>
-
-            </div>
-        </div>
-        <?php
-            endwhile;
-            wp_reset_query();
-            wp_reset_postdata();
+
+                        // Also initialize on window load as fallback
+                        window.addEventListener('load', initMasonry<?php echo $widget_id; ?>);
+                    })();
+                </script>
+            <?php
+            }
             ?>
-    </div>
-</div>
-
-<?php
+
+            <?php
             if ($mgpg_pagination_show) {
                 mp_display_pagination($paged, $mgpg_posts, $settings['mgpg_pagination_style']);
             }
             ?>
+
+            <?php
+            // Premium Features JavaScript & HTML (Pro Only)
+            if (mp_display_check_main_ok()) {
+
+                // Infinite Scroll Trigger
+                if ($mgpg_infinite_scroll) {
+                    echo '<div class="mgpd-infinite-scroll-trigger" style="height: 1px; margin-top: 50px;"></div>';
+                    echo '<div class="mgpd-loading-spinner" style="display: none; text-align: center; padding: 20px;">';
+                    echo $this->get_loading_spinner_icon(40);
+                    echo '<span>' . __('Loading more posts...', 'magical-posts-display') . '</span>';
+                    echo '</div>';
+                }
+
+                // Only localize script if any premium features are enabled
+                if ($mgpg_ajax_filter || $mgpg_infinite_scroll || ($mgpg_hover_effects && $mgpg_hover_effects !== 'none')) {
+                    // Localize script data for JavaScript
+                    wp_localize_script('mgpd-premium-features', 'mgpd_ajax', array(
+                        'ajaxurl' => admin_url('admin-ajax.php'),
+                        'nonce' => wp_create_nonce('mgpd_ajax_nonce'),
+                        'settings' => $settings,
+                        'layout_type' => $mgpg_layout_type,
+                        'ajax_filter_enabled' => $mgpg_ajax_filter && $mgpg_post_type == 'post',
+                        'infinite_scroll_enabled' => $mgpg_infinite_scroll,
+                        'hover_effects_enabled' => $mgpg_hover_effects && $mgpg_hover_effects !== 'none',
+                        'current_page' => $paged,
+                        'max_pages' => $mgpg_posts->max_num_pages,
+                        'post_type' => $mgpg_post_type,
+                        'texts' => array(
+                            'error_loading' => __('Error loading posts. Please try again.', 'magical-posts-display'),
+                            'loading_more' => __('Loading more posts...', 'magical-posts-display')
+                        )
+                    ));
+                }
+            }
+            ?>
+
 <?php else :
             mp_display_posts_not_found($settings['mgpg_post_type']);
         endif;
     }
+
+    /**
+     * AJAX handler for category filtering
+     * Static method to be called from WordPress AJAX hooks
+     */
+    public static function ajax_filter_posts()
+    {
+        // Check nonce for security
+        if (!isset($_POST['nonce']) || !wp_verify_nonce(wp_unslash($_POST['nonce']), 'mgpd_ajax_nonce')) {
+            wp_die(__('Security check failed', 'magical-posts-display'));
+        }
+
+        // Check if pro version is active
+        if (!mp_display_check_main_ok()) {
+            wp_send_json_error(__('Premium feature requires pro version', 'magical-posts-display'));
+        }
+
+        $category = isset($_POST['category']) ? sanitize_text_field(wp_unslash($_POST['category'])) : '';
+        $settings = isset($_POST['settings']) ? wp_unslash($_POST['settings']) : array();
+        $post_type = isset($_POST['post_type']) ? sanitize_text_field(wp_unslash($_POST['post_type'])) : 'post';
+
+        // Build query args
+        $args = array(
+            'post_type' => $post_type,
+            'post_status' => 'publish',
+            'posts_per_page' => isset($settings['mgpg_posts_count']) ? absint($settings['mgpg_posts_count']) : 6,
+            'ignore_sticky_posts' => 1
+        );
+
+        // Add category filter if not "all"
+        if ($category !== 'all' && $post_type === 'post') {
+            $args['tax_query'] = array(
+                array(
+                    'taxonomy' => 'category',
+                    'field' => 'slug',
+                    'terms' => $category
+                )
+            );
+        }
+
+        $query = new WP_Query($args);
+        $output = '';
+
+        if ($query->have_posts()) {
+            // Instantiate widget to reuse render method
+            $widget = new self();
+
+            // Calculate item class - consistent with render() method
+            $mgpg_rownumber = isset($settings['mgpg_rownumber']) ? $settings['mgpg_rownumber'] : '4';
+            $mgpg_layout_type = isset($settings['mgpg_layout_type']) ? $settings['mgpg_layout_type'] : 'grid';
+
+            if ($mgpg_rownumber == '12') {
+                $item_class = 'col-lg-12';
+            } else {
+                $item_class = 'col-lg-' . $mgpg_rownumber . ' col-md-6';
+            }
+
+            if ($mgpg_layout_type === 'masonry') {
+                $item_class .= ' mgpd-masonry-item';
+            }
+
+            while ($query->have_posts()) {
+                $query->the_post();
+                ob_start();
+                $widget->render_single_post_item($settings, $item_class);
+                $output .= ob_get_clean();
+            }
+            wp_reset_postdata();
+        }
+
+        wp_send_json_success($output);
+    }
+
+    /**
+     * AJAX handler for infinite scroll
+     * Static method to be called from WordPress AJAX hooks
+     */
+    public static function ajax_infinite_scroll()
+    {
+        // Check nonce for security
+        if (!isset($_POST['nonce']) || !wp_verify_nonce(wp_unslash($_POST['nonce']), 'mgpd_ajax_nonce')) {
+            wp_die(__('Security check failed', 'magical-posts-display'));
+        }
+
+        // Check if pro version is active
+        if (!mp_display_check_main_ok()) {
+            wp_send_json_error(__('Premium feature requires pro version', 'magical-posts-display'));
+        }
+
+        $page = isset($_POST['page']) ? absint($_POST['page']) : 1;
+        $settings = isset($_POST['settings']) ? wp_unslash($_POST['settings']) : array();
+        $post_type = isset($_POST['post_type']) ? sanitize_text_field(wp_unslash($_POST['post_type'])) : 'post';
+
+        // Build query args
+        $args = array(
+            'post_type' => $post_type,
+            'post_status' => 'publish',
+            'posts_per_page' => isset($settings['mgpg_posts_count']) ? absint($settings['mgpg_posts_count']) : 6,
+            'paged' => $page,
+            'ignore_sticky_posts' => 1
+        );
+
+        $query = new WP_Query($args);
+        $output = '';
+
+        if ($query->have_posts()) {
+            // Instantiate widget
+            $widget = new self();
+
+            // Calculate item class - consistent with render() method
+            $mgpg_rownumber = isset($settings['mgpg_rownumber']) ? $settings['mgpg_rownumber'] : '4';
+            $mgpg_layout_type = isset($settings['mgpg_layout_type']) ? $settings['mgpg_layout_type'] : 'grid';
+
+            if ($mgpg_rownumber == '12') {
+                $item_class = 'col-lg-12';
+            } else {
+                $item_class = 'col-lg-' . $mgpg_rownumber . ' col-md-6';
+            }
+
+            if ($mgpg_layout_type === 'masonry') {
+                $item_class .= ' mgpd-masonry-item';
+            }
+
+            while ($query->have_posts()) {
+                $query->the_post();
+                ob_start();
+                $widget->render_single_post_item($settings, $item_class);
+                $output .= ob_get_clean();
+            }
+            wp_reset_postdata();
+        }
+        wp_send_json_success($output);
+    }
 }

magical-posts-display/trunk/includes/elementor/widgets/posts-list.php

@@ -1878 +1878 @@
                     <?php
                     endwhile;
-                    wp_reset_query();
+                    wp_reset_postdata();
                     wp_reset_postdata();
                     ?>

magical-posts-display/trunk/includes/elementor/widgets/posts-slider.php

@@ -1700 +1700 @@
 
                     endwhile;
-                    wp_reset_query();
+                    wp_reset_postdata();
                     wp_reset_postdata();
                     ?>
@@ -1742 +1742 @@
         $mgps_btn_target = $settings['mgps_btn_target'];
         $mgps_layout_style = $settings['mgps_layout_style'];
-        
+
         if ($mgps_layout_style === 'style_two') {
             $this->render_style_two($settings, $mgpslide_category, $mgps_post_btn, $mgps_btn_title, $mgps_usebtn_icon, $mgps_btn_icon_position, $mgps_btn_target);
@@ -1800 +1800 @@
             ?>
         </div>
-        <?php
+    <?php
     }
 
     private function render_style_two($settings, $mgpslide_category, $mgps_post_btn, $mgps_btn_title, $mgps_usebtn_icon, $mgps_btn_icon_position, $mgps_btn_target)
     {
-        ?>
+    ?>
         <!-- Slides Style Two -->
         <div class="swiper-slide mgs-item mgs-item-style-two">
@@ -1855 +1855 @@
             </div>
         </div>
-        <?php
+<?php
     }
 }

magical-posts-display/trunk/includes/elementor/widgets/posts-tab.php

@@ -2094 +2094 @@
                                                 <?php
                                                 endwhile;
-                                                wp_reset_query();
+                                                wp_reset_postdata();
                                                 wp_reset_postdata();
                                                 ?>

magical-posts-display/trunk/includes/elementor/widgets/posts-ticker.php

@@ -686 +686 @@
                         <?php
                         endwhile;
-                        wp_reset_query();
+                        wp_reset_postdata();
                         wp_reset_postdata();
                         ?>

magical-posts-display/trunk/includes/mp-posts-function.php

@@ -78 +78 @@
                 <?php
                 // translators: %s: list of categories
-                $categories_text = sprintf(esc_html__('%s', 'magical-addons-for-elementor'), $mpg_cat_list);
+                $categories_text = sprintf(esc_html__('%s', 'magical-posts-display'), $mpg_cat_list);
                 printf('<span class="mgp-post-cats">%s</span>', wp_kses_post($categories_text));
                 ?>
@@ -154 +154 @@
 
 
-function mpd_validate_html_tag($tag, $default_tag = 'h2', $allowed_tags = array()) {
+function mpd_validate_html_tag($tag, $default_tag = 'h2', $allowed_tags = array())
+{
     // Use the provided whitelist or fall back to a predefined set of safe tags
     $safe_tags = !empty($allowed_tags) ? $allowed_tags : array(
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'span', 'p'
+        'h1',
+        'h2',
+        'h3',
+        'h4',
+        'h5',
+        'h6',
+        'div',
+        'span',
+        'p'
     );
 

magical-posts-display/trunk/magical-posts-display.php

@@ -1 +1 @@
 <?php
-/*
- * @link              http://wpthemespace.com
- * @since             1.0.0
- * @package           Magical Posts Display
+
+/**
+ * Plugin Name: Magical Posts Display
+ * Plugin URI: http://wpthemespace.com/magical-posts-display
+ * Description: Show your site posts, Pages and Custom Post Types with many different styles by Elementor Widgets.
+ * Version: 1.2.54
+ * Author: Noor Alam
+ * Author URI: http://wpthemespace.com
+ * Text Domain: magical-posts-display
+ * Domain Path: /languages
+ * Requires at least: 6.0
+ * Requires PHP: 7.4
+ * License: GPL-2.0+
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.txt
  *
- * @wordpress-plugin
- * Plugin Name:       Magical Posts Display
- * Plugin URI:        http://wpthemespace.com
- * Description:       Show your site posts, Pages and Custom Post Types with many different styles by Elementor Widgets.
- * Version:           1.2.53
- * Author:            Noor alam
- * Author URI:        https://profiles.wordpress.org/nalam-1
- * License:           GPL-2.0+
- * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
- * Text Domain:       magical-posts-display
- * Domain Path:       /languages
+ * @package magical-posts-display
  */
 
@@ -21 +21 @@
     exit; // Exit if accessed directly.
 }
+
 
 /**
@@ -37 +38 @@
          * @var string The plugin version.
          */
-        const version = '1.2.53';
+        const version = '1.2.54';
 
         /**
@@ -46 +47 @@
          * @var string Minimum PHP version required to run the plugin.
          */
-        const MINIMUM_PHP_VERSION = '5.6';
-
-
+        const MINIMUM_PHP_VERSION = '7.4';
         /**
          * Instance
@@ -96 +95 @@
             add_action('plugins_loaded', [$this, 'init']);
             add_filter('plugin_action_links_' . plugin_basename(__FILE__), [$this, 'admin_adminpro_link']);
-            add_action('init', [$this, 'elementor_notice_hide_options']);
             require_once('lib/custom-template/pagetemplater.php');
             require_once('includes/elementor/extra.php');
         }
 
-        // After active go homepage
-        /*
-    public function mgpd_plugin_homego($plugin)
-    {
-        if (plugin_basename(__FILE__) == $plugin) {
-            wp_redirect(admin_url('admin.php?page=mgpd-page'));
-            die();
-        }
-    }
-    */
+        // After active go homepage - functionality removed
+        // Was: mgpd_plugin_homego method for redirect after activation
 
         public  function admin_adminpro_link($links)
         {
-            $newlink = sprintf("<a target='_blank' href='%s'><span style='color:red;font-weight:bold'>%s</span></a>", esc_url('https://wpthemespace.com/product/magical-posts-display-pro/?add-to-cart=8239'), __('Get Pro', 'optionsdemo'));
+            $newlink = sprintf("<a target='_blank' href='%s'><span style='color:red;font-weight:bold'>%s</span></a>", esc_url('https://wpthemespace.com/product/magical-posts-display-pro/?add-to-cart=8239'), __('Get Pro', 'magical-posts-display'));
             if (empty(mp_display_check_main_ok())) {
                 $links[] = $newlink;
@@ -147 +137 @@
         public function init()
         {
-
+            // Include all plugin files
             require_once('file-include.php');
 
-            //  require_once( 'lib/carbon-fields/vendor/autoload.php' );
+            // Initialize new user settings
             $this->mgposts_new_user();
 
+            // Handle Carbon Fields loading for older installations
             $install_date = gmdate("Y-m-d", strtotime(get_option('mgposte_install_date', current_time('mysql', true))));
             $compare_date = '2023-03-07';
@@ -162 +153 @@
             }
 
-
-
             // Check for required PHP version
             if (version_compare(PHP_VERSION, self::MINIMUM_PHP_VERSION, '<')) {
-                add_action('admin_notices', [$this, 'admin_notice_minimum_php_version']);
-                return;
-            }
-            //
-            add_action('admin_enqueue_scripts', [$this, 'mgpost_display_editor_scripts']);
-            add_action('enqueue_block_assets', [$this, 'mgpblock_style']);
-            add_action('enqueue_block_assets', [$this, 'mgpblock_scripts']);
-            add_action('enqueue_block_editor_assets', [$this, 'mgpblock_editor_scripts']);
-
-            // Add image size
-            add_image_size('slider-bg', 1600, 600, true);
-            add_image_size('card-grid', 600, 900, true);
-            add_image_size('card-list', 600, 700, true);
-
-            // Check if Elementor installed and activated
+                return; // Admin notice is now handled by admin-info.php
+            }
+
+            // Load Elementor integration if available
             if (did_action('elementor/loaded')) {
                 require_once('includes/elementor/elementor-main.php');
-            } else {
-                global $pagenow;
-                if (in_array($pagenow, array('plugins.php', 'admin.php')) && !(get_option('mgelhide9'))) {
-                    add_action('admin_notices', [$this, 'admin_notice_missing_main_plugin']);
+            }
+
+            // Track plugin activation and installation
+            $this->track_plugin_usage();
+
+            // Initialize Appsero tracking after 2 days
+            $mgposte_install_date = get_option('mgposte_install_date');
+            if (!empty($mgposte_install_date)) {
+                $install_day = round((time() - strtotime($mgposte_install_date)) / 24 / 60 / 60);
+                if ($install_day > 2) {
+                    //$this->appsero_init_tracker_magical_posts_display();
                 }
             }
+        }
+
+        /**
+         * Track plugin usage
+         */
+        public function track_plugin_usage()
+        {
             $is_plugin_activated = get_option('mgposte_plugin_activated');
             if ('yes' !== $is_plugin_activated) {
                 update_option('mgposte_plugin_activated', 'yes');
             }
+
             $mgposte_install_date = get_option('mgposte_install_date');
             if (empty($mgposte_install_date)) {
                 update_option('mgposte_install_date', current_time('mysql'));
             }
-            if (!empty($mgposte_install_date)) {
-                $install_day = round((time() - strtotime($mgposte_install_date)) / 24 / 60 / 60);
-                if ($install_day > 2) {
-                    $this->appsero_init_tracker_magical_posts_display();
-                }
-            }
-        }
-
-        public function elementor_notice_hide_options()
-        {
-            if (isset($_GET['mgelhide']) && $_GET['mgelhide'] == 1) {
-                //  delete_option( 'mgelhide');
-                update_option('mgelhide9', 1);
-            }
-        }
-
-
-        /**
-         * Admin notice
-         *
-         * Warning when the site doesn't have Elementor installed or activated.
-         *
-         * @since 1.0.0
-         *
-         * @access public
-         */
-        public function admin_notice_missing_main_plugin()
-        {
-            if (get_option('mgelhide9')) {
-                return;
-            }
-            if (isset($_GET['activate'])) unset($_GET['activate']);
-
-
-            if (file_exists(WP_PLUGIN_DIR . '/elementor/elementor.php')) {
-                $magial_eactive_url = wp_nonce_url('plugins.php?action=activate&plugin=elementor/elementor.php&plugin_status=all&paged=1', 'activate-plugin_elementor/elementor.php');
-                $message = sprintf(
-                    /* translators: 1: Plugin name 2: Elementor 3: Elementor installation link */
-                    esc_html__('%1$s Recommended %2$s plugin, which is currently NOT RUNNING  %3$s', 'magical-posts-display'),
-                    '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
-                    '<strong>' . esc_html__('Elementor', 'magical-posts-display') . '</strong>',
-                    '<a class="button button-primary" style="margin-left:20px" href="' . $magial_eactive_url . '">' . __('Activate Elementor', 'magical-posts-display') . '</a>'
-
-                );
-            } else {
-                $magial_einstall_url =  wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=elementor'), 'install-plugin_elementor');
-                $message = sprintf(
-                    /* translators: 1: Plugin name 2: Elementor 3: Elementor installation link */
-                    esc_html__('%1$s Recommended %2$s plugin for use all Elementor addons, which is currently NOT RUNNING  %3$s', 'magical-posts-display'),
-                    '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
-                    '<strong>' . esc_html__('Elementor', 'magical-posts-display') . '</strong>',
-                    '<a class="button button-primary" style="margin-left:20px" href="' . $magial_einstall_url . '">' . __('Install Elementor', 'magical-posts-display') . '</a>'
-                    /* '<a class="button skipelementor" style="margin-left:20px" href="#">' . __('Skip it for only use Gutenberg addons', 'magical-posts-display') . '</a>' */
-
-                );
-            }
-
-            printf('<div class="notice notice-warning is-dismissible mgpd-notice"><p style="padding: 13px 0">%1$s</p></div>', wp_kses_post($message));
-        }
-
-
-
-        /**
-         * Add style and scripts
-         *
-         * Add the plugin style and scripts for this
-         *
-         * @since 1.0.0
-         *
-         * @access public
-         */
-        public function mgpblock_style()
-        {
-            wp_register_style(
-                'swiper',
-                plugins_url('/assets/css/swiper.min.css', __FILE__),
-                [],
-                '8.4.5',
-                'all'
-            );
-
-            wp_enqueue_style('venobox.min', plugins_url('/assets/css/venobox.min.css', __FILE__), array(), '1.0.0', 'all');
-            wp_enqueue_style('bootstrap', plugins_url('/assets/css/bootstrap.min.css', __FILE__), array(), '5.1.1', 'all');
-            wp_enqueue_style('mpd-fonts', plugins_url('/assets/css/fontello.css', __FILE__), array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-            //  wp_enqueue_style('swiper.min', plugins_url('/assets/css/swiper.min.css', __FILE__), array(), '5.3.8', 'all');
-            wp_enqueue_style('mpd-style', plugins_url('/assets/css/mp-style.css', __FILE__), array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-        }
-
-        public function mgpblock_scripts()
-        {
-
-            wp_register_script(
-                'mg-swiper',
-                plugins_url('/assets/js/swiper.min.js', __FILE__),
-                ['jquery'],
-                '8.4.5',
-                true
-            );
-            wp_register_script(
-                'jquery.easy-ticker',
-                plugins_url('/assets/js/jquery.easy-ticker.min.js', __FILE__),
-                ['jquery'],
-                '3.1.0',
-                true
-            );
-
-            wp_enqueue_script('masonry');
-            wp_enqueue_script('venobox-js', plugins_url('/assets/js/venobox.min.js', __FILE__), array('jquery'), '1.0.0', true);
-            wp_enqueue_script('bootstrap.bundle.min', plugins_url('/assets/js/bootstrap.bundle.min.js', __FILE__), array('jquery'), '5.1.1', false);
-            wp_enqueue_script('mpd-main', plugins_url('/assets/js/main.js', __FILE__), array('jquery'), MAGICAL_POSTS_DISPLAY_VERSION, true);
-        }
-
-        /**
-         * Add style and scripts for gutenburg editor
-         *
-         * Add the plugin style and scripts for gutenburg editor
-         *
-         * @since 1.0.4
-         *
-         * @access public
-         */
-        public function mgpblock_editor_scripts()
-        {
-            wp_enqueue_style('mp-admin-block', plugins_url('/assets/css/mgblock-admin.css', __FILE__), array(), '1.0.0', 'all');
-        }
-
-
-        /**
-         * Add style and scripts for editor
-         *
-         * Add the plugin style and scripts for editor only
-         *
-         * @since 1.0.0
-         *
-         * @access public
-         */
-        public function mgpost_display_editor_scripts()
-        {
-            global $pagenow;
-
-
-            wp_enqueue_style('mp-admin-style', plugins_url('/assets/css/admin-style.css', __FILE__), array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-            if (in_array($pagenow, array('post-new.php', 'post.php'))) {
-                wp_enqueue_script('cmb2-conditional-logic', plugins_url('/assets/js/cmb2-conditional-logic.js', __FILE__), array('jquery'), '2.5.1', true);
-            }
-            if (isset($_GET['page']) && $_GET['page'] == 'mgpd-page') {
-                wp_enqueue_style('mp-admin-page', plugins_url('/assets/css/mgadmin-page.css', __FILE__), array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-                wp_enqueue_style('venobox.min', plugins_url('/assets/css/venobox.min.css', __FILE__), array(), MAGICAL_POSTS_DISPLAY_VERSION, 'all');
-                wp_enqueue_script('venobox-js', plugins_url('/assets/js/venobox.min.js', __FILE__), array('jquery'), MAGICAL_POSTS_DISPLAY_VERSION, true);
-            }
-            wp_enqueue_script('mgntc-js', plugins_url('/assets/js/mgntc.js', __FILE__), array('jquery'), '1.0.0', true);
         }
 
@@ -363 +205 @@
 
 
-
-
-        /**
-         * Admin notice
-         *
-         * Warning when the site doesn't have a minimum required PHP version.
-         *
-         * @since 1.0.0
-         *
-         * @access public
-         */
-        public function admin_notice_minimum_php_version()
-        {
-
-            if (isset($_GET['activate'])) unset($_GET['activate']);
-
-            $message = sprintf(
-                /* translators: 1: Plugin name 2: PHP 3: Required PHP version */
-                esc_html__('"%1$s" requires "%2$s" version %3$s or greater.', 'magical-posts-display'),
-                '<strong>' . esc_html__('Magical Posts Display', 'magical-posts-display') . '</strong>',
-                '<strong>' . esc_html__('PHP', 'magical-posts-display') . '</strong>',
-                self::MINIMUM_PHP_VERSION
-            );
-
-            printf(
-                '<div class="notice notice-warning is-dismissible"><p>%1$s</p></div>',
-                wp_kses_post($message)
-            );
-        }