Rewrite based on new plugin boilerplate.

includes/class-genesis-simple-sidebars-admin.php

@@ -13,6 +13,25 @@
  */
 class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 
+	/**
+	 * Settings field.
+	 *
+	 * @since 2.1.0
+	 */
+	public $settings_field;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+
+		$this->settings_field = Genesis_Simple_Sidebars()->settings_field;
+
+		// For backward compatibility
+		define( 'SS_SETTINGS_FIELD', $this->settings_field );
+
+	}
+
 	/**
 	 * Create an admin menu item and settings page.
 	 *
@@ -22,7 +41,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 *
 	 * @see Genesis_Admin_Import_Export::actions() Handle creating, editing, and deleting sidebars.
 	 */
-	public function __construct() {
+	public function admin_menu() {
 
 		$page_id = 'simple-sidebars';
 
@@ -34,14 +53,12 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 			)
 		);
 
-		//* Empty, as we'll be building the page manually
+		// Empty, as we'll be building the page manually
 		$page_ops = array();
 
-		$settings_field = SS_SETTINGS_FIELD;
+		$this->create( $page_id, $menu_ops, $page_ops, $this->settings_field );
 
-		$this->create( $page_id, $menu_ops, $page_ops, $settings_field );
-
-		//* Simpe Sidebar actions (create, edit, or delete)
+		// Simpe Sidebar actions (create, edit, or delete)
 		add_action( 'admin_init', array( $this, 'actions' ) );
 
 	}
