From 55a8368fecd222daa6cf565905ee9fc0ea611030 Mon Sep 17 00:00:00 2001
From: nobu <big-me@n-k-y.net>
Date: Wed, 30 Jun 2021 18:25:55 +0900
Subject: [PATCH] WP PLUGIN MTEE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

変数チェックで使った不要な記載を削除
---
 template/index.php | 67 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/template/index.php b/template/index.php
index 4f35726..8c9369f 100644
--- a/template/index.php
+++ b/template/index.php
@@ -1,6 +1,6 @@
 <?php
 $register_targets = MTEE::register_target();
-$opt = get_option('_mtee');
+$opt              = get_option( '_mtee' );
 ?>
 <div class="wrap">
     <h2>meta keyword, description / バージョン情報 設定</h2>
@@ -14,15 +14,16 @@ $opt = get_option('_mtee');
         </ul>
     </nav>
     <form action="" method="post">
-        <?php wp_nonce_field('check_options'); ?>
+		<?php wp_nonce_field( 'check_options' ); ?>
         <input type="hidden" id="mtee_set_nav" name="mtee_set_nav"
-               value="<?php echo esc_attr($_POST['mtee_set_nav'] ?? 'nav_metas'); ?>">
+               value="<?php echo esc_attr( $_POST['mtee_set_nav'] ?? 'nav_metas' ); ?>">
         <div class="mtee_tab_box">
             <div class="mtee-form-box">
                 <h2>メタキーワード・ディスクリプション</h2>
                 <label>
                     <input type="hidden" name="_mtee[enabled]" value="0">
-                    <input type="checkbox" name="_mtee[enabled]" <?php checked($this->get_key_setting('enabled'), 1); ?>
+                    <input type="checkbox"
+                           name="_mtee[enabled]" <?php checked( $this->get_key_setting( 'enabled' ), 1 ); ?>
                            value="1">有効
                 </label>
             </div>
@@ -31,33 +32,33 @@ $opt = get_option('_mtee');
                 <p>個別設定していない投稿やカテゴリー等は、このテンプレートを適用します。</p>
                 <dl class="mtee_description_tmp_list">
                     <dt>投稿</dt>
-                    <dd>base[$param][$type]
+                    <dd>
                         <input class="mtee_keywords_tmp" type="text" name="_mtee[keywords_tmp][post]"
-                               value="<?php echo esc_attr($opt['keywords_tmp']['post']); ?>"
+                               value="<?php echo esc_attr( $opt['keywords_tmp']['post'] ); ?>"
                                placeholder="##title##,##category##,##tag##,##custom_tax##,##description##,##site_name##"
                     </dd>
                     <dt>ページ</dt>
                     <dd>
                         <input class="mtee_keywords_tmp" type="text" name="_mtee[keywords_tmp][page]"
-                               value="<?php echo esc_attr($opt['keywords_tmp']['page']); ?>"
+                               value="<?php echo esc_attr( $opt['keywords_tmp']['page'] ); ?>"
                                placeholder="##title##,##description##,##site_name##"
                     </dd>
                     <dt>カテゴリー</dt>
                     <dd>
                         <input class="mtee_keywords_tmp" type="text" name="_mtee[keywords_tmp][category]"
-                               value="<?php echo esc_attr($opt['keywords_tmp']['category']); ?>"
+                               value="<?php echo esc_attr( $opt['keywords_tmp']['category'] ); ?>"
                                placeholder="##title##,##description##,##site_name##">
                     </dd>
                     <dt>タグ</dt>
                     <dd>
                         <input class="mtee_keywords_tmp" type="text" name="_mtee[keywords_tmp][tag]"
-                               value="<?php echo esc_attr($opt['keywords_tmp']['tag']); ?>"
+                               value="<?php echo esc_attr( $opt['keywords_tmp']['tag'] ); ?>"
                                placeholder="##title##,##description##,##site_name##">
                     </dd>
                     <dt>カスタム分類</dt>
                     <dd>
                         <input class="mtee_keywords_tmp" type="text" name="_mtee[keywords_tmp][tax]"
