Below is a differential between the unpatched vulnerable code and the patched update, for reference.
--- a/blog-floating-button/blog-floating-button.php
+++ b/blog-floating-button/blog-floating-button.php
@@ -3,7 +3,7 @@
Plugin Name: Blog Floating Button
Plugin URI: https://bfb-plugin.com/
Description: 「Blog Floating Button(BFB)」はブログ内にフロートボタンを簡単に実装できるプラグインです。
-Version: 1.4.20
+Version: 1.4.21
Author: Meril Inc.
Author URI: https://meril.co.jp/
License: GPL2
@@ -11,10 +11,12 @@
?>
<?php
-if ( strpos( $_SERVER['HTTP_HOST'], 'dev.' ) !== false ) {
- error_reporting( E_ALL );
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
}
+define( 'BFB_PLUGIN_VERSION', '1.4.21' );
+
#[AllowDynamicProperties] // PHP8.2対応
class BlogFloatingButton {
@@ -174,6 +176,7 @@
public function insertFooter( $device = null ) {
// エラー処理を追加 v1.4.20
+ // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_set_error_handler -- SCSSコンパイル中の警告を抑止する目的。全ての return 前で restore_error_handler() により復元している
set_error_handler(
function ( $errno, $errstr, $errfile, $errline ) {
// すべてのエラーを無視する
@@ -190,6 +193,7 @@
$cookie_bfb_closed = $cookie_bfb_closed !== null ? htmlspecialchars( $cookie_bfb_closed, ENT_QUOTES, 'UTF-8' ) : '';
if ( $cookie_bfb_closed == 'true' ) {
+ restore_error_handler();
return false;
}
}
@@ -200,6 +204,7 @@
// 管理者のみ表示
if ( $this->get_metadata( 'bfb_mode' ) != 'open' ) {
if ( ! current_user_can( 'manage_options' ) ) {
+ restore_error_handler();
return false;
}
}
@@ -208,6 +213,7 @@
// 管理画面では非表示にならない
if ( isset( $this->bfb_exclude_toppage ) && $this->bfb_exclude_toppage === 'show_top_only' && is_singular() ) {
if ( ! is_home() && ! is_front_page() ) {
+ restore_error_handler();
return '';
}
}
@@ -215,6 +221,7 @@
// トップページの表示/非表示
if ( is_home() || is_front_page() ) {
if ( isset( $this->bfb_exclude_toppage ) && $this->bfb_exclude_toppage === 'hide' ) {
+ restore_error_handler();
return '';
}
} else {
@@ -225,6 +232,7 @@
$bfb_exclude_post_ids = explode( ',', $this->bfb_exclude_post_ids );
if ( count( $bfb_exclude_post_ids ) > 0 && isset( $post->ID ) ) {
if ( in_array( strval( $post->ID ), $bfb_exclude_post_ids, true ) ) {
+ restore_error_handler();
return '';
}
}
@@ -287,7 +295,9 @@
// 管理画面はスクリプトは表示しない
if ( is_admin() ) {
- return ''; }
+ restore_error_handler();
+ return '';
+ }
if ( empty( $this->bfb_cookie_hide_span ) ) {
$bfb_cookie_hide_span = 7;
@@ -321,6 +331,7 @@
}
// jsの内容を大幅変更 (v1.4.17)
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- スクリプト本体は固定で、動的な数値は wp_json_encode() 済み
echo $this->delete_br(
'
<script type="text/javascript">
@@ -332,9 +343,9 @@
var scrollTop = 0;
var bfb_show_pos = 0;
var bfb_hide_pos = 99999999;
- var bfb_showing_area = ' . $bfb_showing_area . ';
- var is_autohide = ' . $js_is_autohide . ';
- var is_pro = ' . $js_is_pro . ';
+ var bfb_showing_area = ' . wp_json_encode( (int) $bfb_showing_area ) . ';
+ var is_autohide = ' . wp_json_encode( (int) $js_is_autohide ) . ';
+ var is_pro = ' . wp_json_encode( (int) $js_is_pro ) . ';
var has_show_pos = 0;
var has_hide_pos = 0;
@@ -421,6 +432,7 @@
'
);
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- スクリプト本体は固定で、動的な数値は wp_json_encode() 済み
echo $this->delete_br(
'
@@ -429,7 +441,7 @@
$(document).on('click touchend','[id^="bfb_content_"] .bfb_closed',function(){
$('[id^="bfb_content_"]').html("");
- $.cookie("bfb_closed", "true", { expires: ' . esc_html( $bfb_cookie_hide_span ) . ' });
+ $.cookie("bfb_closed", "true", { expires: ' . wp_json_encode( (int) $bfb_cookie_hide_span ) . ' });
});
});
@@ -441,12 +453,6 @@
// 最適化テスト中
if ( ! empty( $this->{'bfb_optId_pc'} ) || ! empty( $this->{'bfb_optId_sp'} ) ) {
- $ajax_page_type = '';
- if ( is_singular() ) {
- // 個別記事、固定ページ
- $ajax_page_type = '"page_type": "single",';
- }
-
foreach ( $this->devices as $device ) {
// 初期化
@@ -456,41 +462,49 @@
// 最適化テストではキャッシュ対策のためajaxで出力
// [bfb_show]があれば初期表示しない
- if ( ! $this->is_bfb_show() ) {
- $bfb_display_ajax = '$('[id^="bfb_content_"]').css({"cssText": "display: block;"});';
- } else {
- $bfb_display_ajax = '';
- }
+ $bfb_display_ajax = ! $this->is_bfb_show();
$this->{'optimize_type_' . $device} = $this->optDatas['optimizeBtn']; // tracking_js.phpで使用
+ $ajax_data = array(
+ 'device' => $device,
+ 'post_id' => isset( $post->ID ) ? (int) $post->ID : 0,
+ 'optimize_id' => $this->{'bfb_optId_' . $device},
+ 'optimizeBtn' => $this->{'optimize_type_' . $device},
+ );
+ if ( is_singular() ) {
+ // 個別記事、固定ページ
+ $ajax_data['page_type'] = 'single';
+ }
+
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- スクリプト本体は固定で、動的な値は wp_json_encode() 済み
echo $this->delete_br(
'<script type="text/javascript">
jQuery(function($){
+ var bfbDevice = ' . wp_json_encode( $device, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ) . ';
+ var bfbDisplayAjax = ' . wp_json_encode( $bfb_display_ajax ) . ';
try{
jQuery.ajax({
- url: "' . site_url( $this->echo_bfb_optimize_url ) . '",
+ url: ' . wp_json_encode( site_url( $this->echo_bfb_optimize_url ), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ) . ',
type: "post",
- data: {
- "device": "' . $device . '",
- "post_id": ' . $post->ID . ','
- . $ajax_page_type . '
- "optimize_id": "' . $this->{'bfb_optId_' . $device} . '",
- "optimizeBtn": "' . $this->{'optimize_type_' . $device} . '",
- },
+ data: ' . wp_json_encode( $ajax_data, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ) . ',
}).done(function(res){
- if( "' . $device . '" == "sp" ){
+ if( bfbDevice === "sp" ){
/*SPはPCを待機して表示*/
var is_bfb_sp_show = setInterval(function(){
if( jQuery('[id^="bfb_content_pc"]').length ){
jQuery("body").append(res);
- ' . $bfb_display_ajax . '
+ if ( bfbDisplayAjax ) {
+ $('[id^="bfb_content_"]').css({"cssText": "display: block;"});
+ }
clearInterval(is_bfb_sp_show);
}
}, 1000);
}else{
jQuery("body").append(res);
- ' . $bfb_display_ajax . '
+ if ( bfbDisplayAjax ) {
+ $('[id^="bfb_content_"]').css({"cssText": "display: block;"});
+ }
}
}).fail(function(res){
}).always(function(res){
@@ -717,7 +731,7 @@
$distribution_rate = $this->optDatas['distribution_rate'];
// 振り分け率:70なら70%でメインボタン
- $opt_rand = mt_rand( 0, 100 );
+ $opt_rand = wp_rand( 0, 100 );
if ( $opt_rand < $distribution_rate ) {
$this->optDatas['optimizeBtn'] = 'mainBtnDesign';
$this->optDatas['suf_optimizeBtn'] = '_opt_mainBtn';
@@ -938,8 +952,10 @@
$current_screen = get_current_screen();
// ABテスト結果画面ではABテスト実行中でもメッセージは出さずプレビューを出力する
if ( $current_screen && $current_screen->id === 'blog-floating-button_page_blog-floating-button-optimize-report' ) {
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- $echo_html は各値をコンテキスト別にエスケープ済みで、許可対象外の style/SVG/カスタム属性を含む生成済みマークアップ
echo $echo_html;
} elseif ( $admin_pro_flg && empty( $this->{'bfb_optId_' . $device} ) ) {
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- $echo_html は各値をコンテキスト別にエスケープ済みで、許可対象外の style/SVG/カスタム属性を含む生成済みマークアップ
echo $echo_html;
} else {
echo wp_kses_post( $this->abtest_message );
@@ -950,6 +966,7 @@
// ABテストでは出力しない
// キャッシュによりABできないため
// Ajaxで取得→出力
+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- $echo_html は各値をコンテキスト別にエスケープ済みで、許可対象外の style/SVG/カスタム属性を含む生成済みマークアップ
echo $echo_html;
}
}
@@ -992,7 +1009,7 @@
'MediaUpLoader',
plugins_url( 'js/bfb_admin.js', __FILE__ ),
array( 'jquery' ),
- false,
+ BFB_PLUGIN_VERSION,
true
);
wp_enqueue_media();
@@ -1035,6 +1052,7 @@
// 設定保存
public function save_metadata() {
+ // phpcs:ignore WordPress.Security.NonceVerification.Missing -- 直後の check_admin_referer() で検証している。nonce値自体を $_POST から取るため存在チェックが先行するのは避けられない
if ( ! $_POST ) {
return false; }
@@ -1265,7 +1283,8 @@
'webmate',
);
$pattern = '/' . implode( '|', $useragents ) . '/i';
- return preg_match( $pattern, $_SERVER['HTTP_USER_AGENT'] );
+ $user_agent = isset( $_SERVER['HTTP_USER_AGENT'] ) ? sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) : '';
+ return preg_match( $pattern, $user_agent );
}
// 更新メッセージ
@@ -1274,7 +1293,7 @@
}
// エラーメッセージ
public function error_message( $msg ) {
- echo '<div id="setting-error-settings_updated" class="error settings-error notice bfb_notice is-dismissible"><p><strong>' . $msg . '</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">この通知を非表示にする</span></button></div>';
+ echo '<div id="setting-error-settings_updated" class="error settings-error notice bfb_notice is-dismissible"><p><strong>' . esc_html( $msg ) . '</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">この通知を非表示にする</span></button></div>';
}
// PRO版ライセンスキーのチェック
public function check_license_key() {
@@ -1356,7 +1375,9 @@
}
// 現在のURL
- $url = empty( $_SERVER['HTTPS'] ) ? 'http://' : 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $http_host = isset( $_SERVER['HTTP_HOST'] ) ? sanitize_text_field( wp_unslash( $_SERVER['HTTP_HOST'] ) ) : '';
+ $request_uri = isset( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
+ $url = empty( $_SERVER['HTTPS'] ) ? 'http://' : esc_url_raw( 'https://' . $http_host . $request_uri );
$data = array(
'body' => array(
@@ -1676,4 +1697,4 @@
}
}
-$bfb_content = new BlogFloatingButton();
No newline at end of file
+$bfb_content = new BlogFloatingButton();
--- a/blog-floating-button/function.php
+++ b/blog-floating-button/function.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
// 管理画面でスクリプト読み込み
function bfb_admin_scripts( $loader_src ) {
@@ -10,27 +14,27 @@
// 日付ピッカー
wp_enqueue_script( 'jquery-ui-datepicker' );
- wp_enqueue_style( 'jquery-ui-css', plugins_url( 'css/jquery-ui.css', __FILE__ ) );
+ wp_enqueue_style( 'jquery-ui-css', plugins_url( 'css/jquery-ui.css', __FILE__ ), array(), BFB_PLUGIN_VERSION );
// カラーピッカー
wp_enqueue_style( 'wp-color-picker' );
// フォント
- wp_enqueue_style( 'font-Montserrat', 'https://fonts.googleapis.com/css?family=Montserrat&display=swap' );
+ wp_enqueue_style( 'bfb_font_montserrat', plugins_url( 'css/bfb-font.css', __FILE__ ), array(), BFB_PLUGIN_VERSION );
// グラフ描画
global $hook_suffix;
if ( strpos( $hook_suffix, 'blog-floating-button' ) > -1 ) {
- wp_enqueue_script( 'chart-min-js', plugins_url( 'js/Chart.min.js', __FILE__ ) );
- wp_enqueue_script( 'chartjs-plugin-colorschemes-min-js', plugins_url( 'js/chartjs-plugin-colorschemes.min.js', __FILE__ ) );
+ wp_enqueue_script( 'chart-min-js', plugins_url( 'js/Chart.min.js', __FILE__ ), array(), BFB_PLUGIN_VERSION, true );
+ wp_enqueue_script( 'chartjs-plugin-colorschemes-min-js', plugins_url( 'js/chartjs-plugin-colorschemes.min.js', __FILE__ ), array( 'chart-min-js' ), BFB_PLUGIN_VERSION, true );
}
// table
- wp_enqueue_script( 'jquery-dataTables-min-js', plugins_url( 'js/jquery.dataTables.min.js', __FILE__ ) );
- wp_enqueue_style( 'jquery-dataTables-min-css', plugins_url( 'css/jquery.dataTables.min.css', __FILE__ ) );
+ wp_enqueue_script( 'jquery-dataTables-min-js', plugins_url( 'js/jquery.dataTables.min.js', __FILE__ ), array( 'jquery' ), BFB_PLUGIN_VERSION, true );
+ wp_enqueue_style( 'jquery-dataTables-min-css', plugins_url( 'css/jquery.dataTables.min.css', __FILE__ ), array(), BFB_PLUGIN_VERSION );
// 管理画面CSS
- wp_enqueue_style( 'admin-bfb-style-css', plugins_url( 'css/admin_bfb_style.css', __FILE__ ) );
+ wp_enqueue_style( 'admin-bfb-style-css', plugins_url( 'css/admin_bfb_style.css', __FILE__ ), array(), BFB_PLUGIN_VERSION );
}
add_action( 'admin_enqueue_scripts', 'bfb_admin_scripts' );
@@ -38,10 +42,9 @@
function bfb_enqueue_scripts() {
wp_enqueue_script( 'jquery' );
- wp_register_script( 'bfb_js_cookie', plugins_url( 'js/jquery.cookie.js', __FILE__ ), array(), '', true );
+ wp_register_script( 'bfb_js_cookie', plugins_url( 'js/jquery.cookie.js', __FILE__ ), array( 'jquery' ), BFB_PLUGIN_VERSION, true );
wp_enqueue_script( 'bfb_js_cookie' );
- wp_enqueue_style( 'bfb_fontawesome_stylesheet', 'https://use.fontawesome.com/releases/v5.12.1/css/all.css' );
- wp_enqueue_style( 'bfb_font_Montserrat', 'https://fonts.googleapis.com/css?family=Montserrat&display=swap' );
+ wp_enqueue_style( 'bfb_font_montserrat', plugins_url( 'css/bfb-font.css', __FILE__ ), array(), BFB_PLUGIN_VERSION );
}
add_action( 'wp_enqueue_scripts', 'bfb_enqueue_scripts' );
@@ -88,7 +91,7 @@
function bfb_save_fields( $post_id ) {
// nonceを確認し値が正しくなければ何もしない
- $nonce = isset( $_POST['_wpnonce_bfb'] ) ? $_POST['_wpnonce_bfb'] : null;
+ $nonce = isset( $_POST['_wpnonce_bfb'] ) ? sanitize_text_field( wp_unslash( $_POST['_wpnonce_bfb'] ) ) : '';
if ( ! wp_verify_nonce( $nonce, 'bfb_setting' ) ) {
return $post_id;
}
@@ -167,11 +170,12 @@
$bfb = new BlogFloatingButton();
+ // phpcs:ignore WordPress.Security.NonceVerification.Missing -- 直後の wp_verify_nonce() で検証している。nonce値自体を $_POST から取るため存在チェックが先行するのは避けられない
if ( ! $_POST ) {
return false; }
// nonceを確認し値が正しくなければ何もしない
- $nonce = isset( $_POST['_wpnonce_bfb'] ) ? $_POST['_wpnonce_bfb'] : null;
+ $nonce = isset( $_POST['_wpnonce_bfb'] ) ? sanitize_text_field( wp_unslash( $_POST['_wpnonce_bfb'] ) ) : '';
if ( ! wp_verify_nonce( $nonce, 'bfb_setting' ) ) {
return $post_id;
}
@@ -318,6 +322,7 @@
// DBにアクセスログ、クリックログを残す
function bfb_write_log() {
+ // phpcs:ignore WordPress.Security.NonceVerification.Missing -- 未ログインの一般訪問者からアクセスログを受け取る公開エンドポイントのため nonce は適用できない
if ( empty( $_POST['data'] ) ) {
return false; }
@@ -426,7 +431,12 @@
$previewDatas['live_preview'] = true;
if ( $previewDatas ) {
- return $bfb->generate_btn_html( $_POST['device'], $previewDatas );
+ // phpcs:ignore WordPress.Security.NonceVerification.Missing -- 管理画面のプレビュー生成のみを行い、値の保存や状態変更をしない読み取り専用エンドポイント。受け取った device は直後にホワイトリスト照合している
+ $device = isset( $_POST['device'] ) ? sanitize_text_field( wp_unslash( $_POST['device'] ) ) : '';
+ if ( ! in_array( $device, $bfb->devices, true ) ) {
+ return false;
+ }
+ return $bfb->generate_btn_html( $device, $previewDatas );
}
}
function bfb_livePreview_endpoint() {
@@ -555,17 +565,26 @@
return;
} else {
// 取得した数値をUnixタイムスタンプに変換
- $threshold_date = date( 'Y-m-d', strtotime( '-' . $threshold_date . ' days' ) );
+ $threshold_date = gmdate( 'Y-m-d', strtotime( '-' . $threshold_date . ' days' ) );
// ログを削除する処理を実装
global $wpdb;
+ $where = array( 'date < %s' );
+ $params = array( $threshold_date );
+
// アクセスログを削除
$table_name = $wpdb->prefix . 'bfb_access_log';
- $wpdb->query( $wpdb->prepare( "DELETE FROM $table_name WHERE date < %s", $threshold_date ) );
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- テーブル名は $wpdb->prefix 由来で固定
+ $sql = "DELETE FROM $table_name WHERE " . implode( ' AND ', $where );
+ // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter,WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching -- $sql は固定の断片と %s プレースホルダのみで構成し値は prepare() でバインドしている。プラグイン独自テーブルの定期削除のため WP API では代替できず、削除処理にキャッシュは不要
+ $wpdb->query( $wpdb->prepare( $sql, $params ) );
// クリックログを削除
$table_name = $wpdb->prefix . 'bfb_click_log';
- $wpdb->query( $wpdb->prepare( "DELETE FROM $table_name WHERE date < %s", $threshold_date ) );
+ // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- テーブル名は $wpdb->prefix 由来で固定
+ $sql = "DELETE FROM $table_name WHERE " . implode( ' AND ', $where );
+ // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter,WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching -- $sql は固定の断片と %s プレースホルダのみで構成し値は prepare() でバインドしている。プラグイン独自テーブルの定期削除のため WP API では代替できず、削除処理にキャッシュは不要
+ $wpdb->query( $wpdb->prepare( $sql, $params ) );
}
}
add_action( 'bfb_cleanup_logs_event', 'bfb_cleanup_analysis_logs' );
--- a/blog-floating-button/inc/live_preview.php
+++ b/blog-floating-button/inc/live_preview.php
@@ -1,8 +1,13 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<script>
//ライブプレビュー機能
var btnData = {};
-var bfb_url = '<?php echo site_url('/wp-json/bfb/api/live_preview'); ?>';
+var bfb_url = <?php echo wp_json_encode( site_url( '/wp-json/bfb/api/live_preview' ), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>;
var bfb_tabs1_name = '';
var bfb_tabs2_name = '';
@@ -233,4 +238,4 @@
});
}
-</script>
No newline at end of file
+</script>
--- a/blog-floating-button/inc/optimize/optimize-init.php
+++ b/blog-floating-button/inc/optimize/optimize-init.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="bfb_wrap" class="optimize">
<h1 class="bfb_h1">A/Bテストのパターン作成</h1>
@@ -25,7 +30,7 @@
<td>
<?php
foreach( $this->designTypes as $designType ): ?>
- <label for="<?php echo esc_attr($designType); ?>_main"><input type="radio" id="<?php echo esc_attr($designType); ?>_main" name="mainBtnDesign" class="" value="<?php echo esc_attr($designType); ?>" <?= ($this->mainBtnDesign == $designType) ? 'checked' : '' ?>><?php echo esc_attr($this->designNames[$designType]); ?></label>
+ <label for="<?php echo esc_attr($designType); ?>_main"><input type="radio" id="<?php echo esc_attr($designType); ?>_main" name="mainBtnDesign" class="" value="<?php echo esc_attr($designType); ?>" <?php checked( $this->mainBtnDesign, $designType ); ?>><?php echo esc_attr($this->designNames[$designType]); ?></label>
<?php endforeach; ?>
</td>
</tr>
@@ -34,7 +39,7 @@
<td>
<?php
foreach( $this->designTypes as $designType ): ?>
- <label for="<?php echo esc_attr($designType); ?>_sub"><input type="radio" id="<?php echo esc_attr($designType); ?>_sub" name="subBtnDesign" class="" value="<?php echo esc_attr($designType); ?>" <?= ($this->subBtnDesign == $designType) ? 'checked' : '' ?>><?php echo esc_attr($this->designNames[$designType]); ?></label>
+ <label for="<?php echo esc_attr($designType); ?>_sub"><input type="radio" id="<?php echo esc_attr($designType); ?>_sub" name="subBtnDesign" class="" value="<?php echo esc_attr($designType); ?>" <?php checked( $this->subBtnDesign, $designType ); ?>><?php echo esc_attr($this->designNames[$designType]); ?></label>
<?php endforeach; ?>
</td>
</tr>
@@ -47,7 +52,7 @@
<td>
<?php
foreach( $this->devices as $bfb_device ): ?>
- <label for="<?php echo esc_attr($bfb_device); ?>"><input type="radio" id="<?php echo esc_attr($bfb_device); ?>" name="device" class="" value="<?php echo esc_attr($bfb_device); ?>" <?= ($this->device == $bfb_device)?'checked':''; ?>><?php echo esc_attr($this->devicesName[$bfb_device]); ?></label>
+ <label for="<?php echo esc_attr($bfb_device); ?>"><input type="radio" id="<?php echo esc_attr($bfb_device); ?>" name="device" class="" value="<?php echo esc_attr($bfb_device); ?>" <?php checked( $this->device, $bfb_device ); ?>><?php echo esc_attr($this->devicesName[$bfb_device]); ?></label>
<?php endforeach; ?>
</td>
</tr>
@@ -71,4 +76,4 @@
<input type="hidden" name="status" value="<?php echo esc_attr($this->optimize_status); ?>">
</form>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/optimize/optimize-list.php
+++ b/blog-floating-button/inc/optimize/optimize-list.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="bfb_wrap" class="optimize">
<h1 class="bfb_h1">A/Bテスト</h1>
@@ -11,4 +16,4 @@
<?php include_once( dirname(__FILE__) . '/optimize-table.php' ); ?>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/optimize/optimize-main.php
+++ b/blog-floating-button/inc/optimize/optimize-main.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
$filter_arg = array(
'action' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
'optimize_step' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
@@ -114,16 +118,16 @@
<script type="text/javascript">
jQuery(function($){
$('a.alert').on('click',function(){
- if( $(this).attr('action') == 'delete' ){
+ if( $(this).attr('data-action') == 'delete' ){
return alert_msg("設定データと最適化結果を削除します。一度削除したデータは復元できません。データを削除してよろしいですか?");
}
- if( $(this).attr('action') == 'opt_start' ){
+ if( $(this).attr('data-action') == 'opt_start' ){
return alert_msg("テストを開始していいですか?");
}
- if( $(this).attr('action') == 'opt_stop' ){
+ if( $(this).attr('data-action') == 'opt_stop' ){
return alert_msg("テストを停止していいですか?停止後に再開することもできます。");
}
- if( $(this).attr('action') == 'opt_finish' ){
+ if( $(this).attr('data-action') == 'opt_finish' ){
return alert_msg("テストを完了していいですか?完了後はテスト再開できません。");
}
});
@@ -170,4 +174,4 @@
?>
-<?php endif; ?>
No newline at end of file
+<?php endif; ?>
--- a/blog-floating-button/inc/optimize/optimize-mainBtn.php
+++ b/blog-floating-button/inc/optimize/optimize-mainBtn.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="bfb_wrap" class="optimize">
<h1 class="bfb_h1">A/Bテストのパターン作成</h1>
@@ -62,4 +67,4 @@
</div>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/optimize/optimize-subBtn.php
+++ b/blog-floating-button/inc/optimize/optimize-subBtn.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="bfb_wrap" class="optimize">
<h1 class="bfb_h1">A/Bテストのパターン作成</h1>
@@ -27,7 +32,7 @@
<table class="form-table">
<tr>
<th>テストID<span class="bfb_popup_help" data-message="自動付与されるIDです。変更はできません。">?</span></th>
- <td><input type="text" class="regular-text" value="<?php echo $this->optimize_id; ?>" readonly><small class="bfb_small">自動付与されるため変更できません。</small></td>
+ <td><input type="text" class="regular-text" value="<?php echo esc_attr( $this->optimize_id ); ?>" readonly><small class="bfb_small">自動付与されるため変更できません。</small></td>
</tr>
</table>
@@ -61,4 +66,4 @@
</div>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/optimize/optimize-table.php
+++ b/blog-floating-button/inc/optimize/optimize-table.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
$get_page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
if( $get_page == "blog-floating-button-optimize" ){
@@ -15,66 +19,67 @@
$html = '';
foreach( $datas as $opt_id => $data ){
- if(isset($data['status'])){
- switch($data['status']){
- case 0:
- $status = '<span class="status_stop">停止</span>';
- break;
- case 1:
- $status = '<span class="status_start">稼働中</span>';
- break;
- case 2:
- $status = '完了';
- break;
- default:
- $status = '<span class="status_stop">停止</span>';
- break;
- }
-
+ $optimize_status = isset( $data['status'] ) ? $data['status'] : '';
+ switch( $optimize_status ){
+ case 0:
+ $status = '<span class="status_stop">停止</span>';
+ break;
+ case 1:
+ $status = '<span class="status_start">稼働中</span>';
+ break;
+ case 2:
+ $status = '完了';
+ break;
+ default:
+ $status = '<span class="status_stop">停止</span>';
+ break;
}
$optimize_name = isset($data['optimize_name']) ? $data['optimize_name'] : '';
$device = isset($data['device']) ? $data['device'] : '';
$mainBtnDesign = isset($data['mainBtnDesign']) ? $data['mainBtnDesign'] : '';
$subBtnDesign = isset($data['subBtnDesign']) ? $data['subBtnDesign'] : '';
+ $main_btn_name = isset( $this->designNames[ $mainBtnDesign ] ) ? $this->designNames[ $mainBtnDesign ] : '';
+ $sub_btn_name = isset( $this->designNames[ $subBtnDesign ] ) ? $this->designNames[ $subBtnDesign ] : '';
$distribution_rate = isset($data['distribution_rate']) ? $data['distribution_rate'] : '';
$scheduled_finish_date = isset($data['scheduled_finish_date']) ? $data['scheduled_finish_date'] : '';
$created_date = isset($data['created_date']) ? $data['created_date'] : '';
$finished_date = isset($data['finished_date']) ? $data['finished_date'] : '';
$memo = isset($data['memo']) ? $data['memo'] : '';
- $report_linkTarget = $is_optimize_page?'target="_blank"':'';
+ $report_link_target = $is_optimize_page ? ' target="_blank"' : '';
+ $report_url = esc_url( '?page=blog-floating-button-optimize-report&optimize_id=' . $opt_id );
$html .= '<tr>';
$html .= '<td>'.$status.'</td>';
- $html .= '<td><a href="?page=blog-floating-button-optimize-report&optimize_id='.$opt_id.'" '.$report_linkTarget.'>'.$optimize_name.'</a></td>';
- $html .= '<td>'.$device.'</td>';
- $html .= '<td>'.$this->designNames[$mainBtnDesign].'</td>';
- $html .= '<td>'.$this->designNames[$subBtnDesign].'</td>';
- $html .= '<td>'.$distribution_rate.'%</td>';
+ $html .= '<td><a href="' . $report_url . '"' . $report_link_target . '>' . esc_html( $optimize_name ) . '</a></td>';
+ $html .= '<td>' . esc_html( $device ) . '</td>';
+ $html .= '<td>' . esc_html( $main_btn_name ) . '</td>';
+ $html .= '<td>' . esc_html( $sub_btn_name ) . '</td>';
+ $html .= '<td>' . esc_html( intval( $distribution_rate ) ) . '%</td>';
//$html .= '<td>'.$scheduled_finish_date.'</td>';
- $html .= '<td>'.$created_date.'</td>';
- $html .= '<td>'.$finished_date.'</td>';
- $html .= '<td>'.$memo.'</td>';
+ $html .= '<td>' . esc_html( $created_date ) . '</td>';
+ $html .= '<td>' . esc_html( $finished_date ) . '</td>';
+ $html .= '<td>' . esc_html( $memo ) . '</td>';
if( $is_optimize_page ){
$html .= '<td>';
//0:停止、1:稼働中、2:完了
- if( $data['status'] == 0 && $data['status'] != 2 ){
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&action=opt_start" class="alert" action="opt_start"><b>開始</b></a> | ';
- }elseif( $data['status'] == 1 ){
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&action=opt_stop" class="alert" action="opt_stop">停止</a> | ';
+ if( $optimize_status == 0 && $optimize_status != 2 ){
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&action=opt_start' ) . '" class="alert" data-action="opt_start"><b>開始</b></a> | ';
+ }elseif( $optimize_status == 1 ){
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&action=opt_stop' ) . '" class="alert" data-action="opt_stop">停止</a> | ';
}
- if( $data['status'] == 0 || $data['status'] == 1 ){
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&action=opt_finish" class="alert" action="opt_finish">完了</a> | ';
+ if( $optimize_status == 0 || $optimize_status == 1 ){
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&action=opt_finish' ) . '" class="alert" data-action="opt_finish">完了</a> | ';
}
- if( $data['status'] == 0 && $data['status'] != 2 ){
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&optimize_step=opt_init&action=edit">編集</a> | ';
+ if( $optimize_status == 0 && $optimize_status != 2 ){
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&optimize_step=opt_init&action=edit' ) . '">編集</a> | ';
}
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&action=copy">コピー</a> | ';
- if( $data['status'] == 0 ){
- $html .= '<a href="?page=blog-floating-button-optimize&optimize_id='.$opt_id.'&action=delete" class="alert" action="delete">削除</a>';
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&action=copy' ) . '">コピー</a> | ';
+ if( $optimize_status == 0 ){
+ $html .= '<a href="' . esc_url( '?page=blog-floating-button-optimize&optimize_id=' . $opt_id . '&action=delete' ) . '" class="alert" data-action="delete">削除</a>';
}
$html .= '</td>';
}
@@ -94,8 +99,8 @@
</tr>
</thead>
<tbody id="the-list">
- <?php echo $html; ?>
+ <?php echo wp_kses_post( $html ); ?>
</tbody>
</table>
-<?php } ?>
No newline at end of file
+<?php } ?>
--- a/blog-floating-button/inc/optimize/report/report-graph.php
+++ b/blog-floating-button/inc/optimize/report/report-graph.php
@@ -1,22 +1,29 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="canvasWrapper">
<canvas id="myChart"></canvas>
</div>
<script>
+// Chart.js はフッターで読み込むため、DOM 構築と依存スクリプトの読み込み後に初期化する。
+document.addEventListener("DOMContentLoaded", function() {
var chartData = {
- labels: [<?php echo $optData['graphData']['date']; ?>],
+ labels: <?php echo wp_json_encode( $optData['graphData']['date'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
datasets: [
{
type: 'line',
label: 'クリック率(メイン)',
- data: [<?php echo $optData['graphData']['main']; ?>],
+ data: <?php echo wp_json_encode( $optData['graphData']['main'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
yAxisID: "y-clickRate",
fill: false,
},
{
type: 'line',
label: 'クリック率(サブ)',
- data: [<?php echo $optData['graphData']['sub']; ?>],
+ data: <?php echo wp_json_encode( $optData['graphData']['sub'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
yAxisID: "y-clickRate",
fill: false,
},
@@ -39,9 +46,9 @@
yAxes: [
{
id: "y-clickRate",
- type: "linear",
+ type: "linear",
ticks: {
- max: <?php echo $total_maxClickRate; ?>,
+ max: <?php echo wp_json_encode( $total_maxClickRate ); ?>,
min: 0,
},
gridLines: {
@@ -53,4 +60,5 @@
}
}
});
-</script>
No newline at end of file
+});
+</script>
--- a/blog-floating-button/inc/optimize/report/report-main.php
+++ b/blog-floating-button/inc/optimize/report/report-main.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
$table_html = '';
$get_optimize_id = filter_input(INPUT_GET, 'optimize_id', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -21,8 +25,15 @@
$start_date = '2020-01';
$optData = $this->get_tableData($start_date,'',$opt_id);
- $table_html .= "<tr><td><a href="?page=blog-floating-button-optimize-report&optimize_id=".$opt_id."">".$optData['optimize_name']."</a></td><td>".$optData['device']."</td><td>".($optData['main_access']+$optData['sub_access'])."</td><td>".$optData['main_click']."(".$optData['main_clickRate']."%)</td><td>".$optData['sub_click']."(".$optData['sub_clickRate']."%)</td><td>".$optData['created_date']."</td><td>".$optData['finished_date']."</td></tr>";
-
+ $table_html .= '<tr>';
+ $table_html .= '<td><a href="' . esc_url( '?page=blog-floating-button-optimize-report&optimize_id=' . $opt_id ) . '">' . esc_html( $optData['optimize_name'] ) . '</a></td>';
+ $table_html .= '<td>' . esc_html( $optData['device'] ) . '</td>';
+ $table_html .= '<td>' . esc_html( intval( $optData['main_access'] ) + intval( $optData['sub_access'] ) ) . '</td>';
+ $table_html .= '<td>' . esc_html( intval( $optData['main_click'] ) ) . '(' . esc_html( $optData['main_clickRate'] ) . '%)</td>';
+ $table_html .= '<td>' . esc_html( intval( $optData['sub_click'] ) ) . '(' . esc_html( $optData['sub_clickRate'] ) . '%)</td>';
+ $table_html .= '<td>' . esc_html( $optData['created_date'] ) . '</td>';
+ $table_html .= '<td>' . esc_html( $optData['finished_date'] ) . '</td>';
+ $table_html .= '</tr>';
}
}
}
@@ -33,7 +44,7 @@
<?php if( !empty($optimize_id) ): ?>
- <h1 class="bfb_h1">「<?php echo $optData['optimize_name']; ?>」のA/Bテストの詳細</h1>
+ <h1 class="bfb_h1">「<?php echo esc_html( $optData['optimize_name'] ); ?>」のA/Bテストの詳細</h1>
<?php
@@ -80,7 +91,16 @@
$click_subNum_sum += $click_subNum;
$click_subRate = $this->report->calc_click_rate($access_subNum,$click_subNum);
- $table_html = "<tr><td>$today</td><td>$access_entireNum</td><td>$click_mainNum($click_mainRate%)</td><td>$click_subNum($click_subRate%)</td></tr>$table_html";
+ $table_html = sprintf(
+ '<tr><td>%1$s</td><td>%2$s</td><td>%3$s(%4$s%%)</td><td>%5$s(%6$s%%)</td></tr>%7$s',
+ esc_html( $today ),
+ esc_html( intval( $access_entireNum ) ),
+ esc_html( intval( $click_mainNum ) ),
+ esc_html( $click_mainRate ),
+ esc_html( intval( $click_subNum ) ),
+ esc_html( $click_subRate ),
+ $table_html
+ );
$optData['main_maxClickRate'][] = $click_mainRate;
$optData['sub_maxClickRate'][] = $click_subRate;
@@ -97,7 +117,14 @@
}else{
$click_subRate_sum = 0;
}
- $table_html .= "<tr class='bold red'><td>合計</td><td>$access_num_sum</td><td>$click_mainNum_sum($click_mainRate_sum%)</td><td>$click_subNum_sum($click_subRate_sum%)</td></tr>";
+ $table_html .= sprintf(
+ '<tr class="bold red"><td>合計</td><td>%1$s</td><td>%2$s(%3$s%%)</td><td>%4$s(%5$s%%)</td></tr>',
+ esc_html( intval( $access_num_sum ) ),
+ esc_html( intval( $click_mainNum_sum ) ),
+ esc_html( $click_mainRate_sum ),
+ esc_html( intval( $click_subNum_sum ) ),
+ esc_html( $click_subRate_sum )
+ );
}
@@ -119,7 +146,7 @@
<tr><th class="short_item">日付</th><th>合計ユーザー数</th><th>メインのクリック数(CTR)</th><th>サブのクリック数(CTR)</th></tr>
</thead>
<tbody>
- <?php echo $table_html; ?>
+ <?php echo wp_kses_post( $table_html ); ?>
</tbody>
</table>
@@ -157,13 +184,13 @@
<div id="bfb_sub" class="bfb_pro">
<div class="preview_wrap">
- <div class="bfb_preview_<?php echo $device; ?>">
+ <div class="bfb_preview_<?php echo esc_attr( $device ); ?>">
<h2>メインのプレビュー</h2>
<div class="preview_area">
<iframe srcdoc='<?php $this->generate_btn_html($device,$mainBtnData); ?>'></iframe>
</div>
</div>
- <div class="bfb_preview_<?php echo $device; ?>">
+ <div class="bfb_preview_<?php echo esc_attr( $device ); ?>">
<h2>サブのプレビュー</h2>
<div class="preview_area">
<iframe srcdoc='<?php $this->generate_btn_html($device,$subBtnData); ?>'></iframe>
@@ -178,9 +205,9 @@
<table class="table th_yellow">
<tr><th>テスト名</th><th>対象デバイス</th><th>合計ユーザー数</th><th>メインのクリック数(CTR)</th><th>サブのクリック数(CTR)</th><th>作成日</th><th>終了日</th></tr>
- <?php echo $table_html; ?>
+ <?php echo wp_kses_post( $table_html ); ?>
</table>
<?php endif; ?>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/report/report-daily.php
+++ b/blog-floating-button/inc/report/report-daily.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<h2>日別レポート</h2>
<?php
@@ -28,7 +33,14 @@
$click_rate = $this->report->calc_click_rate($access_num,$click_num);
- $table_html = "<tr><td>$today</td><td>$access_num</td><td>$click_num</td><td>$click_rate%</td></tr>$table_html";
+ $table_html = sprintf(
+ '<tr><td>%1$s</td><td>%2$s</td><td>%3$s</td><td>%4$s%%</td></tr>%5$s',
+ esc_html( $today ),
+ esc_html( intval( $access_num ) ),
+ esc_html( intval( $click_num ) ),
+ esc_html( $click_rate ),
+ $table_html
+ );
$access_num_sum += $access_num;
$click_num_sum += $click_num;
}
@@ -37,8 +49,13 @@
}else{
$click_rate_sum = 0;
}
-echo $table_html;
-echo "<tr class='bold red'><td>合計</td><td>$access_num_sum</td><td>$click_num_sum</td><td>$click_rate_sum%</td></tr>";
+echo wp_kses_post( $table_html );
+printf(
+ '<tr class="bold red"><td>合計</td><td>%1$s</td><td>%2$s</td><td>%3$s%%</td></tr>',
+ esc_html( intval( $access_num_sum ) ),
+ esc_html( intval( $click_num_sum ) ),
+ esc_html( $click_rate_sum )
+);
?>
</tbody>
-</table>
No newline at end of file
+</table>
--- a/blog-floating-button/inc/report/report-dashboard.php
+++ b/blog-floating-button/inc/report/report-dashboard.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
$todays_data = $this->report->get_target_data();
$todays_data['date'] = date_i18n('Y-m-d');
$today['access'] = $todays_data['access'][$todays_data['date']] ?? '0';
@@ -36,7 +40,7 @@
<table class="table th_yellow scroll">
<tr><th class="short_item"></th><th>本日</th><th>昨日</th><th>一昨日</th><th>今月</th><th>前月</th></tr>
- <tr><td>ユーザー数</td><td><?php echo $today['access']; ?></td><td><?php echo $one_day_ago['access']; ?></td><td><?php echo $two_days_ago['access']; ?></td><td><?php echo $search_span['access']; ?></td><td><?php echo $last_month['access']; ?></td></tr>
- <tr><td>クリック数</td><td><?php echo $today['click']; ?></td><td><?php echo $one_day_ago['click']; ?></td><td><?php echo $two_days_ago['click']; ?></td><td><?php echo $search_span['click']; ?></td><td><?php echo $last_month['click']; ?></td></tr>
- <tr><td>クリック率</td><td><?php echo $today['click_rate']; ?>%</td><td><?php echo $one_day_ago['click_rate']; ?>%</td><td><?php echo $two_days_ago['click_rate']; ?>%</td><td><?php echo $search_span['click_rate']; ?>%</td><td><?php echo $last_month['click_rate']; ?>%</td></tr>
-</table>
No newline at end of file
+ <tr><td>ユーザー数</td><td><?php echo esc_html( intval( $today['access'] ) ); ?></td><td><?php echo esc_html( intval( $one_day_ago['access'] ) ); ?></td><td><?php echo esc_html( intval( $two_days_ago['access'] ) ); ?></td><td><?php echo esc_html( intval( $search_span['access'] ) ); ?></td><td><?php echo esc_html( intval( $last_month['access'] ) ); ?></td></tr>
+ <tr><td>クリック数</td><td><?php echo esc_html( intval( $today['click'] ) ); ?></td><td><?php echo esc_html( intval( $one_day_ago['click'] ) ); ?></td><td><?php echo esc_html( intval( $two_days_ago['click'] ) ); ?></td><td><?php echo esc_html( intval( $search_span['click'] ) ); ?></td><td><?php echo esc_html( intval( $last_month['click'] ) ); ?></td></tr>
+ <tr><td>クリック率</td><td><?php echo esc_html( $today['click_rate'] ); ?>%</td><td><?php echo esc_html( $one_day_ago['click_rate'] ); ?>%</td><td><?php echo esc_html( $two_days_ago['click_rate'] ); ?>%</td><td><?php echo esc_html( $search_span['click_rate'] ); ?>%</td><td><?php echo esc_html( $last_month['click_rate'] ); ?>%</td></tr>
+</table>
--- a/blog-floating-button/inc/report/report-detail-access.php
+++ b/blog-floating-button/inc/report/report-detail-access.php
@@ -1,4 +1,8 @@
<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
$data = array();
$data = array( 'start_date' => $start_date, 'end_date' => $end_date, 'post_url' => $post_url, 'device' => $device );
$condi = array( 'limit' => intval($this->bfb_get_data('limit','get')), 'paged' => intval($this->bfb_get_data('paged','get')) );
@@ -12,11 +16,11 @@
<?php
if( isset($pagination['html']) ){
- echo $pagination['html'];
+ echo wp_kses_post( $pagination['html'] );
}
?>
-<div class="bfb_pagination_count_text"><?php echo $pagination['count_text']; ?></div>
+<div class="bfb_pagination_count_text"><?php echo esc_html( $pagination['count_text'] ); ?></div>
<table class="table th_yellow scroll">
<tr><th class="w50">id</th><th>記事URL</th><th class="w100">IPアドレス</th><th>リファラ</th><th>ユーザーエージェント</th><th class="w50">デバイス</th><th class="w100">日時</th></tr>
@@ -24,7 +28,18 @@
<?php
foreach( $datas as $data ){
if( !isset($data->id) ){ continue; }
- echo "<tr><td>$data->id</td><td><a href="$data->post_url" target="_blank">$data->post_url</a></td><td>$data->ip</td><td><a href="$data->referer" target="_blank">$data->referer</a></td><td>$data->ua</td><td>$data->device</td><td>$data->date</td></tr>";
+ printf(
+ '<tr><td>%1$d</td><td><a href="%2$s" target="_blank">%3$s</a></td><td>%4$s</td><td><a href="%5$s" target="_blank">%6$s</a></td><td>%7$s</td><td>%8$s</td><td>%9$s</td></tr>',
+ intval( $data->id ),
+ esc_url( $data->post_url ),
+ esc_html( $data->post_url ),
+ esc_html( $data->ip ),
+ esc_url( $data->referer ),
+ esc_html( $data->referer ),
+ esc_html( $data->ua ),
+ esc_html( $data->device ),
+ esc_html( $data->date )
+ );
}
?>
@@ -33,7 +48,7 @@
<?php
if( isset($pagination['html']) ){
- echo $pagination['html'];
+ echo wp_kses_post( $pagination['html'] );
}
-?>
No newline at end of file
+?>
--- a/blog-floating-button/inc/report/report-detail-click.php
+++ b/blog-floating-button/inc/report/report-detail-click.php
@@ -1,4 +1,8 @@
<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
$data = array();
$data = array( 'memo' => $memo, 'start_date' => $start_date, 'end_date' => $end_date, 'post_url' => $post_url, 'device' => $device );
$condi = array( 'limit' => intval($this->bfb_get_data('limit','get')), 'paged' => intval($this->bfb_get_data('paged','get')) );
@@ -11,11 +15,11 @@
<?php
if( isset($pagination['html']) ){
- echo $pagination['html'];
+ echo wp_kses_post( $pagination['html'] );
}
?>
-<div class="bfb_pagination_count_text"><?php echo $pagination['count_text']; ?></div>
+<div class="bfb_pagination_count_text"><?php echo esc_html( $pagination['count_text'] ); ?></div>
<table class="table th_yellow scroll">
<tr><th class="w50">id</th><th>記事URL</th><th>遷移先URL</th><th>ユーザーエージェント</th><th class="w50">デバイス</th><th>メモ</th><th class="w100">日時</th></tr>
@@ -23,13 +27,24 @@
<?php
foreach( $datas as $data ){
if( !isset($data->id) ){ continue; }
- echo "<tr><td>$data->id</td><td><a href="$data->post_url" target="_blank">$data->post_url</a></td><td><a href="$data->linked_url" target="_blank">$data->linked_url</a></td><td>$data->ua</td><td>$data->device</td><td>$data->memo</td><td>$data->date</td></tr>";
+ printf(
+ '<tr><td>%1$d</td><td><a href="%2$s" target="_blank">%3$s</a></td><td><a href="%4$s" target="_blank">%5$s</a></td><td>%6$s</td><td>%7$s</td><td>%8$s</td><td>%9$s</td></tr>',
+ intval( $data->id ),
+ esc_url( $data->post_url ),
+ esc_html( $data->post_url ),
+ esc_url( $data->linked_url ),
+ esc_html( $data->linked_url ),
+ esc_html( $data->ua ),
+ esc_html( $data->device ),
+ esc_html( $data->memo ),
+ esc_html( $data->date )
+ );
}
?>
</table>
<?php
if( isset($pagination['html']) ){
- echo $pagination['html'];
+ echo wp_kses_post( $pagination['html'] );
}
-?>
No newline at end of file
+?>
--- a/blog-floating-button/inc/report/report-graph.php
+++ b/blog-floating-button/inc/report/report-graph.php
@@ -1,27 +1,34 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<div id="canvasWrapper">
<canvas id="myChart"></canvas>
</div>
<script>
+// Chart.js はフッターで読み込むため、DOM 構築と依存スクリプトの読み込み後に初期化する。
+document.addEventListener("DOMContentLoaded", function() {
var chartData = {
- labels: [<?php echo $graphData['date']; ?>],
+ labels: <?php echo wp_json_encode( $graphData['date'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
datasets: [
{
type: 'bar',
label: 'ユーザー数',
- data: [<?php echo $graphData['access']; ?>],
+ data: <?php echo wp_json_encode( $graphData['access'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
yAxisID: "y-access",
},
{
type: 'bar',
label: 'クリック数',
- data: [<?php echo $graphData['click']; ?>],
+ data: <?php echo wp_json_encode( $graphData['click'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
yAxisID: "y-click",
},
{
type: 'line',
label: 'クリック率',
- data: [<?php echo $graphData['click_rate']; ?>],
+ data: <?php echo wp_json_encode( $graphData['click_rate'], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT ); ?>,
yAxisID: "y-clickRate",
fill: false,
},
@@ -47,7 +54,7 @@
type: "linear",
position: "left",
ticks: {
- max: <?php echo $this->report->ceil_1($graphData['max_access']); ?>,
+ max: <?php echo wp_json_encode( $this->report->ceil_1( $graphData['max_access'] ) ); ?>,
min: 0,
},
},
@@ -56,7 +63,7 @@
type: "linear",
position: "right",
ticks: {
- max: <?php echo $this->report->ceil_1($graphData['max_access']); ?>,
+ max: <?php echo wp_json_encode( $this->report->ceil_1( $graphData['max_access'] ) ); ?>,
min: 0,
},
gridLines: {
@@ -79,4 +86,5 @@
}
}
});
-</script>
No newline at end of file
+});
+</script>
--- a/blog-floating-button/inc/report/report-main.php
+++ b/blog-floating-button/inc/report/report-main.php
@@ -1,5 +1,9 @@
<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+
$report_type = $this->bfb_get_data('report_type','get');
$start_date = $this->bfb_get_data('start_date','get');
$end_date = $this->bfb_get_data('end_date','get');
@@ -46,4 +50,4 @@
<?php endif; ?>
-</div><!--bfb_wrap-->
No newline at end of file
+</div><!--bfb_wrap-->
--- a/blog-floating-button/inc/report/report-monthly.php
+++ b/blog-floating-button/inc/report/report-monthly.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<h2>月別レポート</h2>
<?php
@@ -29,7 +34,13 @@
}else{
$click_rate = 0;
}
- echo "<tr><td>$today</td><td>$access_num</td><td>$click_num</td><td>$click_rate%</td></tr>";
+ printf(
+ '<tr><td>%1$s</td><td>%2$s</td><td>%3$s</td><td>%4$s%%</td></tr>',
+ esc_html( $today ),
+ esc_html( intval( $access_num ) ),
+ esc_html( intval( $click_num ) ),
+ esc_html( $click_rate )
+ );
$access_num_sum += $access_num;
$click_num_sum += $click_num;
}
@@ -38,7 +49,12 @@
}else{
$click_rate_sum = 0;
}
-echo "<tr class='bold red'><td>合計</td><td>$access_num_sum</td><td>$click_num_sum</td><td>$click_rate_sum%</td></tr>";
+printf(
+ '<tr class="bold red"><td>合計</td><td>%1$s</td><td>%2$s</td><td>%3$s%%</td></tr>',
+ esc_html( intval( $access_num_sum ) ),
+ esc_html( intval( $click_num_sum ) ),
+ esc_html( $click_rate_sum )
+);
?>
-</table>
No newline at end of file
+</table>
--- a/blog-floating-button/inc/report/report-search.php
+++ b/blog-floating-button/inc/report/report-search.php
@@ -1,9 +1,14 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<form action="" method="get" class="search_box">
<table>
<tr>
<th>レポート種類</th>
<td>
- <label for="daily_report"><input type="radio" id="daily_report" name="report_type" class="" value="daily_report" <?= $report_type=='daily_report' ? 'checked' : '' ?>>日別</label><label for="monthly_report"><input type="radio" id="monthly_report" name="report_type" class="" value="monthly_report" <?= $report_type=='monthly_report' ? 'checked' : '' ?>>月別</label><label for="access_detail_report"><input type="radio" id="access_detail_report" name="report_type" class="" value="access_detail_report" <?= $report_type=='access_detail_report' ? 'checked' : '' ?>>アクセス詳細</label><label for="click_detail_report"><input type="radio" id="click_detail_report" name="report_type" class="" value="click_detail_report" <?= $report_type=='click_detail_report' ? 'checked' : '' ?>>クリック詳細</label>
+ <label for="daily_report"><input type="radio" id="daily_report" name="report_type" class="" value="daily_report" <?php checked( $report_type, 'daily_report' ); ?>>日別</label><label for="monthly_report"><input type="radio" id="monthly_report" name="report_type" class="" value="monthly_report" <?php checked( $report_type, 'monthly_report' ); ?>>月別</label><label for="access_detail_report"><input type="radio" id="access_detail_report" name="report_type" class="" value="access_detail_report" <?php checked( $report_type, 'access_detail_report' ); ?>>アクセス詳細</label><label for="click_detail_report"><input type="radio" id="click_detail_report" name="report_type" class="" value="click_detail_report" <?php checked( $report_type, 'click_detail_report' ); ?>>クリック詳細</label>
</td>
</tr>
<tr>
@@ -21,8 +26,8 @@
<tr>
<th>デバイス</th>
<td>
- <label for="all"><input type="radio" id="all" name="device" class="" value="" <?= $device=='' ? 'checked' : '' ?>>全て</label>
- <label for="PC"><input type="radio" id="PC" name="device" class="" value="PC" <?= $device=='PC' ? 'checked' : '' ?>>PC</label><label for="SP"><input type="radio" id="SP" name="device" class="" value="SP" <?= $device=='SP' ? 'checked' : '' ?>>スマホ</label><label for="Tab"><input type="radio" id="Tab" name="device" class="" value="Tab" <?= $device=='Tab' ? 'checked' : '' ?>>タブレット</label><label for="Mobile"><input type="radio" id="Mobile" name="device" class="" value="Mobile" <?= $report_type=='Mobile' ? 'checked' : '' ?>>モバイル</label>
+ <label for="all"><input type="radio" id="all" name="device" class="" value="" <?php checked( $device, '' ); ?>>全て</label>
+ <label for="PC"><input type="radio" id="PC" name="device" class="" value="PC" <?php checked( $device, 'PC' ); ?>>PC</label><label for="SP"><input type="radio" id="SP" name="device" class="" value="SP" <?php checked( $device, 'SP' ); ?>>スマホ</label><label for="Tab"><input type="radio" id="Tab" name="device" class="" value="Tab" <?php checked( $device, 'Tab' ); ?>>タブレット</label><label for="Mobile"><input type="radio" id="Mobile" name="device" class="" value="Mobile" <?php checked( $report_type, 'Mobile' ); ?>>モバイル</label>
</td>
</tr>
<tr class="bfb_memo" style="display: none;">
@@ -94,4 +99,4 @@
});
</script>
-<?php $this->date_picker_script(); ?>
No newline at end of file
+<?php $this->date_picker_script(); ?>
--- a/blog-floating-button/inc/setting-common.php
+++ b/blog-floating-button/inc/setting-common.php
@@ -1,3 +1,8 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+ exit;
+}
+?>
<h2>共通の設定</h2>
<div class="bfb_box">
@@ -10,7 +15,7 @@
<?php
$bfb_mode_open = '';
if( $this->bfb_mode == "open" ){
- $bfb_mode_open = 'selected="selected"';
+ $bfb_mode_open = 'selected';
}
?>
<select name="bfb_mode">
@@ -30,28 +35,28 @@
$bfb_designType_pc_none = '';
switch( $this->bfb_designType_pc ){
case "textBtn":
- $bfb_designType_pc_textBtn = 'selected="selected"';
+ $bfb_designType_pc_textBtn = 'selected';
break;
case "textTextBtn":
- $bfb_designType_pc_textTextBtn = 'selected="selected"';
+ $bfb_designType_pc_textTextBtn = 'selected';
break;
case "textBtnTextBtn":
- $bfb_designType_pc_textBtnTextBtn = 'selected="selected"';
+ $bfb_designType_pc_textBtnTextBtn = 'selected';
break;
case "imgBanner":
- $bfb_designType_pc_imgBanner = 'selected="selected"';
+ $bfb_designType_pc_imgBanner = 'selected';
break;
case "none":
- $bfb_designType_pc_none = 'selected="selected"';
+ $bfb_designType_pc_none = 'selected';
break;
}
?>
<select name="bfb_designType_pc">
- <option value="textBtn" <?php echo $bfb_designType_pc_textBtn; ?>>ボタンのみ</option>
- <option value="textTextBtn" <?php echo $bfb_designType_pc_textTextBtn; ?>>説明文+ボタン</option>
- <option value="textBtnTextBtn" <?php echo $bfb_designType_pc_textBtnTextBtn; ?>>ボタン+ボタン</option>
- <option value="imgBanner" <?php echo $bfb_designType_pc_imgBanner; ?>>バナー画像</option>
- <option value="none" <?php echo $bfb_designType_pc_none; ?>>表示しない</option>
+ <option value="textBtn" <?php echo esc_attr( $bfb_designType_pc_textBtn ); ?>>ボタンのみ</option>
+ <option value="textTextBtn" <?php echo esc_attr( $bfb_designType_pc_textTextBtn ); ?>>説明文+ボタン</option>
+ <option value="textBtnTextBtn" <?php echo esc_attr( $bfb_designType_pc_textBtnTextBtn ); ?>>ボタン+ボタン</option>
+ <option value="imgBanner" <?php echo esc_attr( $bfb_designType_pc_imgBanner ); ?>>バナー画像</option>
+ <option value="none" <?php echo esc_attr( $bfb_designType_pc_none ); ?>>表示しない</option>
</select>
</td>
</tr>
@@ -66,28 +71,28 @@
$bfb_designType_sp_none = '';
switch( $this->bfb_designType_sp ){
case "textBtn":
- $bfb_designType_sp_textBtn = 'selected="selected"';
+ $bfb_designType_sp_textBtn = 'selected';
break;
case "textTextBtn":
- $bfb_designType_sp_textTextBtn = 'selected="selected"';
+ $bfb_designType_sp_textTextBtn = 'selected';
break;
case "textBtnTextBtn":
- $bfb_designType_sp_textBtnTextBtn = 'selected="selected"';
+ $bfb_designType_sp_textBtnTextBtn = 'selected';
break;
case "imgBanner":
- $bfb_designType_sp_imgBanner = 'selected="selected"';
+ $bfb_designType_sp_imgBanner = 'selected';
break;
case "none":
- $bfb_designType_sp_none = 'selected="selected"';
+ $bfb_designType_sp_none = 'selected';
break;
}
?>
<select name="bfb_designType_sp">
- <option value="textBtn" <?php echo $bfb_designType_sp_textBtn; ?>>ボタンのみ</option>
- <option value="textTextBtn" <?php echo $bfb_designType_sp_textTextBtn; ?>>説明文+ボタン</option>
- <option value="textBtnTextBtn" <?php echo $bfb_designType_sp_textBtnTextBtn; ?>>ボタン+ボタン</option>
- <option value="imgBanner" <?php echo $bfb_designType_sp_imgBanner; ?>>バナー画像</option>
- <option value="none" <?php echo $bfb_designType_sp_none; ?>>表示しない</option>
+ <option value="textBtn" <?php echo esc_attr( $bfb_designType_sp_textBtn ); ?>>ボタンのみ</option>
+ <option value="textTextBtn" <?php echo esc_attr( $bfb_designType_sp_textTextBtn ); ?>>説明文+ボタン</option>
+ <option value="textBtnTextBtn" <?php echo esc_attr( $bfb_designType_sp_textBtnTextBtn ); ?>>ボタン+ボタン</option>
+ <option value="imgBanner" <?php echo esc_attr( $bfb_designType_sp_imgBanner ); ?>>バナー画像</option>
+ <option value="none" <?php echo esc_attr( $bfb_designType_sp_none ); ?>>表示しない</option>
</select>
</td>
</tr>
@@ -98,15 +103,15 @@
$bfb_exclude_toppage_hide = '';
$bfb_exclude_toppage_show_top_only = '';
if( $this->bfb_exclude_toppage == "hide" ){
- $bfb_exclude_toppage_hide = 'selected="selected"';
+ $bfb_exclude_toppage_hide = 'selected';
}elseif( $this->bfb_exclude_toppage == "show_top_only" ){
- $bfb_exclude_toppage_show_top_only = 'selected="selected"';
+ $bfb_exclude_toppage_show_top_only = 'selected';
}
?>
<select name="bfb_exclude_toppage">
<option value="show">表示</option>
- <option value="show_top_only" <?php echo $bfb_exclude_toppage_show_top_only; ?>>トップページのみ表示</option>
- <option value="hide" <?php echo $bfb_exclude_toppage_hide; ?>>トップページのみ非表示</option>
+ <option value="show_top_only" <?php echo esc_attr( $bfb_exclude_toppage_show_top_only ); ?>>トップページのみ表示</option>
+ <option value="hide" <?php echo esc_attr( $bfb_exclude_toppage_hide ); ?>>トップページのみ非表示</option>
</select>
</td>
</tr>
@@ -136,11 +141,11 @@
?>
<td>
- <label for="category"><input type="checkbox" id="category" name="bfb_hidden_pages[]" value="category" <?php echo $bfb_hidden_pages_category; ?>>カテゴリーページ</label>
- <label for="tag"><input type="checkbox" id="tag" name="bfb_hidden_pages[]" value="tag" <?php echo $bfb_hidden_pages_tag; ?>>タグページ</label>
- <label for="search"><input type="checkbox" id="search" name="bfb_hidden_pages[]" value="search" <?php echo $bfb_hidden_pages_search; ?>>検索結果ページ</label>
- <label for="author"><input type="checkbox" id="author" name="bfb_hidden_pages[]" value="author" <?php echo $bfb_hidden_pages_author; ?>>投稿者アーカイブページ</label>
- <label for="404"><input type="checkbox" id="404" name="bfb_hidden_pages[]" value="404" <?php echo $bfb_hidden_pages_404; ?>>404ページ</label>
+ <label for="category"><input type="checkbox" id="category" name="bfb_hidden_pages[]" value="category" <?php echo esc_attr( $bfb_hidden_pages_category ); ?>>カテゴリーページ</label>
+ <label for="tag"><input type="checkbox" id="tag" name="bfb_hidden_pages[]" value="tag" <?php echo esc_attr( $bfb_hidden_pages_tag ); ?>>タグページ</label>
+ <label for="search"><input type="checkbox" id="search" name="bfb_hidden_pages[]" value="search" <?php echo esc_attr( $bfb_hidden_pages_search ); ?>>検索結果ページ</label>
+ <label for="author"><input type="checkbox" id="author" name="bfb_hidden_pages[]" value="author" <?php echo esc_attr( $bfb_hidden_pages_author ); ?>>投稿者アーカイブページ</label>
+ <label for="404"><input type="checkbox" id="404" name="bfb_hidden_pages[]" value="404" <?php echo esc_attr( $bfb_hidden_pages_404 ); ?>>404ページ</label>
</td>
</tr>
<?php endif; ?>
@@ -150,12 +155,12 @@
<?php
$bfb_autohide_off = '';
if( $this->bfb_autohide == "off" ){
- $bfb_autohide_off = 'selected="selected"';
+ $bfb_autohide_off = 'selected';
}
?>
<select name="bfb_autohide">
<option value="on">下スクロール時は非表示</option>
- <option value="off" <?php echo $bfb_autohide_off; ?>>常に表示</option>
+ <option value="off" <?php echo esc_attr( $bfb_autohide_off ); ?>>常に表示</option>
</select>
</td>
</tr>
@@ -209,12 +214,12 @@
<?php
$bfb_clickAnalyze_off = '';
if( $this->bfb_clickAnalyze == "off" ){
- $bfb_clickAnalyze_off = 'selected="selected"';
+ $bfb_clickAnalyze_off = 'selected';
}
?>
<select name="bfb_clickAnalyze">
<option value="on">計測する</option>
- <option value="off" <?php echo $bfb_clickAnalyze_off; ?>>計測しない</option>
+ <option value="off" <?php echo esc_attr( $bfb_clickAnalyze_off ); ?>>計測しない</option>
</select>
</td>
</tr>
@@ -224,12 +229,12 @@
<?php
$bfb_clickAnalyze_exclude_admin_off = '';
if( $this->bfb_clickAnalyze_exclude_admin == "off" ){
- $bfb_clickAnalyze_exclude_admin_off = 'selected="selected"';
+ $bfb_clickAnalyze_exclude_admin_off = 'selected';
}
?>
<select name="bfb_clickAnalyze_exclude_admin">
<option value="on">管理者を除外する</option>
- <option value="off" <?php echo $bfb_clickAnalyze_exclude_admin_off; ?>>管理者を除外しない</option>
+ <option value="off" <?php echo esc_attr( $bfb_clickAnalyze_exclude_admin_off ); ?>>管理者を除外しない</option>
</select>
</td>
</tr>
@@ -243,7 +248,6 @@
if( !empty($optDatas) ){
foreach( $optDatas as $optId => $optData ){
if( $optData['device'] == 'sp' ) continue;
- $bfb_optId_checked = ($this->bfb_optId_pc==$optId)?'selected="selected"':'';
$bfb_opt_status = '';
switch($optData['status']){
case 1:
@@ -256,13 +260,23 @@
$bfb_opt_status = '【停止】';
break;
}
- $opt_html .= '<option value="'.$optId.'" '.$bfb_optId_checked.'>'.$bfb_opt_status.$optData['optimize_name'].'('.$optId.')</option>';
+ $opt_html .= '<option value="' . esc_attr( $optId ) . '"' . selected( $this->bfb_optId_pc, $optId, false ) . '>' . esc_html( $bfb_opt_status . $optData['optimize_name'] . '(' . $optId . ')' ) . '</option>';
}
}
?>
<select name="bfb_optId_pc">
<option value="">実施しない</option>
- <?php echo $opt_html; ?>
+ <?php
+ echo wp_kses(
+ $opt_html,
+ array(
+ 'option' => array(
+ 'value' => array(),
+ 'selected' => array(),
+ ),
+ )
+ );
+ ?>
</select>
</td>
</tr>
@@ -275,7 +289,6 @@
if( !empty($optDatas) ){
foreach( $optDatas as $optId => $optData ){
if( $optData['device'] == 'pc' ) continue;
- $bfb_optId_checked = ($this->