@@ -56,14 +73,14 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 */
 	public function admin() {
 
-		$_sidebars = get_option( $this->settings_field );
-
 		echo '<div class="wrap">';
 
-			if ( isset( $_REQUEST['action'] ) && 'edit' == $_REQUEST['action'] )
-				require_once( SS_PLUGIN_DIR . '/includes/views/edit.php' );
-			else
-				require_once( SS_PLUGIN_DIR . '/includes/views/main.php' );
+			if ( isset( $_REQUEST['action'] ) && 'edit' == $_REQUEST['action'] ) {
+				require_once( Genesis_Simple_Sidebars()->plugin_dir_path . '/includes/views/admin-edit.php' );
+			}
+			else {
+				require_once( Genesis_Simple_Sidebars()->plugin_dir_path . '/includes/views/admin-main.php' );
+			}
 
 		echo '</div>';
 
@@ -129,8 +146,9 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 */
 	public function actions() {
 
-		if ( ! genesis_is_menu_page( 'simple-sidebars' ) )
+		if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) {
 			return;
+		}
 
 		/**
 		 * This section handles the data if a new sidebar is created
@@ -164,8 +182,9 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 */
 	public function notices() {
 
-		if ( ! genesis_is_menu_page( 'simple-sidebars' ) )
+		if ( ! genesis_is_menu_page( 'simple-sidebars' ) ) {
 			return;
+		}
 
 		$pattern = '<div id="message" class="updated"><p><strong>%s</strong></p></div>';
 
@@ -196,34 +215,39 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	 */
 	protected function create_sidebar( $args = array() ) {
 
-		if ( empty( $args['name'] ) || empty( $args['id'] ) ) {
+		if ( empty( $args['name'] ) ) {
 			wp_die( $this->error( 1 ) );
 			exit;
 		}
 
-		//* nonce verification
+		// nonce verification
 		check_admin_referer( 'simple-sidebars-action_create-sidebar' );
 
-		//* WP changes a numeric sidebar id to sidebar-id which makes it inaccessible to the user
-		if ( is_numeric( $args['id'] ) )
-			$args['id'] = sanitize_title_with_dashes( $args['name'] );
+		// Change empty or numeric IDs to the name, lowercased and separated by dashes.
+		if ( empty( $args['id'] ) || is_numeric( $args['id'] ) ) {
+			$args['id'] = $args['name'];
+		}
+
+		// Strip all but alphanumeric, sanitize with dashes.
+		$id = preg_replace( "/[^a-zA-Z0-9 -]+/", "", sanitize_title_with_dashes( $args['id'] ) );
+
+		$db = (array) get_option( $this->settings_field );
 
-		$db = (array) get_option( SS_SETTINGS_FIELD );
 		$new = array(
-			sanitize_title_with_dashes( $args['id'] ) => array(
-				'name' => esc_html( $args['name'] ),
+			$id => array(
+				'name'        => esc_html( $args['name'] ),
 				'description' => esc_html( $args['description'] )
-			)
+			),
 		);
 
-		if ( array_key_exists( $args['id'], $db ) ) {
+		if ( array_key_exists( $id, $db ) ) {
 			wp_die( $this->error( 2 ) );
 			exit;
 		}
 
 		$_sidebars = wp_parse_args( $new, $db );
 
-		update_option( SS_SETTINGS_FIELD, $_sidebars );
+		update_option( $this->settings_field, $_sidebars );
 		wp_redirect( admin_url( 'admin.php?page=simple-sidebars&created=true' ) );
 		exit;
 
@@ -242,17 +266,13 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 			exit;
 		}
 
-		//* nonce verification
+		// nonce verification
 		check_admin_referer( 'simple-sidebars-action_edit-sidebar' );
 
-		//* WP changes a numeric sidebar id to sidebar-id which makes it inaccessible to the user
-		if ( is_numeric( $args['id'] ) )
-			$args['id'] = sanitize_title_with_dashes( $args['name'] );
-
-		$db = (array) get_option( SS_SETTINGS_FIELD );
+		$db = (array) get_option( $this->settings_field );
 		$new = array(
-			sanitize_title_with_dashes( $args['id'] ) => array(
-				'name' => esc_html( $args['name'] ),
+			$args['id'] => array(
+				'name'        => esc_html( $args['name'] ),
 				'description' => esc_html( $args['description'] )
 			)
 		);
@@ -264,7 +284,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 
 		$_sidebars = wp_parse_args( $new, $db );
 
-		update_option( SS_SETTINGS_FIELD, $_sidebars );
+		update_option( $this->settings_field, $_sidebars );
 		wp_redirect( admin_url( 'admin.php?page=simple-sidebars&edited=true' ) );
 		exit;
 
@@ -283,10 +303,10 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 			exit;
 		}
 
-		//* nonce verification
+		// nonce verification
 		check_admin_referer( 'simple-sidebars-action_delete-sidebar' );
 
-		$_sidebars = (array) get_option( SS_SETTINGS_FIELD );
+		$_sidebars = (array) get_option( $this->settings_field );
 
 		if ( ! isset( $_sidebars[$id] ) ) {
 			wp_die( $this->error( 4 ) );
@@ -295,7 +315,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 
 		unset( $_sidebars[$id] );
 
-		update_option( SS_SETTINGS_FIELD, $_sidebars );
+		update_option( $this->settings_field, $_sidebars );
 		wp_redirect( admin_url( 'admin.php?page=simple-sidebars&deleted=true' ) );
 		exit;
 
@@ -316,7 +336,7 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 		switch( (int) $error ) {
 
 			case 1:
-				return __( 'Oops! Please choose a valid Name and ID for this sidebar', 'genesis-simple-sidebars' );
+				return __( 'Oops! Please choose a valid Name for this sidebar', 'genesis-simple-sidebars' );
 				break;
 			case 2:
 				return __( 'Oops! That sidebar ID already exists', 'genesis-simple-sidebars' );
@@ -335,17 +355,3 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic {
 	}
 
 }
-
-add_action( 'genesis_admin_menu', 'simplesidebars_settings_menu' );
-/**
- * Instantiate the class to create the menu.
- *
- * @since 1.0.0
- */
-function simplesidebars_settings_menu() {
-
-	global $_genesis_simple_sidebars_admin;
-	
-	$_genesis_simple_sidebars_admin = new Genesis_Simple_Sidebars_Admin;
-
-}

includes/class-genesis-simple-sidebars-core.php

@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * Controls the core functions of registration and output of Sidebars
+ *
+ * @since 2.1.0
+ */
+class Genesis_Simple_Sidebars_Core {
+
+	/**
+	 * The created sidebars.
+	 */
+	private $sidebars;
+
+	/**
+	 * Public taxonomies.
+	 */
+	private $public_taxonomies;
+
+	/**
+	 * Initialize the class.
+	 */
+	public function init() {
+
+		add_action( 'widgets_init', array( $this, 'register_sidebars' ) );
+		add_action( 'get_header', array( $this, 'swap_sidebars' ) );
+
+	}
+
+	/**
+	 * Take created sidebars and register them with WordPress.
+	 *
+	 * @since 2.1.0
+	 */
+	public function register_sidebars() {
+
+		$sidebars = Genesis_Simple_Sidebars()->core->get_sidebars();
+
+		if ( ! $sidebars ) {
+			return;
+		}
+
+		// Cycle through created sidebars, register them as widget areas
+		foreach ( (array) $sidebars as $id => $info ) {
+
+			if ( ! isset( $info['name'] ) || ! isset( $info['description'] ) ) {
+				continue;
+			}
+
+			genesis_register_sidebar( array(
+				'name'        => esc_html( $info['name'] ),
+				'id'          => $id,
+				'description' => esc_html( $info['description'] ),
+				'editable'    => 1,
+			) );
+
+		}
+
+	}
+
+	/**
+	 * Remove default sidebars and inject custom sidebars.
+	 *
+	 * @since 2.1.0
+	 */
+	public function swap_sidebars() {
+
+		// Header
+		if ( is_registered_sidebar( 'header-right' ) ) {
+			global $wp_registered_sidebars;
+			$wp_registered_sidebars['ss-header-right-temp'] = $wp_registered_sidebars['header-right'];
+			unset( $wp_registered_sidebars['header-right'] );
+			add_action( 'genesis_header_right', array( $this, 'do_header_right' ) );
+		}
+
+		// Sidebars
+		remove_action( 'genesis_sidebar', 'genesis_do_sidebar' );
+		remove_action( 'genesis_sidebar_alt', 'genesis_do_sidebar_alt' );
+		add_action( 'genesis_sidebar', array( $this, 'do_primary_sidebar' ) );
+		add_action( 'genesis_sidebar_alt', array( $this, 'do_secondary_sidebar' ) );
+
+	}
+
+	/**
+	 * Output custom header widget area, if one is set. Otherwise output default.
+	 *
+	 * @since 2.1.0
+	 */
+	public function do_header_right() {
+
+		global $wp_registered_sidebars;
+
+		if ( ! $this->do_sidebar( '_ss_header' ) ) {
+			$wp_registered_sidebars['header-right'] = $wp_registered_sidebars['ss-header-right-temp'];
+		}
+
+		unset( $wp_registered_sidebars['ss-header-right-temp'] );
+
+	}
+
+	/**
+	 * Output custom primary sidebar, if one is set. Otherwise output default.
+	 *
+	 * @since 2.1.0
+	 */
+	public function do_primary_sidebar() {
+
+		if ( ! $this->do_sidebar( '_ss_sidebar' ) ) {
+			genesis_do_sidebar();
+		}
+
+	}
+
+	/**
+	 * Output custom secondary sidebar, if one is set. Otherwise output default.
+	 *
+	 * @since 2.1.0
+	 */
+	public function do_secondary_sidebar() {
+
+		if ( ! $this->do_sidebar( '_ss_sidebar_alt' ) ) {
+			genesis_do_sidebar_alt();
+		}
+
+	}
+
+	/**
+	 * Show widgets in a particular sidebar.
+	 *
+	 * @param string $key sidebar id you wish to output.
+	 *
+	 * @since 2.1.0
+	 */
+	public function do_sidebar( $key ) {
+
+		if ( is_singular() && $key = genesis_get_custom_field( $key ) ) {
+
+			if ( dynamic_sidebar( $key ) ) {
+				return true;
+			}
+
+		}
+
+		if ( is_tax() || is_category() || is_tag() ) {
+
+			if ( $key = get_term_meta( get_queried_object()->term_id, $key, true ) ) {
+				dynamic_sidebar( $key );
+				return true;
+			}
+
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Get all custom registered sidebars.
+	 *
+	 * @since 2.1.0
+	 */
+	public function get_sidebars( $cache = true ) {
+
+		if ( ! $cache ) {
+			return stripslashes_deep( get_option( Genesis_Simple_Sidebars()->settings_field ) );
+		}
+
+		if ( is_null( $this->sidebars ) ) {
+			$this->sidebars = stripslashes_deep( get_option( Genesis_Simple_Sidebars()->settings_field ) );
+		}
+
+		return $this->sidebars;
+
+	}
+
+	/**
+	 * Return taxonomy ids.
+	 *
+	 * Helper function to return the array keys from a taxonomy query.
+	 *
+	 * @since 2.1.0
+	 */
+	public function get_public_taxonomies() {
+
+		if ( is_null( $this->public_taxonomies ) ) {
+			$this->public_taxonomies = get_taxonomies( array(
+				'show_ui' => true,
+				'public'  => true,
+			) );
+		}
+
+		$this->public_taxonomies = apply_filters( 'genesis_simple_sidebars_taxonomies', array_keys( $this->public_taxonomies ) );
+
+		return $this->public_taxonomies;
+
+	}
+
+	/**
+	 * Determines if this site has disabled 3 column layouts or not.
+	 *
+	 * @since 2.1.0
+	 */
+	public function has_3_column_layout() {
+
+		$layouts = genesis_get_layouts();
+
+		$three_column_layouts = array(
+			'content-sidebar-sidebar',
+			'sidebar-content-sidebar',
+			'sidebar-sidebar-content',
+		);
+
+		foreach ( $three_column_layouts as $layout ) {
+			if ( array_key_exists( $layout, $layouts ) ) {
+				return true;
+			}
+		}
+
+		return false;
+
+	}
+
+}

includes/class-genesis-simple-sidebars-entry.php

@@ -0,0 +1,63 @@
+<?php
+
+class Genesis_Simple_Sidebars_Entry {
+
+	public function init() {
+
+		add_action( 'admin_menu', array( $this, 'add_metaboxes' ) );
+		add_action( 'save_post', array( $this, 'metabox_save' ), 1, 2 );
+
+	}
+
+	/**
+	 * Cycle through supported post types and add metaboxes.
+	 *
+	 * @since 2.1.0
+	 */
+	public function add_metaboxes() {
+
+		foreach ( (array) get_post_types( array( 'public' => true ) ) as $type ) {
+
+			if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) {
+				add_meta_box( 'ss_inpost_metabox', __( 'Sidebar Selection', 'genesis-simple-sidebars' ), array( $this, 'metabox_content' ), $type, 'side', 'low' );
+			}
+
+		}
+
+	}
+
+	/**
+	 * Include the metabox content.
+	 *
+	 * @since 2.1.0
+	 */
+	public function metabox_content() {
+
+		require_once( Genesis_Simple_Sidebars()->plugin_dir_path . 'includes/views/entry-metabox-content.php' );
+
+		print_r( get_post_meta( get_the_ID() ) );
+
+	}
+
+	/**
+	 * Save the metabox fields when the entry is saved.
+	 *
+	 * @since 2.1.0
+	 */
+	public function metabox_save( $post_id, $post ) {
+
+		if ( ! isset( $_POST['genesis_simple_sidebars'] ) ) {
+			return;
+		}
+
+		$data = wp_parse_args( $_POST['genesis_simple_sidebars'], array(
+			'_ss_header'      => '',
+			'_ss_sidebar'     => '',
+			'_ss_sidebar_alt' => '',
+		) );
+
+		genesis_save_custom_fields( $data, 'genesis-simple-sidebars-save-entry', 'genesis-simple-sidebars-save-entry-nonce', $post );
+
+	}
+
+}

includes/class-genesis-simple-sidebars-term.php

@@ -0,0 +1,31 @@
+<?php
+
+class Genesis_Simple_Sidebars_Term {
+
+	public function init() {
+
+		add_action( 'init', array( $this, 'add_term_fields' ) );
+
+	}
+
+	public function add_term_fields() {
+
+		$taxonomies = Genesis_Simple_Sidebars()->core->get_public_taxonomies();
+
+		if ( ! empty( $taxonomies ) && is_admin() && is_array( $taxonomies ) ) {
+
+			foreach ( $taxonomies as $tax ) {
+				add_action( "{$tax}_edit_form", array( $this, 'term_sidebar_form' ), 9, 2 );
+			}
+
+		}
+
+	}
+
+	public function term_sidebar_form( $tag, $taxonomy ) {
+
+		require_once( Genesis_Simple_Sidebars()->plugin_dir_path . 'includes/views/term-edit-sidebar-form.php' );
+
+	}
+
+}

includes/deprecated.php

@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_activation_check() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 1.0.0
+ * @deprecated 2.1.0
+ */
+function ss_deactivate() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_genesis_init() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_register_sidebars() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_sidebars_init() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_do_sidebar() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_do_sidebar_alt() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_do_one_sidebar() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_get_taxonomies() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.2
+ * @deprecated 2.1.0
+ */
+function ss_has_3_column_layouts() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 1.0.0
+ * @deprecated 2.1.0
+ */
+function simplesidebars_settings_menu() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_add_inpost_metabox() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_inpost_metabox() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_inpost_metabox_save() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_term_edit_init() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}
+
+/**
+ * Deprecated.
+ *
+ * @since 0.9.0
+ * @deprecated 2.1.0
+ */
+function ss_term_sidebar() {
+	_deprecated_function( __FUNCTION__, '2.1.0' );
+}

includes/inpost.php

@@ -1,102 +0,0 @@
-<?php
-add_action('admin_menu', 'ss_add_inpost_metabox');
-/**
- * This bit of code registers the meta box on posts/pages,
- * so that users can choose what sidebar to use.
- */
-function ss_add_inpost_metabox() {
-
-	foreach ( (array) get_post_types( array( 'public' => true ) ) as $type ) {
-
-		if ( post_type_supports( $type, 'genesis-simple-sidebars' ) || $type == 'post' || $type == 'page' ) {
-			add_meta_box( 'ss_inpost_metabox', __( 'Sidebar Selection', 'genesis-simple-sidebars' ), 'ss_inpost_metabox', $type, 'side', 'low' );
-		}
-
-	}
-
-}
-
-function ss_inpost_metabox() {
-
-	$_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) );
-	global $wp_registered_sidebars;
-
-?>
-
-	<input type="hidden" name="ss_inpost_nonce" value="<?php echo wp_create_nonce( plugin_basename( __FILE__ ) ); ?>" />
-
-<?php
-	if( isset( $wp_registered_sidebars['sidebar'] ) ) {
-?>
-
-	<p>
-		<label class="howto" for="_ss_sidebar"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar']['name'] ); ?><span></label>
-		<select name="_ss_sidebar" id="_ss_sidebar" style="width: 99%">
-			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
-			<?php
-			foreach ( (array) $_sidebars as $id => $info ) {
-				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar' ), false), esc_html( $info['name'] ) );
-			}
-			?>
-		</select>
-	</p>
-<?php
-	}
-	if( isset( $wp_registered_sidebars['sidebar-alt'] ) ) {
-?>
-	<p>
-		<label class="howto" for="_ss_sidebar_alt"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar-alt']['name'] ); ?><span></label>
-		<select name="_ss_sidebar_alt" id="_ss_sidebar_alt" style="width: 99%">
-			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
-			<?php
-			foreach ( (array) $_sidebars as $id => $info ) {
-				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar_alt' ), false ), esc_html( $info['name'] ) );
-			}
-			?>
-		</select>
-	</p>
-
-<?php
-	}
-}
-
-add_action( 'save_post', 'ss_inpost_metabox_save', 1, 2 );
-/**
- * This bit of code saves the sidebars chosen as post meta.
- */
-function ss_inpost_metabox_save( $post_id, $post ) {
-
-	//* verify the nonce
-	if ( !isset($_POST['ss_inpost_nonce']) || !wp_verify_nonce( $_POST['ss_inpost_nonce'], plugin_basename(__FILE__) ) )
-		return $post->ID;
-
-	//* don't try to save the data under autosave, ajax, or future post.
-	if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) return;
-	if ( defined('DOING_AJAX') && DOING_AJAX ) return;
-	if ( defined('DOING_CRON') && DOING_CRON ) return;
-
-	//* is the user allowed to edit the post or page?
-	if ( ( 'page' == $_POST['post_type'] && ! current_user_can( 'edit_page', $post->ID ) ) || ! current_user_can( 'edit_post', $post->ID ) )
-		return $post->ID;
-
-	$_sidebars = array(
-		'_ss_sidebar'     => isset( $_POST['_ss_sidebar'] ) ? $_POST['_ss_sidebar'] : '',
-		'_ss_sidebar_alt' => isset( $_POST['_ss_sidebar_alt'] ) ? $_POST['_ss_sidebar_alt'] : '',
-	);
-
-	//* store the custom fields
-	foreach ( $_sidebars as $key => $value ) {
-
-		//* don't try to store data during revision save
-		if ( 'revision' === $post->post_type )
-			return;
-
-		if ( $value ) {
-			update_post_meta($post->ID, $key, $value);
-		} else {
-			delete_post_meta($post->ID, $key);
-		}
-
-	}
-
-}

includes/term.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * This function, hooked to display on the category/tag edit forms,
- * adds new fields to select a sidebar. The variables $tag and $taxonomy
- * are passed via the hook so that we can use them.
- */
-function ss_term_edit_init() {
-
-	$taxonomies = ss_get_taxonomies();
-
-	if ( ! empty( $taxonomies ) && is_admin() && is_array( $taxonomies ) ) {
-
-		foreach( $taxonomies as $tax )
-			add_action( "{$tax}_edit_form", 'ss_term_sidebar', 9, 2 );
-
-	}
-
-}
-
-function ss_term_sidebar($tag, $taxonomy) {
-
-	//* Merge Defaults to prevent notices
-	$tag->meta = wp_parse_args( $tag->meta, array( '_ss_sidebar' => '', '_ss_sidebar_alt' => '' ) );
-
-	//* Pull custom sidebars
-	$_sidebars = stripslashes_deep( get_option( SS_SETTINGS_FIELD ) );
-
-?>
-
-	<h3><?php _e( 'Sidebar Options', 'genesis-simple-sidebars' ); ?></h3>
-	<table class="form-table">
-
-	<tr class="form-field">
-		<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar]"><?php _e( 'Primary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
-		<td>
-			<select name="genesis-meta[_ss_sidebar]" id="genesis-meta[_ss_sidebar]" style="padding-right: 10px;">
-				<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
-				<?php
-				foreach ( (array) $_sidebars as $id => $info ) {
-					printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar', true ), false), esc_html( $info['name'] ) );
-				}
-				?>
-			</select>
-		</td>
-	</tr>
-<?php
-	//* don't show the option if there are no 3 column layouts registered
-	if ( ss_has_3_column_layouts() ) {
-?>
-	<tr class="form-field">
-		<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar_alt]"><?php _e( 'Secondary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
-		<td>
-			<select name="genesis-meta[_ss_sidebar_alt]" id="genesis-meta[_ss_sidebar_alt]" style="padding-right: 10px;">
-				<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
-				<?php
-				foreach ( (array) $_sidebars as $id => $info ) {
-					printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar_alt', true ), false), esc_html( $info['name'] ) );
-				}
-				?>
-			</select>
-		</td>
-	</tr>
-<?php
-	}
-?>
-	</table>
-
-<?php
-}