-                               value="<?php echo esc_attr($opt['keywords_tmp']['tax']); ?>"
+                               value="<?php echo esc_attr( $opt['keywords_tmp']['tax'] ); ?>"
                                placeholder="##title##,##description##,##site_name##">
                     </dd>
                 </dl>
@@ -65,8 +66,8 @@ $opt = get_option('_mtee');
                     <li><b>共通</b>
                         <ul>
                             <li>##title##：投稿、ページ、カテゴリー等のタイトル</li>
-                            <li>##site_name##：サイト名（<?php echo get_bloginfo('name'); ?>）</li>
-                            <li>##site_description##：サイトの説明（<?php echo get_bloginfo('description'); ?>）</li>
+                            <li>##site_name##：サイト名（<?php echo get_bloginfo( 'name' ); ?>）</li>
+                            <li>##site_description##：サイトの説明（<?php echo get_bloginfo( 'description' ); ?>）</li>
                         </ul>
                     </li>
                     <li><b>投稿</b>
@@ -85,35 +86,35 @@ $opt = get_option('_mtee');
                     <dt>ページ／投稿</dt>
                     <dd>
                         <input class="mtee_description_tmp" type="text" name="_mtee[description_tmp][page]"
-                               value="<?php echo esc_attr($opt['description_tmp']['page']); ?>"
-                               placeholder="##site_name##の<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS); ?>##title##<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS); ?><?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_SINGLE_BASE); ?>"
+                               value="<?php echo esc_attr( $opt['description_tmp']['page'] ); ?>"
+                               placeholder="##site_name##の<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS ); ?>##title##<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS ); ?><?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_SINGLE_BASE ); ?>"
                     </dd>
                     <dt>カテゴリー</dt>
                     <dd>
                         <input class="mtee_description_tmp" type="text" name="_mtee[description_tmp][category]"
-                               value="<?php echo esc_attr($opt['description_tmp']['category']); ?>"
-                               placeholder="##site_name##の<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS); ?>##title##<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS); ?><?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE); ?>">
+                               value="<?php echo esc_attr( $opt['description_tmp']['category'] ); ?>"
+                               placeholder="##site_name##の<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS ); ?>##title##<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS ); ?><?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE ); ?>">
                     </dd>
                     <dt>タグ</dt>
                     <dd>
                         <input class="mtee_description_tmp" type="text" name="_mtee[description_tmp][tag]"
-                               value="<?php echo esc_attr($opt['description_tmp']['tag']); ?>"
-                               placeholder="##site_name##の<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS); ?>##title##<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS); ?><?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE); ?>">
+                               value="<?php echo esc_attr( $opt['description_tmp']['tag'] ); ?>"
+                               placeholder="##site_name##の<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS ); ?>##title##<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS ); ?><?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE ); ?>">
                     </dd>
                     <dt>カスタム分類</dt>
                     <dd>
                         <input class="mtee_description_tmp" type="text" name="_mtee[description_tmp][tax]"
-                               value="<?php echo esc_attr($opt['description_tmp']['tax']); ?>"
-                               placeholder="##site_name##の<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS); ?>##title##<?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS); ?><?php echo esc_attr(MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE); ?>">
+                               value="<?php echo esc_attr( $opt['description_tmp']['tax'] ); ?>"
+                               placeholder="##site_name##の<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_BEFORE_BRACKETS ); ?>##title##<?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_AFTER_BRACKETS ); ?><?php echo esc_attr( MTEE_CONFIG::MTEE_META_DESC_ARCHIVE_BASE ); ?>">
                     </dd>
                 </dl>
                 <ul>
-                    <li>##site_name##：サイト名（<?php bloginfo('name'); ?>）</li>
-                    <li>##site_description##：サイトの説明（<?php bloginfo('description'); ?>）</li>
+                    <li>##site_name##：サイト名（<?php bloginfo( 'name' ); ?>）</li>
+                    <li>##site_description##：サイトの説明（<?php bloginfo( 'description' ); ?>）</li>
                     <li>##title##：投稿、ページ、カテゴリー等のタイトル</li>
                 </ul>
             </div>
-            <?php include 'pages_meta.php'; ?>
+			<?php include 'pages_meta.php'; ?>
             <p class="submit"><input type="submit" name="Submit" class="button-primary" value="変更を保存"/></p>
         </div>
         <div class="mtee_tab_box">
@@ -122,11 +123,11 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[ogp_setting]" value="0">
                     <input type="checkbox"
-                           name="_mtee[ogp_setting]" <?php checked($this->get_key_setting('ogp_setting'), 1); ?>
+                           name="_mtee[ogp_setting]" <?php checked( $this->get_key_setting( 'ogp_setting' ), 1 ); ?>
                            value="1">有効（デフォルトのog:descriptionはmeta descriptionになります）
                 </label>
             </div>
-            <?php include 'pages_ogp.php'; ?>
+			<?php include 'pages_ogp.php'; ?>
             <p class="submit"><input type="submit" name="Submit" class="button-primary" value="変更を保存"/></p>
         </div>
         <div class="mtee_tab_box">
@@ -134,10 +135,10 @@ $opt = get_option('_mtee');
             <label>
                 <input type="hidden" name="_mtee[noindex_nofollow]" value="0">
                 <input type="checkbox"
-                       name="_mtee[noindex_nofollow]" <?php checked($this->get_key_setting('noindex_nofollow'), 1); ?>
+                       name="_mtee[noindex_nofollow]" <?php checked( $this->get_key_setting( 'noindex_nofollow' ), 1 ); ?>
                        value="1">有効
             </label>
-            <?php include 'pages_noindexnofollow.php'; ?>
+			<?php include 'pages_noindexnofollow.php'; ?>
         </div>
         <div class="mtee_tab_box">
             <div class="mtee-form-box mtee_box_border">
@@ -145,11 +146,11 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[canonical_setting]" value="0">
                     <input type="checkbox"
-                           name="_mtee[canonical_setting]" <?php checked($this->get_key_setting('canonical_setting'), 1); ?>
+                           name="_mtee[canonical_setting]" <?php checked( $this->get_key_setting( 'canonical_setting' ), 1 ); ?>
                            value="1">有効
                 </label>
             </div>
-            <?php include 'pages_canonical.php'; ?>
+			<?php include 'pages_canonical.php'; ?>
             <p class="submit"><input type="submit" name="Submit" class="button-primary" value="変更を保存"/></p>
         </div>
         <div class="mtee_tab_box">
@@ -159,7 +160,7 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[rss_disabled]" value="0">
                     <input type="checkbox"
-                           name="_mtee[rss_disabled]" <?php checked($this->get_key_setting('rss_disabled'), 1); ?>
+                           name="_mtee[rss_disabled]" <?php checked( $this->get_key_setting( 'rss_disabled' ), 1 ); ?>
                            value="1">出力しない
                 </label>
             </div>
@@ -168,7 +169,7 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[wp_ver_disabled]" value="0">
                     <input type="checkbox"
-                           name="_mtee[wp_ver_disabled]" <?php checked($this->get_key_setting('wp_ver_disabled'), 1); ?>
+                           name="_mtee[wp_ver_disabled]" <?php checked( $this->get_key_setting( 'wp_ver_disabled' ), 1 ); ?>
                            value="1">表示しない
                 </label>
             </div>
@@ -177,7 +178,7 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[asset_ver_disabled]" value="0">
                     <input type="checkbox"
-                           name="_mtee[asset_ver_disabled]" <?php checked($this->get_key_setting('asset_ver_disabled'), 1); ?>
+                           name="_mtee[asset_ver_disabled]" <?php checked( $this->get_key_setting( 'asset_ver_disabled' ), 1 ); ?>
                            value="1">表示しない
                 </label>
             </div>
@@ -186,7 +187,7 @@ $opt = get_option('_mtee');
                 <label>
                     <input type="hidden" name="_mtee[emoji_disabled]" value="0">
                     <input type="checkbox"
-                           name="_mtee[emoji_disabled]" <?php checked($this->get_key_setting('emoji_disabled'), 1); ?>
+                           name="_mtee[emoji_disabled]" <?php checked( $this->get_key_setting( 'emoji_disabled' ), 1 ); ?>
                            value="1">表示しない
                 </label>
             </div>