Changeset 1744797

Timestamp:

10/11/2017 02:10:48 PM (18 months ago)

Author:

euthelup

Message:

update to 1.4.8

Location:

pixtypes

Files:

• tags/1.4.8 (copied) (copied from pixtypes/trunk)
• tags/1.4.8/README.md (modified) (1 diff)
• tags/1.4.8/class-pixtypes.php (copied) (copied from pixtypes/trunk/class-pixtypes.php) (19 diffs)
• tags/1.4.8/core/classes/HTMLElement.php (modified) (1 diff)
• tags/1.4.8/core/classes/HTMLTag.php (modified) (1 diff)
• tags/1.4.8/core/classes/Meta.php (modified) (1 diff)
• tags/1.4.8/core/classes/Processor.php (modified) (1 diff)
• tags/1.4.8/core/classes/Validator.php (modified) (1 diff)
• tags/1.4.8/core/classes/forms/Form.php (modified) (1 diff)
• tags/1.4.8/core/classes/forms/FormField.php (modified) (1 diff)
• tags/1.4.8/core/defaults.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/HTMLElement.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/HTMLTag.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/Meta.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/Processor.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/Validator.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/extended/Form.php (modified) (1 diff)
• tags/1.4.8/core/interfaces/extended/FormField.php (modified) (1 diff)
• tags/1.4.8/features/class-pix-query.php (deleted)
• tags/1.4.8/features/custom-entities.php (deleted)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2 (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/.gitignore (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/README.md (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/cmb-field-select2.php (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/css (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/css/select2.css (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2 (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2-init.js (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2/select2.css (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2/select2.full.min.js (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2/select2.min.css (added)
• tags/1.4.8/features/metaboxes/cmb-field-select2-v2/js/select2/select2.min.js (added)
• tags/1.4.8/features/metaboxes/css/style.css (copied) (copied from pixtypes/trunk/features/metaboxes/css/style.css)
• tags/1.4.8/features/metaboxes/init.php (modified) (1 diff)
• tags/1.4.8/features/metaboxes/metaboxes.php (copied) (copied from pixtypes/trunk/features/metaboxes/metaboxes.php) (1 diff)
• tags/1.4.8/features/metaboxes/scss/style.scss (copied) (copied from pixtypes/trunk/features/metaboxes/scss/style.scss)
• tags/1.4.8/js/admin.js (modified) (2 diffs)
• tags/1.4.8/pixtypes.php (copied) (copied from pixtypes/trunk/pixtypes.php) (4 diffs)
• tags/1.4.8/readme.txt (copied) (copied from pixtypes/trunk/readme.txt)
• tags/1.4.8/settings/post_types.php (modified) (2 diffs)
• tags/1.4.8/views/admin.php (modified) (3 diffs)
• trunk/README.md (modified) (1 diff)
• trunk/class-pixtypes.php (modified) (19 diffs)
• trunk/core/classes/HTMLElement.php (modified) (1 diff)
• trunk/core/classes/HTMLTag.php (modified) (1 diff)
• trunk/core/classes/Meta.php (modified) (1 diff)
• trunk/core/classes/Processor.php (modified) (1 diff)
• trunk/core/classes/Validator.php (modified) (1 diff)
• trunk/core/classes/forms/Form.php (modified) (1 diff)
• trunk/core/classes/forms/FormField.php (modified) (1 diff)
• trunk/core/defaults.php (modified) (1 diff)
• trunk/core/interfaces/HTMLElement.php (modified) (1 diff)
• trunk/core/interfaces/HTMLTag.php (modified) (1 diff)
• trunk/core/interfaces/Meta.php (modified) (1 diff)
• trunk/core/interfaces/Processor.php (modified) (1 diff)
• trunk/core/interfaces/Validator.php (modified) (1 diff)
• trunk/core/interfaces/extended/Form.php (modified) (1 diff)
• trunk/core/interfaces/extended/FormField.php (modified) (1 diff)
• trunk/features/class-pix-query.php (deleted)
• trunk/features/custom-entities.php (deleted)
• trunk/features/metaboxes/cmb-field-select2-v2 (added)
• trunk/features/metaboxes/cmb-field-select2-v2/.gitignore (added)
• trunk/features/metaboxes/cmb-field-select2-v2/README.md (added)
• trunk/features/metaboxes/cmb-field-select2-v2/cmb-field-select2.php (added)
• trunk/features/metaboxes/cmb-field-select2-v2/css (added)
• trunk/features/metaboxes/cmb-field-select2-v2/css/select2.css (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2 (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2-init.js (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2/select2.css (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2/select2.full.min.js (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2/select2.min.css (added)
• trunk/features/metaboxes/cmb-field-select2-v2/js/select2/select2.min.js (added)
• trunk/features/metaboxes/init.php (modified) (1 diff)
• trunk/features/metaboxes/metaboxes.php (modified) (1 diff)
• trunk/js/admin.js (modified) (2 diffs)
• trunk/pixtypes.php (modified) (4 diffs)
• trunk/settings/post_types.php (modified) (2 diffs)
• trunk/views/admin.php (modified) (3 diffs)

pixtypes/tags/1.4.8/README.md

@@ -49 +49 @@
                 ),
                 'has_archive'   => 'portfolio-archive',
-                'menu_icon'     => 'report.png',
+                'menu_icon'     => 'dashicons-portfolio',
                 'menu_position' => null,
                 'hierarchical' => true,

pixtypes/tags/1.4.8/class-pixtypes.php

@@ -25 +25 @@
      * @const   string
      */
-    protected $version = '1.4.7';
+    protected $version;
     /**
      * Unique identifier for your plugin.
@@ -72 +72 @@
      *
      * @since     1.0.0
-     */
-    protected function __construct() {
-
+     *
+     * @param string $version
+     */
+    protected function __construct( $version = '1.0.0' ) {
+        $this->version = $version;
         $this->plugin_basepath = plugin_dir_path( __FILE__ );
         $this->config          = self::config();
@@ -80 +82 @@
         // Load plugin text domain
         add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
-//      add_action( 'admin_init', array( $this, 'wpgrade_init_plugin' ) );
 
         // Add the options page and menu item only when is needed.
@@ -92 +93 @@
         }
 
-        // Load admin style sheet and JavaScript.
+        // Load admin stylesheet and JavaScript files.
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
 
-        // Load public-facing style sheet and JavaScript.
-//      add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-//      add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-
         add_action( 'plugins_loaded', array( $this, 'register_metaboxes' ), 14 );
         add_action( 'init', array( $this, 'register_entities' ), 99999 );
 
-        // We need this later that the default 10 so we can have things happening between the init-10 and the PixTypes config
+        // We need this later then the default 10 priority so we can have things happening between the init-10 and the PixTypes config
         add_action( 'init', array( $this, 'theme_version_check' ), 15 );
 
         /**
-         * Ajax Callbacks
+         * Ajax Callbacks - only for logged in users
          */
         add_action( 'wp_ajax_unset_pixtypes', array( &$this, 'ajax_unset_pixtypes' ) );
-        add_action( 'wp_ajax_nopriv_unset_pixtypes', array( &$this, 'ajax_unset_pixtypes' ) );
     }
 
@@ -118 +114 @@
      * @since     1.0.0
      *
+     * @param string $version The current plugin version.
      * @return    object    A single instance of this class.
      */
-    public static function get_instance() {
+    public static function get_instance( $version = '1.0.0' ) {
 
         // If the single instance hasn't been set, set it now.
         if ( null == self::$instance ) {
-            self::$instance = new self;
+            self::$instance = new self( $version );
         }
 
@@ -133 +130 @@
         // @TODO maybe check this
         return include 'plugin-config.php';
-    }
-
-    public function wpgrade_init_plugin() {
-//      $this->plugin_textdomain();
-//      $this->add_wpgrade_shortcodes_button();
     }
 
@@ -184 +176 @@
                     if ( ! empty( $theme_types[ $current_theme ]['post_types'] ) ) {
                         foreach ( $theme_types[ $current_theme ]['post_types'] as $key => $post_type ) {
-                            $testable_slug = $is_slug_unique = '';
-                            $testable_slug = str_replace( $theme_name . '-', '', $post_type["rewrite"]["slug"] );
+                            $testable_slug = str_replace( $theme_name . '-', '', $post_type['rewrite']['slug'] );
 
                             /** for our current theme we try to prioritize slugs */
-                            if ( isset( $post_type["rewrite"] ) && self::is_custom_post_type_slug_unique( $testable_slug ) ) {
+                            if ( isset( $post_type['rewrite'] ) && self::is_custom_post_type_slug_unique( $testable_slug ) ) {
                                 /** this slug is unique we can quit the theme suffix */
-                                $theme_types[ $current_theme ]['post_types'][ $key ]["rewrite"]["slug"] = $testable_slug;
+                                $theme_types[ $current_theme ]['post_types'][ $key ]['rewrite']['slug'] = $testable_slug;
                             }
 
                             // process menu icon if it exists
                             if ( isset( $post_type['menu_icon'] ) ) {
-                                $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] = plugins_url( 'assets/' . $post_type['menu_icon'], __FILE__ );
+                                // If we have been given a dashicon, use it without processing
+                                if ( false !== strpos( $post_type['menu_icon'], 'dashicon' ) ) {
+                                    $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] =  $post_type['menu_icon'];
+                                } else {
+                                    $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] = plugins_url( 'assets/' . $post_type['menu_icon'], __FILE__ );
+                                }
                             }
                         }
@@ -203 +199 @@
                     if ( ! empty( $theme_types[ $current_theme ]['taxonomies'] ) ) {
                         foreach ( $theme_types[ $current_theme ]['taxonomies'] as $key => $tax ) {
-                            $testable_slug = $is_slug_unique = '';
-                            $testable_slug = str_replace( $theme_name . '-', '', $tax["rewrite"]["slug"] );
-                            if ( isset( $tax["rewrite"] ) && self::is_tax_slug_unique( $testable_slug ) ) {
+                            $testable_slug = str_replace( $theme_name . '-', '', $tax['rewrite']['slug'] );
+                            if ( isset( $tax['rewrite'] ) && self::is_tax_slug_unique( $testable_slug ) ) {
                                 /** this slug is unique we can quit the theme suffix */
-                                $theme_types[ $current_theme ]['taxonomies'][ $key ]["rewrite"]["slug"] = $testable_slug;
+                                $theme_types[ $current_theme ]['taxonomies'][ $key ]['rewrite']['slug'] = $testable_slug;
                             }
                         }
@@ -218 +213 @@
         update_option( $config['settings-key'], $types_settings );
 
-//      flush_rewrite_rules();
-//      global $wp_rewrite;
-//      $wp_rewrite->generate_rewrite_rules();
-//      flush_rewrite_rules();
-
         /**
          * http://wordpress.stackexchange.com/questions/36152/flush-rewrite-rules-not-working-on-plugin-deactivation-invalid-urls-not-showing
-         * nothing from above works in plugin so ...
+         * nothing from above works in plugins so ...
          */
         delete_option( 'rewrite_rules' );
@@ -299 +289 @@
 
     /**
-     * Register and enqueue public-facing style sheet.
-     *
-     * @since    1.0.0
-     */
-    function enqueue_styles() {
-        wp_enqueue_style( $this->plugin_slug . '-plugin-styles', plugins_url( 'css/public.css', __FILE__ ), array(), $this->version );
-    }
-
-    /**
-     * Register and enqueues public-facing JavaScript files.
-     *
-     * @since    1.0.0
-     */
-    public function enqueue_scripts() {
-        wp_enqueue_script( $this->plugin_slug . '-plugin-script', plugins_url( 'js/public.js', __FILE__ ), array( 'jquery' ), $this->version );
-    }
-
-    /**
      * Register the administration menu for this plugin into the WordPress Dashboard menu.
      */
@@ -322 +294 @@
 
         $this->plugin_screen_hook_suffix = add_options_page(
-            esc_html__( 'PixTypes', $this->plugin_slug ),
-            esc_html__( 'PixTypes', $this->plugin_slug ),
+            esc_html__( 'PixTypes', 'pixtypes' ),
+            esc_html__( 'PixTypes', 'pixtypes' ),
             'manage_options',
             $this->plugin_slug,
@@ -342 +314 @@
      */
     function add_action_links( $links ) {
-        return array_merge( array( 'settings' => '<a href="' . admin_url( 'options-general.php?page=pixtypes' ) . '">' . esc_html__( 'Settings', $this->plugin_slug ) . '</a>' ), $links );
+        return array_merge( array( 'settings' => '<a href="' . admin_url( 'options-general.php?page=pixtypes' ) . '">' . esc_html__( 'Settings', 'pixtypes' ) . '</a>' ), $links );
     }
 
     function register_entities() {
-        require_once( $this->plugin_basepath . 'features/custom-entities.php' );
+        // register post types
+        $options = $updated_options  = apply_filters( 'pixtypes_settings_pre_register_entitites', get_option( 'pixtypes_settings' ) );
+        $updated_options['display_settings'] = false;
+
+        // go through each theme and activate portfolio post types
+        if ( empty( $options['themes'] ) || ! array( $options['themes'] ) ) {
+            return;
+        }
+
+        /** A pixelgrade theme will always have this class so we know we can import new settings **/
+        $current_theme = false;
+        if ( class_exists( 'wpgrade' ) ) {
+            $current_theme = wpgrade::shortname();
+        }
+
+        $theme_types = $options['themes'];
+        foreach ( $theme_types as $key => $theme ) {
+            // post types
+            if ( isset( $theme['post_types'] ) && is_array( $theme['post_types'] ) ) {
+                // Remember what post types we have removed from settings so we can skip registering their taxonomies
+                $deleted_post_types = array();
+                foreach ( $theme['post_types'] as $post_type => $post_type_args ) {
+                    // First check if the post type is already registered - we bail if that is the case
+                    if ( post_type_exists( $post_type ) ) {
+                        continue;
+                    }
+
+                    // Second, for post types not belonging to the current theme, we only register them if there are posts
+                    if ( false !== $current_theme && $key != $current_theme ) {
+                        // We get the posts to see if there are any - we include all post statuses (trash and auto-draft need to be specified directly)
+                        $posts = get_posts( array( 'post_type' => $post_type, 'post_status' => array( 'any', 'trash', 'auto-draft' ), 'posts_per_page' => '1' ) );
+                        if ( empty( $posts ) ) {
+                            // We should also delete the post type from the settings - no worries; if the theme gets activated again, all this will come back
+                            // This is just for auto-cleanup
+                            unset( $updated_options['themes'][ $key ]['post_types'][ $post_type ] );
+                            $deleted_post_types[] = $post_type;
+                            continue;
+                        }
+                    }
+
+                    $is_jetpack_compatible = false;
+                    if ( strpos( $post_type, 'jetpack' ) !== false ) {
+                        ///$xxxx = str_replace(  'jetpack-', '', $post_type);
+                        $is_jetpack_compatible = true;
+                    }
+
+                    if ( $is_jetpack_compatible ) {
+                        $post_type_key = strstr( $post_type, '-' );
+                        $post_type_key = substr( $post_type_key, 1 );
+                    } else {
+                        // eliminate the theme prefix
+                        $post_type_key = strstr( $post_type, '_' );
+                        $post_type_key = substr( $post_type_key, 1 );
+                    }
+
+                    // process menu icon if it exists
+                    if ( isset( $post_type_args['menu_icon'] ) ) {
+                        // If we have been given a dashicon or full URL, use it without processing
+                        if ( false === strpos( $post_type_args['menu_icon'], 'dashicon' ) && false === filter_var( $post_type_args['menu_icon'], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED ) ) {
+                            $post_type_args['menu_icon'] = plugins_url( 'assets/' . $post_type_args['menu_icon'], __FILE__ );
+                        }
+                    }
+
+                    if ( isset( $options[ 'enable_' . $post_type_key ] ) ) {
+                        $updated_options['display_settings'] = true;
+                        if ( $options[ 'enable_' . $post_type_key ] ) {
+                            register_post_type( $post_type, $post_type_args );
+                        }
+                    }
+                }
+            }
+
+            // taxonomies
+            if ( isset( $theme['taxonomies'] ) && is_array( $theme['taxonomies'] ) ) {
+                foreach ( $theme['taxonomies'] as $tax => $tax_args ) {
+                    // First check if the taxonomy is already registered - we bail if that is the case
+                    if ( taxonomy_exists( $tax ) ) {
+                        continue;
+                    }
+
+                    // If we have deleted post types settings we need to skip registering their taxonomies
+                    if ( ! empty( $tax_args['post_types'] ) && ! empty( $deleted_post_types ) ) {
+                        if ( ! is_array( $tax_args['post_types'] ) ) {
+                            if ( in_array( $tax_args['post_types'], $deleted_post_types ) ) {
+                                continue;
+                            }
+                        } else {
+                            $temp = array_diff( $tax_args['post_types'], $deleted_post_types );
+                            if ( empty( $temp ) ) {
+                                continue;
+                            }
+                        }
+                    }
+
+                    $tax_post_types = $tax_args['post_types'];
+                    // remove "post_types", isn't a register_taxonomy argument we are just using it for post type linking
+                    unset( $tax_args['post_types'] );
+
+                    $is_jetpack_compatible = false;
+                    if ( strpos( $tax, 'jetpack' ) !== false ) {
+                        ///$xxxx = str_replace(  'jetpack-', '', $tax);
+                        $is_jetpack_compatible = true;
+                    }
+
+                    if ( $is_jetpack_compatible ) {
+                        $tax_key = strstr( $tax, '-' );
+                        $tax_key = substr( $tax_key, 1 );
+                    } else {
+                        // eliminate the theme prefix
+                        $tax_key = strstr( $tax, '_' );
+                        $tax_key = substr( $tax_key, 1 );
+                    }
+
+                    if ( isset( $options[ 'enable_' . $tax_key ] ) ) {
+                        $updated_options['display_settings'] = true;
+                        if ( $options[ 'enable_' . $tax_key ] ) {
+                            register_taxonomy( $tax, $tax_post_types, $tax_args );
+                        }
+                    }
+                }
+            }
+        }
+
+        // Only update if we have actually changed something
+        if ( $options != $updated_options ) {
+            update_option( 'pixtypes_settings', $updated_options );
+        }
     }
 
@@ -369 +467 @@
             $rewrite = $post_type->rewrite;
             /** if this post_type has a rewrite rule check for it */
-            if ( ! empty( $rewrite ) && isset( $rewrite["slug"] ) && $slug == $rewrite["slug"] ) {
+            if ( ! empty( $rewrite ) && isset( $rewrite['slug'] ) && $slug == $rewrite['slug'] ) {
                 $is_unique = false;
             } elseif ( $slug == $key ) {
@@ -388 +486 @@
      */
     static function is_tax_slug_unique( $slug ) {
-
         global $wp_taxonomies;
+
+        /** Suppose it's true */
         $is_unique = true;
-        /** Suppose it's true */
 
         foreach ( $wp_taxonomies as $key => $tax ) {
             $rewrite = $tax->rewrite;
             /** if this post_type has a rewrite rule check for it */
-            if ( ! empty( $rewrite ) && isset( $rewrite["slug"] ) && $slug == $rewrite["slug"] ) {
+            if ( ! empty( $rewrite ) && isset( $rewrite['slug'] ) && $slug == $rewrite['slug'] ) {
                 $is_unique = false;
             } elseif ( $slug == $key ) {
@@ -433 +531 @@
                 ),
                 'has_archive'   => 'portfolio-archive',
-                'menu_icon'     => plugins_url( 'assets/report.png', __FILE__ ),
+                'menu_icon'     => 'dashicons-portfolio',
                 'supports'      => array( 'title', 'editor', 'thumbnail', 'page-attributes', 'excerpt' ),
                 'yarpp_support' => true,
@@ -459 +557 @@
                 'has_archive'   => 'galleries-archive',
                 'menu_position' => null,
+                'menu_icon'     => 'dashicons-format-gallery',
                 'supports'      => array( 'title', 'thumbnail', 'page-attributes', 'excerpt' ),
                 'yarpp_support' => true,
@@ -546 +645 @@
 
     /**
-     * Ajax callback for unseting unneeded post types
+     * Ajax callback for cleaning up the settings for a theme
      */
     function ajax_unset_pixtypes() {
@@ -555 +654 @@
         }
 
-        if ( isset( $_POST['post_type'] ) ) {
-            $key     = $_POST['post_type'];
+        if ( isset( $_POST['theme_slug'] ) ) {
+            $key     = $_POST['theme_slug'];
             $options = get_option( 'pixtypes_settings' );
             if ( isset( $options['themes'][ $key ] ) ) {
                 unset( $options['themes'][ $key ] );
                 update_option( 'pixtypes_settings', $options );
-                $result['msg']     = 'Post type ' . $key . ' is gone.';
+                $result['msg']     = 'Settings for ' . ucfirst( $key ) . ' have been cleaned up!';
                 $result['success'] = true;
             }
@@ -574 +673 @@
      */
     function theme_version_check() {
-
-        $options = get_option( 'pixtypes_settings' );
-
-        if ( class_exists( 'wpgrade' ) && isset( $options['wpgrade_theme_version'] ) ) {
-
-            if ( wpgrade::themeversion() != $options['wpgrade_theme_version'] ) {
+        if ( class_exists( 'wpgrade' ) ) {
+            // Each theme should have it's pixtypes config theme version saved
+            $options = get_option( 'pixtypes_settings' );
+
+            // Make sure that we fix things just in case
+            if ( ! isset( $options['wpgrade_theme_version'] ) ) {
+                $options['wpgrade_theme_version'] = '0.0.1';
+            }
+
+            if ( version_compare( wpgrade::themeversion(), $options['wpgrade_theme_version'], '!=' ) ) {
                 // here the theme is updating it's options
-                $test = function_exists( 'wpgrade_callback_geting_active' );
-
-                wpgrade_callback_geting_active();
-                // the plugin will copy these options into it's own field
-                self::activate( false );
-                // end finally merge user's settings with the theme ones
-                save_pixtypes_settings( $options );
-
+                if ( function_exists( 'wpgrade_callback_geting_active' ) ) {
+                    wpgrade_callback_geting_active();
+                    // the plugin will copy these options into it's own field
+                    self::activate( false );
+                    // end finally merge user's settings with the theme ones
+                    save_pixtypes_settings( $options );
+                }
             }
         }

pixtypes/tags/1.4.8/core/classes/HTMLElement.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/HTMLTag.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/Meta.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/Processor.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/Validator.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/forms/Form.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/classes/forms/FormField.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/defaults.php

@@ -28 +28 @@
         'errors' => array
             (
-                'is_numeric' => esc_html__('Numberic value required.', pixtypes::textdomain()),
-                'not_empty' => esc_html__('Field is required.', pixtypes::textdomain()),
+                'is_numeric' => esc_html__('Numberic value required.', 'pixtypes' ),
+                'not_empty' => esc_html__('Field is required.', 'pixtypes' ),
             ),
 

pixtypes/tags/1.4.8/core/interfaces/HTMLElement.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/HTMLTag.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/Meta.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/Processor.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/Validator.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/extended/Form.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/core/interfaces/extended/FormField.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/tags/1.4.8/features/metaboxes/init.php

@@ -1012 +1012 @@
             // validate meta value
             if ( isset( $field['validate_func'] ) ) {
-                $ok = call_user_func( array( 'cmb_Meta_Box_Validate', $field['validate_func'] ), $new );
+                $ok = call_user_func( $field['validate_func'], $new, $field, $post_id );
                 if ( $ok === false ) { // pass away when meta value is invalid
                     continue;

pixtypes/tags/1.4.8/features/metaboxes/metaboxes.php

@@ -53 +53 @@
 
         require_once 'cmb-field-select2/cmb-field-select2.php';
+        require_once 'cmb-field-select2-v2/cmb-field-select2.php';
     }
 

pixtypes/tags/1.4.8/js/admin.js

@@ -61 +61 @@
         /** ajax callbacks */
         $('#unset_pixypes').on('click', 'button', function(e){
-            var response = confirm('Be sure that you don\'t need this post type anymore');
+            var response = confirm('Make sure that you have moved the theme specific content you were interested in. If at any time you wish to access it again, reactivate that previous theme.');
 
             if ( response == false ) {
@@ -69 +69 @@
 
                 var ajax_nounce = $(this).parents('ul').siblings('.unset_nonce').val();
-                // reload likes number
+                // Cleanup pixtypes settings
                 jQuery.ajax({
-                    type: "post",url: locals.ajax_url,data: { action: 'unset_pixtypes', _ajax_nonce: ajax_nounce, post_type: $(this).val() },
+                    type: "post",url: locals.ajax_url,data: { action: 'unset_pixtypes', _ajax_nonce: ajax_nounce, theme_slug: $(this).val() },
                     //beforeSend: function() {jQuery("#loading").show("slow");}, //show loading just when link is clicked
                     //complete: function() { jQuery("#loading").hide("fast");}, //stop showing loading when the process is complete

pixtypes/tags/1.4.8/pixtypes.php

@@ -1 +1 @@
 <?php
 /*
-* @package   PixTypes
-* @author    Pixelgrade <[email protected]>
-* @license   GPL-2.0+
-* @link      https://pixelgrade.com
-* @copyright 2013-2017 Pixelgrade
-*
-* @wordpress-plugin
-Plugin Name: PixTypes
-Plugin URI:  https://pixelgrade.com
-Description: Custom post types and meta-boxes needed by your theme
-Version: 1.4.7
-Author: Pixelgrade
-Author URI: https://pixelgrade.com
-Author Email: [email protected]
-Text Domain: pixtypes
-License:     GPL-2.0+
-License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Domain Path: /lang
-*/
+ * Plugin Name: PixTypes
+ * Plugin URI: https://wordpress.org/plugins/pixtypes/
+ * Description: Custom post types and meta-boxes needed by your themes.
+ * Version: 1.4.8
+ * Author URI: https://pixelgrade.com
+ * Author Email: [email protected]
+ * License: GPL2+
+ * Text Domain: pixtypes
+ * Domain Path: /lang/
+ */
 
 // If this file is called directly, abort.
@@ -34 +25 @@
 
 $config = include 'plugin-config' . EXT;
-include 'features/class-pix-query' . EXT;
 // set textdomain
 pixtypes::settextdomain( $config['textdomain'] );
@@ -56 +46 @@
 // --------------
 
-$basepath     = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
-$callbackpath = $basepath . 'callbacks' . DIRECTORY_SEPARATOR;
+$basepath     = trailingslashit( dirname( __FILE__ ) );
+$callbackpath = trailingslashit( $basepath . 'callbacks' );
 pixtypes::require_all( $callbackpath );
 
@@ -67 +57 @@
 
 global $pixtypes_plugin;
-$pixtypes_plugin = PixTypesPlugin::get_instance();
+$pixtypes_plugin = PixTypesPlugin::get_instance( '1.4.8' );

pixtypes/tags/1.4.8/settings/post_types.php

@@ -7 +7 @@
 
 $options = get_option( 'pixtypes_settings' );
-// go through each theme and activate portfolio post types
-if ( isset( $options["themes"] ) ) {
-    $theme_types = $options["themes"];
+// go through each theme and activate the post types settings
+if ( isset( $options['themes'] ) ) {
+    $theme_types = $options['themes'];
     foreach ( $theme_types as $key => $theme ) {
 
@@ -23 +23 @@
             }
             $display_settings = true;
-        } else {
-            return array( 'type' => 'hidden' );
         }
     }
+}
+
+// Check if we have any post type that should be shown settings
+$hide = true;
+foreach ( $display_option as $post_type => $display ) {
+    if ( $display ) {
+        $hide = false;
+        break;
+    }
+}
+
+if ( $hide ) {
+    return array( 'type' => 'hidden' );
 }
 

pixtypes/tags/1.4.8/views/admin.php

@@ -43 +43 @@
         <?php endif; ?>
 
-        <?php echo $f = pixtypes::form( $config, $processor );
-        echo $f->field( 'hiddens' )->render(); ?>
+        <?php
+        $f = pixtypes::form( $config, $processor ); ?>
+
+        <?php echo $f->startform() ?>
+
+        <?php echo $f->field( 'hiddens' )->render(); ?>
 
         <?php echo $f->field( 'post_types' )->render(); ?>
@@ -70 +74 @@
 
             <div class="handlediv" title="Click to toggle"><br></div>
-            <h3 class="hndle"><span><?php esc_html_e( 'Danger Zone', 'pixtypes' ); ?></span></h3>
+            <h3 class="hndle"><span><?php esc_html_e( 'Extra Careful Zone', 'pixtypes' ); ?></span></h3>
 
             <div class="inside">
 
-                <p><?php esc_html_e( 'If you are done with copying your content from old post types to new ones, you can also get rid of the old post types.', 'pixtypes' ); ?></p>
+                <p><?php esc_html_e( 'If you are done with copying your content from old themes to new ones, you can also get rid of the old themes settings and post types.', 'pixtypes' ); ?></p>
                 <form method="post" id="unset_pixypes"
                       action="<?php echo admin_url( 'options-general.php?page=pixtypes' ) ?>">
@@ -83 +87 @@
                         if ( isset( $options['themes'] ) && count( $options['themes'] ) > 1 ) {
                             foreach ( $options['themes'] as $key => $theme ) {
-                                echo '<li><button class="button delete-action" type="submit" name="unset_pixtype" value="' . $key . '">' . esc_html__( 'Unset', 'pixtypes' ) . ' ' . $key . '</button></li>';
+                                echo '<li><button class="button delete-action" type="submit" name="unset_pixtype" value="' . $key . '">' . esc_html__( 'Clean-up after', 'pixtypes' ) . ' ' . ucfirst( $key ) . '</button></li>';
                             }
                         } ?>

pixtypes/trunk/README.md

@@ -49 +49 @@
                 ),
                 'has_archive'   => 'portfolio-archive',
-                'menu_icon'     => 'report.png',
+                'menu_icon'     => 'dashicons-portfolio',
                 'menu_position' => null,
                 'hierarchical' => true,

pixtypes/trunk/class-pixtypes.php

@@ -25 +25 @@
      * @const   string
      */
-    protected $version = '1.4.7';
+    protected $version;
     /**
      * Unique identifier for your plugin.
@@ -72 +72 @@
      *
      * @since     1.0.0
-     */
-    protected function __construct() {
-
+     *
+     * @param string $version
+     */
+    protected function __construct( $version = '1.0.0' ) {
+        $this->version = $version;
         $this->plugin_basepath = plugin_dir_path( __FILE__ );
         $this->config          = self::config();
@@ -80 +82 @@
         // Load plugin text domain
         add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
-//      add_action( 'admin_init', array( $this, 'wpgrade_init_plugin' ) );
 
         // Add the options page and menu item only when is needed.
@@ -92 +93 @@
         }
 
-        // Load admin style sheet and JavaScript.
+        // Load admin stylesheet and JavaScript files.
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
 
-        // Load public-facing style sheet and JavaScript.
-//      add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-//      add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-
         add_action( 'plugins_loaded', array( $this, 'register_metaboxes' ), 14 );
         add_action( 'init', array( $this, 'register_entities' ), 99999 );
 
-        // We need this later that the default 10 so we can have things happening between the init-10 and the PixTypes config
+        // We need this later then the default 10 priority so we can have things happening between the init-10 and the PixTypes config
         add_action( 'init', array( $this, 'theme_version_check' ), 15 );
 
         /**
-         * Ajax Callbacks
+         * Ajax Callbacks - only for logged in users
          */
         add_action( 'wp_ajax_unset_pixtypes', array( &$this, 'ajax_unset_pixtypes' ) );
-        add_action( 'wp_ajax_nopriv_unset_pixtypes', array( &$this, 'ajax_unset_pixtypes' ) );
     }
 
@@ -118 +114 @@
      * @since     1.0.0
      *
+     * @param string $version The current plugin version.
      * @return    object    A single instance of this class.
      */
-    public static function get_instance() {
+    public static function get_instance( $version = '1.0.0' ) {
 
         // If the single instance hasn't been set, set it now.
         if ( null == self::$instance ) {
-            self::$instance = new self;
+            self::$instance = new self( $version );
         }
 
@@ -133 +130 @@
         // @TODO maybe check this
         return include 'plugin-config.php';
-    }
-
-    public function wpgrade_init_plugin() {
-//      $this->plugin_textdomain();
-//      $this->add_wpgrade_shortcodes_button();
     }
 
@@ -184 +176 @@
                     if ( ! empty( $theme_types[ $current_theme ]['post_types'] ) ) {
                         foreach ( $theme_types[ $current_theme ]['post_types'] as $key => $post_type ) {
-                            $testable_slug = $is_slug_unique = '';
-                            $testable_slug = str_replace( $theme_name . '-', '', $post_type["rewrite"]["slug"] );
+                            $testable_slug = str_replace( $theme_name . '-', '', $post_type['rewrite']['slug'] );
 
                             /** for our current theme we try to prioritize slugs */
-                            if ( isset( $post_type["rewrite"] ) && self::is_custom_post_type_slug_unique( $testable_slug ) ) {
+                            if ( isset( $post_type['rewrite'] ) && self::is_custom_post_type_slug_unique( $testable_slug ) ) {
                                 /** this slug is unique we can quit the theme suffix */
-                                $theme_types[ $current_theme ]['post_types'][ $key ]["rewrite"]["slug"] = $testable_slug;
+                                $theme_types[ $current_theme ]['post_types'][ $key ]['rewrite']['slug'] = $testable_slug;
                             }
 
                             // process menu icon if it exists
                             if ( isset( $post_type['menu_icon'] ) ) {
-                                $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] = plugins_url( 'assets/' . $post_type['menu_icon'], __FILE__ );
+                                // If we have been given a dashicon, use it without processing
+                                if ( false !== strpos( $post_type['menu_icon'], 'dashicon' ) ) {
+                                    $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] =  $post_type['menu_icon'];
+                                } else {
+                                    $theme_types[ $current_theme ]['post_types'][ $key ]['menu_icon'] = plugins_url( 'assets/' . $post_type['menu_icon'], __FILE__ );
+                                }
                             }
                         }
@@ -203 +199 @@
                     if ( ! empty( $theme_types[ $current_theme ]['taxonomies'] ) ) {
                         foreach ( $theme_types[ $current_theme ]['taxonomies'] as $key => $tax ) {
-                            $testable_slug = $is_slug_unique = '';
-                            $testable_slug = str_replace( $theme_name . '-', '', $tax["rewrite"]["slug"] );
-                            if ( isset( $tax["rewrite"] ) && self::is_tax_slug_unique( $testable_slug ) ) {
+                            $testable_slug = str_replace( $theme_name . '-', '', $tax['rewrite']['slug'] );
+                            if ( isset( $tax['rewrite'] ) && self::is_tax_slug_unique( $testable_slug ) ) {
                                 /** this slug is unique we can quit the theme suffix */
-                                $theme_types[ $current_theme ]['taxonomies'][ $key ]["rewrite"]["slug"] = $testable_slug;
+                                $theme_types[ $current_theme ]['taxonomies'][ $key ]['rewrite']['slug'] = $testable_slug;
                             }
                         }
@@ -218 +213 @@
         update_option( $config['settings-key'], $types_settings );
 
-//      flush_rewrite_rules();
-//      global $wp_rewrite;
-//      $wp_rewrite->generate_rewrite_rules();
-//      flush_rewrite_rules();
-
         /**
          * http://wordpress.stackexchange.com/questions/36152/flush-rewrite-rules-not-working-on-plugin-deactivation-invalid-urls-not-showing
-         * nothing from above works in plugin so ...
+         * nothing from above works in plugins so ...
          */
         delete_option( 'rewrite_rules' );
@@ -299 +289 @@
 
     /**
-     * Register and enqueue public-facing style sheet.
-     *
-     * @since    1.0.0
-     */
-    function enqueue_styles() {
-        wp_enqueue_style( $this->plugin_slug . '-plugin-styles', plugins_url( 'css/public.css', __FILE__ ), array(), $this->version );
-    }
-
-    /**
-     * Register and enqueues public-facing JavaScript files.
-     *
-     * @since    1.0.0
-     */
-    public function enqueue_scripts() {
-        wp_enqueue_script( $this->plugin_slug . '-plugin-script', plugins_url( 'js/public.js', __FILE__ ), array( 'jquery' ), $this->version );
-    }
-
-    /**
      * Register the administration menu for this plugin into the WordPress Dashboard menu.
      */
@@ -322 +294 @@
 
         $this->plugin_screen_hook_suffix = add_options_page(
-            esc_html__( 'PixTypes', $this->plugin_slug ),
-            esc_html__( 'PixTypes', $this->plugin_slug ),
+            esc_html__( 'PixTypes', 'pixtypes' ),
+            esc_html__( 'PixTypes', 'pixtypes' ),
             'manage_options',
             $this->plugin_slug,
@@ -342 +314 @@
      */
     function add_action_links( $links ) {
-        return array_merge( array( 'settings' => '<a href="' . admin_url( 'options-general.php?page=pixtypes' ) . '">' . esc_html__( 'Settings', $this->plugin_slug ) . '</a>' ), $links );
+        return array_merge( array( 'settings' => '<a href="' . admin_url( 'options-general.php?page=pixtypes' ) . '">' . esc_html__( 'Settings', 'pixtypes' ) . '</a>' ), $links );
     }
 
     function register_entities() {
-        require_once( $this->plugin_basepath . 'features/custom-entities.php' );
+        // register post types
+        $options = $updated_options  = apply_filters( 'pixtypes_settings_pre_register_entitites', get_option( 'pixtypes_settings' ) );
+        $updated_options['display_settings'] = false;
+
+        // go through each theme and activate portfolio post types
+        if ( empty( $options['themes'] ) || ! array( $options['themes'] ) ) {
+            return;
+        }
+
+        /** A pixelgrade theme will always have this class so we know we can import new settings **/
+        $current_theme = false;
+        if ( class_exists( 'wpgrade' ) ) {
+            $current_theme = wpgrade::shortname();
+        }
+
+        $theme_types = $options['themes'];
+        foreach ( $theme_types as $key => $theme ) {
+            // post types
+            if ( isset( $theme['post_types'] ) && is_array( $theme['post_types'] ) ) {
+                // Remember what post types we have removed from settings so we can skip registering their taxonomies
+                $deleted_post_types = array();
+                foreach ( $theme['post_types'] as $post_type => $post_type_args ) {
+                    // First check if the post type is already registered - we bail if that is the case
+                    if ( post_type_exists( $post_type ) ) {
+                        continue;
+                    }
+
+                    // Second, for post types not belonging to the current theme, we only register them if there are posts
+                    if ( false !== $current_theme && $key != $current_theme ) {
+                        // We get the posts to see if there are any - we include all post statuses (trash and auto-draft need to be specified directly)
+                        $posts = get_posts( array( 'post_type' => $post_type, 'post_status' => array( 'any', 'trash', 'auto-draft' ), 'posts_per_page' => '1' ) );
+                        if ( empty( $posts ) ) {
+                            // We should also delete the post type from the settings - no worries; if the theme gets activated again, all this will come back
+                            // This is just for auto-cleanup
+                            unset( $updated_options['themes'][ $key ]['post_types'][ $post_type ] );
+                            $deleted_post_types[] = $post_type;
+                            continue;
+                        }
+                    }
+
+                    $is_jetpack_compatible = false;
+                    if ( strpos( $post_type, 'jetpack' ) !== false ) {
+                        ///$xxxx = str_replace(  'jetpack-', '', $post_type);
+                        $is_jetpack_compatible = true;
+                    }
+
+                    if ( $is_jetpack_compatible ) {
+                        $post_type_key = strstr( $post_type, '-' );
+                        $post_type_key = substr( $post_type_key, 1 );
+                    } else {
+                        // eliminate the theme prefix
+                        $post_type_key = strstr( $post_type, '_' );
+                        $post_type_key = substr( $post_type_key, 1 );
+                    }
+
+                    // process menu icon if it exists
+                    if ( isset( $post_type_args['menu_icon'] ) ) {
+                        // If we have been given a dashicon or full URL, use it without processing
+                        if ( false === strpos( $post_type_args['menu_icon'], 'dashicon' ) && false === filter_var( $post_type_args['menu_icon'], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED ) ) {
+                            $post_type_args['menu_icon'] = plugins_url( 'assets/' . $post_type_args['menu_icon'], __FILE__ );
+                        }
+                    }
+
+                    if ( isset( $options[ 'enable_' . $post_type_key ] ) ) {
+                        $updated_options['display_settings'] = true;
+                        if ( $options[ 'enable_' . $post_type_key ] ) {
+                            register_post_type( $post_type, $post_type_args );
+                        }
+                    }
+                }
+            }
+
+            // taxonomies
+            if ( isset( $theme['taxonomies'] ) && is_array( $theme['taxonomies'] ) ) {
+                foreach ( $theme['taxonomies'] as $tax => $tax_args ) {
+                    // First check if the taxonomy is already registered - we bail if that is the case
+                    if ( taxonomy_exists( $tax ) ) {
+                        continue;
+                    }
+
+                    // If we have deleted post types settings we need to skip registering their taxonomies
+                    if ( ! empty( $tax_args['post_types'] ) && ! empty( $deleted_post_types ) ) {
+                        if ( ! is_array( $tax_args['post_types'] ) ) {
+                            if ( in_array( $tax_args['post_types'], $deleted_post_types ) ) {
+                                continue;
+                            }
+                        } else {
+                            $temp = array_diff( $tax_args['post_types'], $deleted_post_types );
+                            if ( empty( $temp ) ) {
+                                continue;
+                            }
+                        }
+                    }
+
+                    $tax_post_types = $tax_args['post_types'];
+                    // remove "post_types", isn't a register_taxonomy argument we are just using it for post type linking
+                    unset( $tax_args['post_types'] );
+
+                    $is_jetpack_compatible = false;
+                    if ( strpos( $tax, 'jetpack' ) !== false ) {
+                        ///$xxxx = str_replace(  'jetpack-', '', $tax);
+                        $is_jetpack_compatible = true;
+                    }
+
+                    if ( $is_jetpack_compatible ) {
+                        $tax_key = strstr( $tax, '-' );
+                        $tax_key = substr( $tax_key, 1 );
+                    } else {
+                        // eliminate the theme prefix
+                        $tax_key = strstr( $tax, '_' );
+                        $tax_key = substr( $tax_key, 1 );
+                    }
+
+                    if ( isset( $options[ 'enable_' . $tax_key ] ) ) {
+                        $updated_options['display_settings'] = true;
+                        if ( $options[ 'enable_' . $tax_key ] ) {
+                            register_taxonomy( $tax, $tax_post_types, $tax_args );
+                        }
+                    }
+                }
+            }
+        }
+
+        // Only update if we have actually changed something
+        if ( $options != $updated_options ) {
+            update_option( 'pixtypes_settings', $updated_options );
+        }
     }
 
@@ -369 +467 @@
             $rewrite = $post_type->rewrite;
             /** if this post_type has a rewrite rule check for it */
-            if ( ! empty( $rewrite ) && isset( $rewrite["slug"] ) && $slug == $rewrite["slug"] ) {
+            if ( ! empty( $rewrite ) && isset( $rewrite['slug'] ) && $slug == $rewrite['slug'] ) {
                 $is_unique = false;
             } elseif ( $slug == $key ) {
@@ -388 +486 @@
      */
     static function is_tax_slug_unique( $slug ) {
-
         global $wp_taxonomies;
+
+        /** Suppose it's true */
         $is_unique = true;
-        /** Suppose it's true */
 
         foreach ( $wp_taxonomies as $key => $tax ) {
             $rewrite = $tax->rewrite;
             /** if this post_type has a rewrite rule check for it */
-            if ( ! empty( $rewrite ) && isset( $rewrite["slug"] ) && $slug == $rewrite["slug"] ) {
+            if ( ! empty( $rewrite ) && isset( $rewrite['slug'] ) && $slug == $rewrite['slug'] ) {
                 $is_unique = false;
             } elseif ( $slug == $key ) {
@@ -433 +531 @@
                 ),
                 'has_archive'   => 'portfolio-archive',
-                'menu_icon'     => plugins_url( 'assets/report.png', __FILE__ ),
+                'menu_icon'     => 'dashicons-portfolio',
                 'supports'      => array( 'title', 'editor', 'thumbnail', 'page-attributes', 'excerpt' ),
                 'yarpp_support' => true,
@@ -459 +557 @@
                 'has_archive'   => 'galleries-archive',
                 'menu_position' => null,
+                'menu_icon'     => 'dashicons-format-gallery',
                 'supports'      => array( 'title', 'thumbnail', 'page-attributes', 'excerpt' ),
                 'yarpp_support' => true,
@@ -546 +645 @@
 
     /**
-     * Ajax callback for unseting unneeded post types
+     * Ajax callback for cleaning up the settings for a theme
      */
     function ajax_unset_pixtypes() {
@@ -555 +654 @@
         }
 
-        if ( isset( $_POST['post_type'] ) ) {
-            $key     = $_POST['post_type'];
+        if ( isset( $_POST['theme_slug'] ) ) {
+            $key     = $_POST['theme_slug'];
             $options = get_option( 'pixtypes_settings' );
             if ( isset( $options['themes'][ $key ] ) ) {
                 unset( $options['themes'][ $key ] );
                 update_option( 'pixtypes_settings', $options );
-                $result['msg']     = 'Post type ' . $key . ' is gone.';
+                $result['msg']     = 'Settings for ' . ucfirst( $key ) . ' have been cleaned up!';
                 $result['success'] = true;
             }
@@ -574 +673 @@
      */
     function theme_version_check() {
-
-        $options = get_option( 'pixtypes_settings' );
-
-        if ( class_exists( 'wpgrade' ) && isset( $options['wpgrade_theme_version'] ) ) {
-
-            if ( wpgrade::themeversion() != $options['wpgrade_theme_version'] ) {
+        if ( class_exists( 'wpgrade' ) ) {
+            // Each theme should have it's pixtypes config theme version saved
+            $options = get_option( 'pixtypes_settings' );
+
+            // Make sure that we fix things just in case
+            if ( ! isset( $options['wpgrade_theme_version'] ) ) {
+                $options['wpgrade_theme_version'] = '0.0.1';
+            }
+
+            if ( version_compare( wpgrade::themeversion(), $options['wpgrade_theme_version'], '!=' ) ) {
                 // here the theme is updating it's options
-                $test = function_exists( 'wpgrade_callback_geting_active' );
-
-                wpgrade_callback_geting_active();
-                // the plugin will copy these options into it's own field
-                self::activate( false );
-                // end finally merge user's settings with the theme ones
-                save_pixtypes_settings( $options );
-
+                if ( function_exists( 'wpgrade_callback_geting_active' ) ) {
+                    wpgrade_callback_geting_active();
+                    // the plugin will copy these options into it's own field
+                    self::activate( false );
+                    // end finally merge user's settings with the theme ones
+                    save_pixtypes_settings( $options );
+                }
             }
         }

pixtypes/trunk/core/classes/HTMLElement.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/HTMLTag.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/Meta.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/Processor.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/Validator.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/forms/Form.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/classes/forms/FormField.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/defaults.php

@@ -28 +28 @@
         'errors' => array
             (
-                'is_numeric' => esc_html__('Numberic value required.', pixtypes::textdomain()),
-                'not_empty' => esc_html__('Field is required.', pixtypes::textdomain()),
+                'is_numeric' => esc_html__('Numberic value required.', 'pixtypes' ),
+                'not_empty' => esc_html__('Field is required.', 'pixtypes' ),
             ),
 

pixtypes/trunk/core/interfaces/HTMLElement.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/HTMLTag.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/Meta.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/Processor.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/Validator.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/extended/Form.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/core/interfaces/extended/FormField.php

@@ -1 +1 @@
 <?php defined('ABSPATH') or die;
-
-/* This file is property of Pixel Grade Media. You may NOT copy, or redistribute
- * it. Please see the license that came with your copy for more information.
- */
 
 /**

pixtypes/trunk/features/metaboxes/init.php

@@ -1012 +1012 @@
             // validate meta value
             if ( isset( $field['validate_func'] ) ) {
-                $ok = call_user_func( array( 'cmb_Meta_Box_Validate', $field['validate_func'] ), $new );
+                $ok = call_user_func( $field['validate_func'], $new, $field, $post_id );
                 if ( $ok === false ) { // pass away when meta value is invalid
                     continue;

pixtypes/trunk/features/metaboxes/metaboxes.php

@@ -53 +53 @@
 
         require_once 'cmb-field-select2/cmb-field-select2.php';
+        require_once 'cmb-field-select2-v2/cmb-field-select2.php';
     }
 

pixtypes/trunk/js/admin.js

@@ -61 +61 @@
         /** ajax callbacks */
         $('#unset_pixypes').on('click', 'button', function(e){
-            var response = confirm('Be sure that you don\'t need this post type anymore');
+            var response = confirm('Make sure that you have moved the theme specific content you were interested in. If at any time you wish to access it again, reactivate that previous theme.');
 
             if ( response == false ) {
@@ -69 +69 @@
 
                 var ajax_nounce = $(this).parents('ul').siblings('.unset_nonce').val();
-                // reload likes number
+                // Cleanup pixtypes settings
                 jQuery.ajax({
-                    type: "post",url: locals.ajax_url,data: { action: 'unset_pixtypes', _ajax_nonce: ajax_nounce, post_type: $(this).val() },
+                    type: "post",url: locals.ajax_url,data: { action: 'unset_pixtypes', _ajax_nonce: ajax_nounce, theme_slug: $(this).val() },
                     //beforeSend: function() {jQuery("#loading").show("slow");}, //show loading just when link is clicked
                     //complete: function() { jQuery("#loading").hide("fast");}, //stop showing loading when the process is complete

pixtypes/trunk/pixtypes.php

@@ -1 +1 @@
 <?php
 /*
-* @package   PixTypes
-* @author    Pixelgrade <[email protected]>
-* @license   GPL-2.0+
-* @link      https://pixelgrade.com
-* @copyright 2013-2017 Pixelgrade
-*
-* @wordpress-plugin
-Plugin Name: PixTypes
-Plugin URI:  https://pixelgrade.com
-Description: Custom post types and meta-boxes needed by your theme
-Version: 1.4.7
-Author: Pixelgrade
-Author URI: https://pixelgrade.com
-Author Email: [email protected]
-Text Domain: pixtypes
-License:     GPL-2.0+
-License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Domain Path: /lang
-*/
+ * Plugin Name: PixTypes
+ * Plugin URI: https://wordpress.org/plugins/pixtypes/
+ * Description: Custom post types and meta-boxes needed by your themes.
+ * Version: 1.4.8
+ * Author URI: https://pixelgrade.com
+ * Author Email: [email protected]
+ * License: GPL2+
+ * Text Domain: pixtypes
+ * Domain Path: /lang/
+ */
 
 // If this file is called directly, abort.
@@ -34 +25 @@
 
 $config = include 'plugin-config' . EXT;
-include 'features/class-pix-query' . EXT;
 // set textdomain
 pixtypes::settextdomain( $config['textdomain'] );
@@ -56 +46 @@
 // --------------
 
-$basepath     = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
-$callbackpath = $basepath . 'callbacks' . DIRECTORY_SEPARATOR;
+$basepath     = trailingslashit( dirname( __FILE__ ) );
+$callbackpath = trailingslashit( $basepath . 'callbacks' );
 pixtypes::require_all( $callbackpath );
 
@@ -67 +57 @@
 
 global $pixtypes_plugin;
-$pixtypes_plugin = PixTypesPlugin::get_instance();
+$pixtypes_plugin = PixTypesPlugin::get_instance( '1.4.8' );

pixtypes/trunk/settings/post_types.php

@@ -7 +7 @@
 
 $options = get_option( 'pixtypes_settings' );
-// go through each theme and activate portfolio post types
-if ( isset( $options["themes"] ) ) {
-    $theme_types = $options["themes"];
+// go through each theme and activate the post types settings
+if ( isset( $options['themes'] ) ) {
+    $theme_types = $options['themes'];
     foreach ( $theme_types as $key => $theme ) {
 
@@ -23 +23 @@
             }
             $display_settings = true;
-        } else {
-            return array( 'type' => 'hidden' );
         }
     }
+}
+
+// Check if we have any post type that should be shown settings
+$hide = true;
+foreach ( $display_option as $post_type => $display ) {
+    if ( $display ) {
+        $hide = false;
+        break;
+    }
+}
+
+if ( $hide ) {
+    return array( 'type' => 'hidden' );
 }
 

pixtypes/trunk/views/admin.php

@@ -43 +43 @@
         <?php endif; ?>
 
-        <?php echo $f = pixtypes::form( $config, $processor );
-        echo $f->field( 'hiddens' )->render(); ?>
+        <?php
+        $f = pixtypes::form( $config, $processor ); ?>
+
+        <?php echo $f->startform() ?>
+
+        <?php echo $f->field( 'hiddens' )->render(); ?>
 
         <?php echo $f->field( 'post_types' )->render(); ?>
@@ -70 +74 @@
 
             <div class="handlediv" title="Click to toggle"><br></div>
-            <h3 class="hndle"><span><?php esc_html_e( 'Danger Zone', 'pixtypes' ); ?></span></h3>
+            <h3 class="hndle"><span><?php esc_html_e( 'Extra Careful Zone', 'pixtypes' ); ?></span></h3>
 
             <div class="inside">
 
-                <p><?php esc_html_e( 'If you are done with copying your content from old post types to new ones, you can also get rid of the old post types.', 'pixtypes' ); ?></p>
+                <p><?php esc_html_e( 'If you are done with copying your content from old themes to new ones, you can also get rid of the old themes settings and post types.', 'pixtypes' ); ?></p>
                 <form method="post" id="unset_pixypes"
                       action="<?php echo admin_url( 'options-general.php?page=pixtypes' ) ?>">
@@ -83 +87 @@
                         if ( isset( $options['themes'] ) && count( $options['themes'] ) > 1 ) {
                             foreach ( $options['themes'] as $key => $theme ) {
-                                echo '<li><button class="button delete-action" type="submit" name="unset_pixtype" value="' . $key . '">' . esc_html__( 'Unset', 'pixtypes' ) . ' ' . $key . '</button></li>';
+                                echo '<li><button class="button delete-action" type="submit" name="unset_pixtype" value="' . $key . '">' . esc_html__( 'Clean-up after', 'pixtypes' ) . ' ' . ucfirst( $key ) . '</button></li>';
                             }
                         } ?>