includes/views/admin-edit.php

@@ -1,12 +1,13 @@
 <?php
-if ( array_key_exists( $_REQUEST['id'], (array) $_sidebars ) ) {
-	$_sidebar = stripslashes_deep( $_sidebars[$_REQUEST['id']] );
+$sidebars = Genesis_Simple_Sidebars()->core->get_sidebars();
+
+if ( array_key_exists( $_REQUEST['id'], (array) $sidebars ) ) {
+	$sidebar = stripslashes_deep( $sidebars[ $_REQUEST['id'] ] );
 } else {
 	wp_die( __( 'Nice try, partner. But that sidebar doesn\'t exist. Click back and try again.', 'genesis-simple-sidebars' ) );
 }
-
-screen_icon( 'themes' ); ?>
-<h2><?php _e( 'Edit Sidebar', 'genesis-simple-sidebars' ); ?></h2>
+?>
+<h1><?php _e( 'Edit Sidebar', 'genesis-simple-sidebars' ); ?></h1>
 
 <form method="post" action="<?php echo admin_url( 'admin.php?page=simple-sidebars&amp;action=edit' ); ?>">
 <?php wp_nonce_field( 'simple-sidebars-action_edit-sidebar' ); ?>
@@ -15,21 +16,21 @@ screen_icon( 'themes' ); ?>
 
 	<tr class="form-field">
 		<th scope="row" valign="top"><label for="edit_sidebar[name]"><?php _e( 'Name', 'genesis-simple-sidebars' ); ?></label></th>
-		<td><input name="edit_sidebar[name]" id="edit_sidebar[name]" type="text" value="<?php echo esc_html( $_sidebar['name'] ); ?>" size="40" />
+		<td><input name="edit_sidebar[name]" id="edit_sidebar[name]" type="text" value="<?php echo esc_html( $sidebar['name'] ); ?>" size="40" />
 		<p class="description"><?php _e( 'A recognizable name for your new sidebar widget area', 'genesis-simple-sidebars' ); ?></p></td>
 	</tr>
 
 	<tr class="form-field">
 		<th scope="row" valign="top"><label for="edit_sidebar[id]"><?php _e( 'ID', 'genesis-simple-sidebars' ); ?></label></th>
 		<td>
-		<input type="text" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" disabled="disabled" />
+		<input type="text" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" readonly />
 		<input name="edit_sidebar[id]" id="edit_sidebar[id]" type="hidden" value="<?php echo esc_html( $_REQUEST['id'] ); ?>" size="40" />
 		<p class="description"><?php _e( 'The unique ID is used to register the sidebar widget area (cannot be changed)', 'genesis-simple-sidebars' ); ?></p></td>
 	</tr>
 
 	<tr class="form-field">
 		<th scope="row" valign="top"><label for="edit_sidebar[description]"><?php _e( 'Description', 'genesis-simple-sidebars' ); ?></label></th>
-		<td><textarea name="edit_sidebar[description]" id="edit_sidebar[description]" rows="3" cols="50" style="width: 97%;"><?php echo esc_html( $_sidebar['description'] ); ?></textarea></td>
+		<td><textarea name="edit_sidebar[description]" id="edit_sidebar[description]" rows="3" cols="50" style="width: 97%;"><?php echo esc_html( $sidebar['description'] ); ?></textarea></td>
 	</tr>
 
 </table>

includes/views/admin-main.php

@@ -1,5 +1,4 @@
-<?php screen_icon( 'themes' ); ?>
-<h2><?php _e( 'Genesis - Simple Sidebars', 'genesis-simple-sidebars' ); ?></h2>
+<h1><?php _e( 'Genesis - Simple Sidebars', 'genesis-simple-sidebars' ); ?></h1>
 
 <div id="col-container">
 
@@ -67,4 +66,4 @@
 </div>
 </div><!-- /col-left -->
 
-</div><!-- /col-container -->
+</div><!-- /col-container -->

includes/views/entry-metabox-content.php

@@ -0,0 +1,46 @@
+<?php
+$sidebars = Genesis_Simple_Sidebars()->core->get_sidebars();
+global $wp_registered_sidebars;
+wp_nonce_field( 'genesis-simple-sidebars-save-entry', 'genesis-simple-sidebars-save-entry-nonce' );
+
+if ( is_registered_sidebar( 'header-right' ) ) : ?>
+<p>
+	<label class="howto" for="genesis_simple_sidebars[_ss_header]"><span><?php echo esc_attr( $wp_registered_sidebars['header-right']['name'] ); ?><span></label>
+	<select name="genesis_simple_sidebars[_ss_header]" id="genesis_simple_sidebars[_ss_header]" style="width: 99%">
+		<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+		<?php
+		foreach ( (array) $sidebars as $id => $info ) {
+			printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_header' ), false), esc_html( $info['name'] ) );
+		}
+		?>
+	</select>
+</p>
+<?php endif;
+
+if ( is_registered_sidebar( 'sidebar' ) ) : ?>
+<p>
+	<label class="howto" for="genesis_simple_sidebars[_ss_sidebar]"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar']['name'] ); ?><span></label>
+	<select name="genesis_simple_sidebars[_ss_sidebar]" id="genesis_simple_sidebars[_ss_sidebar]" style="width: 99%">
+		<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+		<?php
+		foreach ( (array) $sidebars as $id => $info ) {
+			printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar' ), false), esc_html( $info['name'] ) );
+		}
+		?>
+	</select>
+</p>
+<?php endif;
+
+if ( is_registered_sidebar( 'sidebar-alt' ) ) : ?>
+<p>
+	<label class="howto" for="genesis_simple_sidebars[_ss_sidebar_alt]"><span><?php echo esc_attr( $wp_registered_sidebars['sidebar-alt']['name'] ); ?><span></label>
+	<select name="genesis_simple_sidebars[_ss_sidebar_alt]" id="genesis_simple_sidebars[_ss_sidebar_alt]" style="width: 99%">
+		<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+		<?php
+		foreach ( (array) $sidebars as $id => $info ) {
+			printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, genesis_get_custom_field( '_ss_sidebar_alt' ), false ), esc_html( $info['name'] ) );
+		}
+		?>
+	</select>
+</p>
+<?php endif;

includes/views/term-edit-sidebar-form.php

@@ -0,0 +1,51 @@
+<?php $sidebars = Genesis_Simple_Sidebars()->core->get_sidebars(); ?>
+
+<h3><?php _e( 'Sidebar Options', 'genesis-simple-sidebars' ); ?></h3>
+<table class="form-table">
+
+<?php if ( is_registered_sidebar( 'header-right' ) ) : ?>
+<tr class="form-field">
+	<th scope="row" valign="top"><label for="genesis-meta[_ss_header]"><?php _e( 'Header Right', 'genesis-simple-sidebars' ); ?></label></th>
+	<td>
+		<select name="genesis-meta[_ss_header]" id="genesis-meta[_ss_header]" style="padding-right: 10px;">
+			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+			<?php
+			foreach ( (array) $sidebars as $id => $info ) {
+				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_header', true ), false), esc_html( $info['name'] ) );
+			}
+			?>
+		</select>
+	</td>
+</tr>
+<?php endif; ?>
+
+<tr class="form-field">
+	<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar]"><?php _e( 'Primary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
+	<td>
+		<select name="genesis-meta[_ss_sidebar]" id="genesis-meta[_ss_sidebar]" style="padding-right: 10px;">
+			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+			<?php
+			foreach ( (array) $sidebars as $id => $info ) {
+				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar', true ), false), esc_html( $info['name'] ) );
+			}
+			?>
+		</select>
+	</td>
+</tr>
+
+<?php if ( Genesis_Simple_Sidebars()->core->has_3_column_layout() ) : ?>
+<tr class="form-field">
+	<th scope="row" valign="top"><label for="genesis-meta[_ss_sidebar_alt]"><?php _e( 'Secondary Sidebar', 'genesis-simple-sidebars' ); ?></label></th>
+	<td>
+		<select name="genesis-meta[_ss_sidebar_alt]" id="genesis-meta[_ss_sidebar_alt]" style="padding-right: 10px;">
+			<option value=""><?php _e( 'Default', 'genesis-simple-sidebars' ); ?></option>
+			<?php
+			foreach ( (array) $sidebars as $id => $info ) {
+				printf( '<option value="%s" %s>%s</option>', esc_html( $id ), selected( $id, get_term_meta( $tag->term_id, '_ss_sidebar_alt', true ) , false), esc_html( $info['name'] ) );
+			}
+			?>
+		</select>
+	</td>
+</tr>
+<?php endif; ?>
+</table>