diff --git a/Dockerfile b/Dockerfile
index bff7982e1c..4d2840343b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS}
+RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install -j$(nproc) ${EXT_INSTALL_ARGS}
RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi
# composer
diff --git a/composer.lock b/composer.lock
index dfeaebf5e5..ac158fee2a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1645,16 +1645,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.11.10",
+ "version": "1.11.11",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
+ "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+ "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
"shasum": ""
},
"require": {
@@ -1699,7 +1699,7 @@
"type": "github"
}
],
- "time": "2024-08-08T09:02:50+00:00"
+ "time": "2024-08-19T14:37:29+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/data/Smarty/templates/default/entry/kiyaku.tpl b/data/Smarty/templates/default/entry/kiyaku.tpl
index 1707b6b561..16cab8ea07 100644
--- a/data/Smarty/templates/default/entry/kiyaku.tpl
+++ b/data/Smarty/templates/default/entry/kiyaku.tpl
@@ -40,7 +40,7 @@
-
+
diff --git a/data/Smarty/templates/sphone/abouts/index.tpl b/data/Smarty/templates/sphone/abouts/index.tpl
index bcd3e76dfb..3f134a11bf 100644
--- a/data/Smarty/templates/sphone/abouts/index.tpl
+++ b/data/Smarty/templates/sphone/abouts/index.tpl
@@ -55,7 +55,7 @@
メールアドレス
-
+
diff --git a/data/Smarty/templates/sphone/cart/index.tpl b/data/Smarty/templates/sphone/cart/index.tpl
index 349ccac4dd..df0f48573a 100644
--- a/data/Smarty/templates/sphone/cart/index.tpl
+++ b/data/Smarty/templates/sphone/cart/index.tpl
@@ -65,7 +65,7 @@
diff --git a/data/Smarty/templates/sphone/entry/complete.tpl b/data/Smarty/templates/sphone/entry/complete.tpl
index 9cb1cfc239..f1063374ef 100644
--- a/data/Smarty/templates/sphone/entry/complete.tpl
+++ b/data/Smarty/templates/sphone/entry/complete.tpl
@@ -32,7 +32,7 @@
今後ともご愛顧賜りますよう、よろしくお願い申し上げます。
-
トップページへ
+
トップページへ
diff --git a/data/Smarty/templates/sphone/entry/kiyaku.tpl b/data/Smarty/templates/sphone/entry/kiyaku.tpl
index 7bd6b341d7..b402e9d34b 100644
--- a/data/Smarty/templates/sphone/entry/kiyaku.tpl
+++ b/data/Smarty/templates/sphone/entry/kiyaku.tpl
@@ -30,8 +30,8 @@
@@ -39,8 +39,8 @@
diff --git a/data/Smarty/templates/sphone/footer.tpl b/data/Smarty/templates/sphone/footer.tpl
index 5eb68905e4..2d0742ee8a 100644
--- a/data/Smarty/templates/sphone/footer.tpl
+++ b/data/Smarty/templates/sphone/footer.tpl
@@ -25,10 +25,10 @@
diff --git a/data/Smarty/templates/sphone/forgot/complete.tpl b/data/Smarty/templates/sphone/forgot/complete.tpl
index 91281847aa..c070f4028f 100644
--- a/data/Smarty/templates/sphone/forgot/complete.tpl
+++ b/data/Smarty/templates/sphone/forgot/complete.tpl
@@ -39,7 +39,7 @@
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl b/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
index 55660b2c02..42ce606a0e 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
@@ -23,7 +23,7 @@
id="" style="display: none;">
-
- class="onlink">()
+ class="onlink">()
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/login.tpl b/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
index 1dd43854d7..e4d630e17d 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
@@ -23,15 +23,15 @@
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/login_footer.tpl b/data/Smarty/templates/sphone/frontparts/bloc/login_footer.tpl
index bfb4972ade..24fe51b999 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/login_footer.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/login_footer.tpl
@@ -27,13 +27,13 @@
-
ようこそ さん
+ ようこそ さん
所持ポイントpt
- ログアウト
+ ログアウト
ようこそ ゲストさん
- 新規会員登録
+ 新規会員登録
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl b/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl
index 25e83500cf..cb58e7eb5f 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl
@@ -22,12 +22,12 @@
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl b/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
index b0b169a962..ce355e5a0e 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
@@ -22,14 +22,14 @@
diff --git a/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl b/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
index 6f67262487..853c762b5c 100644
--- a/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
+++ b/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
@@ -30,20 +30,20 @@
diff --git a/data/Smarty/templates/sphone/products/review_confirm.tpl b/data/Smarty/templates/sphone/products/review_confirm.tpl
index 3259dd48e9..00f42840bd 100644
--- a/data/Smarty/templates/sphone/products/review_confirm.tpl
+++ b/data/Smarty/templates/sphone/products/review_confirm.tpl
@@ -65,7 +65,7 @@
diff --git a/data/Smarty/templates/sphone/regist/complete.tpl b/data/Smarty/templates/sphone/regist/complete.tpl
index 802a04f4d7..1ed265ff38 100644
--- a/data/Smarty/templates/sphone/regist/complete.tpl
+++ b/data/Smarty/templates/sphone/regist/complete.tpl
@@ -30,7 +30,7 @@
それではショッピングをお楽しみください。
今後ともご愛顧賜りますようよろしくお願い申し上げます。
diff --git a/data/Smarty/templates/sphone/shopping/complete.tpl b/data/Smarty/templates/sphone/shopping/complete.tpl
index fed29b67d4..3e3015a7b0 100644
--- a/data/Smarty/templates/sphone/shopping/complete.tpl
+++ b/data/Smarty/templates/sphone/shopping/complete.tpl
@@ -48,14 +48,14 @@
万一、ご確認メールが届かない場合は、トラブルの可能性もありますので大変お手数ではございますがもう一度お問い合わせいただくか、お電話にてお問い合わせくださいませ。
今後ともご愛顧賜りますようよろしくお願い申し上げます。
diff --git a/data/Smarty/templates/sphone/shopping/confirm.tpl b/data/Smarty/templates/sphone/shopping/confirm.tpl
index 1e6943c1a2..62e1bf7b5d 100644
--- a/data/Smarty/templates/sphone/shopping/confirm.tpl
+++ b/data/Smarty/templates/sphone/shopping/confirm.tpl
@@ -286,11 +286,11 @@
diff --git a/data/Smarty/templates/sphone/shopping/deliv.tpl b/data/Smarty/templates/sphone/shopping/deliv.tpl
index eff140a84d..8f9e852c20 100644
--- a/data/Smarty/templates/sphone/shopping/deliv.tpl
+++ b/data/Smarty/templates/sphone/shopping/deliv.tpl
@@ -45,7 +45,7 @@
@@ -69,7 +69,7 @@
@@ -84,14 +84,14 @@
diff --git a/data/Smarty/templates/sphone/shopping/index.tpl b/data/Smarty/templates/sphone/shopping/index.tpl
index fab7197ce7..3b00b3ca52 100644
--- a/data/Smarty/templates/sphone/shopping/index.tpl
+++ b/data/Smarty/templates/sphone/shopping/index.tpl
@@ -70,7 +70,7 @@
- パスワードを忘れた方
+ パスワードを忘れた方
@@ -82,7 +82,7 @@
diff --git a/data/Smarty/templates/sphone/shopping/multiple.tpl b/data/Smarty/templates/sphone/shopping/multiple.tpl
index 3a9d9fc705..9acfc544ec 100644
--- a/data/Smarty/templates/sphone/shopping/multiple.tpl
+++ b/data/Smarty/templates/sphone/shopping/multiple.tpl
@@ -34,7 +34,7 @@
@@ -108,8 +108,8 @@
diff --git a/data/Smarty/templates/sphone/shopping/payment.tpl b/data/Smarty/templates/sphone/shopping/payment.tpl
index 6abe5d5598..ac1626172f 100644
--- a/data/Smarty/templates/sphone/shopping/payment.tpl
+++ b/data/Smarty/templates/sphone/shopping/payment.tpl
@@ -271,8 +271,8 @@
diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php
index daae3e4ae7..202e6c3872 100644
--- a/data/class/SC_Initial.php
+++ b/data/class/SC_Initial.php
@@ -364,8 +364,6 @@ public function defineConstants()
define('FILE_NOT_FOUND', 20);
/** 書き込みエラー */
define('WRITE_FILE_ERROR', 21);
- /** DB接続エラー */
- define('DB_CONNECT_ERROR', 22);
/** ダウンロードファイル存在エラー */
define('DOWNFILE_NOT_FOUND', 22);
/** フリーメッセージ */
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
index 142028d197..81526a1324 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php
@@ -98,7 +98,8 @@ public function action()
if (count($this->arrErr) == 0) {
$this->lfRegistData($objFormParam, $objPayment, $_SESSION['member_id'], $post['payment_id']);
$this->objUpFile->moveTempFile();
- $this->tpl_onload = "location.href = './payment.php'; return;";
+ SC_Response_Ex::sendRedirect('payment.php');
+ SC_Response_Ex::actionExit();
}
$this->tpl_payment_id = $post['payment_id'];
break;
diff --git a/html/install/sql/insert_data.sql b/html/install/sql/insert_data.sql
index b54e0b59f0..b377320466 100644
--- a/html/install/sql/insert_data.sql
+++ b/html/install/sql/insert_data.sql
@@ -608,7 +608,7 @@ INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, h
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 14, '現在のカゴの中', 'cart/index.php', 'cart/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 15, 'お問い合わせ(入力ページ)', 'contact/index.php', 'contact/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 16, 'お問い合わせ(完了ページ)', 'contact/complete.php', 'contact/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
-INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 17, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 17, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 18, 'ご利用規約', 'entry/kiyaku.php', 'entry/kiyaku', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 19, '会員登録(完了ページ)', 'entry/complete.php', 'entry/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (10, 20, '特定商取引に関する法律に基づく表記', 'order/index.php', 'order/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
@@ -637,7 +637,7 @@ INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, h
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 14, '現在のカゴの中', 'cart/index.php', 'cart/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 15, 'お問い合わせ(入力ページ)', 'contact/index.php', 'contact/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 16, 'お問い合わせ(完了ページ)', 'contact/complete.php', 'contact/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
-INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 17, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 17, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 18, 'ご利用規約', 'entry/kiyaku.php', 'entry/kiyaku', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 19, '会員登録(完了ページ)', 'entry/complete.php', 'entry/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (2, 20, '特定商取引に関する法律に基づく表記', 'order/index.php', 'order/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
@@ -668,7 +668,7 @@ INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, h
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 16, '現在のカゴの中', 'cart/index.php', 'cart/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 17, 'お問い合わせ(入力ページ)', 'contact/index.php', 'contact/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 18, 'お問い合わせ(完了ページ)', 'contact/complete.php', 'contact/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
-INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 19, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 19, '会員登録(入力ページ)', 'entry/index.php', 'entry/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'noindex');
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 20, 'ご利用規約', 'entry/kiyaku.php', 'entry/kiyaku', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 21, '会員登録(完了ページ)', 'entry/complete.php', 'entry/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);
INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date, meta_robots) VALUES (1, 22, '携帯メール登録', 'entry/email_mobile.php', 'entry/email_mobile', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL);