diff --git a/class/mtee-tax-setting.php b/class/mtee-tax-setting.php deleted file mode 100644 index 6b04a18..0000000 --- a/class/mtee-tax-setting.php +++ /dev/null @@ -1,92 +0,0 @@ -options = $options; - $this->set_fields(); - add_action( 'create_term', array( $this, 'save_terms' ) ); //新規追加用フック - add_action( 'edit_terms', array( $this, 'save_terms' ) ); //編集ページ用フック - } - - public function set_fields() { - $built_ins = array( - 'term' => array( 'category', 'post_tag' ), - ); - - foreach ( $built_ins['term'] as $built_in ) { - add_action( $built_in . '_add_form_fields', array( $this, 'insert_term_meta_add_fields' ) ); - add_action( $built_in . '_edit_form_fields', array( $this, 'insert_term_meta_edit_fields' ) ); - } - - if ( isset( $this->options['taxonomies'] ) ) { - foreach ( $this->options['taxonomies'] as $tax_key => $tax_chk ) { - if ( $tax_chk == 1 ) { - add_action( $tax_key . '_add_form_fields', array( $this, 'insert_term_meta_add_fields' ) ); - add_action( $tax_key . '_edit_form_fields', array( $this, 'insert_term_meta_edit_fields' ) ); - } - } - } - } - - function insert_term_meta_add_fields( $tag ) { - $key_value = ''; - $desc_value = ''; - if ( isset( $tag->term_id ) ) { - $key_value = get_term_meta( $tag->term_id, MTEE_NAME_KEYWORDS, true ); - $desc_value = get_term_meta( $tag->term_id, MTEE_MTEE_NAME_DESCRIPTION, true ); - } - echo ' -
-meta keywords
- -
-
-meta description
- -
-'; - } - - function insert_term_meta_edit_fields( $tag ) { - $key_value = ''; - $desc_value = ''; - if ( isset( $tag->term_id ) ) { - $key_value = get_term_meta( $tag->term_id, MTEE_NAME_KEYWORDS, true ); - $desc_value = get_term_meta( $tag->term_id, MTEE_NAME_DESCRIPTION, true ); - } - echo ' - -meta keywords - - - -meta description - - -'; - } - - - function save_terms( $term_id ) { - if ( array_key_exists( MTEE_NAME_KEYWORDS, $_POST ) ) { - update_term_meta( $term_id, MTEE_NAME_KEYWORDS, $_POST[ MTEE_NAME_KEYWORDS ] ); - } - if ( array_key_exists( MTEE_NAME_DESCRIPTION, $_POST ) ) { - update_term_meta( $term_id, MTEE_NAME_DESCRIPTION, $_POST[ MTEE_NAME_DESCRIPTION ] ); - } - } - } - -} \ No newline at end of file diff --git a/class/mtee-canonical-setting.php b/class/mtee_canonical_setting.php similarity index 84% rename from class/mtee-canonical-setting.php rename to class/mtee_canonical_setting.php index 6341906..6730c28 100644 --- a/class/mtee-canonical-setting.php +++ b/class/mtee_canonical_setting.php @@ -33,31 +33,19 @@ if (!class_exists('mtee_canonical_setting')) { //------------------------------------------------------------------------------------------- public function add_meta_fields() { //add_meta_box(表示される入力ボックスのHTMLのID, ラベル, 表示する内容を作成する関数名, 投稿タイプ, 表示方法) - $default_built_ins = array( - 'posts' => array('page', 'post',), - ); + $custom_posts = array_values(get_post_types(array('public' => true, '_builtin' => false))); + $target_posts = array_merge(array('page', 'post',), $custom_posts); - foreach ($default_built_ins['posts'] as $built_in) { + foreach ($target_posts as $target_post) { add_meta_box( 'canonical_setting', 'Canonical設定', - array($this, 'insert_meta_fields'), - $built_in, - 'normal' - ); - } - - if (isset($this->options['custom_posts'])) { - foreach ($this->options['custom_posts'] as $custom_post => $post_chk) { - if ($post_chk == 1) { - add_meta_box( - 'canonical_setting', - 'Canonical設定', - array($this, 'insert_meta_fields'), - $custom_post, 'normal' - ); - } - } + array( + $this, + 'insert_meta_fields' + ), + $target_post, + 'normal'); } } diff --git a/class/mtee-output-canonical.php b/class/mtee_meta_output_canonical.php similarity index 100% rename from class/mtee-output-canonical.php rename to class/mtee_meta_output_canonical.php diff --git a/class/mtee-output-noindexnofollow.php b/class/mtee_meta_output_noindexnofollow.php similarity index 100% rename from class/mtee-output-noindexnofollow.php rename to class/mtee_meta_output_noindexnofollow.php diff --git a/class/mtee-output-ogp.php b/class/mtee_meta_output_ogp.php similarity index 100% rename from class/mtee-output-ogp.php rename to class/mtee_meta_output_ogp.php diff --git a/class/mtee-noindexnofollow-setting.php b/class/mtee_noindexnofolow_setting.php similarity index 100% rename from class/mtee-noindexnofollow-setting.php rename to class/mtee_noindexnofolow_setting.php diff --git a/class/mtee-post-setting.php b/class/mtee_post_setting.php similarity index 73% rename from class/mtee-post-setting.php rename to class/mtee_post_setting.php index d450ea0..89e26ca 100644 --- a/class/mtee-post-setting.php +++ b/class/mtee_post_setting.php @@ -5,10 +5,9 @@ if ( ! defined( 'ABSPATH' ) ) { if ( ! class_exists( 'mtee_post_setting' ) ) { - /** - * ページ、投稿、カスタム投稿の設定フォーム - * Class amd_post_setting - */ + /** + * Class mtee_post_setting + */ class mtee_post_setting { private $options; @@ -23,24 +22,19 @@ if ( ! class_exists( 'mtee_post_setting' ) ) { public function add_meta_fields() { //add_meta_box(表示される入力ボックスのHTMLのID, ラベル, 表示する内容を作成する関数名, 投稿タイプ, 表示方法) - $default_built_ins = array( - 'posts' => array( 'page', 'post', ), - ); - - foreach ( $default_built_ins['posts'] as $built_in ) { - add_meta_box( 'meta_setting', 'meta設定', array( $this, 'insert_meta_fields' ), $built_in, 'normal' ); - } - - if ( isset( $this->options['custom_posts'] ) ) { - foreach ( $this->options['custom_posts'] as $custom_post => $post_chk ) { - if ( $post_chk == 1 ) { - add_meta_box( 'meta_setting', 'meta設定', array( - $this, - 'insert_meta_fields' - ), $custom_post, 'normal' ); - } - } - } + $custom_posts = array_values(get_post_types(array('public' => true, '_builtin' => false))); + $target_posts = array_merge(array('page', 'post',), $custom_posts); + foreach ($target_posts as $target_post) { + add_meta_box( + 'meta_setting', + 'meta設定', + array( + $this, + 'insert_meta_fields'), + $target_post, + 'normal' + ); + } } // カスタムフィールドの入力エリア diff --git a/class/mtee_tax_setting.php b/class/mtee_tax_setting.php new file mode 100644 index 0000000..0aeecbd --- /dev/null +++ b/class/mtee_tax_setting.php @@ -0,0 +1,90 @@ +options = $options; + $this->set_fields(); + add_action('create_term', array($this, 'save_terms')); //新規追加用フック + add_action('edit_terms', array($this, 'save_terms')); //編集ページ用フック + } + + public function set_fields() { + $taxs = $this->set_tax_types(); + foreach ($taxs as $tax) { + add_action($tax . '_add_form_fields', array($this, 'insert_term_meta_add_fields')); + add_action($tax . '_edit_form_fields', array($this, 'insert_term_meta_edit_fields')); + } + } + + public function set_tax_types(): array { + $custom_tax = get_taxonomies(array('public' => true, '_builtin' => false)); + $tax_array = array_merge(array('category', 'post_tag'), $custom_tax); + $add_tax = filter_input(INPUT_GET, 'taxonomy'); + + if (!empty($add_tax)) { + return array_merge($tax_array, array($add_tax)); + } + return $tax_array; + } + + function insert_term_meta_add_fields($tag) { + $key_value = ''; + $desc_value = ''; + if (isset($tag->term_id)) { + $key_value = get_term_meta($tag->term_id, MTEE_NAME_KEYWORDS, true); + $desc_value = get_term_meta($tag->term_id, MTEE_MTEE_NAME_DESCRIPTION, true); + } + echo ' +
+meta keywords
+ +
+
+meta description
+ +
+'; + } + + function insert_term_meta_edit_fields($tag) { + $key_value = ''; + $desc_value = ''; + if (isset($tag->term_id)) { + $key_value = get_term_meta($tag->term_id, MTEE_NAME_KEYWORDS, true); + $desc_value = get_term_meta($tag->term_id, MTEE_NAME_DESCRIPTION, true); + } + echo ' + +meta keywords + + + +meta description + + +'; + } + + + function save_terms($term_id) { + if (array_key_exists(MTEE_NAME_KEYWORDS, $_POST)) { + update_term_meta($term_id, MTEE_NAME_KEYWORDS, $_POST[MTEE_NAME_KEYWORDS]); + } + if (array_key_exists(MTEE_NAME_DESCRIPTION, $_POST)) { + update_term_meta($term_id, MTEE_NAME_DESCRIPTION, $_POST[MTEE_NAME_DESCRIPTION]); + } + } + } + +} \ No newline at end of file diff --git a/class/mtee-version-setting.php b/class/mtee_version_setting.php similarity index 100% rename from class/mtee-version-setting.php rename to class/mtee_version_setting.php diff --git a/config.php b/config.php index 481ad2a..2cc6bbc 100644 --- a/config.php +++ b/config.php @@ -1,13 +1,15 @@ get_options(); // enabled my meta keywords, description if ($mtee->is_enable('enabled')) { - require_once MTEE_CLASS_DIR . 'mtee-tax-setting.php'; - require_once MTEE_CLASS_DIR . 'mtee-post-setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_tax_setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_post_setting.php'; require_once MTEE_CLASS_DIR . 'mtee_meta_output_keydesc.php'; new mtee_tax_setting($options); new mtee_post_setting($options); @@ -41,31 +41,31 @@ if ($mtee->is_enable('enabled')) { // enabled my canonical. caution : default canonical delete if ($mtee->is_enable('canonical_setting')) { remove_action('wp_head', 'rel_canonical'); - require_once MTEE_CLASS_DIR . 'mtee-canonical-setting.php'; - require_once MTEE_CLASS_DIR . 'mtee-output-canonical.php'; + require_once MTEE_CLASS_DIR . 'mtee_canonical_setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_meta_output_canonical.php'; new mtee_canonical_setting($options); new mtee_meta_output_canonical(); } // enabled my OGP tag if ($mtee->is_enable('ogp_setting')) { - require_once MTEE_CLASS_DIR . 'mtee-ogp-setting.php'; - require_once MTEE_CLASS_DIR . 'mtee-output-ogp.php'; - new mtee_ogp_setting(); + require_once MTEE_CLASS_DIR . 'mtee_ogp_post_setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_meta_output_ogp.php'; + new mtee_ogp_post_setting($options); new mtee_meta_output_ogp(); } //enabled my noindex, nofollow if ($mtee->is_enable('noindex_nofollow')) { - require_once MTEE_CLASS_DIR . 'mtee-noindexnofollow-setting.php'; - require_once MTEE_CLASS_DIR . 'mtee-output-noindexnofollow.php'; + require_once MTEE_CLASS_DIR . 'mtee_noindexnofolow_setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_meta_output_noindexnofollow.php'; new mtee_noindexnofolow_setting($options); new mtee_meta_output_noindexnofollow(); } //disabled WP version, WP JS/CSS version if ($mtee->is_disable('asset_ver_disabled') || $mtee->is_disable('asset_ver_disabled')) { - require_once MTEE_CLASS_DIR . 'mtee-version-setting.php'; + require_once MTEE_CLASS_DIR . 'mtee_version_setting.php'; new mtee_version_setting($options); } diff --git a/template/index.php b/template/index.php index 2cde990..ae60a71 100644 --- a/template/index.php +++ b/template/index.php @@ -27,57 +27,6 @@ $asset_ver_disabled = $this->get_key_setting('asset_ver_disabled'); value="1">有効 - 0 || count($register_targets['taxonomies']) > 0): ?> - - 0): ?> - - - - - - 0): ?> - - - - - -
カスタム投稿 -
    - - -
  • - -
    • - -
-
カスタム分類 -
    - -
  • - - -
    • - -
-
-

meta keywords テンプレート設定 is_enable('enabled')): ?>